From 38c7fb27a39bf4f951e32c76537c04be1f236e2f Mon Sep 17 00:00:00 2001
From: mmdolze <mmdolze@users.sourceforge.net>
Date: Sun, 19 Aug 2012 14:13:26 +0000
Subject: [PATCH] Fix a few text mistaked discovered during merge.

---
 LCDd.conf               | 6 +++---
 clients/lcdproc/iface.c | 2 +-
 clients/lcdproc/mem.c   | 3 ++-
 server/client.h         | 2 +-
 server/screen.h         | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/LCDd.conf b/LCDd.conf
index fec7b98..ebea746 100644
--- a/LCDd.conf
+++ b/LCDd.conf
@@ -45,7 +45,7 @@ DriverPath=server/drivers/
 #
 # The following drivers are supported:
 #   bayrad, CFontz, CFontzPacket, curses, CwLnx, ea65,
-#   EyeboxOne, g15, glcdlib, glk, hd44780, icp_a106, imon, imonlcd,
+#   EyeboxOne, g15, glcd, glcdlib, glk, hd44780, icp_a106, imon, imonlcd,
 #   IOWarrior, irman, joy, lb216, lcdm001, lcterm, lirc, lis, MD8800,
 #   mdm166a, ms6931, mtc_s16209x, MtxOrb, mx5000, NoritakeVFD, picolcd,
 #   pyramid, sdeclcd, sed1330, sed1520, serialPOS, serialVFD, shuttleVFD, sli,
@@ -359,7 +359,7 @@ ConnectionType=t6963
 # the ConnectionType. [default: 128x64; legal: 1x1 - 640x480]
 #Size=128x64
 
-# Width ond height of a character cell in pixels. This value is only used if
+# Width and height of a character cell in pixels. This value is only used if
 # the driver has been compiled with FreeType and it is enabled. Otherwise the
 # default 6x8 cell is used.
 #CellSize=12x16
@@ -1053,7 +1053,7 @@ InterfaceType=80
 DelayMult=0
 
 # The original wiring used an inverter to drive the control lines. If you do
-# not use an inverter set haveInverter to off. [default: yes; legal: yes, no]
+# not use an inverter set haveInverter to no. [default: yes; legal: yes, no]
 haveInverter=no
 
 
diff --git a/clients/lcdproc/iface.c b/clients/lcdproc/iface.c
index ae8d9a6..40e50cb 100644
--- a/clients/lcdproc/iface.c
+++ b/clients/lcdproc/iface.c
@@ -65,7 +65,7 @@ iface_process_configfile(void)
 		iface[iface_count].alias = strdup(config_get_string("Iface", iface_label, 0, iface[iface_count].name));
 		if (iface[iface_count].alias == NULL)
 			/*
-			 * make alias the same as the interface name in case #
+			 * make alias the same as the interface name in case
 			 * strdup() failed
 			 */
 			iface[iface_count].alias = iface[iface_count].name;
diff --git a/clients/lcdproc/mem.c b/clients/lcdproc/mem.c
index 61d505c..616a2ad 100644
--- a/clients/lcdproc/mem.c
+++ b/clients/lcdproc/mem.c
@@ -276,9 +276,10 @@ mem_top_screen(int rep, int display, int *flags_ptr)
 
 		/* frame from (2nd line, left) to (last line, right) */
 		sock_send_string(sock, "widget_add S f frame\n");
+
+		/* scroll rate: 1 line every X ticks (= 1/8 sec) */
 		sock_printf(sock, "widget_set S f 1 2 %i %i %i 5 v %i\n",
 			    lcd_wid, lcd_hgt, lcd_wid,
-			    /* scroll rate: 1 line every X ticks (= 1/8 sec) */
 			    ((lcd_hgt >= 4) ? 8 : 12));
 
 		/* frame contents */
diff --git a/server/client.h b/server/client.h
index b605894..f210aca 100644
--- a/server/client.h
+++ b/server/client.h
@@ -1,7 +1,7 @@
 /** \file server/client.h
  * Defines all the client data and actions.
  *
- * \note If you only need 'struct Client' to work with you should use the
+ * \note If you only need 'struct Client' to work with, you should use the
  *       following code (which does not create an indirect dependency on
  *       'struct Screen'):
  *
diff --git a/server/screen.h b/server/screen.h
index b4aedf4..1eeeb99 100644
--- a/server/screen.h
+++ b/server/screen.h
@@ -1,7 +1,7 @@
 /** \file server/screen.h
  * Public interface to the screen management methods.
  *
- * \note If you only need 'struct Screen' to work with you should use the
+ * \note If you only need 'struct Screen' to work with, you should use the
  *       following code (which does not create an indirect dependency on
  *       'struct Widget'):
  *