diff --git a/docs/lcdproc-user/drivers/IOWarrior.docbook b/docs/lcdproc-user/drivers/IOWarrior.docbook
index 80861fe..ff832e4 100644
--- a/docs/lcdproc-user/drivers/IOWarrior.docbook
+++ b/docs/lcdproc-user/drivers/IOWarrior.docbook
@@ -58,7 +58,7 @@ support controlling LCD displays:
 </para>
 
 <para>
-The <literal>IOWarrior</literal> driver currently only supports writing
+The <code>IOWarrior</code> driver currently only supports writing
 to a single-controller HD44780-type display.
 LED output using the <command>output()</command> function is also implemented,
 although not tested very well.
@@ -74,6 +74,12 @@ the current state regarding support of this chip is unknown due to the
 lack of the required hardware.
 </para>
 
+</sect2>
+
+
+<sect2 id="IOWarrior-requirements">
+<title>Requirements</title>
+
 <para>
 The driver is based on the <ulink url="http://libusb.sourceforge.net/"><filename>libusb</filename></ulink>
 USB library, which should make it work with Linux, the different BSB variants
@@ -81,7 +87,7 @@ as well as Darwin/MacOS X.
 
 <note>
   <para>
-    When using a <filename>libusb</filename> based driver like <literal>IOWarrior</literal>,
+    When using a <filename>libusb</filename> based driver like <code>IOWarrior</code>,
     <application>LCDd</application> needs to be started as root.
   </para>
 </note>
@@ -92,7 +98,7 @@ as well as Darwin/MacOS X.
     <filename>iowarrior.ko</filename> that allows controlling IOWarrior
     chips using device files.
     Having this module loaded may hinder <application>LCDd</application>
-    from starting using the <literal>IOWarrior</literal> driver.
+    from starting using the <code>IOWarrior</code> driver.
     In this case, simply unload the kernel module.
   </para>
 </note>
diff --git a/docs/lcdproc-user/drivers/hd44780.docbook b/docs/lcdproc-user/drivers/hd44780.docbook
index f21de29..1339819 100644
--- a/docs/lcdproc-user/drivers/hd44780.docbook
+++ b/docs/lcdproc-user/drivers/hd44780.docbook
@@ -690,7 +690,7 @@ you need it otherwise, then connect it to GND. This certainly applies if you hav
 </note>
 
 <para>
-The <literal>4bit</literal> connection type supports more than one display connected
+The <code>4bit</code> connection type supports more than one display connected
 to the same parallel port.
 If you want to connect more than one display, then wire the all the displays to the
 parallel port according to the scheme above with the exception of the <literal>EN</literal>
@@ -2124,7 +2124,7 @@ that can be piggy-packed to a HD44780 display and connects that to USB.
 </para>
 
 <para>
-The board, driven by the <literal>bwctusb</literal> connection type,
+The board, driven by the <code>bwctusb</code> connection type,
 does neither support a keypad for input, nor more than one single-controller
 display, nor does it allow setting the backlight or brightness.
 But you can set the display's contrast using software
@@ -2184,7 +2184,7 @@ Besides the standard configuration options for <code>hd44780</code> displays, th
 <command>Contrast=</command> to set the display's contrast,
 <command>Brightness=</command> to set the display's brightness when the backlight is switched on and
 <command>OffBrightness=</command> to set the display's brightness when is backlight is switched off.
-Both options expect a number in the range from <literal>0</literal> to <literal>1000</literal>.
+All three options expect a number in the range from <literal>0</literal> to <literal>1000</literal>.
 </para>
 
 <example id="hd44780-lcd2usb-config.example">
@@ -2589,7 +2589,7 @@ This can be done by specifying <option>--enable-drivers=all</option> or by inclu
   </term>
   <listitem><para>
     Set the initial off-brightness, i.e. the brightness when the backlight is off,
-    for the <literal>lcd2usb</literal> connection type.
+    for the <code>lcd2usb</code> connection type.
     The ilegal range is <literal>0</literal> - <literal>1000</literal>.
     If not given, it defaults to <literal>300</literal>.
   </para></listitem>
@@ -2601,8 +2601,8 @@ This can be done by specifying <option>--enable-drivers=all</option> or by inclu
     <arg choice="plain"><replaceable>CONTRAST</replaceable></arg>
   </term>
   <listitem><para>
-    Set the initial contrast for the <literal>bwctusb</literal> and
-    <literal>lcd2usb</literal> connection types.
+    Set the initial contrast for the <code>bwctusb</code> and
+    <code>lcd2usb</code> connection types.
     Legal values for <replaceable>CONTRAST</replaceable> are
     <literal>0</literal> - <literal>1000</literal>.
     If not given, it defaults to <literal>500</literal> which may
@@ -2806,7 +2806,7 @@ This can be done by specifying <option>--enable-drivers=all</option> or by inclu
     <arg choice="plain"><replaceable>VENDORID</replaceable></arg>
   </term>
   <listitem><para>
-    USB vendor ID to look for a FTDI chip with <command>ConnectionType=</command><literal>ftdi</literal>.
+    USB vendor ID to look for a FTDI chip with connection type <code>ftdi</code>.
     Default: <literal>0x4003</literal>.
   </para></listitem>
 </varlistentry>
@@ -2817,7 +2817,7 @@ This can be done by specifying <option>--enable-drivers=all</option> or by inclu
     <arg choice="plain"><replaceable>PRODUCTID</replaceable></arg>
   </term>
   <listitem><para>
-    USB product ID to look for a FTDI chip with <command>ConnectionType=</command><literal>ftdi</literal>.
+    USB product ID to look for a FTDI chip with connection type <code>ftdi</code>.
     Default: <literal>0x6001</literal>.
   </para></listitem>
 </varlistentry>
@@ -2829,7 +2829,7 @@ This can be done by specifying <option>--enable-drivers=all</option> or by inclu
   </term>
   <listitem><para>
     Serial number of the USB device to look for with
-    <command>ConnectionType=</command><literal>bwctusb</literal>.
+    connection type <code>bwctusb</code>.
     If not given, the first BWCT USB module found will be used.
   </para></listitem>
 </varlistentry>
diff --git a/docs/lcdproc-user/drivers/irman.docbook b/docs/lcdproc-user/drivers/irman.docbook
index 08b3295..5046aff 100644
--- a/docs/lcdproc-user/drivers/irman.docbook
+++ b/docs/lcdproc-user/drivers/irman.docbook
@@ -2,9 +2,8 @@
 <title>The irman Driver</title>
 
 <para>
-The irman driver allows you to use the IrMan IR remote control
-to control the LCDproc server
-(<application>LCDd</application>)
+The <code>irman</code> driver allows you to use the IrMan IR remote control
+to control the LCDproc server <application>LCDd</application>
 and/or clients that can handle input.
 </para>
 
@@ -50,10 +49,11 @@ The keys are mapped according to the following table:
 </table>
 
 <tip>
-<para>
-If you have trouble using the <code>irman</code> driver, you might try the <code>lirc</code> driver.
-lirc supports IrMan as well.
-</para>
+  <para>
+    If you have trouble using the <code>irman</code> driver,
+    you might try the <code>lirc</code> driver.
+    <package>lirc</package> supports IrMan as well.
+  </para>
 </tip>
 
 
diff --git a/docs/lcdproc-user/drivers/lircin.docbook b/docs/lcdproc-user/drivers/lircin.docbook
index a1c9f16..76ac0cf 100644
--- a/docs/lcdproc-user/drivers/lircin.docbook
+++ b/docs/lcdproc-user/drivers/lircin.docbook
@@ -2,10 +2,9 @@
 <title>The lirc Driver</title>
 
 <para>
-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.
+The <code>lirc</code> driver enables you to use any IR remote control
+that works with <package>LIRC</package> to control the LCDproc server
+<application>LCDd</application> and/or clients that can handle input.
 </para>
 
 <para>
@@ -179,7 +178,7 @@ end
 </example>
 
 <para>
-Which buttons you specify here depends on your RC and your LIRC configuration.
+Which buttons you specify here depends on your remote control and your LIRC configuration.
 </para>
 
 <para>
diff --git a/docs/lcdproc-user/drivers/lis.docbook b/docs/lcdproc-user/drivers/lis.docbook
index e37aa26..b8d2582 100644
--- a/docs/lcdproc-user/drivers/lis.docbook
+++ b/docs/lcdproc-user/drivers/lis.docbook
@@ -28,22 +28,38 @@ between the FTDI and the NEC chips.
 <title>Requirements</title>
 
 <para>
-The driver depends on libftdi, version 0.8 or higher, from
+The driver depends on <filename>libftd</filename>, version 0.8 or higher, from
 <ulink url="http://www.intra2net.com/opensource/ftdi/">
 http://www.intra2net.com/opensource/ftdi/</ulink>.
 </para>
 
-</sect2>
-<sect2 id="lis-compiling">
-<title>Compiling</title>
-
 <para>
-Make sure that the L.I.S files are built when you run configure. This
-can be done by specifying "--enable-drivers=all" or by
-"--enable-drivers=lis".
+<filename>libftd</filename> itself depends on the
+<ulink url="http://libusb.sourceforge.net/"><filename>libusb</filename></ulink>
+USB library.
+
+<note>
+  <para>
+    When using a <filename>libusb</filename> based driver like <code>lis</code>,
+    <application>LCDd</application> needs to be started as root.
+  </para>
+</note>
+
+<note>
+  <para>
+    Newer Linux kernels (2.6.20 and higher) provide a kernel module
+    <filename>iowarrior.ko</filename> that allows controlling IOWarrior
+    chips using device files.
+    Having this module loaded may hinder <application>LCDd</application>
+    from starting using the <code>lis</code> driver.
+    In this case, simply unload the kernel module.
+  </para>
+</note>
 </para>
 
 </sect2>
+
+
 <sect2 id="lis-config">
 <title>Configuration in LCDd.conf</title>