Index: appendices/glossary.xml
===================================================================
--- appendices/glossary.xml	(revision 31ff91e4dfb98fa9bf994c480d7945af0a3c0262)
+++ appendices/glossary.xml	(revision ca89a83575f4ae83bac816aec62544c314c48a6e)
@@ -140,4 +140,7 @@
 <glossdef><para><acronym>GNU</acronym> Compiler Collection</para></glossdef></glossentry>
 
+<glossentry id="gGDBM"><glossterm><acronym>GDBM</acronym></glossterm>
+<glossdef><para><acronym>GNU</acronym> DataBase Manager</para></glossdef></glossentry>
+
 <glossentry id="gGDK"><glossterm><acronym>GDK</acronym></glossterm>
 <glossdef><para><acronym>GTK</acronym>+ Drawing Kit</para></glossdef></glossentry>
Index: general/genlib/gdbm.xml
===================================================================
--- general/genlib/gdbm.xml	(revision 31ff91e4dfb98fa9bf994c480d7945af0a3c0262)
+++ general/genlib/gdbm.xml	(revision ca89a83575f4ae83bac816aec62544c314c48a6e)
@@ -1,5 +1,5 @@
-<sect1 id="gdbm" xreflabel="gdbm-&gdbm-version;">
+<sect1 id="gdbm" xreflabel="GDBM-&gdbm-version;">
 <?dbhtml filename="gdbm.html" dir="general"?>
-<title>gdbm-&gdbm-version;</title>
+<title>GDBM-&gdbm-version;</title>
 
 &gdbm-intro;
Index: general/genlib/gdbm/gdbm-config.xml
===================================================================
--- general/genlib/gdbm/gdbm-config.xml	(revision 31ff91e4dfb98fa9bf994c480d7945af0a3c0262)
+++ general/genlib/gdbm/gdbm-config.xml	(revision ca89a83575f4ae83bac816aec62544c314c48a6e)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring <application>gdbm</application></title>
+<title>Configuring <application><acronym>GDBM</acronym></application></title>
 
 <sect3><title>Configuration Information</title>
Index: general/genlib/gdbm/gdbm-desc.xml
===================================================================
--- general/genlib/gdbm/gdbm-desc.xml	(revision 31ff91e4dfb98fa9bf994c480d7945af0a3c0262)
+++ general/genlib/gdbm/gdbm-desc.xml	(revision ca89a83575f4ae83bac816aec62544c314c48a6e)
@@ -2,5 +2,6 @@
 <title>Contents</title>
 
-<para>The <application>gdbm</application> package contains <filename>libgdbm</filename> libraries.</para>
+<para>The <application><acronym>GDBM</acronym></application> package
+contains <filename class="libraryfile">libgdbm</filename> libraries.</para>
 
 </sect2>
@@ -9,5 +10,5 @@
 
 <sect3><title>gdbm libraries</title>
-<para><filename>libgdbm</filename> libraries contain functions that perform 
+<para><filename class="libraryfile">libgdbm</filename> libraries contain functions that perform 
 database routines using extendible hashing.</para></sect3>
 
Index: general/genlib/gdbm/gdbm-exp.xml
===================================================================
--- general/genlib/gdbm/gdbm-exp.xml	(revision 31ff91e4dfb98fa9bf994c480d7945af0a3c0262)
+++ general/genlib/gdbm/gdbm-exp.xml	(revision ca89a83575f4ae83bac816aec62544c314c48a6e)
@@ -2,6 +2,8 @@
 <title>Command explanations</title>
 
-<para><command>--infodir=/usr/share/info --mandir=/usr/share/man</command> : These switches set the documentation directory to <filename>/usr/share
-</filename> instead of <filename>/usr</filename>.</para>
+<para><command>--infodir=/usr/share/info
+--mandir=/usr/share/man</command> : These switches set the documentation
+directory to <filename class="directory">/usr/share</filename> instead of 
+<filename class="directory">/usr</filename>.</para>
 
 <para><command>BINOWN=root BINGRP=root</command> : This command
Index: general/genlib/gdbm/gdbm-inst.xml
===================================================================
--- general/genlib/gdbm/gdbm-inst.xml	(revision 31ff91e4dfb98fa9bf994c480d7945af0a3c0262)
+++ general/genlib/gdbm/gdbm-inst.xml	(revision ca89a83575f4ae83bac816aec62544c314c48a6e)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Installation of <application>gdbm</application></title>
+<title>Installation of <application><acronym>GDBM</acronym></application></title>
 
-<para>Install <application>gdbm</application> by running the following commands:
+<para>Install <application><acronym>GDBM</acronym></application> by running the following commands:
 </para>
 
Index: general/genlib/gdbm/gdbm-intro.xml
===================================================================
--- general/genlib/gdbm/gdbm-intro.xml	(revision 31ff91e4dfb98fa9bf994c480d7945af0a3c0262)
+++ general/genlib/gdbm/gdbm-intro.xml	(revision ca89a83575f4ae83bac816aec62544c314c48a6e)
@@ -1,6 +1,7 @@
 <sect2>
-<title>Introduction to <application>gdbm</application></title>
+<title>Introduction to <application><acronym>GDBM</acronym></application></title>
 
-<para>The <application>gdbm</application> package contains a dbm library. This 
+<para>The <application><acronym>GDBM</acronym></application> package
+contains the <acronym>GNU</acronym> Database Manager. This 
 is useful for database routines that use extendible hashing.</para>
 
Index: server/other/bind/bind-config.xml
===================================================================
--- server/other/bind/bind-config.xml	(revision 31ff91e4dfb98fa9bf994c480d7945af0a3c0262)
+++ server/other/bind/bind-config.xml	(revision ca89a83575f4ae83bac816aec62544c314c48a6e)
@@ -14,5 +14,5 @@
 jail as an unprivileged user (named). This configuration is more secure
 in that a <acronym>DNS</acronym> compromise can only affect a few files
-in the named user's <envar>$HOME</envar> directory.</para> 
+in the named user's <envar>HOME</envar> directory.</para> 
 
 <para>First we create the unpriviledged user and group named:</para>
@@ -58,5 +58,5 @@
      file "pz/127.0.0";
  };
-<command>>EOF</command></userinput></screen>
+<command>EOF</command></userinput></screen>
 
 <para>Create a zone file with the following contents:</para>
@@ -107,10 +107,10 @@
 L.ROOT-SERVERS.NET.     6D  IN      A       198.32.64.12
 M.ROOT-SERVERS.NET.     6D  IN      A       202.12.27.33
-<command>>EOF</command></userinput></screen>
+<command>EOF</command></userinput></screen>
 
 <para>The <filename>root.hints</filename> file is a list of root name
 servers. This file must be updated periodically with the
 <command>dig</command> utility.
-Consult the <acronym>BIND</acronym> 9 Administrator Reference Manual for
+Consult the <application><acronym>BIND</acronym></application> 9 Administrator Reference Manual for
 details.</para>
 
@@ -143,5 +143,5 @@
 search yourdomain.com
 nameserver 127.0.0.1
-<command>>EOF</command></userinput></screen>
+<command>EOF</command></userinput></screen>
 
 <para>Set permissions on the chroot jail with the following
Index: server/other/cvsserver/cvsserver-inst.xml
===================================================================
--- server/other/cvsserver/cvsserver-inst.xml	(revision 31ff91e4dfb98fa9bf994c480d7945af0a3c0262)
+++ server/other/cvsserver/cvsserver-inst.xml	(revision ca89a83575f4ae83bac816aec62544c314c48a6e)
@@ -47,5 +47,5 @@
 
 <screen><userinput><command>export CVS_RSH=/usr/bin/ssh &amp;&amp;
-cvs -d:ext:servername:/cvsroot co cvstest</command></userinput></screen></sect3>
+cvs -d:ext:<replaceable>servername</replaceable>:/cvsroot co cvstest</command></userinput></screen></sect3>
 </sect2>
 <sect2>
@@ -95,6 +95,5 @@
 </para>
 
-<screen><userinput><command>cvs
--d:pserver:anonymous@<replaceable>servername</replaceable>:/cvsroot co cvstest</command></userinput></screen>
+<screen><userinput><command>cvs -d:pserver:anonymous@<replaceable>servername</replaceable>:/cvsroot co cvstest</command></userinput></screen>
 <note><para>Replace "servername" with the <acronym>IP</acronym> address or 
 hostname of the <acronym>CVS</acronym> server</para></note>
Index: server/other/dhcp/dhcp-config.xml
===================================================================
--- server/other/dhcp/dhcp-config.xml	(revision 31ff91e4dfb98fa9bf994c480d7945af0a3c0262)
+++ server/other/dhcp/dhcp-config.xml	(revision ca89a83575f4ae83bac816aec62544c314c48a6e)
@@ -16,5 +16,5 @@
 that this script is coded for the <emphasis role="strong">eth1</emphasis> 
 interface, which may need to be modified for your hardware configuration. 
-With that in mind the <command>dhcp</command> init.d script can be created
+With that in mind the <application><acronym>DHCP</acronym></application> init.d script can be created
 using the following commands.</para>
 
Index: server/other/openldap/openldap-exp.xml
===================================================================
--- server/other/openldap/openldap-exp.xml	(revision 31ff91e4dfb98fa9bf994c480d7945af0a3c0262)
+++ server/other/openldap/openldap-exp.xml	(revision ca89a83575f4ae83bac816aec62544c314c48a6e)
@@ -10,6 +10,7 @@
 
 <para><command>--enable-ldbm</command> : Build <command>slapd</command>
-with primary database backend using either Berkeley DB or
-<acronym>GNU</acronym> Database Manager.</para> 
+with primary database backend using either <application>Berkeley
+DB</application> or
+<application><acronym>GNU</acronym> Database Manager</application>.</para> 
 
 <para><command>--disable-debug</command> : Disable debugging code.</para>  
Index: server/other/openssh/openssh-config.xml
===================================================================
--- server/other/openssh/openssh-config.xml	(revision 31ff91e4dfb98fa9bf994c480d7945af0a3c0262)
+++ server/other/openssh/openssh-config.xml	(revision ca89a83575f4ae83bac816aec62544c314c48a6e)
@@ -19,5 +19,5 @@
 machine.  The <command>ssh</command> client doesn't need this script to be 
 used.  Having said that, if you want to run the <command>ssh</command> daemon, 
-the <command>sshd</command> init.d script can be created using the following 
+the <application>Open<acronym>SSH</acronym></application> daemon init.d script can be created using the following 
 commands:</para>
 
Index: server/other/rsync/rsync-config.xml
===================================================================
--- server/other/rsync/rsync-config.xml	(revision 31ff91e4dfb98fa9bf994c480d7945af0a3c0262)
+++ server/other/rsync/rsync-config.xml	(revision ca89a83575f4ae83bac816aec62544c314c48a6e)
@@ -32,5 +32,5 @@
 your machine. The <application>rsync</application> client doesn't need this 
 script to be used.  Having said that, if you want to run the <application>rsync
-</application> daemon, the <command>rsyncd</command> init.d script can be 
+</application> daemon, the <application>rsync</application> daemon init.d script can be 
 created using the following commands:</para>
 
Index: server/other/rsync/rsync.ent
===================================================================
--- server/other/rsync/rsync.ent	(revision 31ff91e4dfb98fa9bf994c480d7945af0a3c0262)
+++ server/other/rsync/rsync.ent	(revision ca89a83575f4ae83bac816aec62544c314c48a6e)
@@ -10,3 +10,3 @@
 <!ENTITY rsync-download-ftp "ftp://rsync.samba.org/pub/rsync/rsync-&rsync-version;.tar.gz">
 <!ENTITY rsyncd-size "571 KB">
-<!ENTITY rsyncd-time "1 min (1GHz)">
+<!ENTITY rsyncd-time "0.65 SBU">
