Index: sicnet/netlibs/gnet/gnet-config.xml
===================================================================
--- basicnet/netlibs/gnet/gnet-config.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ 	(revision )
@@ -1,15 +1,0 @@
-<sect2>
-<title>Configuring <application>GNet</application></title>
-
-<sect3><title>Config files</title>
-<para><userinput>List of config files</userinput></para>
-</sect3>
-
-<sect3><title>Configuration Information</title>
-
-<para><userinput>USERINPUT GOES HERE</userinput> Blah blah blah about config.
-</para>
-</sect3>
-
-</sect2>
-
Index: connect/dhcp/dhcpcd/dhcpcd-exp.xml
===================================================================
--- connect/dhcp/dhcpcd/dhcpcd-exp.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ connect/dhcp/dhcpcd/dhcpcd-exp.xml	(revision a4be499f616c1dddf755c46814b8527ab9936ba9)
@@ -6,18 +6,22 @@
 and temporary files in <filename>/etc/dhcpc</filename>. This becomes very 
 annoying when <application>dhcpcd</application> tells you it's running and it's 
-not.  You look in <filename class="directory">/var/run</filename> for the pid file, but it's not 
-there, the pid file that needs deleting is in <filename>/etc/dhcpc</filename>. 
+not.  You look in <filename class="directory">/var/run</filename> for
+the <filename>PID</filename> file, but it's not 
+there, the <filename>PID</filename> file that needs deleting is in
+<filename class="directory">/etc/dhcpc</filename>. 
 This patch brings this program into <acronym>FHS</acronym> compliance, but more 
 importantly, puts files where you expect them to be.</para>
 
 <para><parameter>--prefix=""</parameter>: There may be a good reason for
-abandoning the normal <acronym>BLFS</acronym> convention of using --prefix=/usr 
-here.  If you are installing <acronym>DHCP</acronym>, it is likely that it is 
-required during the boot process and <filename class="directory">/usr</filename> may be network 
+abandoning the normal <acronym>BLFS</acronym> convention of using
+<parameter>--prefix=/usr</parameter> here.  If you are installing 
+<acronym>DHCP</acronym>, it is likely that it is 
+required during the boot process and 
+<filename class="directory">/usr</filename> may be network 
 mounted in which case, <command>dhcpcd</command> wouldn't be available due to 
 being on the network!  Therefore, depending on your situation, you may want it 
-to be installed in <filename class="directory">/sbin</filename> or <filename
-class="directory">/usr/sbin
-</filename>.  This command installs to <filename class="directory">/sbin</filename>.</para>
+to be installed in <filename class="directory">/sbin</filename> or 
+<filename class="directory">/usr/sbin</filename>.  This command installs to 
+<filename class="directory">/sbin</filename>.</para>
 
 <para><parameter>--sysconfdir=/var/lib</parameter>: This command install
Index: content/databases/db/db-config.xml
===================================================================
--- content/databases/db/db-config.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ content/databases/db/db-config.xml	(revision a4be499f616c1dddf755c46814b8527ab9936ba9)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring <application>Bekerley DB</application></title>
+<title>Configuring <application>Berkeley DB</application></title>
 
 <sect3><title>Configuration Information</title>
Index: content/databases/mysql/mysql-config.xml
===================================================================
--- content/databases/mysql/mysql-config.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ content/databases/mysql/mysql-config.xml	(revision a4be499f616c1dddf755c46814b8527ab9936ba9)
@@ -19,5 +19,5 @@
 
 <para>We can now install a database and change the ownership to the
-unpriviledged user and group.</para>
+unprivileged user and group.</para>
 
 <screen><userinput><command>mysql_install_db
Index: content/databases/mysql/mysql-inst.xml
===================================================================
--- content/databases/mysql/mysql-inst.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ content/databases/mysql/mysql-inst.xml	(revision a4be499f616c1dddf755c46814b8527ab9936ba9)
@@ -2,5 +2,5 @@
 <title>Installation of <application>My<acronym>SQL</acronym></application></title>
 
-<para>For security reasons, running the server as an unpriviledged user 
+<para>For security reasons, running the server as an unprivileged user 
 and group is strongly encouraged:</para>
 
Index: content/web/apache/apache-inst.xml
===================================================================
--- content/web/apache/apache-inst.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ content/web/apache/apache-inst.xml	(revision a4be499f616c1dddf755c46814b8527ab9936ba9)
@@ -2,5 +2,5 @@
 <title>Installation of <application>Apache</application></title>
 
-<para>For security reasons, running the server as an unpriviledged user and group is strongly encouraged.</para>
+<para>For security reasons, running the server as an unprivileged user and group is strongly encouraged.</para>
 
 <screen><userinput><command>groupadd apache &amp;&amp;
Index: content/web/proftpd/proftpd-config.xml
===================================================================
--- content/web/proftpd/proftpd-config.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ content/web/proftpd/proftpd-config.xml	(revision a4be499f616c1dddf755c46814b8527ab9936ba9)
@@ -36,5 +36,5 @@
 Group				proftpd
 
-# Normally, we want files to be overwriteable.
+# Normally, we want files to be overwritable.
 &lt;Directory /*&gt;
   AllowOverwrite		on
Index: content/web/proftpd/proftpd-desc.xml
===================================================================
--- content/web/proftpd/proftpd-desc.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ content/web/proftpd/proftpd-desc.xml	(revision a4be499f616c1dddf755c46814b8527ab9936ba9)
@@ -26,5 +26,5 @@
 
 <sect3><title>proftpd</title>
-<para><command>proftpd</command> the deamon itself.</para></sect3>
+<para><command>proftpd</command> the daemon itself.</para></sect3>
 
 </sect2>
Index: content/web/proftpd/proftpd-inst.xml
===================================================================
--- content/web/proftpd/proftpd-inst.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ content/web/proftpd/proftpd-inst.xml	(revision a4be499f616c1dddf755c46814b8527ab9936ba9)
@@ -3,5 +3,5 @@
 
 <para>For security reasons, running <application>ProFTPD</application>
-as an unpriviledged user and group is encouraged.</para>
+as an unprivileged user and group is encouraged.</para>
 
 <screen><userinput><command>groupadd proftpd &amp;&amp;
Index: general/sysutils/fcron/fcron-inst.xml
===================================================================
--- general/sysutils/fcron/fcron-inst.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ general/sysutils/fcron/fcron-inst.xml	(revision a4be499f616c1dddf755c46814b8527ab9936ba9)
@@ -22,5 +22,5 @@
 <screen><userinput><command>/etc/rc.d/init.d/sysklogd reload</command></userinput></screen>
 
-<para>For security reasons, we need to create an unpriviledged user and
+<para>For security reasons, we need to create an unprivileged user and
 group for <application>fcron</application>:</para>
 
Index: gnome/lib/gtk-doc/gtk-doc-desc.xml
===================================================================
--- gnome/lib/gtk-doc/gtk-doc-desc.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ gnome/lib/gtk-doc/gtk-doc-desc.xml	(revision a4be499f616c1dddf755c46814b8527ab9936ba9)
@@ -17,5 +17,5 @@
 
 
-<para>This are all <application>Perl</application> scripts used by
+<para>These are all <application>Perl</application> scripts used by
 <filename>Makefile</filename> scripts to generate
 documentation for the package.</para>
Index: ome/lib/gtkhtml/gtkhtml2-config.xml
===================================================================
--- gnome/lib/gtkhtml/gtkhtml2-config.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ 	(revision )
@@ -1,15 +1,0 @@
-<sect2>
-<title>Configuring <application>GtkHTML</application></title>
-
-<sect3><title>Config files</title>
-<para><filename>List of config files</filename></para>
-</sect3>
-
-<sect3><title>Configuration Information</title>
-
-<para><userinput>USERINPUT GOES HERE</userinput> Blah blah blah about config.
-</para>
-</sect3>
-
-</sect2>
-
Index: gnome/lib/gtkhtml2.xml
===================================================================
--- gnome/lib/gtkhtml2.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ gnome/lib/gtkhtml2.xml	(revision a4be499f616c1dddf755c46814b8527ab9936ba9)
@@ -5,5 +5,4 @@
 &gtkhtml2-intro;
 &gtkhtml2-inst;
-&gtkhtml2-config;
 &gtkhtml2-desc;
 
Index: gnome/lib/intltool/intltool-desc.xml
===================================================================
--- gnome/lib/intltool/intltool-desc.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ gnome/lib/intltool/intltool-desc.xml	(revision a4be499f616c1dddf755c46814b8527ab9936ba9)
@@ -33,5 +33,5 @@
 
 <sect3><title>intltool-unicodify</title>
-<para><command>intltool-unicodify</command> is the i18n unicode encoding
+<para><command>intltool-unicodify</command> is the i18n Unicode encoding
 utility.</para></sect3>
 
Index: ome/lib/libgsf/libgsf-config.xml
===================================================================
--- gnome/lib/libgsf/libgsf-config.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ 	(revision )
@@ -1,15 +1,0 @@
-<sect2>
-<title>Configuring <application>libgsf</application></title>
-
-<sect3><title>Config files</title>
-<para><filename>List of config files</filename></para>
-</sect3>
-
-<sect3><title>Configuration Information</title>
-
-<para><userinput>USERINPUT GOES HERE</userinput> Blah blah blah about config.
-</para>
-</sect3>
-
-</sect2>
-
Index: ome/lib/themes/gnome-icon-themes-config.xml
===================================================================
--- gnome/lib/themes/gnome-icon-themes-config.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ 	(revision )
@@ -1,15 +1,0 @@
-<sect2>
-<title>Configuring <application><acronym>GNOME</acronym> Icon Theme</application></title>
-
-<sect3><title>Config files</title>
-<para><userinput>List of config files</userinput></para>
-</sect3>
-
-<sect3><title>Configuration Information</title>
-
-<para><userinput>USERINPUT GOES HERE</userinput> Blah blah blah about config.
-</para>
-</sect3>
-
-</sect2>
-
Index: ome/lib/themes/gnome-themes-config.xml
===================================================================
--- gnome/lib/themes/gnome-themes-config.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ 	(revision )
@@ -1,15 +1,0 @@
-<sect2>
-<title>Configuring <application><acronym>GNOME</acronym> Themes</application></title>
-
-<sect3><title>Config files</title>
-<para><userinput>List of config files</userinput></para>
-</sect3>
-
-<sect3><title>Configuration Information</title>
-
-<para><userinput>USERINPUT GOES HERE</userinput> Blah blah blah about config.
-</para>
-</sect3>
-
-</sect2>
-
Index: ome/lib/vte/vte-config.xml
===================================================================
--- gnome/lib/vte/vte-config.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ 	(revision )
@@ -1,15 +1,0 @@
-<sect2>
-<title>Configuring <application>VTE</application></title>
-
-<sect3><title>Config files</title>
-<para><userinput>List of config files</userinput></para>
-</sect3>
-
-<sect3><title>Configuration Information</title>
-
-<para><userinput>USERINPUT GOES HERE</userinput> Blah blah blah about config.
-</para>
-</sect3>
-
-</sect2>
-
Index: introduction/important/beyond.xml
===================================================================
--- introduction/important/beyond.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ introduction/important/beyond.xml	(revision a4be499f616c1dddf755c46814b8527ab9936ba9)
@@ -24,5 +24,5 @@
 that the executable belongs to, first try a google search with the name of the 
 executable. If the results are overwhelming, try searching for the given 
-executable in the debian repository at
+executable in the Debian repository at
 <ulink url="http://www.debian.org/distrib/packages#search_contents"/>.
 </para></listitem>
Index: introduction/important/position.xml
===================================================================
--- introduction/important/position.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ introduction/important/position.xml	(revision a4be499f616c1dddf755c46814b8527ab9936ba9)
@@ -9,8 +9,8 @@
 <acronym>LFS</acronym> based system.</para>
 
-<para>In traditional unix systems, <filename>/usr</filename> usually 
+<para>In traditional Unix systems, <filename>/usr</filename> usually 
 contains files that come with the system distribution, and the <filename>
 /usr/local</filename> tree is free for the local administrator to add things 
-to.  The only really hard and fast rule is that unix distributions should not 
+to.  The only really hard and fast rule is that Unix distributions should not 
 touch <filename>/usr/local</filename>, except perhaps for creating the basic 
 directories within it.</para>
Index: introduction/welcome/askhelp.xml
===================================================================
--- introduction/welcome/askhelp.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ introduction/welcome/askhelp.xml	(revision a4be499f616c1dddf755c46814b8527ab9936ba9)
@@ -32,5 +32,6 @@
 <command>moduser -G audio &lt;user&gt;</command> may be all that's necessary 
 for that user to have access to the sound system.  Any question that starts 
-out with "It works as root, but not as ..." should review permissions throughly
+out with "It works as root, but not as ..." should review permissions
+thoroughly
 prior to asking.</para></listitem>
 
Index: introduction/welcome/credits.xml
===================================================================
--- introduction/welcome/credits.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ introduction/welcome/credits.xml	(revision a4be499f616c1dddf755c46814b8527ab9936ba9)
@@ -49,5 +49,5 @@
 </emphasis>.</para></listitem>
 
-<listitem><para>Chapter 03: Creating a custom bootdisk <emphasis>Mike
+<listitem><para>Chapter 03: Creating a Custom Boot Disk <emphasis>Mike
 Bedwell</emphasis> and expanded by <emphasis>Bill Maltby</emphasis>.</para>
 </listitem>
Index: introduction/welcome/which.xml
===================================================================
--- introduction/welcome/which.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ introduction/welcome/which.xml	(revision a4be499f616c1dddf755c46814b8527ab9936ba9)
@@ -20,9 +20,9 @@
 <para>The part on <xref linkend="postlfs"/> is where most people will want
 to turn next.  This deals with not just configuration but also Security
-(<xref linkend="postlfs-security"/>), Filesystems (<xref
+(<xref linkend="postlfs-security"/>), File Systems (<xref
 linkend="postlfs-filesystems"/>), Editors (<xref
 linkend="postlfs-editors"/>) and Shells (<xref linkend="postlfs-shells"/>).
 Indeed, you may wish to reference certain parts of this chapter (especially
-the sections on Editors and Filesystems) while building your <acronym>LFS
+the sections on Editors and File Systems) while building your <acronym>LFS
 </acronym> system.</para>
 
Index: postlfs/config/bootdisk.xml
===================================================================
--- postlfs/config/bootdisk.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ postlfs/config/bootdisk.xml	(revision a4be499f616c1dddf755c46814b8527ab9936ba9)
@@ -209,5 +209,5 @@
 
 <para><emphasis>A cautionary note:</emphasis> if you are not running in a
-<command>chroot</command> environment, be sure that you do not accidently
+<command>chroot</command> environment, be sure that you do not accidentlly
 omit the <filename class="directory">/mnt/loop1</filename> reference in the commands. If
 you do so, you might replace the equivalent components on your host with
Index: postlfs/config/compressdoc.xml
===================================================================
--- postlfs/config/compressdoc.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ postlfs/config/compressdoc.xml	(revision a4be499f616c1dddf755c46814b8527ab9936ba9)
@@ -66,5 +66,5 @@
 
   --force, -F   Force (re-)compression, even if the previous one was the same
-                method. Usefull when changing the compression ratio. By default,
+                method. Useful when changing the compression ratio. By default,
                 a page will not be re-compressed if it ends with the same suffix
                 as the method adds (.bz2 for bzip2, .gz for gzip).
Index: postlfs/filesystems/filesystems.xml
===================================================================
--- postlfs/filesystems/filesystems.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ postlfs/filesystems/filesystems.xml	(revision a4be499f616c1dddf755c46814b8527ab9936ba9)
@@ -1,5 +1,5 @@
 <chapter id="postlfs-filesystems">
 <?dbhtml filename="filesystems.html" dir="postlfs"?>
-<title>Filesystems</title>
+<title>File Systems</title>
 
 <para>Journaling file systems reduce the time needed to recover a
Index: stlfs/security/gnupg/gnupg-config.xml
===================================================================
--- postlfs/security/gnupg/gnupg-config.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ 	(revision )
@@ -1,15 +1,0 @@
-<sect2>
-<title>Configuring <application>GnuPG</application></title>
-
-<sect3><title>Config files</title>
-<para><userinput>List of config files</userinput></para>
-</sect3>
-
-<sect3><title>Configuration Information</title>
-
-<para><userinput>USERINPUT GOES HERE</userinput> Blah blah blah about config.
-</para>
-</sect3>
-
-</sect2>
-
Index: preface/organization.xml
===================================================================
--- preface/organization.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ preface/organization.xml	(revision a4be499f616c1dddf755c46814b8527ab9936ba9)
@@ -18,5 +18,5 @@
 <para>In this section we cover libraries which are often needed by the rest
 of the book as well as system utilities.  Information on Programming
-(including recompiling <application>gcc</application> to support its full range 
+(including recompiling <application>GCC</application> to support its full range 
 of languages) concludes this part.</para></sect2>
 
Index: server/mail/courier/courier-config.xml
===================================================================
--- server/mail/courier/courier-config.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ server/mail/courier/courier-config.xml	(revision a4be499f616c1dddf755c46814b8527ab9936ba9)
@@ -198,5 +198,5 @@
 echo "vmailman:x:9000:" &gt;&gt; /etc/group</command></userinput></screen>
 
-<para>Now to setup the maildir for these virutal users.</para>
+<para>Now to setup the maildir for these virtual users.</para>
 
 <screen><userinput><command>cd /home/vmailman
@@ -226,9 +226,9 @@
 
 <para>You will need to copy the file webmail from
-<filename>/usr/libexec/courier/webmail/webmail</filename> to your <filename>cgi-bin
+<filename>/usr/sbin/courier/webmail/webmail</filename> to your <filename>cgi-bin
 </filename> directory of your <application>Apache</application>
 server.</para>
 
-<screen><userinput><command>cp -a /usr/libexec/courier/webmail/webmail /var/www/cgi-bin</command></userinput></screen>
+<screen><userinput><command>cp -a /usr/sbin/courier/webmail/webmail /var/www/cgi-bin</command></userinput></screen>
 
 <para>You will then need to copy the images to a directory under your
@@ -244,10 +244,10 @@
 system.</para>
 
-<para>You will need to copy the file webadmin from
-<filename>/usr/libexec/courier/webmail/webmin</filename> to your <filename>cgi-bin
-</filename> directory of your <application>Apache</application>
-server.</para>
-
-<screen><userinput><command>cp -a /usr/libexec/courier/webmail/webadmin /var/www/cgi-bin</command></userinput></screen>
+<para>You will need to copy the file <filename>webadmin</filename> from
+<filename class="directory">/usr/sbin/courier/webmail/webmin</filename>
+to your <filename class="directory">cgi-bin </filename> directory of your 
+<application>Apache</application> server.</para>
+
+<screen><userinput><command>cp -a /usr/sbin/courier/webmail/webadmin /var/www/cgi-bin</command></userinput></screen>
 
 <para><filename>/etc/courier/webadmin/password</filename></para>
Index: server/mail/courier/courier-exp.xml
===================================================================
--- server/mail/courier/courier-exp.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ server/mail/courier/courier-exp.xml	(revision a4be499f616c1dddf755c46814b8527ab9936ba9)
@@ -6,17 +6,21 @@
 files are installed.</para>
 
-<para><parameter>--with-piddir=/var/run</parameter>: Specfies the
-directory where <application>Courier</application>'s pid files are stored
+<para><parameter>--with-piddir=/var/run</parameter>: Specifies the
+directory where <application>Courier</application>'s
+<filename>PID</filename> files are stored
 when <application>Courier</application> is active.</para>
 
-<para><parameter>--libexecdir=/usr/sbin</parameter>: libexecdir contains programs and libraries that cannot
-be directly executed from the command line.</para>
+<para><parameter>--libexecdir=/usr/sbin</parameter>: libexecdir contains 
+programs and libraries that cannot be directly executed from the command line.
+</para>
 
-<para><parameter>--datadir=/usr/share/courier</parameter>: Specifies the directory where miscellaneous shell
-scripts, <application>Perl</application> scripts, and data files will be installed.</para>
+<para><parameter>--datadir=/usr/share/courier</parameter>: Specifies the 
+directory where miscellaneous shell scripts, <application>Perl</application> 
+scripts, and data files will be installed.</para>
 
-<para><parameter>--localstatedir=/var/lib/courier</parameter>: specifies the directory that will hold the mail 
-queue, and other temporary data. This option defaults to the subdirectory "var" in the directory specified
-by the --prefix option.</para>
+<para><parameter>--localstatedir=/var/lib/courier</parameter>: Specifies the 
+directory that will hold the mail queue, and other temporary data. This option 
+defaults to the subdirectory <filename class="directory">var</filename> in the 
+directory specified by the <option>--prefix</option> option.</para>
 
 <para><option>--disable-root-check</option>: Allows
@@ -38,5 +42,7 @@
 <application>Courier</application> will install and run as.</para>
 
-<para><parameter>--withmailgroup=courier</parameter>: like --with-mailuser, but specifies the group ID.</para>
+<para><parameter>--withmailgroup=courier</parameter>: like
+<option>--with-mailuser</option>, but specifies the group
+<acronym>ID</acronym>.</para>
 
 <para><option>--enable-workarounds-for-imap-client-bugs</option>: there are several confirmed bugs in some
@@ -49,6 +55,7 @@
 <application>Courier</application>'s webmail server can use spell checking, if
 the aspell program is available. If configure finds ispell, spell checking is enabled. If aspell is not in the
-current search path, use --with-ispell=program to explicitly set the
-location of <application>aspell</application>.</para>
+current search path, use
+<parameter>--with-ispell=<replaceable>program</replaceable></parameter> to 
+explicitly set the location of <application>aspell</application>.</para>
 
 </sect2>
Index: server/mail/exim/exim-exp.xml
===================================================================
--- server/mail/exim/exim-exp.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ server/mail/exim/exim-exp.xml	(revision a4be499f616c1dddf755c46814b8527ab9936ba9)
@@ -2,13 +2,19 @@
 <title>Command explanations</title>
 
-<para><command>sed -e ... > Local/Makefile</command>: Many of exim's
+<para><command>sed -e ... > Local/Makefile</command>: Many of
+<application>Exim</application>'s
 configuration options are compiled in. Here, we specify the minimum set
-of options, BIN_DIRECTORY, CONFIGURE_FILE and EXIM_USER. We also defer
-building the exim monitor program, which requires the X Window System
-support, by commenting out the EXIM_MONITOR line in the Makefile.</para>
+of options, <parameter>BIN_DIRECTORY</parameter>,
+<parameter>CONFIGURE_FILE</parameter> and
+<parameter>EXIM_USER</parameter>. We also defer
+building the <application>Exim</application> monitor program, which
+requires the <application>X</application> Window System
+support, by commenting out the <parameter>EXIM_MONITOR</parameter> line
+in the <filename>Makefile</filename>.</para>
 
 <para><command>ln -s exim /usr/sbin/sendmail</command>:
-Create a link to sendmail for applications which need it. exim will
-accept most Sendmail command line options.</para>
+Create a link to <command>sendmail</command> for applications which need
+it. <application>Exim</application> will
+accept most <application>Sendmail</application> command line options.</para>
 
 </sect2>
Index: server/other/bind/bind-config.xml
===================================================================
--- server/other/bind/bind-config.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ server/other/bind/bind-config.xml	(revision a4be499f616c1dddf755c46814b8527ab9936ba9)
@@ -16,5 +16,5 @@
 in the named user's <envar>HOME</envar> directory.</para> 
 
-<para>First we create the unpriviledged user and group named:</para>
+<para>First we create the unprivileged user and group named:</para>
 
 <screen><userinput><command>groupadd -g 200 named &amp;&amp;
Index: server/other/cvsserver/cvsserver-inst.xml
===================================================================
--- server/other/cvsserver/cvsserver-inst.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ server/other/cvsserver/cvsserver-inst.xml	(revision a4be499f616c1dddf755c46814b8527ab9936ba9)
@@ -40,12 +40,12 @@
 machine using a user account that has <command>ssh</command> access to the 
 <acronym>CVS</acronym> server with the following commands:
-<note><para>Replace "servername" with the <acronym>IP</acronym> address or host 
-name ofthe <acronym>CVS</acronym> repository machine.  You will be prompted for 
-the user's shellaccount password before <acronym>CVS</acronym> checkout can
-continue.</para></note></para>
+<note><para>Replace <replaceable>[servername]</replaceable> with the 
+<acronym>IP</acronym> address or host name of the <acronym>CVS</acronym> 
+repository machine.  You will be prompted for the user's shell account password 
+before <acronym>CVS</acronym> checkout can continue.</para></note></para>
 
 
 <screen><userinput><command>export CVS_RSH=/usr/bin/ssh &amp;&amp;
-cvs -d:ext:<replaceable>servername</replaceable>:/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,6 @@
 </para>
 
-<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 
+<screen><userinput><command>cvs -d:pserver:anonymous@<replaceable>[servername]</replaceable>:/cvsroot co cvstest</command></userinput></screen>
+<note><para>Replace <replaceable>[servername]</replaceable> with the <acronym>IP</acronym> address or 
 hostname of the <acronym>CVS</acronym> server</para></note>
 
Index: server/other/openssh/openssh-exp.xml
===================================================================
--- server/other/openssh/openssh-exp.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ server/other/openssh/openssh-exp.xml	(revision a4be499f616c1dddf755c46814b8527ab9936ba9)
@@ -6,5 +6,6 @@
 
 <para><parameter>--with-md5-passwords</parameter>: This is required
-if you made the changes recommended by the shadowpasswd_plus lfs hint on
+if you made the changes recommended by the shadowpasswd_plus
+<acronym>LFS</acronym> hint on
 your <acronym>SSH</acronym> server when you installed the Shadow Password 
 Suite or if you access a <acronym>SSH</acronym> server that authenticates by 
Index: server/other/openssh/openssh-inst.xml
===================================================================
--- server/other/openssh/openssh-inst.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ server/other/openssh/openssh-inst.xml	(revision a4be499f616c1dddf755c46814b8527ab9936ba9)
@@ -4,5 +4,5 @@
 <para><application>Open<acronym>SSH</acronym></application> runs as two 
 processes when connecting to other
-computers. The first process is a priviledged process and controls the
+computers. The first process is a privileged process and controls the
 issuance of privileges as necessary. The second process communicates
 with the network. Additional installation steps are necessary to set up
Index: server/other/rsync/rsync-config.xml
===================================================================
--- server/other/rsync/rsync-config.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ server/other/rsync/rsync-config.xml	(revision a4be499f616c1dddf755c46814b8527ab9936ba9)
@@ -6,9 +6,9 @@
 <para><filename>/etc/rsyncd.conf</filename></para>
 <para>This is a simple download-only configuration. See the rsyncd man-page for
-additional options (i.e. user authentification).</para>
+additional options (i.e. user authentication).</para>
 
 <screen><userinput><command>cat &gt; /etc/rsyncd.conf &lt;&lt; "EOF"</command>
 # This is a basic rsync configuration file
-# It exports a single module without user authentification.
+# It exports a single module without user authentication.
 
 motd file = /home/rsync/welcome.msg
Index: server/other/rsync/rsync-inst.xml
===================================================================
--- server/other/rsync/rsync-inst.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ server/other/rsync/rsync-inst.xml	(revision a4be499f616c1dddf755c46814b8527ab9936ba9)
@@ -3,5 +3,5 @@
 
 <para>For security reasons, running <application>rsync</application> server as 
-an unpriviledged user and group is encouraged.</para>
+an unprivileged user and group is encouraged.</para>
 
 <screen><userinput><command>groupadd rsyncd &amp;&amp;
Index: server/other/samba/samba-desc.xml
===================================================================
--- server/other/samba/samba-desc.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ server/other/samba/samba-desc.xml	(revision a4be499f616c1dddf755c46814b8527ab9936ba9)
@@ -30,6 +30,6 @@
 pages to binary code page files and vice versa.</para></sect3>
 <sect3><title>make_unicodemap</title>
-<para><command>make_unicodemap</command> converts text unicode map files to 
-binary, for use in mapping characters to 16 bit unicode.</para></sect3>
+<para><command>make_unicodemap</command> converts text Unicode map files to 
+binary, for use in mapping characters to 16 bit Unicode.</para></sect3>
 <sect3><title>mount.smbfs</title>
 <para><command>mount.smbfs</command> provides <command>/bin/mount</command> 
Index: x/installing/xfree86-setup.xml
===================================================================
--- x/installing/xfree86-setup.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ x/installing/xfree86-setup.xml	(revision a4be499f616c1dddf755c46814b8527ab9936ba9)
@@ -93,5 +93,5 @@
 <screen>Section "Files"
         ...
-        FontPath     "/usr/X11R6/lib/X11/fonts/&lt;TruetypeDir&gt;/"
+        FontPath "/usr/X11R6/lib/X11/fonts/<replaceable>[TrueTypeDir]</replaceable>/"
         ...
 EndSection</screen></para>
@@ -122,7 +122,7 @@
 <sect2>
 <title>Setting up keyboards</title>
-<para>In this version of <application>XFree86</application>, it has been reported that non-latin
-keyboard layouts do not include latin configurations as was previous
-practice. To set up a keyboard for latin and non-latin input, 
+<para>In this version of <application>XFree86</application>, it has been reported that non-Latin
+keyboard layouts do not include Latin configurations as was previous
+practice. To set up a keyboard for Latin and non-Latin input, 
 change the XkbLayout keyboard driver option in the InputDevice section
 of the <filename>XF86Config</filename> file.  For example:</para>
Index: x/installing/xfree86/xfree86-inst.xml
===================================================================
--- x/installing/xfree86/xfree86-inst.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ x/installing/xfree86/xfree86-inst.xml	(revision a4be499f616c1dddf755c46814b8527ab9936ba9)
@@ -89,5 +89,5 @@
 /* #define HasMTRRSupport      YES  */ /* Enabled in kernel see kernel docs*/
 /* #define HasMMXSupport        NO  */ /* Any i586 or above */
-/* #define HasKatmaiSupport     NO  */ /* PIII SSE instuctions */
+/* #define HasKatmaiSupport     NO  */ /* PIII SSE instructions */
 /* #define Has3DNowSupport      NO  */ /* AMD instructions */
 
Index: x/lib/atk/atk-desc.xml
===================================================================
--- x/lib/atk/atk-desc.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ x/lib/atk/atk-desc.xml	(revision a4be499f616c1dddf755c46814b8527ab9936ba9)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The <application>atk</application> package contains <filename
+<para>The <application><acronym>ATK</acronym></application> package contains <filename
 class="libraryfile">libatk</filename> libraries.</para>
 
@@ -10,5 +10,5 @@
 
 <sect3><title>ATK Libraries</title>
-<para><application>ATK</application> libraries contain the <acronym>API</acronym> used by assistive technologies in order to 
+<para><application><acronym>ATK</acronym></application> libraries contain the <acronym>API</acronym> used by assistive technologies in order to 
 interact with the desktop and applications.</para></sect3>
 
Index: x/lib/atk/atk-intro.xml
===================================================================
--- x/lib/atk/atk-intro.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ x/lib/atk/atk-intro.xml	(revision a4be499f616c1dddf755c46814b8527ab9936ba9)
@@ -1,9 +1,9 @@
 <sect2>
-<title>Introduction to <application>ATK</application></title>
+<title>Introduction to <application><acronym>ATK</acronym></application></title>
 
-<para>The <application>atk</application> package contains the
-<application>ATK</application> libraries. They are useful for
+<para>The <application><acronym>ATK</acronym></application> package contains the
+<application><acronym>ATK</acronym></application> libraries. They are useful for
 allowing accessibility solutions to be available for all
-<application>GTK2</application>
+<application><acronym>GTK</acronym>2</application>
 applications.</para>
 
@@ -17,5 +17,5 @@
 </sect3>
 
-<sect3><title><application>ATK</application> dependencies</title>
+<sect3><title><application><acronym>ATK</acronym></application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="GLib2"/></para></sect4>
Index: x/lib/fontconfig/fontconfig-config.xml
===================================================================
--- x/lib/fontconfig/fontconfig-config.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ x/lib/fontconfig/fontconfig-config.xml	(revision a4be499f616c1dddf755c46814b8527ab9936ba9)
@@ -30,5 +30,5 @@
 <note><para><application>X</application> also includes an internal (and
 older) version of <application>Fontconfig</application>
-and unless it is explictly disabled when building
+and unless it is explicitly disabled when building
 <application>XFree86</application>, the internal
 version is created leaving two slightly incompatible libraries on your system.
Index: x/lib/lib.xml
===================================================================
--- x/lib/lib.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ x/lib/lib.xml	(revision a4be499f616c1dddf755c46814b8527ab9936ba9)
@@ -11,5 +11,5 @@
 and feel and interprocess communications so that applications written by
 different programmers end up looking and acting similarly. They also
-assist programmers by suppling common elements.</para> 
+assist programmers by supplying common elements.</para> 
 
 &freetype2;
Index: x/lib/pango/pango-desc.xml
===================================================================
--- x/lib/pango/pango-desc.xml	(revision 635e06c655eade2647ad11fdb86297a41fd3fac6)
+++ x/lib/pango/pango-desc.xml	(revision a4be499f616c1dddf755c46814b8527ab9936ba9)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The <application>pango</application> package contains <filename
+<para>The <application>Pango</application> package contains <filename
 class="libraryfile">libpango</filename> libraries.</para>
 
