Replace <term><command><arg> with <term><property><parameter> to describe

options in the config file because: * <arg> can only be used within <cmdsynopsis>. * <cmdsynopsis> does not allow text outside <command> and <arg>. * <arg> does not allow decorating elements like <literal> or <emphasis>. This fixes #2803057. Add shortcut entities for commonly used parameters (yes/no, size). Remove Debian patch which is obsoleted by above changes.
2009-06-12 09:12:50 +00:00
parent 5108e4931e
commit f59af2e241
48 changed files with 794 additions and 1321 deletions
@@ -11,6 +11,7 @@ EXTRA_DIST =	bookinfo.docbook \
 		introduction.docbook \
 		lcdproc-user.docbook \
 		license.docbook \
 		parameters.ent \
 		running.docbook \
 		README.docbook
@@ -228,11 +228,7 @@ settings for the LCDproc server <application>LCDd</application>.
 <varlistentry>
  <term>
-    <property>ReportToSyslog</property> =
+    <property>ReportToSyslog</property> = &parameters.yesnodef;
    {
      <emphasis><parameter><literal>no</literal></parameter></emphasis> |
      <parameter><literal>yes</literal></parameter>
    }
  </term>
  <listitem>
    <para>
@@ -276,11 +272,7 @@ settings for the LCDproc server <application>LCDd</application>.
 <varlistentry>
  <term>
-    <property>Foreground</property> =
+    <property>Foreground</property> = &parameters.yesnodef;
    {
      <emphasis><parameter><literal>no</literal></parameter></emphasis> |
      <parameter><literal>yes</literal></parameter>
    }
  </term>
  <listitem>
    <para>
@@ -15,8 +15,8 @@ CFA632 and CFA634 series by CrystalFontz, Inc.
 <variablelist>
 <varlistentry>
  <term>
-    <command>Device</command> =
+    <property>Device</property> =
-    <arg choice="plain"><replaceable>DEVICE</replaceable></arg>
+    <parameter><replaceable>DEVICE</replaceable></parameter>
  </term>
  <listitem><para>
    Select the serial output device to use.
@@ -26,12 +26,7 @@ CFA632 and CFA634 series by CrystalFontz, Inc.
 <varlistentry>
  <term>
-    <command>Size</command> =
+    <property>Size</property> = &parameters.size;
    <arg choice="plain">
      <replaceable>WIDTH</replaceable>
      <literal>x</literal>
      <replaceable>HEIGHT</replaceable>
    </arg>
  </term>
  <listitem><para>
    Set the LCD's dimensions in terms of characters per line and lines.
@@ -41,8 +36,8 @@ CFA632 and CFA634 series by CrystalFontz, Inc.
 <varlistentry>
  <term>
-    <command>Contrast</command> =
+    <property>Contrast</property> =
-    <arg choice="plain"><replaceable>CONTRAST</replaceable></arg>
+    <parameter><replaceable>CONTRAST</replaceable></parameter>
  </term>
  <listitem><para>
    Set the initial contrast.
@@ -54,8 +49,8 @@ CFA632 and CFA634 series by CrystalFontz, Inc.
 <varlistentry>
  <term>
-    <command>Brightness</command> =
+    <property>Brightness</property> =
-    <arg choice="plain"><replaceable>BRIGHTNESS</replaceable></arg>
+    <parameter><replaceable>BRIGHTNESS</replaceable></parameter>
  </term>
  <listitem><para>
    Set the initial brightness.
@@ -67,8 +62,8 @@ CFA632 and CFA634 series by CrystalFontz, Inc.
 <varlistentry>
  <term>
-    <command>OffBrightness</command> =
+    <property>OffBrightness</property> =
-    <arg choice="plain"><replaceable>BRIGHTNESS</replaceable></arg>
+    <parameter><replaceable>BRIGHTNESS</replaceable></parameter>
  </term>
  <listitem><para>
    Set the initial off-brightness.
@@ -82,16 +77,14 @@ CFA632 and CFA634 series by CrystalFontz, Inc.
 <varlistentry>
  <term>
-    <command>Speed</command> =
+    <property>Speed</property> =
-    <arg choice="plain">
+    {
-    <group choice="req">
+      <parameter><literal>1200</literal></parameter> |
-      <arg choice="plain"><literal>1200</literal></arg>
+      <parameter><literal>2400</literal></parameter> |
-      <arg choice="plain"><literal>2400</literal></arg>
+      <emphasis><parameter><literal>9600</literal></parameter></emphasis> |
-      <arg choice="plain"><literal><emphasis>9600</emphasis></literal></arg>
+      <parameter><literal>19200</literal></parameter> |
-      <arg choice="plain"><literal>19200</literal></arg>
+      <parameter><literal>115200</literal></parameter> |
-      <arg choice="plain"><literal>115200</literal></arg>
+    }
    </group>
    </arg>
  </term>
  <listitem><para>
    Set the the baud rate to use when communicating with the LCD.
@@ -101,13 +94,7 @@ CFA632 and CFA634 series by CrystalFontz, Inc.
 <varlistentry>
  <term>
-    <command>NewFirmware</command> =
+    <property>NewFirmware</property> = &parameters.yesnodef;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal>yes</literal></arg>
      <arg choice="plain"><literal><emphasis>no</emphasis></literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
    Set the firmware version (<emphasis>New</emphasis> means >= 2.0) [default: <literal>no</literal>; legal: <literal>yes</literal>, <literal>no</literal>]
@@ -116,13 +103,7 @@ CFA632 and CFA634 series by CrystalFontz, Inc.
 <varlistentry>
  <term>
-    <command>Reboot</command> =
+    <property>Reboot</property> = &parameters.yesnodef;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal>yes</literal></arg>
      <arg choice="plain"><literal><emphasis>no</emphasis></literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
    Reinitialize the LCD's BIOS [default: <literal>no</literal>; legal: <literal>yes</literal>, <literal>no</literal>]
@@ -16,8 +16,8 @@ CFontz633 chipset.
 <variablelist>
 <varlistentry>
  <term>
-    <command>Device</command> =
+    <property>Device</property> =
-    <arg choice="plain"><replaceable>DEVICE</replaceable></arg>
+    <parameter><replaceable>DEVICE</replaceable></parameter>
  </term>
  <listitem><para>
    Select the output device to use [default: <filename>/dev/lcd</filename>]
@@ -28,12 +28,7 @@ CFontz633 chipset.
 <varlistentry>
  <term>
-    <command>Size</command> =
+    <property>Size</property> = &parameters.size;
    <arg choice="plain">
      <replaceable>WIDTH</replaceable>
      <literal>x</literal>
      <replaceable>HEIGHT</replaceable>
    </arg>
  </term>
  <listitem><para>
    Select the LCD type (size) [default: <literal>16x2</literal>]
@@ -42,8 +37,8 @@ CFontz633 chipset.
 <varlistentry>
  <term>
-    <command>Contrast</command> =
+    <property>Contrast</property> =
-    <arg choice="plain"><replaceable>CONTRAST</replaceable></arg>
+    <parameter><replaceable>CONTRAST</replaceable></parameter>
  </term>
  <listitem><para>
    Set the initial contrast.
@@ -54,8 +49,8 @@ CFontz633 chipset.
 <varlistentry>
  <term>
-    <command>Brightness</command> =
+    <property>Brightness</property> =
-    <arg choice="plain"><replaceable>BRIGHTNESS</replaceable></arg>
+    <parameter><replaceable>BRIGHTNESS</replaceable></parameter>
  </term>
  <listitem><para>
    Set the initial brightness [default: <literal>1000</literal>; legal: <literal>0</literal> - <literal>1000</literal>]
@@ -64,8 +59,8 @@ CFontz633 chipset.
 <varlistentry>
  <term>
-    <command>OffBrightness</command> =
+    <property>OffBrightness</property> =
-    <arg choice="plain"><replaceable>BRIGHTNESS</replaceable></arg>
+    <parameter><replaceable>BRIGHTNESS</replaceable></parameter>
  </term>
  <listitem><para>
    Set the initial off-brightness [default: <literal>0</literal>; legal: <literal>0</literal> - <literal>1000</literal>]
@@ -76,16 +71,14 @@ CFontz633 chipset.
 <varlistentry>
  <term>
-    <command>Speed</command> =
+    <property>Speed</property> =
-    <arg choice="plain">
+    {
-    <group choice="req">
+      <parameter><literal>1200</literal></parameter> |
-      <arg choice="plain"><literal>1200</literal></arg>
+      <parameter><literal>2400</literal></parameter> |
-      <arg choice="plain"><literal>2400</literal></arg>
+      <parameter><literal>9600</literal></parameter> |
-      <arg choice="plain"><literal>9600</literal></arg>
+      <emphasis><parameter><literal>19200</literal></parameter></emphasis> |
-      <arg choice="plain"><literal><emphasis>19200</emphasis></literal></arg>
+      <parameter><literal>115200</literal></parameter>
-      <arg choice="plain"><literal>115200</literal></arg>
+    }
    </group>
    </arg>
  </term>
  <listitem><para>
    Set the the baud rate for communication with the LCD.
@@ -95,13 +88,7 @@ CFontz633 chipset.
 <varlistentry>
  <term>
-    <command>NewFirmware</command> =
+    <property>NewFirmware</property> = &parameters.yesnodef;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal>yes</literal></arg>
      <arg choice="plain"><literal><emphasis>no</emphasis></literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
    Set the firmware version (<emphasis>New</emphasis> means >= 2.0) [default: <literal>no</literal>; legal: <literal>yes</literal>, <literal>no</literal>]
@@ -111,13 +98,7 @@ CFontz633 chipset.
 <varlistentry>
  <term>
-    <command>Reboot</command> =
+    <property>Reboot</property> = &parameters.yesnodef;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal>yes</literal></arg>
      <arg choice="plain"><literal><emphasis>no</emphasis></literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
    Reinitialize the LCD's BIOS [default: <literal>no</literal>; legal: <literal>yes</literal>, <literal>no</literal>]
@@ -62,14 +62,12 @@ Currently this line of modules comprises the models:
 <variablelist>
 <varlistentry>
  <term>
-    <command>Model</command> =
+    <property>Model</property> =
-    <arg choice="plain">
+    {
-    <group choice="req">
+      <parameter><literal>631</literal></parameter> |
-      <arg choice="plain"><literal>631</literal></arg>
+      <emphasis><parameter><literal>633</literal></parameter></emphasis> |
-      <arg choice="plain"><literal><emphasis>633</emphasis></literal></arg>
+      <parameter><literal>635</literal></parameter>
-      <arg choice="plain"><literal>635</literal></arg>
+    }
    </group>
    </arg>
  </term>
  <listitem><para>
    Select the LCD model that is connected.
@@ -81,8 +79,8 @@ Currently this line of modules comprises the models:
 <varlistentry>
  <term>
-    <command>Device</command> =
+    <property>Device</property> =
-    <arg choice="plain"><replaceable>DEVICE</replaceable></arg>
+    <parameter><replaceable>DEVICE</replaceable></parameter>
  </term>
  <listitem>
    <para>
@@ -101,12 +99,7 @@ Currently this line of modules comprises the models:
 <varlistentry>
  <term>
-    <command>Size</command> =
+    <property>Size</property> = &parameters.size;
    <arg choice="plain">
      <replaceable>WIDTH</replaceable>
      <literal>x</literal>
      <replaceable>HEIGHT</replaceable>
    </arg>
  </term>
  <listitem><para>
    Select the LCD size [default: depending on model: 635: <literal>20x4</literal>,
@@ -117,8 +110,8 @@ Currently this line of modules comprises the models:
 <varlistentry>
  <term>
-    <command>Contrast</command> =
+    <property>Contrast</property> =
-    <arg choice="plain"><replaceable>CONTRAST</replaceable></arg>
+    <parameter><replaceable>CONTRAST</replaceable></parameter>
  </term>
  <listitem><para>
    Set the initial contrast.
@@ -129,8 +122,8 @@ Currently this line of modules comprises the models:
 <varlistentry>
  <term>
-    <command>Brightness</command> =
+    <property>Brightness</property> =
-    <arg choice="plain"><replaceable>BRIGHTNESS</replaceable></arg>
+    <parameter><replaceable>BRIGHTNESS</replaceable></parameter>
  </term>
  <listitem><para>
    Set the initial brightness [default: <literal>1000</literal>; legal: <literal>0</literal> - <literal>1000</literal>]
@@ -139,8 +132,8 @@ Currently this line of modules comprises the models:
 <varlistentry>
  <term>
-    <command>OffBrightness</command> =
+    <property>OffBrightness</property> =
-    <arg choice="plain"><replaceable>BRIGHTNESS</replaceable></arg>
+    <parameter><replaceable>BRIGHTNESS</replaceable></parameter>
  </term>
  <listitem><para>
    Set the initial off-brightness [default: <literal>0</literal>; legal: <literal>0</literal> - <literal>1000</literal>]
@@ -151,16 +144,14 @@ Currently this line of modules comprises the models:
 <varlistentry>
  <term>
-    <command>Speed</command> =
+    <property>Speed</property> =
-    <arg choice="plain">
+    {
-    <group choice="req">
+      <parameter><literal>1200</literal></parameter> |
-      <arg choice="plain"><literal>1200</literal></arg>
+      <parameter><literal>2400</literal></parameter> |
-      <arg choice="plain"><literal>2400</literal></arg>
+      <parameter><literal>9600</literal></parameter> |
-      <arg choice="plain"><literal>9600</literal></arg>
+      <parameter><literal>19200</literal></parameter> |
-      <arg choice="plain"><literal>19200</literal></arg>
+      <parameter><literal>115200</literal></parameter>
-      <arg choice="plain"><literal>115200</literal></arg>
+    }
    </group>
    </arg>
  </term>
  <listitem><para>
    Set the the baud rate for communication with the LCD.
@@ -171,13 +162,7 @@ Currently this line of modules comprises the models:
 <varlistentry>
  <term>
-    <command>NewFirmware</command> =
+    <property>NewFirmware</property> = &parameters.yesnodef;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal>yes</literal></arg>
      <arg choice="plain"><literal><emphasis>no</emphasis></literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
    Set the firmware version (<emphasis>New</emphasis> means >= 2.0) [default: <literal>no</literal>; legal: <literal>yes</literal>, <literal>no</literal>]
@@ -187,13 +172,7 @@ Currently this line of modules comprises the models:
 <varlistentry>
  <term>
-    <command>Reboot</command> =
+    <property>Reboot</property> = &parameters.yesnodef;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal>yes</literal></arg>
      <arg choice="plain"><literal><emphasis>no</emphasis></literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
    Reinitialize the LCD's BIOS [default: <literal>no</literal>; legal: <literal>yes</literal>, <literal>no</literal>]
@@ -57,14 +57,12 @@ For more information see the
 <variablelist>
 <varlistentry>
  <term>
-    <command>Model</command> =
+    <property>Model</property> =
-    <arg choice="plain">
+    {
-    <group choice="req">
+      <emphasis><parameter><literal>12232</literal></parameter></emphasis> |
-      <arg choice="plain"><literal><emphasis>12232</emphasis></literal></arg>
+      <parameter><literal>12832</literal></parameter> |
-      <arg choice="plain"><literal>12832</literal></arg>
+      <parameter><literal>1602</literal></parameter>
-      <arg choice="plain"><literal>1602</literal></arg>
+    }
    </group>
    </arg>
  </term>
  <listitem><para>
    Select the LCD model [default: <literal>12232</literal>;
@@ -74,8 +72,8 @@ For more information see the
 <varlistentry>
  <term>
-    <command>Device</command> =
+    <property>Device</property> =
-    <arg choice="plain"><replaceable>DEVICE</replaceable></arg>
+    <parameter><replaceable>DEVICE</replaceable></parameter>
  </term>
  <listitem><para>
    Select the output device to use [default: <filename>/dev/lcd</filename>]
@@ -85,12 +83,7 @@ For more information see the
 <varlistentry>
  <term>
-    <command>Size</command> =
+    <property>Size</property> = &parameters.size;
    <arg choice="plain">
      <replaceable>WIDTH</replaceable>
      <literal>x</literal>
      <replaceable>HEIGHT</replaceable>
    </arg>
  </term>
  <listitem><para>
    Select the LCD size [default: depending on model: 12232: <literal>20x4</literal>,
@@ -101,13 +94,11 @@ For more information see the
 <varlistentry>
  <term>
-    <command>Speed</command> =
+    <property>Speed</property> =
-    <arg choice="plain">
+    {
-    <group choice="req">
+      <parameter><literal>9600</literal></parameter> |
-      <arg choice="plain"><literal>9600</literal></arg>
+      <emphasis><parameter><literal>19200</literal></parameter></emphasis>
-      <arg choice="plain"><literal><emphasis>19200</emphasis></literal></arg>
+    }
    </group>
    </arg>
  </term>
  <listitem><para>
    Set the the baud rate for communication with the LCD.
@@ -117,13 +108,7 @@ For more information see the
 <varlistentry>
  <term>
-    <command>Reboot</command> =
+    <property>Reboot</property> = &parameters.yesnodef;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal>yes</literal></arg>
      <arg choice="plain"><literal><emphasis>no</emphasis></literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
    Reinitialize the LCD's BIOS [default: <literal>no</literal>; legal: <literal>yes</literal>, <literal>no</literal>]
@@ -133,13 +118,7 @@ For more information see the
 <varlistentry>
  <term>
-    <command>Keypad</command> =
+    <property>Keypad</property> = &parameters.yesnodef;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal>yes</literal></arg>
      <arg choice="plain"><literal><emphasis>no</emphasis></literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
    Tells if you have a keypad connected. Keypad layout is currently not
@@ -149,28 +128,28 @@ For more information see the
 <varlistentry>
  <term>
-    <command>KeyMap_A</command> =
+    <property>KeyMap_A</property> =
-    <arg choice="plain"><replaceable>KEY</replaceable></arg>
+    <parameter><replaceable>KEY</replaceable></parameter>
  </term>
  <term>
-    <command>KeyMap_B</command> =
+    <property>KeyMap_B</property> =
-    <arg choice="plain"><replaceable>KEY</replaceable></arg>
+    <parameter><replaceable>KEY</replaceable></parameter>
  </term>
  <term>
-    <command>KeyMap_C</command> =
+    <property>KeyMap_C</property> =
-    <arg choice="plain"><replaceable>KEY</replaceable></arg>
+    <parameter><replaceable>KEY</replaceable></parameter>
  </term>
  <term>
-    <command>KeyMap_D</command> =
+    <property>KeyMap_D</property> =
-    <arg choice="plain"><replaceable>KEY</replaceable></arg>
+    <parameter><replaceable>KEY</replaceable></parameter>
  </term>
  <term>
-    <command>KeyMap_E</command> =
+    <property>KeyMap_E</property> =
-    <arg choice="plain"><replaceable>KEY</replaceable></arg>
+    <parameter><replaceable>KEY</replaceable></parameter>
  </term>
  <term>
-    <command>KeyMap_F</command> =
+    <property>KeyMap_F</property> =
-    <arg choice="plain"><replaceable>KEY</replaceable></arg>
+    <parameter><replaceable>KEY</replaceable></parameter>
  </term>
  <listitem><para>
    If you have a non standard keypad you can associate any keystrings to keys.
@@ -223,13 +202,7 @@ For more information see the
 <varlistentry>
  <term>
-    <command>keypad_test_mode</command> =
+    <property>keypad_test_mode</property> = &parameters.yesnodef;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal>yes</literal></arg>
      <arg choice="plain"><literal><emphasis>no</emphasis></literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
    keypad_test_mode permit to test keypad assignment
@@ -119,12 +119,7 @@ as well as Darwin/MacOS X.
 <variablelist>
 <varlistentry>
  <term>
-    <command>Size</command> =
+    <property>Size</property> = &parameters.size;
    <arg choice="plain">
      <replaceable>WIDTH</replaceable>
      <literal>x</literal>
      <replaceable>HEIGHT</replaceable>
    </arg>
  </term>
  <listitem><para>
    Set the display dimensions. If not given, it defaults to <literal>20x4</literal>.
@@ -133,8 +128,8 @@ as well as Darwin/MacOS X.
 <varlistentry>
  <term>
-    <command>SerialNumber</command> =
+    <property>SerialNumber</property> =
-    <arg choice="plain"><replaceable>SERIALNO</replaceable></arg>
+    <parameter><replaceable>SERIALNO</replaceable></parameter>
  </term>
  <listitem><para>
    Use the IOWarrior module with the serial number <replaceable>SERIALNO</replaceable>.
@@ -144,13 +139,7 @@ as well as Darwin/MacOS X.
 <varlistentry>
  <term>
-    <command>ExtendedMode</command> =
+    <property>ExtendedMode</property> = &parameters.yesnodef;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal>yes</literal></arg>
      <arg choice="plain"><literal><emphasis>no</emphasis></literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
    If you have a KS0073 or an other 'almost HD44780-compatible' display
@@ -161,13 +150,7 @@ as well as Darwin/MacOS X.
 <varlistentry>
  <term>
-    <command>Lastline</command> =
+    <property>Lastline</property> = &parameters.yesdefno;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal><emphasis>yes</emphasis></literal></arg>
      <arg choice="plain"><literal>no</literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
    Specifies if the last line is pixel addressable or it controls an
@@ -25,8 +25,8 @@ You may find more information about the LCD on
 <variablelist>
 <varlistentry>
  <term>
-    <command>Device</command> =
+    <property>Device</property> =
-    <arg choice="plain"><replaceable>DEVICE</replaceable></arg>
+    <parameter><replaceable>DEVICE</replaceable></parameter>
  </term>
  <listitem><para>
    device to use [default: <filename>/dev/ttyS1</filename>]
@@ -35,12 +35,7 @@ You may find more information about the LCD on
 <varlistentry>
  <term>
-    <command>Size</command> =
+    <property>Size</property> = &parameters.size;
    <arg choice="plain">
      <replaceable>WIDTH</replaceable>
      <literal>x</literal>
      <replaceable>HEIGHT</replaceable>
    </arg>
  </term>
  <listitem><para>
    display size [default: <literal>16x2</literal>]
@@ -49,8 +44,8 @@ You may find more information about the LCD on
 <varlistentry>
  <term>
-    <command>Brightness</command> =
+    <property>Brightness</property> =
-    <arg choice="plain"><replaceable>BRIGHTNESS</replaceable></arg>
+    <parameter><replaceable>BRIGHTNESS</replaceable></parameter>
  </term>
  <listitem><para>
    Set the initial brightness [default: <literal>1000</literal>; legal: <literal>0</literal> - <literal>1000</literal>]
@@ -59,8 +54,8 @@ You may find more information about the LCD on
 <varlistentry>
  <term>
-    <command>OffBrightness</command> =
+    <property>OffBrightness</property> =
-    <arg choice="plain"><replaceable>BRIGHTNESS</replaceable></arg>
+    <parameter><replaceable>BRIGHTNESS</replaceable></parameter>
  </term>
  <listitem><para>
    Set the initial off-brightness [default: <literal>0</literal>; legal: <literal>0</literal> - <literal>1000</literal>]
@@ -16,8 +16,8 @@ This section talks about using LCDproc with text mode VFD displays from
 <variablelist>
 <varlistentry>
  <term>
-    <command>Device</command> =
+    <property>Device</property> =
-    <arg choice="plain"><replaceable>DEVICE</replaceable></arg>
+    <parameter><replaceable>DEVICE</replaceable></parameter>
  </term>
  <listitem><para>
    Port where the VFD is. Usual values are <filename>/dev/ttyS0</filename> and <filename>/dev/ttyS1</filename>
@@ -27,12 +27,7 @@ This section talks about using LCDproc with text mode VFD displays from
 <varlistentry>
  <term>
-    <command>Size</command> =
+    <property>Size</property> = &parameters.size;
    <arg choice="plain">
      <replaceable>WIDTH</replaceable>
      <literal>x</literal>
      <replaceable>HEIGHT</replaceable>
    </arg>
  </term>
  <listitem><para>
    Specifies the size of the LCD.
@@ -42,8 +37,8 @@ This section talks about using LCDproc with text mode VFD displays from
 <varlistentry>
  <term>
-    <command>Brightness</command> =
+    <property>Brightness</property> =
-    <arg choice="plain"><replaceable>BRIGHTNESS</replaceable></arg>
+    <parameter><replaceable>BRIGHTNESS</replaceable></parameter>
  </term>
  <listitem><para>
    Set the initial brightness [default: <literal>1000</literal>; legal: <literal>0</literal> - <literal>1000</literal>]
@@ -52,8 +47,8 @@ This section talks about using LCDproc with text mode VFD displays from
 <varlistentry>
  <term>
-    <command>OffBrightness</command> =
+    <property>OffBrightness</property> =
-    <arg choice="plain"><replaceable>BRIGHTNESS</replaceable></arg>
+    <parameter><replaceable>BRIGHTNESS</replaceable></parameter>
  </term>
  <listitem><para>
    Set the initial off-brightness [default: <literal>0</literal>; legal: <literal>0</literal> - <literal>1000</literal>]
@@ -64,16 +59,14 @@ This section talks about using LCDproc with text mode VFD displays from
 <varlistentry>
  <term>
-    <command>Speed</command> =
+    <property>Speed</property> =
-    <arg choice="plain">
+    {
-    <group choice="req">
+      <parameter><literal>1200</literal></parameter> |
-      <arg choice="plain"><literal>1200</literal></arg>
+      <parameter><literal>2400</literal></parameter> |
-      <arg choice="plain"><literal>2400</literal></arg>
+      <emphasis><parameter><literal>9600</literal></parameter></emphasis> |
-      <arg choice="plain"><literal><emphasis>9600</emphasis></literal></arg>
+      <parameter><literal>19200</literal></parameter> |
-      <arg choice="plain"><literal>19200</literal></arg>
+      <parameter><literal>115200</literal></parameter>
-      <arg choice="plain"><literal>115200</literal></arg>
+    }
    </group>
    </arg>
  </term>
  <listitem><para>
    Set the the baud rate to use when communicating with the VFD.
@@ -83,14 +76,12 @@ This section talks about using LCDproc with text mode VFD displays from
 <varlistentry>
  <term>
-    <command>Parity</command> =
+    <property>Parity</property> =
-    <arg choice="plain">
+    {
-    <group choice="req">
+      <emphasis><parameter><literal>0</literal></parameter></emphasis> |
-      <arg choice="plain"><literal><emphasis>0</emphasis></literal></arg>
+      <parameter><literal>1</literal></parameter> |
-      <arg choice="plain"><literal>1</literal></arg>
+      <parameter><literal>2</literal></parameter>
-      <arg choice="plain"><literal>2</literal></arg>
+    }
    </group>
    </arg>
  </term>
  <listitem><para>
    Set the parity for communication with the device to even parity (<literal>2</literal>),
@@ -101,13 +92,7 @@ This section talks about using LCDproc with text mode VFD displays from
 <varlistentry>
  <term>
-    <command>Reboot</command> =
+    <property>Reboot</property> = &parameters.yesnodef;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal>yes</literal></arg>
      <arg choice="plain"><literal><emphasis>no</emphasis></literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
    Reinitialize the VFD [default: <literal>no</literal>; legal: <literal>yes</literal>, <literal>no</literal>]
@@ -38,8 +38,8 @@ For more information see the
 <variablelist>
 <varlistentry>
  <term>
-    <command>Device</command> =
+    <property>Device</property> =
-    <arg choice="plain"><replaceable>DEVICE</replaceable></arg>
+    <parameter><replaceable>DEVICE</replaceable></parameter>
  </term>
  <listitem><para>
    Select the serial output device to use.
@@ -49,15 +49,13 @@ For more information see the
 <varlistentry>
  <term>
-    <command>Speed</command> =
+    <property>Speed</property> =
-    <arg choice="plain">
+    {
-    <group choice="req">
+      <parameter><literal>1200</literal></parameter> |
-      <arg choice="plain"><literal>1200</literal></arg>
+      <parameter><literal>2400</literal></parameter> |
-      <arg choice="plain"><literal>2400</literal></arg>
+      <emphasis><parameter><literal>9600</literal></parameter></emphasis> |
-      <arg choice="plain"><literal><emphasis>9600</emphasis></literal></arg>
+      <parameter><literal>19200</literal></parameter>
-      <arg choice="plain"><literal>19200</literal></arg>
+    }
    </group>
    </arg>
  </term>
  <listitem><para>
    Set the the baud rate to use when communicating with the LCD.
@@ -16,8 +16,8 @@ curses chipset.
 <variablelist>
 <varlistentry>
  <term>
-    <command>Foreground</command> =
+    <property>Foreground</property> =
-    <arg choice="plain"><replaceable>COLOUR</replaceable></arg>
+    <parameter><replaceable>COLOUR</replaceable></parameter>
  </term>
  <listitem>
    <para>
@@ -37,8 +37,8 @@ curses chipset.
 <varlistentry>
  <term>
-    <command>Background</command> =
+    <property>Background</property> =
-    <arg choice="plain"><replaceable>COLOUR</replaceable></arg>
+    <parameter><replaceable>COLOUR</replaceable></parameter>
  </term>
  <listitem>
    <para>
@@ -48,15 +48,15 @@ curses chipset.
    <para>
    The legal values for <replaceable>COLOUR</replaceable> are
-    the same as for the <command>Foreground</command> setting.
+    the same as for the <property>Foreground</property> setting.
    </para>
  </listitem>
 </varlistentry>
 <varlistentry>
  <term>
-    <command>Backlight</command> =
+    <property>Backlight</property> =
-    <arg choice="plain"><replaceable>COLOUR</replaceable></arg>
+    <parameter><replaceable>COLOUR</replaceable></parameter>
  </term>
  <listitem>
    <para>
@@ -66,19 +66,14 @@ curses chipset.
    <para>
    The legal values for <replaceable>COLOUR</replaceable> are
-    the same as for the <command>Foreground</command> setting.
+    the same as for the <property>Foreground</property> setting.
    </para>
  </listitem>
 </varlistentry>
 <varlistentry>
  <term>
-    <command>Size</command> =
+    <property>Size</property> = &parameters.size;
    <arg choice="plain">
      <replaceable>WIDTH</replaceable>
      <literal>x</literal>
      <replaceable>HEIGHT</replaceable>
    </arg>
  </term>
  <listitem><para>
    display size [default: <literal>20x4</literal>]
@@ -87,12 +82,12 @@ curses chipset.
 <varlistentry>
  <term>
-    <command>TopLeftx</command> =
+    <property>TopLeftx</property> =
-    <arg choice="plain"><replaceable>X-OFFSET</replaceable></arg>
+    <parameter><replaceable>X-OFFSET</replaceable></parameter>
  </term>
  <term>
-    <command>TopLefty</command> =
+    <property>TopLefty</property> =
-    <arg choice="plain"><replaceable>Y-OFFSET</replaceable></arg>
+    <parameter><replaceable>Y-OFFSET</replaceable></parameter>
  </term>
  <listitem><para>
    What position (X,Y) to start the left top corner at.
@@ -102,29 +97,17 @@ curses chipset.
 <varlistentry>
  <term>
-    <command>UseACS</command> =
+    <property>UseACS</property> = &parameters.yesnodef;
    <arg choice ="plain">
      <group choice="req">
        <arg choice="plain"><literal>yes</literal></arg>
        <arg choice="plain"><literal><emphasis>no</emphasis></literal></arg>
      </group>
    </arg>  
  </term>
  <listitem><para>
  Tell whether to use ACS (alternative character set) symbols for icons and bars
-  instead of  simple ASCII characters.
+  instead of simple ASCII characters.
  </para></listitem>
 </varlistentry>
 <varlistentry>
  <term>
-    <command>DrawBorder</command> =
+    <property>DrawBorder</property> = &parameters.yesdefno;
    <arg choice ="plain">
      <group choice="req">
        <arg choice="plain"><literal><emphasis>yes</emphasis></literal></arg>
        <arg choice="plain"><literal>no</literal></arg>
      </group>
    </arg>  
  </term>
  <listitem><para>
  Tell whether to draw a border around the screen.
@@ -2,31 +2,33 @@
 <title>The ea65 driver</title>
 <para>
-      This section describes the ea65 driver which works with the front panel
+This section describes the ea65 driver which works with the front panel
-      VFD display on the AOpen XC Cube-AV EA65 media barebone.
+VFD display on the AOpen XC Cube-AV EA65 media barebone.
 </para>
 <sect2 id="ea65-features">
-        <title>EA65 front panel VFD </title>
+<title>EA65 front panel VFD </title>
-        <para>
+
-          The AOpen XC Cube-AV is a barebone designed for using as a media center.
+<para>
-          It comes with a front panel display which is capable of displaying one line 
+  The AOpen XC Cube-AV is a barebone designed for using as a media center.
-          of 9 characters. 
+  It comes with a front panel display which is capable of displaying one line 
-        </para>
+  of 9 characters. 
-        <para>
+</para>
-          The display is internally connected to the serial port
+<para>
-	  (<filename>/dev/ttyS1</filename>) with a fixed rate of 9600 baud.
+  The display is internally connected to the serial port
-        </para>
+  (<filename>/dev/ttyS1</filename>) with a fixed rate of 9600 baud.
-        <para>
+</para>
-          The display uses 13 segments per character. That's why the driver provides 
+<para>
-          no custom characters like the ones for dot matrix displays do.
+  The display uses 13 segments per character. That's why the driver provides 
-        </para>
+  no custom characters like the ones for dot matrix displays do.
-        <para>
+</para>
-          The front panel furthermore has 9 keys which are illuminated by blue LEDs. 
+<para>
-          The LEDs can be controlled with the backlight functions. The keys are not 
+  The front panel furthermore has 9 keys which are illuminated by blue LEDs. 
-          supported by this driver. The red LED (RECORD) can be controlled with the 
+  The LEDs can be controlled with the backlight functions. The keys are not 
-          <code>output</code> command of <application>LCDd</application>.
+  supported by this driver. The red LED (RECORD) can be controlled with the 
-        </para>
+  <code>output</code> command of <application>LCDd</application>.
 </para>
 </sect2>
 <sect2 id="ea65-config">
@@ -38,8 +40,8 @@
 <variablelist>
 <varlistentry>
  <term>
-    <command>Brightness</command> =
+    <property>Brightness</property> =
-    <arg choice="plain"><replaceable>BRIGHTNESS</replaceable></arg>
+    <parameter><replaceable>BRIGHTNESS</replaceable></parameter>
  </term>
  <listitem><para>
    Set the brightness for the front LEDs if backlight is switched on.
@@ -54,8 +56,8 @@
 </varlistentry>
 <varlistentry>
  <term>
-    <command>OffBrightness</command> =
+    <property>OffBrightness</property> =
-    <arg choice="plain"><replaceable>OFFBRIGHTNESS</replaceable></arg>
+    <parameter><replaceable>OFFBRIGHTNESS</replaceable></parameter>
  </term>
  <listitem><para>
    Set the brightness for the front LEDs if backlight is switched off.
@@ -2,50 +2,59 @@
 <title>The Eyebox One Driver (EyeboxOne)</title>
 <para>
-      This section describes the Eyebox One.
+This section describes the Eyebox One.
-    </para>
+</para>
 <sect2 id="eyeboxone-features">
-        <title>Eyebox One LCD Module</title>
+<title>Eyebox One LCD Module</title>
        <para>
          Eyebox One is a small rackmounted server marketed by Rightvision 
 	  (<ulink url="http://www.alcateleyebox.rightvision.com/"></ulink>).
 	  This server has an LCD module, a keypad, two graphbars and some leds.
        </para>
        <para>
          The LCD is a 20x4 alphanumeric module connected via standard DB-9 cabling and
          connector.
        </para>
        <para>
 	  I couldn't find any documentation about it. 
 	  All I know has been obtained with some reverse engineering.
          It seems that it can run only at 19.200 baud.
          Sending ASCII to the module will make it simply display that text at 
 	  its current cursor position. 
 	  The module has a built-in BIOS that recognizes commands (sent by transmitting a
          single-byte "marker" signifying that a command is on the way, followed by
          the single-byte command character itself along with any parameters, if needed)
          allowing the programmer to clear the screen, position the cursor anywhere, 
 	  hide/show the cursor, on/off the backlight, and so on.
        </para>
        <para>
          This module is fast. If updating less than the whole screen, the LCD can 
 	  update faster than can be seen by the human eye. This, of course, 
 	  more than meets LCDproc's needs.
        </para>
    </sect2>
    <sect2 id="eyeboxone-special_features">
        <title>Eyebox One Driver and lcdproc client</title>
        <para>
 	You can use the two Eyebox One graphbars, one as a free CPU meter, and one as a free RAM meter
 	with lcdproc client (see eyebox.c in lcdproc client sources).
-	In order to use it, you must execute ./configure with a special parameter:
+<para>
-	  <command>CPPFLAGS=-DLCDPROC_EYEBOXONE ./configure --enable-drivers=EyeboxOne</command>
+  Eyebox One is a small rackmounted server marketed by Rightvision 
  (<ulink url="http://www.alcateleyebox.rightvision.com/"></ulink>).
  This server has an LCD module, a keypad, two graphbars and some leds.
 </para>
 <para>
  The LCD is a 20x4 alphanumeric module connected via standard DB-9 cabling and
  connector.
 </para>
 <para>
  I couldn't find any documentation about it. 
  All I know has been obtained with some reverse engineering.
  It seems that it can run only at 19.200 baud.
  Sending ASCII to the module will make it simply display that text at 
  its current cursor position. 
  The module has a built-in BIOS that recognizes commands (sent by transmitting a
  single-byte "marker" signifying that a command is on the way, followed by
  the single-byte command character itself along with any parameters, if needed)
  allowing the programmer to clear the screen, position the cursor anywhere, 
  hide/show the cursor, on/off the backlight, and so on.
 </para>
 <para>
  This module is fast. If updating less than the whole screen, the LCD can 
  update faster than can be seen by the human eye. This, of course, 
  more than meets LCDproc's needs.
 </para>
 </sect2>
 <sect2 id="eyeboxone-special_features">
 <title>Eyebox One Driver and lcdproc client</title>
 <para>
  You can use the two Eyebox One graphbars, one as a free CPU meter, and one as a free RAM meter
  with lcdproc client (see eyebox.c in lcdproc client sources).
 </para>
 <para>
  In order to use it, you must execute ./configure with a special parameter:
  <command>CPPFLAGS=-DLCDPROC_EYEBOXONE ./configure --enable-drivers=EyeboxOne</command>
 </para>
 <para>
 This is only a BETA version modification, take it as a demo...
 </para>
 </sect2>
 	This is only a BETA version modification, take it as a demo...
 	 </para>
    </sect2>
 <sect2 id="eyeboxone-copy">
 <title>Copyright</title>
@@ -68,8 +77,8 @@ This section has been modified by Cédric TESSIER (http://www.nezetic.info)
 <variablelist>
 <varlistentry>
  <term>
-    <command>Device</command> =
+    <property>Device</property> =
-    <arg choice="plain"><replaceable>DEVICE</replaceable></arg>
+    <parameter><replaceable>DEVICE</replaceable></parameter>
  </term>
  <listitem><para>
    Select the output device to use [default: <filename>/dev/ttyS1</filename>]
@@ -78,12 +87,7 @@ This section has been modified by Cédric TESSIER (http://www.nezetic.info)
 <varlistentry>
  <term>
-    <command>Size</command> =
+    <property>Size</property> = &parameters.size;
    <arg choice="plain">
      <replaceable>WIDTH</replaceable>
      <literal>x</literal>
      <replaceable>HEIGHT</replaceable>
    </arg>
  </term>
  <listitem><para>
    Set the display size [default: <literal>20x4</literal>]
@@ -92,13 +96,7 @@ This section has been modified by Cédric TESSIER (http://www.nezetic.info)
 <varlistentry>
  <term>
-    <command>Backlight</command> =
+    <property>Backlight</property> = &parameters.yesdefno;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal><emphasis>yes</emphasis></literal></arg>
      <arg choice="plain"><literal>no</literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
    Switch on the backlight? [default: <literal>yes</literal>; legal: <literal>yes</literal>, <literal>no</literal>]
@@ -112,13 +110,7 @@ This section has been modified by Cédric TESSIER (http://www.nezetic.info)
 <varlistentry>
  <term>
-    <command>Cursor</command> =
+    <property>Cursor</property> = &parameters.yesnodef;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal>yes</literal></arg>
      <arg choice="plain"><literal><emphasis>no</emphasis></literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
     Switch on the cursor? [default: <literal>no</literal>; legal: <literal>yes</literal>, <literal>no</literal>]
@@ -128,15 +120,13 @@ This section has been modified by Cédric TESSIER (http://www.nezetic.info)
 <varlistentry>
  <term>
-    <command>Speed</command> =
+    <property>Speed</property> =
-    <arg choice="plain">
+    {
-    <group choice="req">
+      <parameter><literal>1200</literal></parameter> |
-      <arg choice="plain"><literal>1200</literal></arg>
+      <parameter><literal>2400</literal></parameter> |
-      <arg choice="plain"><literal>2400</literal></arg>
+      <parameter><literal>9600</literal></parameter> |
-      <arg choice="plain"><literal>9600</literal></arg>
+      <emphasis><parameter><literal>19200</literal></parameter></emphasis>
-      <arg choice="plain"><literal><emphasis>19200</emphasis></literal></arg>
+    }
    </group>
    </arg>
  </term>
  <listitem><para>
    Set the the baud rate to use when communicating with the LCD.
@@ -150,28 +140,28 @@ This section has been modified by Cédric TESSIER (http://www.nezetic.info)
 <varlistentry>
  <term>
-    <command>LeftKey</command> =
+    <property>LeftKey</property> =
-    <arg choice="plain"><replaceable>D</replaceable></arg>
+    <parameter><replaceable>D</replaceable></parameter>
  </term>
  <term>
-    <command>RightKey</command> =
+    <property>RightKey</property> =
-    <arg choice="plain"><replaceable>C</replaceable></arg>
+    <parameter><replaceable>C</replaceable></parameter>
  </term>
  <term>
-    <command>UpKey</command> =
+    <property>UpKey</property> =
-    <arg choice="plain"><replaceable>A</replaceable></arg>
+    <parameter><replaceable>A</replaceable></parameter>
  </term>
  <term>
-    <command>DownKey</command> =
+    <property>DownKey</property> =
-    <arg choice="plain"><replaceable>B</replaceable></arg>
+    <parameter><replaceable>B</replaceable></parameter>
  </term>
  <term>
-    <command>EscapeKey</command> =
+    <property>EscapeKey</property> =
-    <arg choice="plain"><replaceable>P</replaceable></arg>
+    <parameter><replaceable>P</replaceable></parameter>
  </term>
  <term>
-    <command>EnterKey</command> =
+    <property>EnterKey</property> =
-    <arg choice="plain"><replaceable></replaceable></arg>
+    <parameter><replaceable></replaceable></parameter>
  </term>
  <listitem><para>
    The following table translate from EyeboxOne Key to Logical Key.
@@ -181,13 +171,7 @@ This section has been modified by Cédric TESSIER (http://www.nezetic.info)
 <varlistentry>
  <term>
-    <command>keypad_test_mode</command> =
+    <property>keypad_test_mode</property> = &parameters.yesnodef;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal>yes</literal></arg>
      <arg choice="plain"><literal><emphasis>no</emphasis></literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
    You can find out which key of your display sends which
@@ -39,9 +39,9 @@ before configuring the LCDproc build process --enable-drivers=glcdlib.
 <variablelist>
 <varlistentry>
-<term>
+  <term>
-<command>Driver</command> =
+    <property>Driver</property> =
-    <arg choice="plain"><replaceable>GRAPHLCD-DRIVER</replaceable></arg>
+    <parameter><replaceable>GRAPHLCD-DRIVER</replaceable></parameter>
  </term>
  <listitem><para>
    Specify which graphical display supported by graphlcd-base to use.
@@ -58,13 +58,7 @@ before configuring the LCDproc build process --enable-drivers=glcdlib.
 <varlistentry>
  <term>
-    <command>UseFT2</command> =
+    <property>UseFT2</property> = &parameters.yesdefno;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal>yes</literal></arg>
      <arg choice="plain"><literal><emphasis>no</emphasis></literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
    Tell whether to use FreeType2 or not.
@@ -79,12 +73,7 @@ before configuring the LCDproc build process --enable-drivers=glcdlib.
 <varlistentry>
  <term>
-    <command>TextResolution</command> =
+    <property>TextResolution</property> = &parameters.size;
    <arg choice="plain">
      <replaceable>WIDTH</replaceable>
      <literal>x</literal>
      <replaceable>HEIGHT</replaceable>
    </arg>
  </term>
  <listitem><para>
    Give text resolution in fixed width characters. If it won't fit according
@@ -96,8 +85,8 @@ before configuring the LCDproc build process --enable-drivers=glcdlib.
 <varlistentry>
  <term>
-    <command>FontFile</command> =
+    <property>FontFile</property> =
-    <arg choice="plain"><replaceable>FILENAME</replaceable></arg>
+    <parameter><replaceable>FILENAME</replaceable></parameter>
  </term>
  <listitem><para>
    Set path to font file to use, e.g. <filename>/usr/share/fonts/corefonts/courbd.ttf</filename>.
@@ -106,14 +95,14 @@ before configuring the LCDproc build process --enable-drivers=glcdlib.
 </variablelist>
 <para>
-The following parameters only apply if <command>UseFT2</command> = <literal>yes</literal>:
+The following parameters only apply if <property>UseFT2</property> = <literal>yes</literal>:
 </para>
 <variablelist>
 <varlistentry>
  <term>
-    <command>CharEncoding</command> =
+    <property>CharEncoding</property> =
-    <arg choice="plain"><replaceable>CHARSET</replaceable></arg>
+    <parameter><replaceable>CHARSET</replaceable></parameter>
  </term>
  <listitem><para>
    Specify character encoding to use, e.g. <literal>iso8859-2</literal>.
@@ -123,12 +112,12 @@ The following parameters only apply if <command>UseFT2</command> = <literal>yes<
 <varlistentry>
  <term>
-    <command>MinFontFaceSize</command> =
+    <property>MinFontFaceSize</property> =
-    <arg choice="plain">
+    <parameter>
      <replaceable>COLUMNS</replaceable>
      <literal>x</literal>
      <replaceable>ROWS</replaceable>
-    </arg>
+    </parameter>
  </term>
  <listitem><para>
    minimum size in pixels in which fonts should be rendered
@@ -142,8 +131,8 @@ The following parameters only apply if <command>UseFT2</command> = <literal>yes<
 <title>Optional settings</title>
 <varlistentry>
  <term>
-    <command>Brightness</command> =
+    <property>Brightness</property> =
-    <arg choice="plain"><replaceable>BRIGHTNESS</replaceable></arg>
+    <parameter><replaceable>BRIGHTNESS</replaceable></parameter>
  </term>
  <listitem><para>
    Brightness (in %) if applicable
@@ -154,8 +143,8 @@ The following parameters only apply if <command>UseFT2</command> = <literal>yes<
 <varlistentry>
  <term>
-    <command>Contrast</command> =
+    <property>Contrast</property> =
-    <arg choice="plain"><replaceable>CONTRAST</replaceable></arg>
+    <parameter><replaceable>CONTRAST</replaceable></parameter>
  </term>
  <listitem><para>
    Set the contrast (in %) if applicable.
@@ -166,13 +155,7 @@ The following parameters only apply if <command>UseFT2</command> = <literal>yes<
 <varlistentry>
  <term>
-    <command>Backlight</command> =
+    <property>Backlight</property> = &parameters.yesnodef;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal>yes</literal></arg>
      <arg choice="plain"><literal><emphasis>no</emphasis></literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
    Backlight if applicable
@@ -181,13 +164,7 @@ The following parameters only apply if <command>UseFT2</command> = <literal>yes<
 <varlistentry>
  <term>
-    <command>UpsideDown</command> =
+    <property>UpsideDown</property> = &parameters.yesnodef;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal>yes</literal></arg>
      <arg choice="plain"><literal><emphasis>no</emphasis></literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
    flip image upside down
@@ -196,13 +173,7 @@ The following parameters only apply if <command>UseFT2</command> = <literal>yes<
 <varlistentry>
  <term>
-    <command>Invert</command> =
+    <property>Invert</property> = &parameters.yesnodef;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal>yes</literal></arg>
      <arg choice="plain"><literal><emphasis>no</emphasis></literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
    invert light/dark pixels
@@ -211,13 +182,7 @@ The following parameters only apply if <command>UseFT2</command> = <literal>yes<
 <varlistentry>
  <term>
-    <command>ShowDebugFrame</command> =
+    <property>ShowDebugFrame</property> = &parameters.yesnodef;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal>yes</literal></arg>
      <arg choice="plain"><literal><emphasis>no</emphasis></literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
    turns on/off 1 pixel thick debugging
@@ -229,13 +194,7 @@ The following parameters only apply if <command>UseFT2</command> = <literal>yes<
 <varlistentry>
  <term>
-    <command>ShowBigBorder</command> =
+    <property>ShowBigBorder</property> = &parameters.yesnodef;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal>yes</literal></arg>
      <arg choice="plain"><literal><emphasis>no</emphasis></literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
    border around the unused area
@@ -244,13 +203,7 @@ The following parameters only apply if <command>UseFT2</command> = <literal>yes<
 <varlistentry>
  <term>
-    <command>ShowThinBorder</command> =
+    <property>ShowThinBorder</property> = &parameters.yesnodef;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal>yes</literal></arg>
      <arg choice="plain"><literal><emphasis>no</emphasis></literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
    border around the unused area
@@ -259,12 +212,17 @@ The following parameters only apply if <command>UseFT2</command> = <literal>yes<
 <varlistentry>
  <term>
-    <command>PixelShiftX=<replaceable>0</replaceable></command>
+    <property>PixelShiftX</property> =
    <parameter><replaceable>SHIFTX</replaceable></parameter>
  </term>
  <term>
-    <command>PixelShiftY=<replaceable>2</replaceable></command>
+    <property>PixelShiftY</property> =
    <parameter><replaceable>SHIFTY</replaceable></parameter>
  </term>
  <listitem><para>
    Shifts the content of the display by <replaceable>SHIFTX</replaceable>
    (default: <literal>0</literal>) and <replaceable>SHIFTY</replaceable>
    (default: <literal>0</literal>) pixels.
  </para></listitem>
 </varlistentry>
 </variablelist>
@@ -16,8 +16,8 @@ Matrix Orbital GLK chipset.
 <variablelist>
 <varlistentry>
  <term>
-    <command>Device</command> =
+    <property>Device</property> =
-    <arg choice="plain"><replaceable>DEVICE</replaceable></arg>
+    <parameter><replaceable>DEVICE</replaceable></parameter>
  </term>
  <listitem><para>
    select the serial device to use [default: <filename>/dev/lcd</filename>]
@@ -26,8 +26,8 @@ Matrix Orbital GLK chipset.
 <varlistentry>
  <term>
-    <command>Contrast</command> =
+    <property>Contrast</property> =
-    <arg choice="plain"><replaceable>CONTRAST</replaceable></arg>
+    <parameter><replaceable>CONTRAST</replaceable></parameter>
  </term>
  <listitem><para>
    Set the initial contrast.
@@ -38,14 +38,12 @@ Matrix Orbital GLK chipset.
 <varlistentry>
  <term>
-    <command>Speed</command> =
+    <property>Speed</property> =
-    <arg choice="plain">
+    {
-    <group choice="req">
+      <parameter><literal>9600</literal></parameter> |
-      <arg choice="plain"><literal>9600</literal></arg>
+      <emphasis><parameter><literal>19200</literal></parameter></emphasis> |
-      <arg choice="plain"><literal><emphasis>19200</emphasis></literal></arg>
+      <parameter><literal>38400</literal></parameter>
-      <arg choice="plain"><literal>38400</literal></arg>
+    }
    </group>
    </arg>
  </term>
  <listitem><para>
    Set the the baud rate for communication with the LCD.
@@ -360,7 +360,7 @@ By default, the following keystrokes are generated by the different keys:
 </table>
 You can change the mapping using the
-<command>KeyDirect_<replaceable>NUM</replaceable></command>
+<property>KeyDirect_<replaceable>NUM</replaceable></property>
 configuration option, where <replaceable>NUM</replaceable>
 is the subscript to the <literal>X</literal> in the table above.
 </para>
@@ -485,7 +485,7 @@ To be more precise, it assumes this mapping:
 <para>
 This mapping can be changed using the
-<command>KeyMatrix_<replaceable>X</replaceable>_<replaceable>Y</replaceable></command>
+<property>KeyMatrix_<replaceable>X</replaceable>_<replaceable>Y</replaceable></property>
 configuration option, where <replaceable>X</replaceable> and
 <replaceable>Y</replaceable> are the subscripts to the respective axes above.
 </para>
@@ -1954,7 +1954,7 @@ serial port <filename>/dev/ttyUSB<replaceable>x</replaceable></filename>.
 The PIC-an-LCD module is also supported. It is not connected to the LPT port
 but to a serial port, which saves you from a lot of potential problems.
 To use it, specify the device to which you have connected the module in the
-config file with the <command>Device</command> setting.
+config file with the <property>Device</property> setting.
 The default is <filename>/dev/lcd</filename>.
 It does not support a keypad nor backlight switching.
 </para>
@@ -2157,7 +2157,7 @@ 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
-(see the <command>Contrast</command> configuration parameter). 
+(see the <property>Contrast</property> configuration parameter).
 </para>
 <sect4 id="hd44780-bwctusb-config">
@@ -2165,7 +2165,7 @@ But you can set the display's contrast using software
 <para>
 If there is more than one BWCT USB module connected to the system,
-the <command>SerialNumber</command> configuration parameter allows
+the <property>SerialNumber</property> configuration parameter allows
 selecting which display is used in LCDd.
 </para>
@@ -2199,7 +2199,7 @@ for your own interface e.g. for a graphic LCD.
 <para>
 Two keys can be connected to the LCD2USB interface board.
 They can generate three key events that can be mapped to key names using
-the <command>DirectKey_1</command> to <command>DirectKey_3</command> commands:
+the <property>DirectKey_1</property> to <property>DirectKey_3</property> commands:
 one for each key and the third if the keys are pressed simultaneously.
 With this 3-key setup, menus can be used (see example below).
 </para>
@@ -2216,9 +2216,9 @@ or those developed by <ulink url="http://www.maltepoeggel.de/index.php?site=sp-l
 <para>
 Besides the standard configuration options for <code>hd44780</code> displays, the
 <code>lcd2usb</code> connection type supports three additional options:
-<command>Contrast</command> to set the display's contrast,
+<property>Contrast</property> to set the display's contrast,
-<command>Brightness</command> to set the display's brightness when the backlight is switched on and
+<property>Brightness</property> 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.
+<property>OffBrightness</property> to set the display's brightness when is backlight is switched off.
 All three options expect a number in the range from <literal>0</literal> to <literal>1000</literal>.
 </para>
@@ -2249,7 +2249,7 @@ KeyDirect_3=Escape
 <tip>
 <para>
  In order to make the <code>lcd2usb</code> connection type work with a 2-controller display
-  you may need to set the <command>vSpan</command> config option accordingly.
+  you may need to set the <property>vSpan</property> config option accordingly.
 </para>
 </tip>
 </sect4>
@@ -2281,7 +2281,7 @@ that illustrate how the pin numbering differs between the two.
 <para>
 Because several manufacturers used the USS720 chip in their USB Parallel Printer Adapters, the
-<command>VendorID</command> and <command>ProductID</command> options are configurable in the 
+<property>VendorID</property> and <property>ProductID</property> options are configurable in the
 <filename>LCDd.conf</filename> file.
 </para>
@@ -2374,7 +2374,7 @@ Keypad=no
 </example>
 <para>
-The <command>Device</command> configuration setting denotes the device file
+The <property>Device</property> configuration setting denotes the device file
 of your I<superscript>2</superscript>C bus (here <filename>/dev/i2c-0</filename>).
 You have to load the kernel standard module <filename>i2c-dev.ko</filename> and
 the bus driver, but <emphasis>no</emphasis> I<superscript>2</superscript>C
@@ -2382,7 +2382,7 @@ chip modules (e.g. <filename>pcf8574.ko</filename>)!
 </para>
 <para>
-The <command>Port</command> config option contains the I<superscript>2</superscript>C
+The <property>Port</property> config option contains the I<superscript>2</superscript>C
 address of the I<superscript>2</superscript>C port expander
 (here 0x20, the PCF8574 from the example above, with all address bits set to <literal>0</literal>).
@@ -2481,7 +2481,7 @@ is the wiring - instead of connecting the display directly to PC (via serial/par
 it is connected via ethernet and the communication is done over TCP connection.
 The main feature is - that to power and control the LCD is needed single UTP cable.
 To use the driver, specify the device IP address or hostname, on which the ethlcd device
-is accessible by setting in config file the <command>Device</command> value.
+is accessible by setting in config file the <property>Device</property> value.
 The default is <filename>ethlcd</filename>.
 </para>
@@ -2539,8 +2539,8 @@ This can be done by specifying <option>--enable-drivers=all</option> or by inclu
 <variablelist>
 <varlistentry>
  <term>
-    <command>Port</command> =
+    <property>Port</property> =
-    <arg choice="plain"><replaceable>PORT</replaceable></arg>
+    <parameter><replaceable>PORT</replaceable></parameter>
  </term>
  <listitem><para>
    For parallel connections, specify the address of the parallel port the LCD is connected to.
@@ -2552,8 +2552,8 @@ This can be done by specifying <option>--enable-drivers=all</option> or by inclu
 <varlistentry>
  <term>
-    <command>Device</command> =
+    <property>Device</property> =
-    <arg choice="plain"><replaceable>DEVICE</replaceable></arg>
+    <parameter><replaceable>DEVICE</replaceable></parameter>
  </term>
  <listitem><para>
    If you are using a serial or I<superscript>2</superscript>C connection,
@@ -2566,28 +2566,26 @@ This can be done by specifying <option>--enable-drivers=all</option> or by inclu
 <varlistentry>
  <term>
-    <command>ConnectionType</command> =
+    <property>ConnectionType</property> =
-    <arg choice="plain">
+    {
-    <group choice="req">
+      <emphasis><parameter><literal>4bit</literal></parameter></emphasis> |
-      <arg choice="plain"><literal><emphasis>4bit</emphasis></literal></arg>
+      <parameter><literal>8bit</literal></parameter> |
-      <arg choice="plain"><literal>8bit</literal></arg>
+      <parameter><literal>winamp</literal></parameter> |
-      <arg choice="plain"><literal>winamp</literal></arg>
+      <parameter><literal>serialLpt</literal></parameter> |
-      <arg choice="plain"><literal>serialLpt</literal></arg>
+      <parameter><literal>picanlcd</literal></parameter> |
-      <arg choice="plain"><literal>picanlcd</literal></arg>
+      <parameter><literal>lcdserializer</literal></parameter> |
-      <arg choice="plain"><literal>lcdserializer</literal></arg>
+      <parameter><literal>los-panel</literal></parameter> |
-      <arg choice="plain"><literal>los-panel</literal></arg>
+      <parameter><literal>vdr-lcd</literal></parameter> |
-      <arg choice="plain"><literal>vdr-lcd</literal></arg>
+      <parameter><literal>vdr-wakeup</literal></parameter> |
-      <arg choice="plain"><literal>vdr-wakeup</literal></arg>
+      <parameter><literal>pertelian</literal></parameter> |
-      <arg choice="plain"><literal>pertelian</literal></arg>
+      <parameter><literal>bwctusb</literal></parameter> |
-      <arg choice="plain"><literal>bwctusb</literal></arg>
+      <parameter><literal>lcd2usb</literal></parameter> |
-      <arg choice="plain"><literal>lcd2usb</literal></arg>
+      <parameter><literal>lis2</literal></parameter> |
-      <arg choice="plain"><literal>lis2</literal></arg>
+      <parameter><literal>mplay</literal></parameter> |
-      <arg choice="plain"><literal>mplay</literal></arg>
+      <parameter><literal>i2c</literal></parameter> |
-      <arg choice="plain"><literal>i2c</literal></arg>
+      <parameter><literal>ftdi</literal></parameter> |
-      <arg choice="plain"><literal>ftdi</literal></arg>
+      <parameter><literal>usblcd</literal></parameter>
-      <arg choice="plain"><literal>usblcd</literal></arg>
+    }
    </group>
    </arg>
  </term>
  <listitem>
    <para>
@@ -2692,8 +2690,8 @@ This can be done by specifying <option>--enable-drivers=all</option> or by inclu
 <varlistentry>
  <term>
-    <command>Speed</command> =
+    <property>Speed</property> =
-    <arg choice="plain"><replaceable>BITRATE</replaceable></arg>
+    <parameter><replaceable>BITRATE</replaceable></parameter>
  </term>
  <listitem><para>
      For a serial connection, set to the serial port bitrate. To use
@@ -2703,15 +2701,13 @@ This can be done by specifying <option>--enable-drivers=all</option> or by inclu
 <varlistentry>
  <term>
-    <command>CharMap</command> =
+    <property>CharMap</property> =
-    <arg choice="plain">
+    {
-    <group choice="req">
+      <emphasis><parameter><literal>hd44780_default</literal></parameter></emphasis> |
-      <arg choice="plain"><literal><emphasis>hd44780_default</emphasis></literal></arg>
+      <parameter><literal>hd44780_euro</literal></parameter> |
-      <arg choice="plain"><literal>hd44780_euro</literal></arg>
+      <parameter><literal>ea_ks0073</literal></parameter> |
-      <arg choice="plain"><literal>ea_ks0073</literal></arg>
+      <parameter><literal>sed12780f_0b</literal></parameter>
-      <arg choice="plain"><literal>sed12780f_0b</literal></arg>
+    }
    </group>
    </arg>
  </term>
  <listitem><para>
      Set the character mapping depending on the display you have:
@@ -2719,20 +2715,20 @@ This can be done by specifying <option>--enable-drivers=all</option> or by inclu
        <listitem><para>
          The default, <literal>hd44780_default</literal>, is for "classic"
          HD44780 displays.
-	</para></listitem>
+        </para></listitem>
-	<listitem><para>
+        <listitem><para>
          <literal>hd44780_euro</literal> is for displays with a ROM mask
          supporting the european charset (ROM code A02).
-	</para></listitem>
+        </para></listitem>
-	<listitem><para>
+        <listitem><para>
          <literal>ea_ks0073</literal> is the charmap for Electronic
          Assembly's KS0073 based displays. These devices have a richer
          charset, including many icons and many more characters of the
          ISO-8859-1 than standard HD44780s.
-	</para></listitem>  
+        </para></listitem>
-	<listitem><para>
+        <listitem><para>
-	  <literal>sed12780f_0b</literal> is for some SED 1278 displays.
+          <literal>sed12780f_0b</literal> is for some SED 1278 displays.
-	</para></listitem>
+        </para></listitem>
      </itemizedlist>
      You only need to set this parameter if you have a non-standard
      HD44780 display.
@@ -2749,13 +2745,7 @@ This can be done by specifying <option>--enable-drivers=all</option> or by inclu
 <varlistentry>
  <term>
-    <command>Keypad</command> =
+    <property>Keypad</property> = &parameters.yesnodef;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal>yes</literal></arg>
      <arg choice="plain"><literal><emphasis>no</emphasis></literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
    Tell whether you have a keypad connected.
@@ -2765,8 +2755,8 @@ This can be done by specifying <option>--enable-drivers=all</option> or by inclu
 <varlistentry>
  <term>
-    <command>Brightness</command> =
+    <property>Brightness</property> =
-    <arg choice="plain"><replaceable>BRIGHTNESS</replaceable></arg>
+    <parameter><replaceable>BRIGHTNESS</replaceable></parameter>
  </term>
  <listitem><para>
    Set the initial brightness when the backlight is on
@@ -2778,8 +2768,8 @@ This can be done by specifying <option>--enable-drivers=all</option> or by inclu
 <varlistentry>
  <term>
-    <command>OffBrightness</command> =
+    <property>OffBrightness</property> =
-    <arg choice="plain"><replaceable>BRIGHTNESS</replaceable></arg>
+    <parameter><replaceable>BRIGHTNESS</replaceable></parameter>
  </term>
  <listitem><para>
    Set the initial off-brightness, i.e. the brightness when the backlight is off,
@@ -2791,8 +2781,8 @@ This can be done by specifying <option>--enable-drivers=all</option> or by inclu
 <varlistentry>
  <term>
-    <command>Contrast</command> =
+    <property>Contrast</property> =
-    <arg choice="plain"><replaceable>CONTRAST</replaceable></arg>
+    <parameter><replaceable>CONTRAST</replaceable></parameter>
  </term>
  <listitem><para>
    Set the initial contrast for the <code>bwctusb</code> and
@@ -2808,13 +2798,7 @@ This can be done by specifying <option>--enable-drivers=all</option> or by inclu
 <varlistentry>
  <term>
-    <command>Backlight</command> =
+    <property>Backlight</property> = &parameters.yesnodef;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal>yes</literal></arg>
      <arg choice="plain"><literal><emphasis>no</emphasis></literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
    Specifiy if you have a switchable backlight.
@@ -2823,13 +2807,7 @@ This can be done by specifying <option>--enable-drivers=all</option> or by inclu
 <varlistentry>
  <term>
-    <command>OutputPort</command> =
+    <property>OutputPort</property> = &parameters.yesnodef;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal>yes</literal></arg>
      <arg choice="plain"><literal><emphasis>no</emphasis></literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
    Tell if you have the additional output port ("bargraph") and you want to
@@ -2839,13 +2817,7 @@ This can be done by specifying <option>--enable-drivers=all</option> or by inclu
 <varlistentry>
  <term>
-    <command>Lastline</command> =
+    <property>Lastline</property> = &parameters.yesdefno;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal><emphasis>yes</emphasis></literal></arg>
      <arg choice="plain"><literal>no</literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
    Specifies whether the lowest pixel line of a character is pixel addressable
@@ -2856,12 +2828,7 @@ This can be done by specifying <option>--enable-drivers=all</option> or by inclu
 <varlistentry>
  <term>
-    <command>Size</command> =
+    <property>Size</property> = &parameters.size;
    <arg choice="plain">
      <replaceable>WIDTH</replaceable>
      <literal>x</literal>
      <replaceable>HEIGHT</replaceable>
    </arg>
  </term>
  <listitem><para>
    Specifies the size of the LCD.
@@ -2872,11 +2839,11 @@ This can be done by specifying <option>--enable-drivers=all</option> or by inclu
 <varlistentry>
  <term>
-    <command>vSpan</command> =
+    <property>vSpan</property> =
-    <arg choice="plain">
+    <parameter>
      <replaceable>HEIGHT</replaceable>
      <literal>,</literal>&hellip;
-    </arg>
+    </parameter>
  </term>
  <listitem><para>
    The "vertical span" when using the driver with multi-controller displays
@@ -2898,13 +2865,7 @@ This can be done by specifying <option>--enable-drivers=all</option> or by inclu
 <varlistentry>
  <term>
-    <command>ExtendedMode</command> =
+    <property>ExtendedMode</property> = &parameters.yesnodef;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal>yes</literal></arg>
      <arg choice="plain"><literal><emphasis>no</emphasis></literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
    If you have a KS0073 or an other 'almost HD44780-compatible', set this
@@ -2914,8 +2875,8 @@ This can be done by specifying <option>--enable-drivers=all</option> or by inclu
 <varlistentry>
  <term>
-    <command>LineAddress</command> =
+    <property>LineAddress</property> =
-    <arg choice="plain"><replaceable>ADDR</replaceable></arg>
+    <parameter><replaceable>ADDR</replaceable></parameter>
  </term>
  <listitem><para>
    If the next line of your display doesn't start <literal>0x20</literal> higher in
@@ -2925,8 +2886,8 @@ This can be done by specifying <option>--enable-drivers=all</option> or by inclu
 <varlistentry>
  <term>
-    <command>DelayMult</command> =
+    <property>DelayMult</property> =
-    <arg choice="plain"><replaceable>DELAY</replaceable></arg>
+    <parameter><replaceable>DELAY</replaceable></parameter>
  </term>
  <listitem><para>
    If your display is slow and cannot keep up with the flow of data from
@@ -2938,13 +2899,7 @@ This can be done by specifying <option>--enable-drivers=all</option> or by inclu
 <varlistentry>
  <term>
-    <command>DelayBus</command> =
+    <property>DelayBus</property> = &parameters.yesdefno;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal><emphasis>yes</emphasis></literal></arg>
      <arg choice="plain"><literal>no</literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
    You can reduce the inserted delays by setting this to <literal>no</literal>.
@@ -2955,8 +2910,8 @@ This can be done by specifying <option>--enable-drivers=all</option> or by inclu
 <varlistentry>
  <term>
-    <command>KeepAliveDisplay</command> =
+    <property>KeepAliveDisplay</property> =
-    <arg choice="plain"><replaceable>SECONDS</replaceable></arg>
+    <parameter><replaceable>SECONDS</replaceable></parameter>
  </term>
  <listitem><para>
    Some displays (e.g. <code>vdr-wakeup</code>) need a message from the driver to
@@ -2969,8 +2924,8 @@ This can be done by specifying <option>--enable-drivers=all</option> or by inclu
 <varlistentry>
  <term>
-    <command>RefreshDisplay</command> =
+    <property>RefreshDisplay</property> =
-    <arg choice="plain"><replaceable>SECONDS</replaceable></arg>
+    <parameter><replaceable>SECONDS</replaceable></parameter>
  </term>
  <listitem><para>
    If you experience occasional garbage on your display you can use this
@@ -2982,12 +2937,12 @@ This can be done by specifying <option>--enable-drivers=all</option> or by inclu
 <varlistentry>
  <term>
-    <command>KeyDirect_<replaceable>NUM</replaceable></command> =
+    <property>KeyDirect_<replaceable>NUM</replaceable></property> =
-    <arg choice="plain"><replaceable>KEY</replaceable></arg>
+    <parameter><replaceable>KEY</replaceable></parameter>
  </term>
  <term>
-    <command>KeyMatrix_<replaceable>X</replaceable>_<replaceable>Y</replaceable></command> =
+    <property>KeyMatrix_<replaceable>X</replaceable>_<replaceable>Y</replaceable></property> =
-    <arg choice="plain"><replaceable>KEY</replaceable></arg>
+    <parameter><replaceable>KEY</replaceable></parameter>
  </term>
  <listitem>
    <para>
@@ -3008,8 +2963,8 @@ This can be done by specifying <option>--enable-drivers=all</option> or by inclu
 <varlistentry>
  <term>
-    <command>VendorID</command> =
+    <property>VendorID</property> =
-    <arg choice="plain"><replaceable>VENDORID</replaceable></arg>
+    <parameter><replaceable>VENDORID</replaceable></parameter>
  </term>
  <listitem><para>
    USB vendor ID to look for in certain USB connection types.
@@ -3022,8 +2977,8 @@ This can be done by specifying <option>--enable-drivers=all</option> or by inclu
 <varlistentry>
  <term>
-    <command>ProductID</command> =
+    <property>ProductID</property> =
-    <arg choice="plain"><replaceable>PRODUCTID</replaceable></arg>
+    <parameter><replaceable>PRODUCTID</replaceable></parameter>
  </term>
  <listitem><para>
    USB product ID to look for in certain USB connection types.
@@ -3036,8 +2991,8 @@ This can be done by specifying <option>--enable-drivers=all</option> or by inclu
 <varlistentry>
  <term>
-    <command>SerialNumber</command> =
+    <property>SerialNumber</property> =
-    <arg choice="plain"><replaceable>SERIALNO</replaceable></arg>
+    <parameter><replaceable>SERIALNO</replaceable></parameter>
  </term>
  <listitem><para>
    Serial number of the USB device to look for with
@@ -3052,36 +3007,6 @@ This can be done by specifying <option>--enable-drivers=all</option> or by inclu
 </sect2>
 <!--
 <sect2 id="hd44780-running">
 <title>Running</title>
 <para>
 Modify the <filename>LCDd.conf</filename> file before you run LCDd. In this config file are
 detailed instructions on how to configure the HD44780 driver.
 </para>
 <para>
 Then as usual, start LCDd with the correct config file:
 </para>
 <para>
 E.g. <command>LCDd -c ./LCDd.conf</command>
 </para>
 <para>
 If you want to override the driver selection in <filename>LCDd.conf</filename> then use:
 </para>
 <para>
 <command>LCDd -c ./LCDd.conf -d HD44780</command>
 </para>
 <para>
 If you use this, the HD44780 driver will read the options from the config
 file anyway.
 </para>
 </sect2>
 -->
 <sect2 id="hd44780-miscellania">
 <title>Miscellania</title>
@@ -25,10 +25,11 @@ very nice.
 <variablelist>
 <varlistentry>
  <term>
-    <command>Device</command> =
+    <property>Device</property> =
-    <arg choice="plain"><replaceable>DEVICE</replaceable></arg>
+    <parameter><replaceable>DEVICE</replaceable></parameter>
  </term>
  <listitem><para>
    Sets the device to use. Defaults to <filename>/dev/lcd</filename>.
  </para></listitem>
 </varlistentry>
 </variablelist>
@@ -56,12 +56,7 @@ For further details, please consult the page and the forum at
 <variablelist>
 <varlistentry>
  <term>
-    <command>Size</command> =
+    <property>Size</property> = &parameters.size;
    <arg choice="plain">
      <replaceable>WIDTH</replaceable>
      <literal>x</literal>
      <replaceable>HEIGHT</replaceable>
    </arg>
  </term>
  <listitem><para>
    Set the display size. The default <literal>16x2</literal> should be safe
@@ -73,8 +68,8 @@ For further details, please consult the page and the forum at
 <varlistentry>
  <term>
-    <command>Device</command> =
+    <property>Device</property> =
-    <arg choice="plain"><replaceable>DEVICE</replaceable></arg>
+    <parameter><replaceable>DEVICE</replaceable></parameter>
  </term>
  <listitem><para>
    Select the output device to use. Change this from the default
@@ -38,10 +38,8 @@ The 15c2:0038 device may require LIRC v0.8.5 or newer.
 <variablelist>
 <varlistentry>
  <term>
-    <command>Protocol</command> = 
+    <property>Protocol</property> =
-    <arg choice="plain">
+    <parameter><replaceable>PROTOCOL</replaceable></parameter>
      <replaceable>PROTOCOL</replaceable>
    </arg>
  </term>
  <listitem><para>
    Specify which version of iMON LCD is installed.
@@ -52,8 +50,8 @@ The 15c2:0038 device may require LIRC v0.8.5 or newer.
 <varlistentry>
  <term>
-    <command>OnExit</command> =
+    <property>OnExit</property> =
-    <arg choice="plain"><replaceable>ONEXIT</replaceable></arg>
+    <parameter><replaceable>ONEXIT</replaceable></parameter>
  </term>
  <listitem><para>
    Specify the exit behavior.
@@ -65,8 +63,8 @@ The 15c2:0038 device may require LIRC v0.8.5 or newer.
 <varlistentry>
  <term>
-    <command>Device</command> =
+    <property>Device</property> =
-    <arg choice="plain"><replaceable>DEVICE</replaceable></arg>
+    <parameter><replaceable>DEVICE</replaceable></parameter>
  </term>
  <listitem><para>
    Select the output device to use. Change this from the default
@@ -78,8 +76,8 @@ The 15c2:0038 device may require LIRC v0.8.5 or newer.
 <varlistentry>
  <term>
-    <command>Contrast</command> =
+    <property>Contrast</property> =
-    <arg choice="plain"><replaceable>CONTRAST</replaceable></arg>
+    <parameter><replaceable>CONTRAST</replaceable></parameter>
  </term>
  <listitem><para>
    Select the display's contrast <literal>200</literal> is the default.
@@ -89,12 +87,7 @@ The 15c2:0038 device may require LIRC v0.8.5 or newer.
 <varlistentry>
  <term>
-    <command>Size</command> =
+    <property>Size</property> = &parameters.size;
    <arg choice="plain">
      <replaceable>WIDTH</replaceable>
      <literal>x</literal>
      <replaceable>HEIGHT</replaceable>
    </arg>
  </term>
  <listitem><para>
    Set the display size in pixels. The default <literal>96x16</literal> should
@@ -105,8 +98,8 @@ The 15c2:0038 device may require LIRC v0.8.5 or newer.
 <varlistentry>
  <term>
-    <command>Backlight</command> =
+    <property>Backlight</property> =
-    <arg choice="plain"><replaceable>BACKLIGHT</replaceable></arg>
+    <parameter><replaceable>BACKLIGHT</replaceable></parameter>
  </term>
  <listitem><para>
    Set the backlight state. The default is <literal>1</literal>, which turns
@@ -116,8 +109,8 @@ The 15c2:0038 device may require LIRC v0.8.5 or newer.
 <varlistentry>
  <term>
-    <command>DiscMode</command> =
+    <property>DiscMode</property> =
-    <arg choice="plain"><replaceable>DISCMODE</replaceable></arg>
+    <parameter><replaceable>DISCMODE</replaceable></parameter>
  </term>
  <listitem><para>
    Sets the disc mode. The default is <literal>0</literal> which spins the
@@ -68,8 +68,8 @@ The keys are mapped according to the following table:
 <variablelist>
 <varlistentry>
  <term>
-    <command>Device</command> =
+    <property>Device</property> =
-    <arg choice="plain"><replaceable>DEVICE</replaceable></arg>
+    <parameter><replaceable>DEVICE</replaceable></parameter>
  </term>
  <listitem><para>
    Select the input device to use, e.g. <filename>/dev/irman</filename>.
@@ -78,8 +78,8 @@ The keys are mapped according to the following table:
 <varlistentry>
  <term>
-    <command>Config</command> =
+    <property>Config</property> =
-    <arg choice="plain"><replaceable>FILENAME</replaceable></arg>
+    <parameter><replaceable>FILENAME</replaceable></parameter>
  </term>
  <listitem><para>
    Select the IrMan configuration file to use, e.g. <filename>/etc/irman.cfg</filename>.
@@ -34,24 +34,18 @@ from <ulink url="http://www.irtrans.de/en/download/linux.php"></ulink>.
 <variablelist>
 <varlistentry>
  <term>
-    <command>Backlight</command> =
+    <property>Backlight</property> = &parameters.yesnodef;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal><emphasis>no</emphasis></literal></arg>
      <arg choice="plain"><literal>yes</literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
    Tell whether te device has a backlight, or whether the backlight shall be used.
-    If not goven, it defaults to <literal><emphasis>no</emphasis></literal>.
+    If not goven, it defaults to <literal>no</literal>.
  </para></listitem>
 </varlistentry>
 <varlistentry>
  <term>
-    <command>Hostname</command> =
+    <property>Hostname</property> =
-    <arg choice="plain"><replaceable>HOSTNAME_OR_IP-ADDRESS</replaceable></arg>
+    <parameter><replaceable>HOSTNAME_OR_IP-ADDRESS</replaceable></parameter>
  </term>
  <listitem><para>
    Set the hostname or IP address of the IRTrans device to connect to.
@@ -61,12 +55,7 @@ from <ulink url="http://www.irtrans.de/en/download/linux.php"></ulink>.
 <varlistentry>
  <term>
-    <command>Size</command> =
+    <property>Size</property> = &parameters.size;
    <arg choice="plain">
      <replaceable>WIDTH</replaceable>
      <literal>x</literal>
      <replaceable>HEIGHT</replaceable>
    </arg>
  </term>
  <listitem><para>
    Select the display size [default: <literal>16x2</literal>]
@@ -15,8 +15,8 @@ This section covers the joystick input driver for LCDd.
 <variablelist>
 <varlistentry>
  <term>
-    <command>Device</command> =
+    <property>Device</property> =
-    <arg choice="plain"><replaceable>DEVICE</replaceable></arg>
+    <parameter><replaceable>DEVICE</replaceable></parameter>
  </term>
  <listitem><para>
    Select the input device to use [default: <filename>/dev/js0</filename>]
@@ -25,12 +25,12 @@ This section covers the joystick input driver for LCDd.
 <varlistentry>
  <term>
-    <command>Map_Axis<replaceable>NUM</replaceable>neg</command> =
+    <property>Map_Axis<replaceable>NUM</replaceable>neg</property> =
-    <arg choice="plain"><replaceable>KEY</replaceable></arg>
+    <parameter><replaceable>KEY</replaceable></parameter>
  </term>
  <term>
-    <command>Map_Axis<replaceable>NUM</replaceable>pos</command> =
+    <property>Map_Axis<replaceable>NUM</replaceable>pos</property> =
-    <arg choice="plain"><replaceable>KEY</replaceable></arg>
+    <parameter><replaceable>KEY</replaceable></parameter>
  </term>
  <listitem>
    <para>
@@ -55,8 +55,8 @@ This section covers the joystick input driver for LCDd.
 <varlistentry>
  <term>
-    <command>Map_Button<replaceable>NUM</replaceable></command> =
+    <property>Map_Button<replaceable>NUM</replaceable></property> =
-    <arg choice="plain"><replaceable>KEY</replaceable></arg>
+    <parameter><replaceable>KEY</replaceable></parameter>
  </term>
  <listitem>
    <para>
@@ -35,8 +35,8 @@ made in australia :-)
 <variablelist>
 <varlistentry>
  <term>
-    <command>Device</command> =
+    <property>Device</property> =
-    <arg choice="plain"><replaceable>DEVICE</replaceable></arg>
+    <parameter><replaceable>DEVICE</replaceable></parameter>
  </term>
  <listitem><para>
    Select the output device to use [default: <filename>/dev/lcd</filename>]
@@ -45,8 +45,8 @@ made in australia :-)
 <varlistentry>
  <term>
-    <command>Brightness</command> =
+    <property>Brightness</property> =
-    <arg choice="plain"><replaceable>BRIGHTNESS</replaceable></arg>
+    <parameter><replaceable>BRIGHTNESS</replaceable></parameter>
  </term>
  <listitem><para>
    Set the initial brightness [default: <literal>255</literal>; legal: <literal>0</literal> - <literal>255</literal>]
@@ -55,13 +55,11 @@ made in australia :-)
 <varlistentry>
  <term>
-    <command>Speed</command> =
+    <property>Speed</property> =
-    <arg choice="plain">
+    {
-    <group choice="req">
+      <parameter><literal>2400</literal></parameter> |
-      <arg choice="plain"><literal>2400</literal></arg>
+      <emphasis><parameter><literal>9600</literal></parameter></emphasis>
-      <arg choice="plain"><literal><emphasis>9600</emphasis></literal></arg>
+    }
    </group>
    </arg>
  </term>
  <listitem><para>
    Set the the baud rate to use when communicating with the LCD.
@@ -71,13 +69,7 @@ made in australia :-)
 <varlistentry>
  <term>
-    <command>Reboot</command> =
+    <property>Reboot</property> = &parameters.yesnodef;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal>yes</literal></arg>
      <arg choice="plain"><literal><emphasis>no</emphasis></literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
    Reinitialize the LCD's BIOS [default: <literal>no</literal>; legal: <literal>yes</literal>, <literal>no</literal>]
@@ -16,8 +16,8 @@ lcdm001 chipset.
 <variablelist>
 <varlistentry>
  <term>
-    <command>Device</command> =
+    <property>Device</property> =
-    <arg choice="plain"><replaceable>DEVICE</replaceable></arg>
+    <parameter><replaceable>DEVICE</replaceable></parameter>
  </term>
  <listitem><para>
  Default: <filename>/dev/lcd</filename>
@@ -26,20 +26,20 @@ lcdm001 chipset.
 <varlistentry>
  <term>
-    <command>PauseKey</command> =
+    <property>PauseKey</property> =
-    <arg choice="plain"><replaceable>KEY</replaceable></arg>
+    <parameter><replaceable>KEY</replaceable></parameter>
  </term>
  <term>
-    <command>BackKey</command> =
+    <property>BackKey</property> =
-    <arg choice="plain"><replaceable>KEY</replaceable></arg>
+    <parameter><replaceable>KEY</replaceable></parameter>
  </term>
  <term>
-    <command>ForwardKey</command> =
+    <property>ForwardKey</property> =
-    <arg choice="plain"><replaceable>KEY</replaceable></arg>
+    <parameter><replaceable>KEY</replaceable></parameter>
  </term>
  <term>
-    <command>MainMenuKey</command> =
+    <property>MainMenuKey</property> =
-    <arg choice="plain"><replaceable>KEY</replaceable></arg>
+    <parameter><replaceable>KEY</replaceable></parameter>
  </term>
  <listitem>
    <para>
@@ -16,8 +16,8 @@ lcterm chipset.
 <variablelist>
 <varlistentry>
  <term>
-    <command>Device</command> =
+    <property>Device</property> =
-    <arg choice="plain"><replaceable>DEVICE</replaceable></arg>
+    <parameter><replaceable>DEVICE</replaceable></parameter>
  </term>
  <listitem><para>
  Default: <filename>/dev/lcd</filename>
@@ -26,15 +26,10 @@ lcterm chipset.
 <varlistentry>
  <term>
-    <command>Size</command> =
+    <property>Size</property> = &parameters.size;
    <arg choice="plain">
      <replaceable>WIDTH</replaceable>
      <literal>x</literal>
      <replaceable>HEIGHT</replaceable>
    </arg>
  </term>
  <listitem><para>
-  16x2
+  Default: <literal>16x2</literal>.
  </para></listitem>
 </varlistentry>
 </variablelist>
@@ -81,8 +81,8 @@ Then you have to modify the <code>[lirc]</code> section of your
 <variablelist>
 <varlistentry>
  <term>
-    <command>lircrc</command> =
+    <property>lircrc</property> =
-    <arg choice="plain"><replaceable>FILENAME</replaceable></arg>
+    <parameter><replaceable>FILENAME</replaceable></parameter>
  </term>
  <listitem>
    <para>
@@ -99,8 +99,8 @@ Then you have to modify the <code>[lirc]</code> section of your
 <varlistentry>
  <term>
-    <command>Prog</command> =
+    <property>Prog</property> =
-    <arg choice="plain"><replaceable>PROGRAM</replaceable></arg>
+    <parameter><replaceable>PROGRAM</replaceable></parameter>
  </term>
  <listitem>
    <para>
@@ -58,12 +58,7 @@ USB library.
 <variablelist>
 <varlistentry>
  <term>
-    <command>Size</command> =
+    <property>Size</property> = &parameters.size;
    <arg choice="plain">
      <replaceable>WIDTH</replaceable>
      <literal>x</literal>
      <replaceable>HEIGHT</replaceable>
    </arg>
  </term>
  <listitem><para>
    Set the display size. The default <literal>20x2</literal> should be safe
@@ -75,10 +70,8 @@ USB library.
 <varlistentry>
  <term>
-    <command>VendorID</command> =
+    <property>VendorID</property> =
-    <arg choice="plain">
+    <parameter><replaceable>VENDORID</replaceable></parameter>
      <replaceable>VENDORID</replaceable>
    </arg>
  </term>
  <listitem>
    <para>
@@ -96,10 +89,8 @@ USB library.
 <varlistentry>
  <term>
-    <command>ProductID</command> =
+    <property>ProductID</property> =
-    <arg choice="plain">
+    <parameter><replaceable>PRODUCTID</replaceable></parameter>
      <replaceable>PRODUCTID</replaceable>
    </arg>
  </term>
  <listitem>
    <para>
@@ -117,8 +108,8 @@ USB library.
 <varlistentry>
  <term>
-    <command>Brightness</command> =
+    <property>Brightness</property> =
-    <arg choice="plain"><replaceable>BRIGHTNESS</replaceable></arg>
+    <parameter><replaceable>BRIGHTNESS</replaceable></parameter>
  </term>
  <listitem>
  <para>
@@ -16,8 +16,8 @@ ms6931 chipset.
 <variablelist>
 <varlistentry>
  <term>
-    <command>Device</command> =
+    <property>Device</property> =
-    <arg choice="plain"><replaceable>DEVICE</replaceable></arg>
+    <parameter><replaceable>DEVICE</replaceable></parameter>
  </term>
  <listitem><para>
    device to use [default: <filename>/dev/ttyS1</filename>]
@@ -26,12 +26,7 @@ ms6931 chipset.
 <varlistentry>
  <term>
-    <command>Size</command> =
+    <property>Size</property> = &parameters.size;
    <arg choice="plain">
      <replaceable>WIDTH</replaceable>
      <literal>x</literal>
      <replaceable>HEIGHT</replaceable>
    </arg>
  </term>
  <listitem><para>
    display size [default: <literal>16x2</literal>]
@@ -16,8 +16,8 @@ mtc_s16209x chipset.
 <variablelist>
 <varlistentry>
  <term>
-    <command>Device</command> =
+    <property>Device</property> =
-    <arg choice="plain"><replaceable>DEVICE</replaceable></arg>
+    <parameter><replaceable>DEVICE</replaceable></parameter>
  </term>
  <listitem><para>
    Select the output device to use [default: <filename>/dev/lcd</filename>]
@@ -26,8 +26,8 @@ mtc_s16209x chipset.
 <varlistentry>
  <term>
-    <command>Brightness</command> =
+    <property>Brightness</property> =
-    <arg choice="plain"><replaceable>BRIGHTNESS</replaceable></arg>
+    <parameter><replaceable>BRIGHTNESS</replaceable></parameter>
  </term>
  <listitem><para>
    Set the initial brightness [default: <literal>255</literal>; legal: <literal>0</literal> - <literal>255</literal>]
@@ -36,13 +36,7 @@ mtc_s16209x chipset.
 <varlistentry>
  <term>
-    <command>Reboot</command> =
+    <property>Reboot</property> = &parameters.yesnodef;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal>yes</literal></arg>
      <arg choice="plain"><literal><emphasis>no</emphasis></literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
    Reinitialize the LCD's BIOS [default: <literal>no</literal>; legal: <literal>yes</literal>, <literal>no</literal>]
@@ -233,8 +233,8 @@ Slightly modified in order to include it in this document March 2002, Rene Wagne
 <variablelist>
 <varlistentry>
  <term>
-    <command>Device</command> =
+    <property>Device</property> =
-    <arg choice="plain"><replaceable>DEVICE</replaceable></arg>
+    <parameter><replaceable>DEVICE</replaceable></parameter>
  </term>
  <listitem><para>
    Select the output device to use [default: <filename>/dev/lcd</filename>]
@@ -243,12 +243,7 @@ Slightly modified in order to include it in this document March 2002, Rene Wagne
 <varlistentry>
  <term>
-    <command>Size</command> =
+    <property>Size</property> = &parameters.size;
    <arg choice="plain">
      <replaceable>WIDTH</replaceable>
      <literal>x</literal>
      <replaceable>HEIGHT</replaceable>
    </arg>
  </term>
  <listitem><para>
    Set the display size [default: <literal>20x4</literal>]
@@ -257,15 +252,13 @@ Slightly modified in order to include it in this document March 2002, Rene Wagne
 <varlistentry>
  <term>
-    <command>Type</command> =
+    <property>Type</property> =
-    <arg choice="plain">
+    {
-    <group choice="req">
+      <emphasis><parameter><literal>lcd</literal></parameter></emphasis> |
-      <arg choice="plain"><literal><emphasis>lcd</emphasis></literal></arg>
+      <parameter><literal>lkd</literal></parameter> |
-      <arg choice="plain"><literal>lkd</literal></arg>
+      <parameter><literal>vfd</literal></parameter> |
-      <arg choice="plain"><literal>vfd</literal></arg>
+      <parameter><literal>vkd</literal></parameter>
-      <arg choice="plain"><literal>vkd</literal></arg>
+    }
    </group>
    </arg>
  </term>
  <listitem><para>
    Set the display type [default: <literal>lcd</literal>; legal: <literal>lcd</literal>,
@@ -277,8 +270,8 @@ Slightly modified in order to include it in this document March 2002, Rene Wagne
 <varlistentry>
  <term>
-    <command>Contrast</command> =
+    <property>Contrast</property> =
-    <arg choice="plain"><replaceable>CONTRAST</replaceable></arg>
+    <parameter><replaceable>CONTRAST</replaceable></parameter>
  </term>
  <listitem><para>
    Set the initial contrast.
@@ -294,13 +287,7 @@ Slightly modified in order to include it in this document March 2002, Rene Wagne
 <varlistentry>
  <term>
-    <command>hasAdjustableBacklight</command> =
+    <property>hasAdjustableBacklight</property> = &parameters.yesdefno;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal><emphasis>yes</emphasis></literal></arg>
      <arg choice="plain"><literal>no</literal></arg>
    </group>
    </arg>    
  </term>
  <listitem><para>
    Some old firmware versions of Matrix Orbital modules do not support an
@@ -313,8 +300,8 @@ Slightly modified in order to include it in this document March 2002, Rene Wagne
 <varlistentry>
  <term>
-    <command>Brightness</command> =
+    <property>Brightness</property> =
-    <arg choice="plain"><replaceable>BRIGHTNESS</replaceable></arg>
+    <parameter><replaceable>BRIGHTNESS</replaceable></parameter>
  </term>
  <listitem><para>
    Set the initial brightness [default: <literal>1000</literal>; legal: <literal>0</literal> - <literal>1000</literal>]
@@ -323,8 +310,8 @@ Slightly modified in order to include it in this document March 2002, Rene Wagne
 <varlistentry>
  <term>
-    <command>OffBrightness</command> =
+    <property>OffBrightness</property> =
-    <arg choice="plain"><replaceable>BRIGHTNESS</replaceable></arg>
+    <parameter><replaceable>BRIGHTNESS</replaceable></parameter>
  </term>
  <listitem><para>
    Set the initial off-brightness [default: <literal>0</literal>; legal: <literal>0</literal> - <literal>1000</literal>]
@@ -335,15 +322,13 @@ Slightly modified in order to include it in this document March 2002, Rene Wagne
 <varlistentry>
  <term>
-    <command>Speed</command> =
+    <property>Speed</property> =
-    <arg choice="plain">
+    {
-    <group choice="req">
+      <parameter><literal>1200</literal></parameter> |
-      <arg choice="plain"><literal>1200</literal></arg>
+      <parameter><literal>2400</literal></parameter> |
-      <arg choice="plain"><literal>2400</literal></arg>
+      <parameter><literal>9600</literal></parameter> |
-      <arg choice="plain"><literal>9600</literal></arg>
+      <emphasis><parameter><literal>19200</literal></parameter></emphasis>
-      <arg choice="plain"><literal><emphasis>19200</emphasis></literal></arg>
+    }
    </group>
    </arg>
  </term>
  <listitem><para>
    Set the the baud rate to use when communicating with the LCD.
@@ -353,8 +338,8 @@ Slightly modified in order to include it in this document March 2002, Rene Wagne
 <varlistentry>
  <term>
-    <command>KeyMap_<replaceable>LETTER</replaceable></command> =
+    <property>KeyMap_<replaceable>LETTER</replaceable></property> =
-    <arg choice="plain"><replaceable>KEY</replaceable></arg>
+    <parameter><replaceable>KEY</replaceable></parameter>
  </term>
  <listitem>
    <para>
@@ -365,7 +350,7 @@ Slightly modified in order to include it in this document March 2002, Rene Wagne
    <para>
    These settings allow to map the letter <replaceable>LETTER</replaceable>,
    that is generated by the display when a key is pressed, to be mapped to
-    a key name <replaceable>KEY</replaceable> that <command>LCDd</command>
+    a key name <replaceable>KEY</replaceable> that <property>LCDd</property>
    can understand (see <link linkend="menu-section" endterm="menu-section.title"/>
    for more information).
    </para>
@@ -388,51 +373,9 @@ Slightly modified in order to include it in this document March 2002, Rene Wagne
  </listitem>
 </varlistentry>
 <!--
 <varlistentry>
  <term>
-    <command>LeftKey</command> =
+    <property>keypad_test_mode</property> = &parameters.yesnodef;
    <arg choice="plain"><replaceable>MTX-KEY</replaceable></arg>
  </term>
  <term>
    <command>RightKey</command> =
    <arg choice="plain"><replaceable>MTX-KEY</replaceable></arg>
  </term>
  <term>
    <command>EnterKey</command> =
    <arg choice="plain"><replaceable>MTX-KEY</replaceable></arg>
  </term>
  <term>
    <command>UpKey</command> =
    <arg choice="plain"><replaceable>MTX-KEY</replaceable></arg>
  </term>
  <term>
    <command>DownKey</command> =
    <arg choice="plain"><replaceable>MTX-KEY</replaceable></arg>
  </term>
  <term>
    <command>EscapeKey</command> =
    <arg choice="plain"><replaceable>MTX-KEY</replaceable></arg>
  </term>
  <listitem><para>
    The following table translate from MtxOrb Key to Logical Key.
    See [input] section for an explanation of the key mappings
    This is a new implementation in 0.5
    Legal values for <replaceable>MTX-KEY</replaceable> are the letters
    <literal>A</literal> - <literal>F</literal>.
  </para></listitem>
 </varlistentry>
 -->
 <varlistentry>
  <term>
    <command>keypad_test_mode</command> =
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal>yes</literal></arg>
      <arg choice="plain"><literal><emphasis>no</emphasis></literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
    You can find out which key of your display sends which
@@ -24,8 +24,8 @@ This drivers uses the library from mx5000tools.
 <variablelist>
 <varlistentry>
  <term>
-    <command>Device</command> =
+    <property>Device</property> =
-    <arg choice="plain"><replaceable>DEVICE</replaceable></arg>
+    <parameter><replaceable>DEVICE</replaceable></parameter>
  </term>
  <listitem><para>
    Select the output device to use [default: <filename>/dev/hiddev0</filename>]
@@ -34,8 +34,8 @@ This drivers uses the library from mx5000tools.
 <varlistentry>
  <term>
-    <command>WaitAfterRefresh</command> =
+    <property>WaitAfterRefresh</property> =
-    <arg choice="plain"><replaceable>MS</replaceable></arg>
+    <parameter><replaceable>MS</replaceable></parameter>
  </term>
  <listitem><para>
    Set the time (in ms) to wait after each screen sent to the keyboard.
@@ -110,58 +110,44 @@
 <title>[picolcd]</title>
 <variablelist>
 <!--
 <varlistentry>
  <term>
-    <command>Backlight</command> =
+    <property>Backlight</property> = &parameters.yesdefno;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal><emphasis>yes</emphasis></literal></arg>
      <arg choice="plain"><literal>no</literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
-    Turn on backlight.
+    Turns the backlight on or off, default <literal>yes</literal>.
  </para></listitem>
 </varlistentry>
 -->
 <varlistentry>
  <term>
-    <command>Brightness</command> =
+    <property>Brightness</property> =
-    <arg choice="plain"><replaceable>BRIGHTNESS</replaceable></arg>
+    <parameter><replaceable>BRIGHTNESS</replaceable></parameter>
  </term>
  <listitem>
  <para>
    Set the initial brightness.
    Legal values are: <literal>0</literal> - <literal>1000</literal>.
-    If not given, it defaults to <literal><emphasis>1000</emphasis></literal>.
+    If not given, it defaults to <literal>1000</literal>.
  </para>
  </listitem>
 </varlistentry>
 <varlistentry>
  <term>
-    <command>Contrast</command> =
+    <property>Contrast</property> =
-    <arg choice="plain"><replaceable>CONTRAST</replaceable></arg>
+    <parameter><replaceable>CONTRAST</replaceable></parameter>
  </term>
  <listitem><para>
    Contrast: <literal>0</literal>-<literal>1000</literal>.
    <literal>0</literal> is visible, and <literal>1000</literal> is not on my M300.
-    Default is <literal><emphasis>1000</emphasis></literal>.			
+    Default is <literal>1000</literal>.
  </para></listitem>
 </varlistentry>
 <varlistentry>
  <term>
-    <command>KeyLights</command> =
+    <property>KeyLights</property> = &parameters.yesdefno;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal><emphasis>yes</emphasis></literal></arg>
      <arg choice="plain"><literal>no</literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
    Allow key LEDs to be turned on or off. Default is <literal>yes</literal>.
@@ -170,118 +156,82 @@
 <varlistentry>
  <term>
-    <command>Key0Light</command> =
+    <property>Key0Light</property> = &parameters.yesdefno;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal><emphasis>yes</emphasis></literal></arg>
      <arg choice="plain"><literal>no</literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
-    If <command>Keylights</command> is set, you can disable the directional pad LED by 
+    If <property>Keylights</property> is set, you can disable the directional pad LED by
    setting this value to <literal>no</literal>.  Default is <literal>yes</literal>.
  </para></listitem>
 </varlistentry>
 <varlistentry>
  <term>
-    <command>Key1Light</command> =
+    <property>Key1Light</property> = &parameters.yesdefno;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal><emphasis>yes</emphasis></literal></arg>
      <arg choice="plain"><literal>no</literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
-    If <command>Keylights</command> is set, you can disable the F1 LED by setting this value 
+    If <property>Keylights</property> is set, you can disable the F1 LED by setting this value
    to <literal>no</literal>.  Default is <literal>yes</literal>.
  </para></listitem>
 </varlistentry>
 <varlistentry>
  <term>
-    <command>Key2Light</command> =
+    <property>Key2Light</property> = &parameters.yesdefno;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal><emphasis>yes</emphasis></literal></arg>
      <arg choice="plain"><literal>no</literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
-    If <command>Keylights</command> is set, you can disable the F2 LED by setting this value 
+    If <property>Keylights</property> is set, you can disable the F2 LED by setting this value
    to <literal>no</literal>.  Default is <literal>yes</literal>.
  </para></listitem>
 </varlistentry>
 <varlistentry>
  <term>
-    <command>Key3Light</command> =
+    <property>Key3Light</property> = &parameters.yesdefno;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal><emphasis>yes</emphasis></literal></arg>
      <arg choice="plain"><literal>no</literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
-    If <command>Keylights</command> is set, you can disable the F3 LED by setting this value 
+    If <property>Keylights</property> is set, you can disable the F3 LED by setting this value
    to <literal>no</literal>.  Default is <literal>yes</literal>.
  </para></listitem>
 </varlistentry>
 <varlistentry>
  <term>
-    <command>Key4Light</command> =
+    <property>Key4Light</property> = &parameters.yesdefno;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal><emphasis>yes</emphasis></literal></arg>
      <arg choice="plain"><literal>no</literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
-    If <command>Keylights</command> is set, you can disable the F4 LED by setting this value 
+    If <property>Keylights</property> is set, you can disable the F4 LED by setting this value
    to <literal>no</literal>.  Default is <literal>yes</literal>.
  </para></listitem>
 </varlistentry>
 <varlistentry>
  <term>
-    <command>Key5Light</command> =
+    <property>Key5Light</property> = &parameters.yesdefno;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal><emphasis>yes</emphasis></literal></arg>
      <arg choice="plain"><literal>no</literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
-    If <command>Keylights</command> is set, you can disable the F5 LED by setting this value 
+    If <property>Keylights</property> is set, you can disable the F5 LED by setting this value
    to <literal>no</literal>.  Default is <literal>yes</literal>.
  </para></listitem>
 </varlistentry>
 <varlistentry>
  <term>
-    <command>KeyTimeout</command> =
+    <property>KeyTimeout</property> =
-    <arg choice="plain"><replaceable>DURATION</replaceable></arg>
+    <parameter><replaceable>DURATION</replaceable></parameter>
  </term>
  <listitem><para>
    (Advanced) This value controls how long <application>LCDd</application> waits for a key press when
    get_key() is called.  The value represents microseconds and the default is <literal>500</literal>
    or .5 seconds.  Lowering this value will make LCDd more responsive but also causes LCDd to use
    more CPU time and, as the timeout grows shorter, key presses become harder to detect.
-    Larger values make key presses more reliable if somewhat slow to take effect.
+    Lparameterer values make key presses more reliable if somewhat slow to take effect.
  </para></listitem>
 </varlistentry>
 <varlistentry>
  <term>
-    <command>LircHost</command> =
+    <property>LircHost</property> =
-    <arg choice="plain"><replaceable>HOSTNAME_OR_IP-ADDRESS</replaceable></arg>
+    <parameter><replaceable>HOSTNAME_OR_IP-ADDRESS</replaceable></parameter>
  </term>
  <listitem>
  <para>
@@ -301,8 +251,8 @@
 <varlistentry>
  <term>
-    <command>LircPort</command> =
+    <property>LircPort</property> =
-    <arg choice="plain"><replaceable>PORTNUM</replaceable></arg>
+    <parameter><replaceable>PORTNUM</replaceable></parameter>
  </term>
  <listitem>
  <para>
@@ -314,8 +264,8 @@
 <varlistentry>
  <term>
-    <command>LircSync</command> =
+    <property>LircSync</property> =
-    <arg choice="plain"><replaceable>DURATION</replaceable></arg>
+    <parameter><replaceable>DURATION</replaceable></parameter>
  </term>
  <listitem>
  <para>
@@ -329,13 +279,13 @@
 <varlistentry>
  <term>
-    <command>LircLength</command> =
+    <property>LircLength</property> =
-    <arg choice="plain"><replaceable>DURATION</replaceable></arg>
+    <parameter><replaceable>DURATION</replaceable></parameter>
  </term>
  <listitem>
  <para>
    This value determines the length in jiffies (1/16384 seconds) of the entire LIRC code for a single remote
-    command. It depends on the notion that all commands are of the same duration, and are padded with a trailing 
+    property. It depends on the notion that all propertys are of the same duration, and are padded with a trailing
    gap (space) to make up the time. No such gap is emitted by the picolcd hardware. Values up to MAXINT are permitted.
    Setting a length of zero will suppress the synthesized gap. The default is 2048 jiffies (125ms).
  </para>
@@ -208,8 +208,8 @@ More information on the Pyramid LC-Display can be found here:
 <variablelist>
 <varlistentry>
  <term>
-    <command>Device</command> =
+    <property>Device</property> =
-    <arg choice="plain"><replaceable>DEVICE</replaceable></arg>
+    <parameter><replaceable>DEVICE</replaceable></parameter>
  </term>
  <listitem><para>
  Device to connect to. Default: <filename>/dev/lcd</filename>
@@ -513,31 +513,24 @@ use the following circuit.
 <variablelist>
 <varlistentry>
  <term>
-    <command>CellSize</command> =
+    <property>CellSize</property> = &parameters.size;
    <arg choice="plain">
      <replaceable>WIDTH</replaceable>
      <literal>x</literal>
      <replaceable>HEIGHT</replaceable>
    </arg>
  </term>
  <listitem><para>
    Specify the size of a character in pixels.
    <replaceable>WIDTH</replaceable> may vary between <literal>6</literal> and <literal>8</literal>;
    legal values for <replaceable>HEIGHT</replaceable> range from <literal>7</literal> to
    <literal>16</literal>.
-    If not given <command>CellSize</command> defaults to <literal>6x10</literal>.
+    If not given <property>CellSize</property> defaults to <literal>6x10</literal>.
  </para></listitem>
 </varlistentry>
 <varlistentry>
  <term>
-    <command>ConnectionType</command> =
+    <property>ConnectionType</property> =
-    <arg choice="plain">
+    {
-    <group choice="req">
+      <emphasis><parameter><literal>classic</literal></parameter></emphasis> |
-      <arg choice="plain"><literal><emphasis>classic</emphasis></literal></arg>
+      <parameter><literal>bitshaker</literal></parameter>
-      <arg choice="plain"><literal>bitshaker</literal></arg>
+    }
    </group>
    </arg>
  </term>
  <listitem>
    <para>
@@ -573,8 +566,8 @@ use the following circuit.
 <varlistentry>
  <term>
-    <command>Port</command> =
+    <property>Port</property> =
-    <arg choice="plain"><replaceable>PORT</replaceable></arg>
+    <parameter><replaceable>PORT</replaceable></parameter>
  </term>
  <listitem><para>
    Specify the address of the parallel port the LCD is connected to.
@@ -586,17 +579,15 @@ use the following circuit.
 <varlistentry>
  <term>
-    <command>Type</command> =
+    <property>Type</property> =
-    <arg choice="plain">
+    {
-    <group choice="req">
+      <parameter><literal>G321D</literal></parameter> |
-      <arg choice="plain"><literal>G321D</literal></arg>
+      <parameter><literal>G121C</literal></parameter> |
-      <arg choice="plain"><literal>G121C</literal></arg>
+      <parameter><literal>G242C</literal></parameter> |
-      <arg choice="plain"><literal>G242C</literal></arg>
+      <parameter><literal>G191D</literal></parameter> |
-      <arg choice="plain"><literal>G191D</literal></arg>
+      <parameter><literal>G2446</literal></parameter> |
-      <arg choice="plain"><literal>G2446</literal></arg>
+      <parameter><literal>SP14Q002</literal></parameter>
-      <arg choice="plain"><literal>SP14Q002</literal></arg>
+    }
    </group>
    </arg>
  </term>
  <listitem>
    <para>
@@ -16,8 +16,8 @@ sed1520 chipset.
 <variablelist>
 <varlistentry>
  <term>
-    <command>Port</command> =
+    <property>Port</property> =
-    <arg choice="plain"><replaceable>PORT</replaceable></arg>
+    <parameter><replaceable>PORT</replaceable></parameter>
  </term>
  <listitem><para>
    Specify the address of the parallel port the LCD is connected to.
@@ -118,8 +118,8 @@ arrow, delete, and return keys by default.
 <varlistentry>
  <term>
-    <command>Device</command> =
+    <property>Device</property> =
-    <arg choice="plain"><replaceable>DEVICE</replaceable></arg>
+    <parameter><replaceable>DEVICE</replaceable></parameter>
  </term>
  <listitem><para>
    Device to use in serial mode. Usual values are <filename>/dev/ttyS0</filename> or
@@ -129,12 +129,7 @@ arrow, delete, and return keys by default.
 <varlistentry>
  <term>
-    <command>Size</command> =
+    <property>Size</property> = &parameters.size;
    <arg choice="plain">
      <replaceable>WIDTH</replaceable>
      <literal>x</literal>
      <replaceable>HEIGHT</replaceable>
    </arg>
  </term>
  <listitem><para>
    Specifies the size of the VFD in characters.
@@ -144,18 +139,16 @@ arrow, delete, and return keys by default.
 <varlistentry>
  <term>
-    <command>Type</command> =
+    <property>Type</property> =
-    <arg choice="plain">
+    {
-    <group choice="req">
+      <parameter><literal>IEE</literal></parameter> |
-      <arg choice="plain"><literal>IEE</literal></arg>
+      <emphasis><parameter><literal>AEDEX</literal></parameter></emphasis> |
-      <arg choice="plain"><literal><emphasis>AEDEX</emphasis></literal></arg>
+      <parameter><literal>Epson</literal></parameter> |
-      <arg choice="plain"><literal>Epson</literal></arg>
+      <parameter><literal>Emax</literal></parameter> |
-      <arg choice="plain"><literal>Emax</literal></arg>
+      <parameter><literal>IBM</literal></parameter> |
-      <arg choice="plain"><literal>IBM</literal></arg>
+      <parameter><literal>LogicControls</literal></parameter> |
-      <arg choice="plain"><literal>LogicControls</literal></arg>
+      <parameter><literal>Ultimate</literal></parameter>
-      <arg choice="plain"><literal>Ultimate</literal></arg>
+    }
    </group>
    </arg>
  </term>
  <listitem><para>
    Set the communication protocol to use with the POS display.
@@ -166,16 +159,14 @@ arrow, delete, and return keys by default.
 <varlistentry>
  <term>
-    <command>Speed</command> =
+    <property>Speed</property> =
-    <arg choice="plain">
+    {
-    <group choice="req">
+      <parameter><literal>1200</literal></parameter> |
-      <arg choice="plain"><literal>1200</literal></arg>
+      <parameter><literal>2400</literal></parameter> |
-      <arg choice="plain"><literal>2400</literal></arg>
+      <emphasis><parameter><literal>9600</literal></parameter></emphasis> |
-      <arg choice="plain"><literal><emphasis>9600</emphasis></literal></arg>
+      <parameter><literal>19200</literal></parameter> |
-      <arg choice="plain"><literal>19200</literal></arg>
+      <parameter><literal>115200</literal></parameter>
-      <arg choice="plain"><literal>115200</literal></arg>
+    }
    </group>
    </arg>
  </term>
  <listitem><para>
    Set the the baud rate communication with the POS display.
@@ -433,13 +433,7 @@ optional
 <varlistentry>
  <term>
-    <command>use_parallel</command> =
+    <property>use_parallel</property> = &parameters.yesdefno;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal><emphasis>yes</emphasis></literal></arg>
      <arg choice="plain"><literal>no</literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
    "<literal>no</literal>" if display connected serial, "<literal>yes</literal>" if connected parallel [default: <literal>no</literal>(serial)].
@@ -448,8 +442,8 @@ optional
 <varlistentry>
  <term>
-    <command>Port</command> =
+    <property>Port</property> =
-    <arg choice="plain"><replaceable>PORT</replaceable></arg>
+    <parameter><replaceable>PORT</replaceable></parameter>
  </term>
  <listitem><para>
    Portaddress where the LPT is. Used in parallelmode only. Usual values are 0x278, 0x378 and 0x3BC [default: <literal>0x278</literal>].
@@ -458,18 +452,18 @@ optional
 <varlistentry>
  <term>
-    <command>PortWait</command> =
+    <property>PortWait</property> =
-    <arg choice="plain"><replaceable>DELAY</replaceable></arg>
+    <parameter><replaceable>DELAY</replaceable></parameter>
  </term>
  <listitem><para>
-    Set parallel port timingdelay (us). Used in parallelmode only. [default: <literal>2</literal>; legal: 0 - 255].
+    Set parallel port timingdelay (us). Used in parallel mode only. [default: <literal>2</literal>; legal: 0 - 255].
  </para></listitem>
 </varlistentry>
 <varlistentry>
  <term>
-    <command>Device</command> =
+    <property>Device</property> =
-    <arg choice="plain"><replaceable>DEVICE</replaceable></arg>
+    <parameter><replaceable>DEVICE</replaceable></parameter>
  </term>
  <listitem><para>
    Device to use in serial mode. Usual values are <filename>/dev/ttyS0</filename> and <filename>/dev/ttyS1</filename>
@@ -479,22 +473,17 @@ optional
 <varlistentry>
  <term>
-    <command>Custom-Characters</command> =
+    <property>Custom-Characters</property> =
-    <arg choice="plain"><replaceable>CUSTOM-CHARACTERS</replaceable></arg>
+    <parameter><replaceable>CUSTOM-CHARACTERS</replaceable></parameter>
  </term>
  <listitem><para>
-Number of Custom-Characters [default: Display-<command>Type</command> dependent].
+Number of Custom-Characters [default: Display-<property>Type</property> dependent].
  </para></listitem>
 </varlistentry>
 <varlistentry>
  <term>
-    <command>Size</command> =
+    <property>Size</property> = &parameters.size;
    <arg choice="plain">
      <replaceable>WIDTH</replaceable>
      <literal>x</literal>
      <replaceable>HEIGHT</replaceable>
    </arg>
  </term>
  <listitem><para>
    Specifies the size of the VFD.
@@ -504,8 +493,8 @@ Number of Custom-Characters [default: Display-<command>Type</command> dependent]
 <varlistentry>
  <term>
-    <command>Type</command> =
+    <property>Type</property> =
-    <arg choice="plain"><replaceable>CODE</replaceable></arg>
+    <parameter><replaceable>CODE</replaceable></parameter>
  </term>
  <listitem>
    <para>
@@ -522,7 +511,7 @@ Number of Custom-Characters [default: Display-<command>Type</command> dependent]
      </thead>
      <tbody>
        <row>
-	  <entry><literal><emphasis>0</emphasis></literal></entry>
+	  <entry><emphasis><literal>0</literal></emphasis></entry>
 	  <entry>NEC (FIPC8367 based) VFDs</entry>
 	</row>
        <row>
@@ -568,8 +557,8 @@ Number of Custom-Characters [default: Display-<command>Type</command> dependent]
 <varlistentry>
  <term>
-    <command>Brightness</command> =
+    <property>Brightness</property> =
-    <arg choice="plain"><replaceable>BRIGHTNESS</replaceable></arg>
+    <parameter><replaceable>BRIGHTNESS</replaceable></parameter>
  </term>
  <listitem><para>
 Set the initial brightness [default: 1000; legal: 0 - 1000]
@@ -579,8 +568,8 @@ Set the initial brightness [default: 1000; legal: 0 - 1000]
 <varlistentry>
  <term>
-    <command>OffBrightness</command> =
+    <property>OffBrightness</property> =
-    <arg choice="plain"><replaceable>OFFBRIGHTNESS</replaceable></arg>
+    <parameter><replaceable>OFFBRIGHTNESS</replaceable></parameter>
  </term>
  <listitem><para>
 Set the initial off-brightness [default: 0; legal: 0 - 1000].
@@ -592,16 +581,14 @@ Set the initial off-brightness [default: 0; legal: 0 - 1000].
 <varlistentry>
  <term>
-    <command>Speed</command> =
+    <property>Speed</property> =
-    <arg choice="plain">
+    {
-    <group choice="req">
+      <parameter><literal>1200</literal></parameter> |
-      <arg choice="plain"><literal>1200</literal></arg>
+      <parameter><literal>2400</literal></parameter> |
-      <arg choice="plain"><literal>2400</literal></arg>
+      <emphasis><parameter><literal>9600</literal></parameter></emphasis> |
-      <arg choice="plain"><literal><emphasis>9600</emphasis></literal></arg>
+      <parameter><literal>19200</literal></parameter> |
-      <arg choice="plain"><literal>19200</literal></arg>
+      <parameter><literal>115200</literal></parameter>
-      <arg choice="plain"><literal>115200</literal></arg>
+    }
    </group>
    </arg>
  </term>
  <listitem><para>
    Set the the baud rate communication with the VFD.
@@ -611,13 +598,7 @@ Set the initial off-brightness [default: 0; legal: 0 - 1000].
 <varlistentry>
  <term>
-    <command>ISO_8859_1</command> =
+    <property>ISO_8859_1</property> = &parameters.yesdefno;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal><emphasis>yes</emphasis></literal></arg>
      <arg choice="plain"><literal>no</literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
    Enable ISO-8859-1 compatibility [default is <literal>yes</literal>].
@@ -16,8 +16,8 @@ sli chipset.
 <variablelist>
 <varlistentry>
  <term>
-    <command>Device</command> =
+    <property>Device</property> =
-    <arg choice="plain"><replaceable>DEVICE</replaceable></arg>
+    <parameter><replaceable>DEVICE</replaceable></parameter>
  </term>
  <listitem><para>
    Select the output device to use [default: <filename>/dev/lcd</filename>]
@@ -26,18 +26,16 @@ sli chipset.
 <varlistentry>
  <term>
-    <command>Speed</command> =
+    <property>Speed</property> =
-    <arg choice="plain">
+    {
-    <group choice="req">
+      <parameter><literal>1200</literal></parameter> |
-      <arg choice="plain"><literal>1200</literal></arg>
+      <parameter><literal>2400</literal></parameter> |
-      <arg choice="plain"><literal>2400</literal></arg>
+      <parameter><literal>9600</literal></parameter> |
-      <arg choice="plain"><literal>9600</literal></arg>
+      <emphasis><parameter><literal>19200</literal></parameter></emphasis> |
-      <arg choice="plain"><literal><emphasis>19200</emphasis></literal></arg>
+      <parameter><literal>38400</literal></parameter> |
-      <arg choice="plain"><literal>38400</literal></arg>
+      <parameter><literal>57600</literal></parameter> |
-      <arg choice="plain"><literal>57600</literal></arg>
+      <parameter><literal>115200</literal></parameter>
-      <arg choice="plain"><literal>115200</literal></arg>
+    }
    </group>
    </arg>
  </term>
  <listitem><para>
    Set the the baud rate communication with the LCD.
@@ -16,8 +16,8 @@ stv5730 chipset.
 <variablelist>
 <varlistentry>
  <term>
-    <command>Port</command> =
+    <property>Port</property> =
-    <arg choice="plain"><replaceable>PORT</replaceable></arg>
+    <parameter><replaceable>PORT</replaceable></parameter>
  </term>
  <listitem><para>
    Specify the address of the parallel port the LCD is connected to.
@@ -16,8 +16,8 @@ svga chipset.
 <variablelist>
 <varlistentry>
  <term>
-    <command>Mode</command> =
+    <property>Mode</property> =
-    <arg choice="plain"><replaceable>SCGALIB-MODE</replaceable></arg>
+    <parameter><replaceable>SCGALIB-MODE</replaceable></parameter>
  </term>
  <listitem><para>
    svgalib mode to use [default: <literal>G320x240x256</literal>]
@@ -29,12 +29,7 @@ svga chipset.
 <varlistentry>
  <term>
-    <command>Size</command> =
+    <property>Size</property> = &parameters.size;
    <arg choice="plain">
      <replaceable>WIDTH</replaceable>
      <literal>x</literal>
      <replaceable>HEIGHT</replaceable>
    </arg>
  </term>
  <listitem><para>
    set display size [default: <literal>20x4</literal>]
@@ -43,8 +38,8 @@ svga chipset.
 <varlistentry>
  <term>
-    <command>Contrast</command> =
+    <property>Contrast</property> =
-    <arg choice="plain"><replaceable>CONTRAST</replaceable></arg>
+    <parameter><replaceable>CONTRAST</replaceable></parameter>
  </term>
  <listitem><para>
    Set the initial contrast.
@@ -59,8 +54,8 @@ svga chipset.
 <varlistentry>
  <term>
-    <command>Brightness</command> =
+    <property>Brightness</property> =
-    <arg choice="plain"><replaceable>BRIGHTNESS</replaceable></arg>
+    <parameter><replaceable>BRIGHTNESS</replaceable></parameter>
  </term>
  <listitem><para>
    Set the initial brightness [default: <literal>1000</literal>; legal: <literal>1</literal> - <literal>1000</literal>]
@@ -69,8 +64,8 @@ svga chipset.
 <varlistentry>
  <term>
-    <command>OffBrightness</command> =
+    <property>OffBrightness</property> =
-    <arg choice="plain"><replaceable>BRIGHTNESS</replaceable></arg>
+    <parameter><replaceable>BRIGHTNESS</replaceable></parameter>
  </term>
  <listitem><para>
    Set the initial off-brightness [default: <literal>500</literal>; legal: <literal>1</literal> - <literal>1000</literal>]
@@ -75,12 +75,7 @@ can be done by specifying "--enable-drivers=all" or by
 <variablelist>
 <varlistentry>
  <term>
-    <command>Size</command> =
+    <property>Size</property> = &parameters.size;
    <arg choice="plain">
      <replaceable>WIDTH</replaceable>
      <literal>x</literal>
      <replaceable>HEIGHT</replaceable>
    </arg>
  </term>
  <listitem><para>
    set display size [default: <literal>20x6</literal>]
@@ -89,8 +84,8 @@ can be done by specifying "--enable-drivers=all" or by
 <varlistentry>
  <term>
-    <command>Port</command> =
+    <property>Port</property> =
-    <arg choice="plain"><replaceable>PORT</replaceable></arg>
+    <parameter><replaceable>PORT</replaceable></parameter>
  </term>
  <listitem><para>
    Specify the address of the parallel port the LCD is connected to.
@@ -103,13 +98,7 @@ can be done by specifying "--enable-drivers=all" or by
 <varlistentry>
  <term>
-    <command>ECPlpt</command> =
+    <property>ECPlpt</property> = &parameters.yesdefno;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal><emphasis>yes</emphasis></literal></arg>
      <arg choice="plain"><literal>no</literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
    Is ECP mode on? [default: <literal>yes</literal>; legal: <literal>yes</literal>, <literal>no</literal>]
@@ -118,13 +107,7 @@ can be done by specifying "--enable-drivers=all" or by
 <varlistentry>
  <term>
-    <command>graphic</command> =
+    <property>graphic</property> = &parameters.yesnodef;
    <arg choice="plain">
    <group choice="req">
      <arg choice="plain"><literal>yes</literal></arg>
      <arg choice="plain"><literal><emphasis>no</emphasis></literal></arg>
    </group>
    </arg>
  </term>
  <listitem><para>
    Use graphic? [default: <literal>no</literal>; legal: <literal>yes</literal>, <literal>no</literal>]
@@ -16,12 +16,7 @@ text chipset.
 <variablelist>
 <varlistentry>
  <term>
-    <command>Size</command> =
+    <property>Size</property> = &parameters.size;
    <arg choice="plain">
      <replaceable>WIDTH</replaceable>
      <literal>x</literal>
      <replaceable>HEIGHT</replaceable>
    </arg>
  </term>
  <listitem><para>
    Set the display size [default: <literal>20x4</literal>]
@@ -39,8 +39,8 @@ of the LCD display by its manufacturer.
 <variablelist>
 <varlistentry>
  <term>
-    <command>Device</command> =
+    <property>Device</property> =
-    <arg choice="plain"><replaceable>DEVICE</replaceable></arg>
+    <parameter><replaceable>DEVICE</replaceable></parameter>
  </term>
  <listitem><para>
    Select the output device to use [default: <filename>/dev/lcd</filename>]
@@ -49,13 +49,11 @@ of the LCD display by its manufacturer.
 <varlistentry>
  <term>
-    <command>Speed</command> =
+    <property>Speed</property> =
-    <arg choice="plain">
+    {
-    <group choice="req">
+      <parameter><literal>4800</literal></parameter> |
-      <arg choice="plain"><literal>4800</literal></arg>
+      <emphasis><parameter><literal>9600</literal></parameter></emphasis>
-      <arg choice="plain"><literal><emphasis>9600</emphasis></literal></arg>
+    }
    </group>
    </arg>
  </term>
  <listitem><para>
    Set the the baud rate communication with the LCD.
@@ -65,12 +63,7 @@ of the LCD display by its manufacturer.
 <varlistentry>
  <term>
-    <command>Size</command> =
+    <property>Size</property> = &parameters.size;
    <arg choice="plain">
      <replaceable>WIDTH</replaceable>
      <literal>x</literal>
      <replaceable>HEIGHT</replaceable>
    </arg>
  </term>
  <listitem><para>
    set display size [default: <literal>16x2</literal>]
@@ -121,12 +121,7 @@ a standard character which looks good.
 <variablelist>
 <varlistentry>
  <term>
-    <command>Size</command> =
+    <property>Size</property> = &parameters.size;
    <arg choice="plain">
      <replaceable>WIDTH</replaceable>
      <literal>x</literal>
      <replaceable>HEIGHT</replaceable>
    </arg>
  </term>
  <listitem><para>
    Select the LCD size [default: <literal>20x4</literal>]
@@ -135,28 +130,28 @@ a standard character which looks good.
 <varlistentry>
  <term>
-    <command>KeyMap_A</command> =
+    <property>KeyMap_A</property> =
-    <arg choice="plain"><replaceable>KEY</replaceable></arg>
+    <parameter><replaceable>KEY</replaceable></parameter>
  </term>
  <term>
-    <command>KeyMap_B</command> =
+    <property>KeyMap_B</property> =
-    <arg choice="plain"><replaceable>KEY</replaceable></arg>
+    <parameter><replaceable>KEY</replaceable></parameter>
  </term>
  <term>
-    <command>KeyMap_C</command> =
+    <property>KeyMap_C</property> =
-    <arg choice="plain"><replaceable>KEY</replaceable></arg>
+    <parameter><replaceable>KEY</replaceable></parameter>
  </term>
  <term>
-    <command>KeyMap_D</command> =
+    <property>KeyMap_D</property> =
-    <arg choice="plain"><replaceable>KEY</replaceable></arg>
+    <parameter><replaceable>KEY</replaceable></parameter>
  </term>
  <term>
-    <command>KeyMap_E</command> =
+    <property>KeyMap_E</property> =
-    <arg choice="plain"><replaceable>KEY</replaceable></arg>
+    <parameter><replaceable>KEY</replaceable></parameter>
  </term>
  <term>
-    <command>KeyMap_F</command> =
+    <property>KeyMap_F</property> =
-    <arg choice="plain"><replaceable>KEY</replaceable></arg>
+    <parameter><replaceable>KEY</replaceable></parameter>
  </term>
  <listitem><para>
    If you have a non standard keypad you can associate any keystrings to keys.
@@ -22,12 +22,7 @@ on-screen display (OSD) used by most modern televisions and video-players.
 <variablelist>
 <varlistentry>
  <term>
-    <command>Size</command> =
+    <property>Size</property> = &parameters.size;
    <arg choice="plain">
      <replaceable>WIDTH</replaceable>
      <literal>x</literal>
      <replaceable>HEIGHT</replaceable>
    </arg>
  </term>
  <listitem><para>
    set display size [default: <literal>20x4</literal>]
@@ -36,12 +31,12 @@ on-screen display (OSD) used by most modern televisions and video-players.
 <varlistentry>
  <term>
-    <command>Offset</command> =
+    <property>Offset</property> =
-    <arg choice="plain">
+    <parameter>
      <replaceable>X-OFFSET</replaceable>
      <literal>x</literal>
      <replaceable>Y-OFFSET</replaceable>
-    </arg>
+    </parameter>
  </term>
  <listitem><para>
    Offset (in pixels) of the top-left corner of <package>LCDproc</package>'s
@@ -52,13 +47,13 @@ on-screen display (OSD) used by most modern televisions and video-players.
 <varlistentry>
  <term>
-    <command>Font</command> =
+    <property>Font</property> =
-    <arg choice="plain"><replaceable>FONT</replaceable></arg>
+    <parameter><replaceable>FONT</replaceable></parameter>
  </term>
  <listitem>
    <para>
      X font to use, in XLFD (X Logical Font Description) format,
-      as given by the <command>xfontsel</command> command.
+      as given by the <property>xfontsel</property> property.
      E.g. <literal>-*-terminus-*-r-*-*-*-320-*-*-*-*-*</literal>.
    </para>
    <para>
@@ -71,8 +66,8 @@ on-screen display (OSD) used by most modern televisions and video-players.
 <varlistentry>
  <term>
-    <command>Contrast</command> =
+    <property>Contrast</property> =
-    <arg choice="plain"><replaceable>CONTRAST</replaceable></arg>
+    <parameter><replaceable>CONTRAST</replaceable></parameter>
  </term>
  <listitem><para>
    Set the initial contrast.
@@ -87,8 +82,8 @@ on-screen display (OSD) used by most modern televisions and video-players.
 <varlistentry>
  <term>
-    <command>Brightness</command> =
+    <property>Brightness</property> =
-    <arg choice="plain"><replaceable>BRIGHTNESS</replaceable></arg>
+    <parameter><replaceable>BRIGHTNESS</replaceable></parameter>
  </term>
  <listitem><para>
    Set the initial brightness [default: <literal>1000</literal>; legal: <literal>1</literal> - <literal>1000</literal>]
@@ -97,8 +92,8 @@ on-screen display (OSD) used by most modern televisions and video-players.
 <varlistentry>
  <term>
-    <command>OffBrightness</command> =
+    <property>OffBrightness</property> =
-    <arg choice="plain"><replaceable>BRIGHTNESS</replaceable></arg>
+    <parameter><replaceable>BRIGHTNESS</replaceable></parameter>
  </term>
  <listitem><para>
    Set the initial off-brightness [default: <literal>500</literal>; legal: <literal>1</literal> - <literal>1000</literal>]
@@ -1,6 +1,7 @@
 <?xml version='1.0'?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
                      "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
  <!ENTITY % parameters SYSTEM "parameters.ent">
  <!ENTITY bookinfo SYSTEM "bookinfo.docbook">
  <!ENTITY introduction SYSTEM "introduction.docbook">
  <!ENTITY how-to-obtain SYSTEM "how-to-obtain.docbook">
@@ -59,10 +60,11 @@
  <!ENTITY tyan SYSTEM "drivers/tyan.docbook">
  <!ENTITY ula200 SYSTEM "drivers/ula200.docbook">
  <!ENTITY xosd SYSTEM "drivers/xosd.docbook">
  %parameters;
 ]>
 <book id="lcdproc-user" lang="en">
 &bookinfo;
 &introduction;
@@ -0,0 +1,21 @@
 <!-- Entity for a yes/no parameters with yes as default value -->
 <!ENTITY parameters.yesdefno "
    {
      <emphasis><parameter><literal>yes</literal></parameter></emphasis> |
      <parameter><literal>no</literal></parameter>
    }" >
 <!-- Entity for a yes/no parameters with no as default value -->
 <!ENTITY parameters.yesnodef "
    {
      <parameter><literal>yes</literal></parameter> |
      <emphasis><parameter><literal>no</literal></parameter></emphasis>
    }" >
 <!-- Entity for a typical size parameter -->
 <!ENTITY parameters.size "
    <parameter>
      <replaceable>WIDTH</replaceable>
      <literal>x</literal>
      <replaceable>HEIGHT</replaceable>
    </parameter>" >
@@ -1,23 +0,0 @@
 diff -ur lcdproc-0.5dev.orig/docs/lcdproc-user/Makefile.am lcdproc-0.5dev/docs/lcdproc-user/Makefile.am
 --- lcdproc-0.5dev.orig/docs/lcdproc-user/Makefile.am	2008-10-10 12:08:10.000000000 +0200
 +++ lcdproc-0.5dev/docs/lcdproc-user/Makefile.am	2009-06-07 15:27:45.000000000 +0200
@@ -23,6 +23,6 @@
 install-html-userguide: $(xmlto) lcdproc-user.docbook
 	$(mkinstalldirs) $(userguidedir)
 -	$(xmlto) html -o $(userguidedir) lcdproc-user.docbook
 +	$(xmlto) html -o $(userguidedir) --skip-validation lcdproc-user.docbook
 ## EOF
 diff -ur lcdproc-0.5dev.orig/docs/lcdproc-user/Makefile.in lcdproc-0.5dev/docs/lcdproc-user/Makefile.in
 --- lcdproc-0.5dev.orig/docs/lcdproc-user/Makefile.in	2009-06-07 15:14:20.000000000 +0200
 +++ lcdproc-0.5dev/docs/lcdproc-user/Makefile.in	2009-06-07 15:29:21.000000000 +0200
@@ -491,7 +491,7 @@
 install-html-userguide: $(xmlto) lcdproc-user.docbook
 	$(mkinstalldirs) $(userguidedir)
 -	$(xmlto) html -o $(userguidedir) lcdproc-user.docbook
 +	$(xmlto) html -o $(userguidedir) --skip-validation lcdproc-user.docbook
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: