Change some descriptions so Config::Model can parse them more reliable (D. Dumont).

LCDd.conf

@@ -106,45 +106,33 @@ WaitTime=5
 #TitleSpeed=10
 
 # The "...Key=" lines define what the server does with keypresses that
-# don't go to any client.
+# don't go to any client. The ToggleRotateKey stops rotation of screens, while
-# These are the defaults:
+# the PrevScreenKey and NextScreenKey go back / forward one screen (even if
+# rotation is disabled.
+# Assign the key string returned by the driver to the ...Key setting. These
+# are the defaults:
 ToggleRotateKey=Enter
 PrevScreenKey=Left
 NextScreenKey=Right
 #ScrollUpKey=Up
 #ScrollDownKey=Down
 
-# If you have only 4 keys, you can choose to use this:
-#ToggleRotateKey=Enter
-#PrevScreenKey=Up
-#NextScreenKey=Down
-
-# If you have only 3 keys, you can choose to use this:
-#ToggleRotateKey=Enter
-#PrevScreenKey=Up
-
-
 
 ## The menu section. The menu is an internal LCDproc client. ##
 [menu]
 # You can configure what keys the menu should use. Note that the MenuKey
 # will be reserved exclusively, the others work in shared mode.
 
-# The following works excellent with 4 keys or more.
+# Up to six keys are supported. The MenuKey (to enter and exit the menu), the
+# EnterKey (to select values) and at least one movement keys are required.
+# These are the default key assignments:
 MenuKey=Escape
 EnterKey=Enter
 UpKey=Up
 DownKey=Down
-# If you have 6 keys you may define these as well
 #LeftKey=Left
 #RightKey=Right
 
-# If you have only 3 keys, you could use something like this:
-#MenuKey=Escape
-#EnterKey=Enter
-#DownKey=Down
-
-
 
 ### Driver sections are below this line, in alphabetical order  ###
 
@@ -175,7 +163,8 @@ Brightness=1000
 # This value is used when the display is normally
 # switched off in case LCDd is inactive
 OffBrightness=0
-# Set the communication speed [default: 9600; legal: 1200, 2400, 9600, 19200 or 115200]
+# Set the communication speed [default: 9600; legal: 1200, 2400, 9600, 19200,
+# 115200]
 Speed=9600
 # Set the firmware version (New means >= 2.0) [default: no; legal: yes, no]
 NewFirmware=no
@@ -222,7 +211,7 @@ Reboot=yes
 #Size=20x4
 
 # Override the default communication speed known for the selected model.
-# [default: depending on model; legal: 19200, 115200]
+# Default value depends on model [legal: 19200, 115200]
 #Speed=115200
 
 
@@ -246,7 +235,7 @@ Size=20x4
 TopLeftX=7
 TopLeftY=7
 
-# use ASC symbols for icons & bars [default: no; legal, yes, no]
+# use ASC symbols for icons & bars [default: no; legal: yes, no]
 UseACS=no
 
 # draw Border [default: yes; legal: yes, no]
@@ -263,7 +252,10 @@ Model=12232
 # Select the output device to use [default: /dev/lcd]
 Device=/dev/ttyUSB0
 
-# Select the LCD size [default: depending on model: 12232: 20x4, 12832: 21x4, 1602: 16x2]
+# Select the LCD size. Default depends on model:
+# 12232: 20x4
+# 12832: 21x4
+# 1602: 16x2
 Size=20x4
 
 # Set the communication speed [default: 19200; legal: 9600, 19200]
@@ -404,7 +396,8 @@ normal_font=/usr/local/lib/X11/fonts/TTF/andalemo.ttf
 Driver=noritake800
 
 # no=use graphlcd bitmap fonts (they have only one size / font file)
-# yes=use fonts supported by FreeType2 (needs Freetype2 support in libglcdprocdriver and its dependants)
+# yes=use fonts supported by FreeType2 (needs Freetype2 support in
+# libglcdprocdriver and its dependants)
 UseFT2=yes
 
 # text resolution in fixed width characters [default: 16x4]
@@ -461,7 +454,7 @@ Speed=19200
 # Select what type of connection. See documentation for types.
 ConnectionType=4bit
 
-# Port where the LPT is [usual: 0x278, 0x378 and 0x3BC]
+# Port where the LPT is. Usual value are: 0x278, 0x378 and 0x3BC
 Port=0x378
 
 # Device of the serial interface [default: /dev/lcd]
@@ -477,7 +470,7 @@ Keypad=no
 # Set the initial contrast (bwctusb and lcd2usb) [default: 500; legal: 0 - 1000]
 Contrast=0
 
-# Set brightness of the backlight (lcd2usb only) [default: 0; legal 0 - 1000]
+# Set brightness of the backlight (lcd2usb only) [default: 0; legal: 0 - 1000]
 #Brightness=1000
 #OffBrightness=0
 
@@ -488,9 +481,9 @@ Backlight=no
 # be able to control it with the lcdproc OUTPUT command
 OutputPort=no
 
-# Specifies if the last line is pixel addressable or it controls an
+# Specifies if the last line is pixel addressable (yes) or it controls an
-# underline effect. [default: true (= pixel addressable); legal: yes, no]
+# underline effect (no). [default: yes; legal: yes, no]
-#Lastline=true
+#Lastline=yes
 
 # Specifies the size of the LCD.
 # In case of multiple combined displays, this should be the total size.
@@ -500,7 +493,7 @@ Size=20x4
 # Vspan=2,2 means both displays have 2 lines.
 #vspan=2,2
 
-# If you have an HD66712, a KS0073 or an other 'almost HD44780-compatible',
+# If you have an HD66712, a KS0073 or another 'almost HD44780-compatible',
 # set this flag to get into extended mode (4-line linear).
 #ExtendedMode=yes
 
@@ -510,8 +503,9 @@ Size=20x4
 
 # Character map to to map ISO-8859-1 to the LCD's character set
 # [default: hd44780_default; legal: hd44780_default, hd44780_euro, ea_ks0073,
-# sed1278f_0b, (hd44780_koi8_r, hd44780_cp1251, hd44780_8859_5, upd16314 if
+# sed1278f_0b, hd44780_koi8_r, hd44780_cp1251, hd44780_8859_5, upd16314 ]
-# compiled with additional charmaps)]
+# (hd44780_koi8_r, hd44780_cp1251, hd44780_8859_5 and upd16314 are possible if
+# compiled with additional charmaps)
 CharMap=hd44780_default
 
 # If your display is slow and cannot keep up with the flow of data from
@@ -559,7 +553,7 @@ Device=/dev/ttyS1
 # display dimensions
 Size=20x4
 
-# serial number [exactly as listed by usbview]
+# serial number. Must be exactly as listed by usbview
 # (if not given, the 1st IOWarrior found gets used)
 #SerialNumber=00000674
 
@@ -567,9 +561,9 @@ Size=20x4
 # set this flag to get into extended mode (4-line linear).
 #ExtendedMode=yes
 
-# Specifies if the last line is pixel addressable or it controls an
+# Specifies if the last line is pixel addressable (yes) or it controls an
-# underline effect. [default: true (= pixel addressable); legal: yes, no]
+# underline effect (no). [default: yes; legal: yes, no]
-#Lastline=true
+#Lastline=yes
 
 
 
@@ -583,18 +577,24 @@ Device=/dev/lcd0
 Size=16x2
 
 # Character map to to map ISO-8859-1 to the displays character set.
-# [default: none; legal: none, hd44780_euro, (upd16314, hd44780_koi8_r,
+# [default: none; legal: none, hd44780_euro, upd16314, hd44780_koi8_r,
-# hd44780_cp1251, hd44780_8859_5 if compiled with additional charmaps)]
+# hd44780_cp1251, hd44780_8859_5 ] (upd16314, hd44780_koi8_r,
+# hd44780_cp1251, hd44780_8859_5 are possible if compiled with additional
+# charmaps)
 CharMap=hd44780_euro
 
 ## Soundgraph iMON LCD ##
 [imonlcd]
-# Specify which iMon protocol should be used [legal: 0=15c2:ffdc device,
+# Specify which iMon protocol should be used
-# 1=15c2:0038 device; default: 0]
+# [legal: 0, 1; default: 0]
+# Choose 0 for 15c2:ffdc device,
+# Choose 1 for 15c2:0038 device
 Protocol=0
 
-# Set the exit behavior [legal: 0=leave shutdown message, 1=show the big clock,
+# Set the exit behavior [legal: 0-2; default: 1]
-# 2=blank device; default: 1]
+# 0 means leave shutdown message,
+# 1 means show the big clock,
+# 2 means blank device
 #OnExit=2
 
 # Select the output device to use [default: /dev/lcd0]
@@ -609,8 +609,9 @@ Contrast=200
 # Set the backlight state [default: on; legal: on, off]
 #Backlight=on
 
-# Set the disc mode [legal: 0=spin the "slim" disc - two disc segments,
+# Set the disc mode [legal: 0,1; default: 0]
-# 1=their complement spinning; default: 0]
+# 0 => spin the "slim" disc - two disc segments,
+# 1 => their complement spinning;
 #DiscMode=0
 
 
@@ -854,7 +855,8 @@ WaitAfterRefresh = 1000
 
 ## Noritake VFD driver ##
 [NoritakeVFD]
-# device where the VFD is. Usual values are /dev/ttyS0 and /dev/ttyS1 [default: /dev/lcd]
+# device where the VFD is. Usual values are /dev/ttyS0 and /dev/ttyS1
+# [default: /dev/lcd]
 Device=/dev/ttyS0
 # Specifies the size of the LCD.
 Size=20x4
@@ -866,7 +868,8 @@ Brightness=1000
 OffBrightness=50
 # set the serial port speed [default: 9600, legal: 1200, 2400, 9600, 19200, 115200]
 Speed=9600
-# Set serial data parity [default: 0 (None), legal: 0(=none), 1(=odd), 2(=even)]
+# Set serial data parity [default: 0; legal: 0-2 ]
+# Meaning: 0(=none), 1(=odd), 2(=even)
 Parity=0
 # re-initialize the VFD [default: no; legal: yes, no]
 Reboot=no
@@ -898,7 +901,7 @@ Brightness=1000
 # Set the initial contrast [default: 1000; legal: 0 - 1000]
 Contrast=1000
 
-# Light the keys? i[default: on; legal: on, off]
+# Light the keys? [default: on; legal: on, off]
 Keylights=on
 
 # If Keylights is on, the you can unlight specific keys below:
@@ -920,7 +923,8 @@ Key5Light=on
 LircPort=8765
 
 # Threshold in jiffies of synthesized gap that triggers flushing the IR data
-# to lirc [default: 100 (6.1ms); legal: 16 - 32767; 0 to disable].
+# to lirc [default: 100 ; max: 32767 ]
+# 100 means 6.1ms. legal: 16 - 32767; Use 0 to disable.
 LircFlushThreshold=100
 
 
@@ -981,7 +985,8 @@ Size=16x2
 # [default: AEDEX; legal: IEE, Epson, Emax, IBM, LogicControls, Ultimate]
 Type=AEDEX
 
-# communication baud rate with the display [default: 9600; legal: 1200, 2400, 19200, 115200]
+# communication baud rate with the display [default: 9600; legal: 1200, 2400,
+# 19200, 115200]
 Speed=9600
 
 
@@ -1003,16 +1008,19 @@ Speed=9600
 # (* most should work, not tested yet.)
 Type=0
 
-# "no" if display connected serial, "yes" if connected parallel. [default: no(=serial)]
+# "no" if display connected serial, "yes" if connected parallel. [default: no]
+# I.e. serial by default
 use_parallel=no
 
-# Number of Custom-Characters [default: display type dependent]
+# Number of Custom-Characters. default is display type dependent
 #Custom-Characters=0
 
-# Portaddress where the LPT is. Used in parallel mode only. Usual values are 0x278, 0x378 and 0x3BC
+# Portaddress where the LPT is. Used in parallel mode only. Usual values are
+# 0x278, 0x378 and 0x3BC.
 Port=0x378
 
-# Set parallel port timing delay (us). Used in parallel mode only. [default: 2; legal: 0 - 255]
+# Set parallel port timing delay (us). Used in parallel mode only.
+# [default: 2; legal: 0 - 255]
 #PortWait=2
 
 # Device to use in serial mode. Usual values are /dev/ttyS0 and /dev/ttyS1
@@ -1078,7 +1086,8 @@ Device=/dev/ttyUSB0
 ## SVGAlib driver ##
 [svga]
 
-# svgalib mode to use [default: G320x240x256; legal: supported svgalib modes]
+# svgalib mode to use [default: G320x240x256 ]
+# legal values are supported svgalib modes
 #Mode=G640x480x256
 
 # set display size [default: 20x4]
@@ -1169,7 +1178,8 @@ Size=20x4
 # Select the output device to use [default: /dev/lcd]
 Device=/dev/lcd
 
-# Set the communication speed [default: 19200; legal: 1200, 2400, 9600, 19200, 38400, 57600, 115200]
+# Set the communication speed [default: 19200; legal: 1200, 2400, 9600, 19200,
+# 38400, 57600, 115200]
 Speed=19200