little update

docs/lcdproc-user/drivers/irman.docbook

@@ -2,85 +2,12 @@
 <title>The irman Driver</title>
 
 <para>
-This section talks about using LCDproc with LCD displays that use the
+The irman driver allows you to use the IrMan IR remote control
-irman chipset.
+to control the LCDproc server
+(<application>LCDd</application>)
+and/or clients that can handle input.
 </para>
 
-<sect2 id="irman-connections">
-<title>Connections</title>
-
-</sect2>
-
-<screen>
-Hello,
-
-I made a IRman input driver for lcdproc-0.4 wich is now include in
-"lcdproc-0.4-pre6". This input driver require "libirman-0.4.1b" the
-library with function support for IRman.
-
-I want to help you use this new driver (if anybody other than me use
-it... please tell me!!!).
-
-In order to help you compile your own version of LCDd with support for
-IRman, I recorded every step I took in order to compile my own copy
-based on two file downloaded directly from the internet.
-
-The first file is " lcdproc-0.4-pre6.tar.gz " the current version of
-lcdproc.  You can download this file from
-"http://lcdproc.omnipotent.net/download.php3" The second file is
-"libirman-0.4.1b.tar.gz" the current version of libirman.  You can
-download this file from http://www.evation.com/libirman/ DO NOT USE
-THE COPY OF LIBIRMAN FROM LCDPROC HOME PAGE...  I don't know what is
-wrong with that one but I can't decompress it???
-
-How to compile lcdproc for use with support for IRman:
-
--Untar lcdproc and libirman:
-        tar -xzvf lcdproc-0.4-pre6.tgz
-        tar -xzvf libirman$$$
--Go, configure and compile libirman:
-        cd libirman-0.4.1b/
-        ./configure
-        make
-        cd ..
--Go in lcdproc directory:
-        cd lcdproc-0.4-pre6
--Here is the modification you need to include IRman driver in lcdproc:
-        edit Makefile.config
-        # Irman input...  handy!
-        DRIVERS += -DIRMANIN_DRV
-        DOBJ += irmanin.o ../../../libirman-0.4.1b/libirman.a
-        IRMAN=1
--Compile lcdproc
-        make
--Make sure you have a network interface up and working:
-        ifup lo
--Go and install your IRman configuration file:
-        cd server
-        cd drivers
-        cp DOTirmanrc ~/.irmanrc
--Modify if needed (if you use another remote control) the .irmanrc file.
--Run LCDd with two driver, irmanin and an output driver:
-        ./LCDd -d irmanin "-d /dev/ttyS0" -d curses
--Try to access the menu by pressing the remote control.
-
-Now if it does not work:
-· Try your IRMAN on ttyS0 alone (with other software).
-· Try LCDd without the IrmanIN driver.
-· ... 
-</screen>
-
-<firstname>David</firstname>
-<surname>GLAUDE</surname>
-<email>dglaude@comtech.be</email>
-
-<screen>
-PS: If you really have successfuly made LCDd working without IRman AND
-You have successfuly made IRman device working AND you don't succeed
-to make it work together ussing my driver... then maybe I can help and
-give you some support (as time permit and if it does not eat up too
-much bandwidth).
-</screen>
 
 The keys are mapped according to the following table:
 
@@ -122,6 +49,13 @@ The keys are mapped according to the following table:
 </tgroup>
 </table>
 
+<tip>
+<para>
+If you have trouble using the IrMan driver, you might try the lirc driver.
+lirc supports Irman as well.
+</para>
+</tip>
+
 
 <!-- ## IrMan driver ## -->
 <sect2 id="IrMan-config">
@@ -130,8 +64,6 @@ The keys are mapped according to the following table:
 <sect3>
 <title>[IrMan]</title>
 
-If in trouble with IrMan, try Lirc emulator for IrMan.
-
 <variablelist>
 <varlistentry>
   <term>

docs/lcdproc-user/drivers/lircin.docbook

@@ -1,8 +1,8 @@
-<sect1 id="lircin">
+<sect1 id="lirc">
-<title>The lircin Driver</title>
+<title>The lirc Driver</title>
 
 <para>
-The lircin driver enables you to use any IR remote control
+The lirc driver enables you to use any IR remote control
 that works with LIRC to control the LCDproc server
 (<application>LCDd</application>)
 and/or clients that can handle input.
@@ -28,11 +28,11 @@ are correct.
 
 </sect2>
 
-<sect2 id="lircin-configure">
+<sect2 id="lirc-configure">
-<title>Build LCDd with the lircin Driver</title>
+<title>Build LCDd with the lirc Driver</title>
 
 <para>
-You need to add lircin to the --enable-drivers=... list.
+You need to add lirc to the --enable-drivers=... list.
 </para>
 
 <para>
@@ -41,20 +41,20 @@ Then simply run make.
 
 </sect2>
 
-<sect2 id="lircin-config">
+<sect2 id="lirc-config">
-<title>Configure LCDd to Use the lircin Driver</title>
+<title>Configure LCDd to Use the lirc Driver</title>
 
 <para>
-First of all you need to activate the driver by adding a Driver=lircin line
+First of all you need to activate the driver by adding a Driver=lirc line
 to your <filename>LCDd.conf</filename>
 </para>
 
 <example>
-<title><filename>LCDd.conf</filename>: Activate the lircin driver</title>
+<title><filename>LCDd.conf</filename>: Activate the lirc driver</title>
 <programlisting>
 
 Driver=mtxorb
-Driver=lircin
+Driver=lirc
 
 </programlisting>
 </example>
@@ -65,16 +65,16 @@ as the input driver.
 </para>
 
 <para>
-Then you have to modify the [lircin] section of your
+Then you have to modify the [lirc] section of your
 <filename>LCDd.conf</filename>.
 </para>
 
-<sect3 id="lircin-section">
+<sect3 id="lirc-section">
-<title><filename>LCDd.conf</filename>: The [lircin] Section</title>
+<title><filename>LCDd.conf</filename>: The [lirc] Section</title>
 
 <para>
-The [lircin] section of the <filename>LCDd.conf</filename> contains the
+The [lirc] section of the <filename>LCDd.conf</filename> contains the
-settings for the lircin LCDproc driver.
+settings for the lirc LCDproc driver.
 </para>
 
 <variablelist>
@@ -84,10 +84,10 @@ settings for the lircin LCDproc driver.
 <para>
 <anchor id="which-lircrc" />Normally all LIRC clients scan the file <filename>~/.lircrc</filename>.
 However, you might want to have a separate file to configure the
-LCDproc lircin driver only.
+LCDproc lirc driver only.
 </para>
 <para>
-This option enables you to specify the file you want the lircin
+This option enables you to specify the file you want the lirc
 driver to scan.
 </para>
 </listitem>
@@ -127,10 +127,10 @@ The prog=... line must be the same as in your <filename>~/.lircrc</filename>
   <listitem>
     <para>
     Normally all LIRC clients scan the file <filename>~/.lircrc</filename>.
-    However, you might want to have a separate file to configure the LCDproc lircin driver only. 
+    However, you might want to have a separate file to configure the LCDproc lirc driver only. 
     </para>
     <para>
-    This option enables you to specify the file you want the lircin driver to scan.
+    This option enables you to specify the file you want the lirc driver to scan.
     If not given it defaults to <filename>~/.lircrc</filename>.
     </para>
   </listitem>
@@ -165,7 +165,7 @@ The prog=... line must be the same as in your <filename>~/.lircrc</filename>
 
 <para>
 As mentioned above you can either modify the <filename>~/.lircrc</filename>
-or use a separate file for the lircin LCDproc driver (See
+or use a separate file for the lirc LCDproc driver (See
 <link linkend="which-lircrc">above</link> for details).
 </para>
 
@@ -176,7 +176,7 @@ lines to the file:
 
 <example>
 <title><filename>~/.lircrc</filename>: Specify the associations from buttons to keysi
-for the lircin driver</title>
+for the lirc driver</title>
 <programlisting>
 
 begin