Index: postlfs/editors/emacs.xml
===================================================================
--- postlfs/editors/emacs.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/editors/emacs.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -1,5 +1,5 @@
-<sect1 id="postlfs-editors-emacs">
+<sect1 id="postlfs-editors-emacs" xreflabel="Emacs-&emacs-version;">
 <?dbhtml filename="emacs.html" dir="postlfs"?>
-<title>emacs-&emacs-version;</title>
+<title>Emacs-&emacs-version;</title>
 
 &emacs-intro;
Index: postlfs/editors/emacs/emacs-desc.xml
===================================================================
--- postlfs/editors/emacs/emacs-desc.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/editors/emacs/emacs-desc.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The emacs package contains <command>emacs</command>,
+<para>The <application>Emacs</application> package contains <command>emacs</command>,
 <command>b2m</command>, <command>ctags</command>,
 <command>ebrowse</command>, <command>emacsclient</command>,
Index: postlfs/editors/emacs/emacs-inst.xml
===================================================================
--- postlfs/editors/emacs/emacs-inst.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/editors/emacs/emacs-inst.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Installation of <application>emacs</application></title>
+<title>Installation of <application>Emacs</application></title>
 
-<para>Install <application>emacs</application> by running the following commands:</para>
+<para>Install <application>Emacs</application> by running the following commands:</para>
 
 <screen><userinput><command>./configure --prefix=/usr \
Index: postlfs/editors/emacs/emacs-intro.xml
===================================================================
--- postlfs/editors/emacs/emacs-intro.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/editors/emacs/emacs-intro.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Introduction to <application>emacs</application></title>
+<title>Introduction to <application>Emacs</application></title>
 
-<para>The <application>emacs</application> package contains the extensible, customizable,
+<para>The <application>Emacs</application> package contains the extensible, customizable,
 self-documenting real-time display editor.</para>
 
@@ -18,5 +18,5 @@
 </sect3>
 
-<sect3><title><application>emacs</application> dependencies</title>
+<sect3><title><application>Emacs</application> dependencies</title>
 <sect4><title>Optional</title>
 <para><xref linkend="xfree86"/>, <xref linkend="libjpeg"/>, <xref
Index: postlfs/editors/joe.xml
===================================================================
--- postlfs/editors/joe.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/editors/joe.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -1,5 +1,5 @@
 <sect1 id="postlfs-editors-joe">
 <?dbhtml filename="joe.html" dir="postlfs"?>
-<title>joe-&joe-version;</title>
+<title>JOE-&joe-version;</title>
 
 &joe-intro;
Index: postlfs/editors/joe/joe-config.xml
===================================================================
--- postlfs/editors/joe/joe-config.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/editors/joe/joe-config.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -2,9 +2,10 @@
 <title>Configuration files</title>
 
-<para><application>Joe</application> can make use of several configuration files. Information
+<para><application><acronym>JOE</acronym></application> can make use of several configuration files. Information
 about these files may be found in the joe man page. These files
 are <filename>/etc/jmacsrc</filename>, <filename>/etc/joerc</filename>,
 <filename>/etc/jpicorc</filename>, <filename>/etc/jstarrc</filename>,
-and <filename>/etc/rjoerc</filename>. Joe can also make use of
+and <filename>/etc/rjoerc</filename>.
+<application><acronym>JOE</acronym></application> can also make use of
 <filename>~/.joerc</filename>, which may be copied from
 <filename>/etc/joerc</filename> and customized for each user's
Index: postlfs/editors/joe/joe-desc.xml
===================================================================
--- postlfs/editors/joe/joe-desc.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/editors/joe/joe-desc.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The joe package contains <command>jmacs</command>,
+<para>The <application><acronym>JOE</acronym></application> package contains <command>jmacs</command>,
 <command>joe</command>, <command>jpico</command>,
 <command>jstar</command>, <command>rjoe</command> and
@@ -11,5 +11,6 @@
 
 <sect3><title>jmacs</title>
-<para><command>jmacs</command> is a symbolic link to joe used to launch Emacs
+<para><command>jmacs</command> is a symbolic link to
+<command>joe</command> used to launch <application>Emacs</application>
 emulation mode.</para></sect3>
 
@@ -31,5 +32,6 @@
 <sect3><title>rjoe</title>
 <para><command>rjoe</command> is a symbolic link to
-<command>joe</command> that restricts <application>joe</application> to editing
+<command>joe</command> that restricts
+<application><acronym>JOE</acronym></application> to editing
 only files which are specified on the command line.</para></sect3>
 
Index: postlfs/editors/joe/joe-inst.xml
===================================================================
--- postlfs/editors/joe/joe-inst.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/editors/joe/joe-inst.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Installation of <application>joe</application></title>
+<title>Installation of <application><acronym>JOE</acronym></application></title>
 
-<para>Install <application>joe</application> by running the following commands:</para>
+<para>Install <application><acronym>JOE</acronym></application> by running the following commands:</para>
 
 <screen><userinput><command>./configure --sysconfdir=/etc --prefix=/usr &amp;&amp;
Index: postlfs/editors/joe/joe-intro.xml
===================================================================
--- postlfs/editors/joe/joe-intro.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/editors/joe/joe-intro.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -1,7 +1,7 @@
 <sect2>
-<title>Introduction to <application>joe</application></title>
+<title>Introduction to <application><acronym>JOE</acronym></application></title>
 
-<para><application>Joe</application> is a small text editor capable of
-emulating WordStar, <application>Pico</application>,
+<para><application>JOE</application> (Joe's own editor) is a small text editor 
+capable of emulating WordStar, <application>Pico</application>,
 and <application>Emacs</application>.</para>
 
Index: postlfs/editors/vim.xml
===================================================================
--- postlfs/editors/vim.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/editors/vim.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -1,5 +1,5 @@
-<sect1 id="postlfs-editors-vim">
+<sect1 id="postlfs-editors-vim" xreflabel="Vim-&vim-version;">
 <?dbhtml filename="vim.html" dir="postlfs"?>
-<title>vim-&vim-version;</title>
+<title>Vim-&vim-version;</title>
 
 &vim-intro;
Index: postlfs/editors/vim/vim-desc.xml
===================================================================
--- postlfs/editors/vim/vim-desc.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/editors/vim/vim-desc.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The <application>vim</application> package contains
+<para>The <application>Vim</application> package contains
 <command>eview</command>, <command>evim</command>,
 <command>ex</command>, <command>gview</command>,
Index: postlfs/editors/vim/vim-exp.xml
===================================================================
--- postlfs/editors/vim/vim-exp.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/editors/vim/vim-exp.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -3,5 +3,5 @@
 
 <para><command>--with-features=huge</command> : Enables all the additional
-features available in vim.</para>
+features available in <application>Vim</application>.</para>
 
 </sect2>
Index: postlfs/editors/vim/vim-inst.xml
===================================================================
--- postlfs/editors/vim/vim-inst.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/editors/vim/vim-inst.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Installation of <application>vim</application></title>
+<title>Installation of <application>Vim</application></title>
 
-<para>Install <application>vim</application> by running the following commands:</para>
+<para>Install <application>Vim</application> by running the following commands:</para>
 
 <para><screen><userinput><command>./configure --prefix=/usr \
Index: postlfs/editors/vim/vim-intro.xml
===================================================================
--- postlfs/editors/vim/vim-intro.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/editors/vim/vim-intro.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -2,5 +2,5 @@
 <title>Introduction to <application>Vim</application></title>
 
-<para>The <application>vim</application> package, which is an
+<para>The <application>Vim</application> package, which is an
 abbreviation for VI IMproved, contains a <command>vi</command>
 clone with extra features as compared to the original
@@ -10,5 +10,5 @@
 <application>vim</application> as a part of the base system, but
 owing to the lack of <application>X</application> libraries during the
-base install, <application>vim</application> needs to be
+base install, <application>Vim</application> needs to be
 recompiled once <application>X</application> is installed to enable the
 <acronym>GUI</acronym> mode. There is no need for
@@ -25,5 +25,5 @@
 </sect3>
 
-<sect3><title><application>vim</application> dependencies</title>
+<sect3><title><application>Vim</application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="xfree86"/></para></sect4>
Index: postlfs/filesystems/reiser.xml
===================================================================
--- postlfs/filesystems/reiser.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/filesystems/reiser.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -1,5 +1,5 @@
-<sect1 id="reiserfs" xreflabel="reiserfs-&reiser-version;">
+<sect1 id="reiserfs" xreflabel="ReiserFS-&reiser-version;">
 <?dbhtml filename="reiserfs.html" dir="postlfs"?>
-<title>reiserfs-&reiser-version;</title>
+<title>ReiserFS-&reiser-version;</title>
 
 &reiser-intro;
Index: postlfs/filesystems/reiser/reiser-desc.xml
===================================================================
--- postlfs/filesystems/reiser/reiser-desc.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/filesystems/reiser/reiser-desc.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>reiserfsprogs contains <command>debugreiserfs</command>,
+<para><application>ReiserFS</application> contains <command>debugreiserfs</command>,
 <command>mkreiserfs</command>, <command>reiserfsck</command>,
 <command>resize_reiserfs</command> and 
@@ -13,17 +13,21 @@
 <sect3><title>debugreiserfs</title>
 <para><command>debugreiserfs</command> can sometimes help to solve problems 
-with reiserfs filesystems.  If it is called without options it prints the super 
+with <application>ReiserFS</application> filesystems.  If it is called without 
+options it prints the super 
 block of any reiserfs filesystem found on the device.</para></sect3>
 
 <sect3><title>mkreiserfs</title>
-<para><command>mkreiserfs</command> creates a reiserfs file system.</para>
+<para><command>mkreiserfs</command> creates a
+<application>ReiserFS</application> file system.</para>
 </sect3>
 
 <sect3><title>reiserfsck</title>
-<para><command>reiserfsck</command> checks a reiserfs file system.</para>
+<para><command>reiserfsck</command> checks a
+<application>ReiserFS</application> file system.</para>
 </sect3>
 
 <sect3><title>reiserfstune</title>
-<para><command>reiserfstune</command> is used for tuning the ReiserFS journal.  
+<para><command>reiserfstune</command> is used for tuning the
+<application>ReiserFS</application> journal.  
 <emphasis>WARNING</emphasis>: Don't use this utility without first reading the 
 man page thoroughly.</para></sect3>
@@ -31,9 +35,11 @@
 <sect3><title>resize_reiserfs</title>
 <para><command>resize_reiserfs</command> is used to resize an unmounted 
-reiserfs file system.</para></sect3>
+<application>ReiserFS</application> file system.</para></sect3>
 
 <sect3><title>unpack</title>
-<para>The <command>unpack</command> utility can be used to dump reiserfs 
-filesystem information to files for debugging, much like debugreiserfs.
+<para>The <command>unpack</command> utility can be used to dump
+<application>ReiserFS</application> 
+filesystem information to files for debugging, much like
+<command>debugreiserfs</command>.
 </para></sect3>
 
Index: postlfs/filesystems/reiser/reiser-exp.xml
===================================================================
--- postlfs/filesystems/reiser/reiser-exp.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/filesystems/reiser/reiser-exp.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -7,5 +7,6 @@
 be.</para>
 
-<para><command>--sbindir=/sbin</command> : This ensures that the reiserfs 
+<para><command>--sbindir=/sbin</command> : This ensures that the
+<application>ReiserFS</application> 
 utilities are installed in <filename>/sbin</filename> as they should be.</para>
 
Index: postlfs/filesystems/reiser/reiser-inst.xml
===================================================================
--- postlfs/filesystems/reiser/reiser-inst.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/filesystems/reiser/reiser-inst.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Installation of <application>reiserfs</application></title>
+<title>Installation of <application>ReiserFS</application></title>
 
-<para>Install <application>reiserfs</application> by running the following 
+<para>Install <application>ReiserFS</application> by running the following 
 commands:</para>
 
Index: postlfs/filesystems/reiser/reiser-intro.xml
===================================================================
--- postlfs/filesystems/reiser/reiser-intro.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/filesystems/reiser/reiser-intro.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -1,7 +1,7 @@
 <sect2>
-<title>Introduction to <application>reiserfsutils</application></title>
+<title>Introduction to <application>ReiserFS</application></title>
 
-<para>The <application>reiserfsutils</application> package contains various 
-utilities for use with the reiser filesystem.</para>
+<para>The <application>ReiserFS</application> package contains various 
+utilities for use with the Reiser filesystem.</para>
 
 <sect3><title>Package information</title>
Index: postlfs/filesystems/xfs.xml
===================================================================
--- postlfs/filesystems/xfs.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/filesystems/xfs.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -1,5 +1,5 @@
-<sect1 id="xfs" xreflabel="xfs-&xfsprogs-version;">
+<sect1 id="xfs" xreflabel="XFS-&xfsprogs-version;">
 <?dbhtml filename="xfsfs.html" dir="postlfs"?>
-<title>xfsprogs-&xfsprogs-version;</title>
+<title>XFS-&xfsprogs-version;</title>
 &xfs-patch;
 &xfs-patch-inst;
Index: postlfs/filesystems/xfs/xfs-desc.xml
===================================================================
--- postlfs/filesystems/xfs/xfs-desc.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/filesystems/xfs/xfs-desc.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>xfsprogs contains <command>xfs_growfs</command>,
+<para><application>XFS</application> contains <command>xfs_growfs</command>,
 <command>xfs_admin</command>, <command>xfs_freeze</command>,
 <command>xfs_mkfile</command>, <command>xfs_check</command>,
@@ -33,5 +33,6 @@
 
 <sect3><title>xfs_check</title>
-<para><command>xfs_check</command> checks XFS filesystem consistency.</para>
+<para><command>xfs_check</command> checks <acronym>XFS</acronym> filesystem 
+consistency.</para>
 </sect3>
 
Index: postlfs/filesystems/xfs/xfs-inst.xml
===================================================================
--- postlfs/filesystems/xfs/xfs-inst.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/filesystems/xfs/xfs-inst.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Installation of <application>xfsprogs</application></title>
+<title>Installation of <application>XFS</application></title>
 
-<para>Install <application>xfsprogs</application> by running the following 
+<para>Install <application>XFS</application> by running the following 
 commands:</para>
 
Index: postlfs/filesystems/xfs/xfs-intro.xml
===================================================================
--- postlfs/filesystems/xfs/xfs-intro.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/filesystems/xfs/xfs-intro.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Introduction to <acronym>XFS</acronym></title>
+<title>Introduction to <application><acronym>XFS</acronym></application></title>
 
-<para>The <application>xfsprogs</application> package contains administration 
+<para>The <application>XFS</application> package contains administration 
 and debugging tools for the <acronym>XFS</acronym> filesystem.</para>
 
Index: postlfs/security/gnupg.xml
===================================================================
--- postlfs/security/gnupg.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/security/gnupg.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -1,5 +1,5 @@
-<sect1 id="gnupg" xreflabel="gnupg-&gnupg-version;">
+<sect1 id="gnupg" xreflabel="GnuPG-&gnupg-version;">
 <?dbhtml filename="gnupg.html" dir="postlfs"?>
-<title>gnupg-&gnupg-version;</title>
+<title>GnuPG-&gnupg-version;</title>
 
 &gnupg-intro;
Index: postlfs/security/gnupg/gnupg-config.xml
===================================================================
--- postlfs/security/gnupg/gnupg-config.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/security/gnupg/gnupg-config.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring <application>gnupg</application></title>
+<title>Configuring <application>GnuPG</application></title>
 
 <sect3><title>Config files</title>
Index: postlfs/security/gnupg/gnupg-desc.xml
===================================================================
--- postlfs/security/gnupg/gnupg-desc.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/security/gnupg/gnupg-desc.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The <application>gnupg</application> package contains <command>gpg</command>,
+<para>The <application>GnuPG</application> package contains <command>gpg</command>,
 <command>gpgsplit</command> and <command>gpgv</command></para>
 
@@ -18,5 +18,6 @@
 
 <sect3><title>gpgv</title>
-<para><command>gpgv</command> is a verify only version of gpg.</para></sect3>
+<para><command>gpgv</command> is a verify only version of
+<command>gpg</command>.</para></sect3>
 
 </sect2>
Index: postlfs/security/gnupg/gnupg-inst.xml
===================================================================
--- postlfs/security/gnupg/gnupg-inst.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/security/gnupg/gnupg-inst.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Installation of <application>gnupg</application></title>
+<title>Installation of <application>GnuPG</application></title>
 
-<para>Install <application>gnupg</application> by running the following commands:</para>
+<para>Install <application>GnuPG</application> by running the following commands:</para>
 
 <screen><userinput><command>./configure --prefix=/usr --libexecdir=/usr/sbin &amp;&amp;
Index: postlfs/security/gnupg/gnupg-intro.xml
===================================================================
--- postlfs/security/gnupg/gnupg-intro.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/security/gnupg/gnupg-intro.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -1,6 +1,7 @@
 <sect2>
-<title>Introduction to <application>gnupg</application></title>
+<title>Introduction to <application>GnuPG</application></title>
 
-<para>The <application>gnupg</application> package contains a public/private key encryptor. This is
+<para>The <application>GnuPG</application> package contains a public/private
+key encryptor. This is
 becoming useful for signing files or emails as proof of identity and
 preventing tampering with contents of the file or email.</para>
Index: postlfs/security/tripwire.xml
===================================================================
--- postlfs/security/tripwire.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/security/tripwire.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -1,5 +1,5 @@
-<sect1 id="tripwire" xreflabel="tripwire-&tripwire-version;">
+<sect1 id="tripwire" xreflabel="Tripwire-&tripwire-version;">
 <?dbhtml filename="tripwire.html" dir="postlfs"?>
-<title>tripwire-&tripwire-version;</title>
+<title>Tripwire-&tripwire-version;</title>
 
 &tripwire-intro;
Index: postlfs/security/tripwire/tripwire-config.xml
===================================================================
--- postlfs/security/tripwire/tripwire-config.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/security/tripwire/tripwire-config.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring <application>tripwire</application></title>
+<title>Configuring <application>Tripwire</application></title>
 
 <sect3><title>Config files</title>
@@ -45,5 +45,6 @@
 
 <sect3><title>Usage Information</title>
-<para>To use tripwire after this and run a report, use the following command:
+<para>To use <application>Tripwire</application> after this and run a report, 
+use the following command:
 
 <screen><userinput><command>tripwire -m c &gt; /etc/tripwire/report.txt
Index: postlfs/security/tripwire/tripwire-desc.xml
===================================================================
--- postlfs/security/tripwire/tripwire-desc.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/security/tripwire/tripwire-desc.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -2,5 +2,6 @@
 <title>Contents</title>
 
-<para>The tripwire package contains <command>siggen</command>,
+<para>The <application>Tripwire</application> package contains <command>siggen
+</command>,
 <command>tripwire</command>, <command>twadmin</command>
 and <command>twprint</command>.</para>
Index: postlfs/security/tripwire/tripwire-exp.xml
===================================================================
--- postlfs/security/tripwire/tripwire-exp.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/security/tripwire/tripwire-exp.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -3,12 +3,14 @@
 
 <para><command>ln -s make /usr/bin/gmake</command> : The reason we create the 
-gmake symlink is that tripwire will only install if the symlink is present. It 
-may be safely removed after installation.</para>
+<command>gmake</command> symlink is that <application>Tripwire</application> 
+will only install if the symlink is present. It may be safely removed after 
+installation.</para>
 
-<para><command>gmake release</command> : This command creates the tripwire 
-binaries.</para>
+<para><command>gmake release</command> : This command creates the
+<application>Tripwire</application> binaries.</para>
 
 <para><command>cp install.{sh,cfg} .</command> : These are copied to the main
-tripwire directory so that the script can be used to install the package.</para>
+<application>Tripwire</application> directory so that the script can be used to 
+install the package.</para>
 
 <para><command>cp policy/*.txt /usr/share/doc/tripwire</command> : This command 
Index: postlfs/security/tripwire/tripwire-inst.xml
===================================================================
--- postlfs/security/tripwire/tripwire-inst.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/security/tripwire/tripwire-inst.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -1,9 +1,9 @@
 <sect2>
-<title>Installation of <application>tripwire</application></title>
+<title>Installation of <application>Tripwire</application></title>
 
-<para>Download the patch for <application>tripwire</application> config from 
+<para>Download the patch for <application>Tripwire</application> config from 
 <ulink url="&hfile-root;"/>.</para>
 
-<para>Install <application>tripwire</application> by running the following 
+<para>Install <application>Tripwire</application> by running the following 
 commands:</para>
 
Index: postlfs/security/tripwire/tripwire-intro.xml
===================================================================
--- postlfs/security/tripwire/tripwire-intro.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/security/tripwire/tripwire-intro.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -1,7 +1,7 @@
 <sect2>
-<title>Introduction to <application>tripwire</application></title>
+<title>Introduction to <application>Tripwire</application></title>
 
-<para>The <application>tripwire</application> package contains the programs 
-used by <application>tripwire</application> to verify the integrity of the 
+<para>The <application>Tripwire</application> package contains the programs 
+used by <application>Tripwire</application> to verify the integrity of the 
 files on a given system.</para>
 
Index: postlfs/shells/tcsh.xml
===================================================================
--- postlfs/shells/tcsh.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/shells/tcsh.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -1,5 +1,5 @@
-<sect1 id="tcsh" xreflabel="tcsh-&tcsh-version;">
+<sect1 id="tcsh" xreflabel="Tcsh-&tcsh-version;">
 <?dbhtml filename="tcsh.html" dir="postlfs"?>
-<title>tcsh-&tcsh-version;</title>
+<title>Tcsh-&tcsh-version;</title>
 
 &tcsh-intro;
Index: postlfs/shells/tcsh/tcsh-config.xml
===================================================================
--- postlfs/shells/tcsh/tcsh-config.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/shells/tcsh/tcsh-config.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring <application>tcsh</application></title>
+<title>Configuring <application>Tcsh</application></title>
 
 <sect3><title>Config files</title>
Index: postlfs/shells/tcsh/tcsh-desc.xml
===================================================================
--- postlfs/shells/tcsh/tcsh-desc.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/shells/tcsh/tcsh-desc.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The <application>tcsh</application> package contains
+<para>The <application>Tcsh</application> package contains
 <command>tcsh</command>.</para>
 
Index: postlfs/shells/tcsh/tcsh-exp.xml
===================================================================
--- postlfs/shells/tcsh/tcsh-exp.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/shells/tcsh/tcsh-exp.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -3,9 +3,9 @@
 
 <para><command>cp tcsh.man /usr/share/man/man1/tcsh.1</command> :
-<application>tcsh</application> doesn't install its man page correctly, so we do it manually.</para>
+<application>TCSH</application> doesn't install its man page correctly, so we do it manually.</para>
 
 <para><command>ln -s /usr/bin/tcsh /bin/csh</command> : The
 <acronym>FHS</acronym> states that
-if there is a C shell installed, there should be a symlink from
+if there is a <application>C</application> shell installed, there should be a symlink from
 <filename>/bin/csh</filename> to it.  This creates that symlink.</para>
 
Index: postlfs/shells/tcsh/tcsh-inst.xml
===================================================================
--- postlfs/shells/tcsh/tcsh-inst.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/shells/tcsh/tcsh-inst.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Installation of <application>tcsh</application></title>
+<title>Installation of <application>Tcsh</application></title>
 
-<para>Install <application>tcsh</application> by running the following commands:</para>
+<para>Install <application>Tcsh</application> by running the following commands:</para>
 
 <screen><userinput><command>./configure --prefix=/usr &amp;&amp;
Index: postlfs/shells/tcsh/tcsh-intro.xml
===================================================================
--- postlfs/shells/tcsh/tcsh-intro.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/shells/tcsh/tcsh-intro.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Introduction to <application>tcsh</application></title>
+<title>Introduction to <application>Tcsh</application></title>
 
-<para>The tcsh package contains "an enhanced but completely compatible
+<para>The <application>Tcsh</application> package contains "an enhanced but completely compatible
 version of the Berkeley UNIX C shell (csh)".  This is useful as an
 alternative shell for those who prefer C syntax to that of the bash
Index: postlfs/shells/zsh.xml
===================================================================
--- postlfs/shells/zsh.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/shells/zsh.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -1,5 +1,5 @@
-<sect1 id="zsh" xreflabel="zsh-&zsh-version;">
+<sect1 id="zsh" xreflabel="ZSH-&zsh-version;">
 <?dbhtml filename="zsh.html" dir="postlfs"?>
-<title>zsh-&zsh-version;</title>
+<title>ZSH-&zsh-version;</title>
 
 &zsh-intro;
Index: postlfs/shells/zsh/zsh-config.xml
===================================================================
--- postlfs/shells/zsh/zsh-config.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/shells/zsh/zsh-config.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -1,7 +1,8 @@
 <sect2>
-<title>Configuring <application>zsh</application></title>
+<title>Configuring <application>ZSH</application></title>
 
 <sect3><title>Config files</title>
-<para>There are a whole host of configuration files for zsh including
+<para>There are a whole host of configuration files for
+<application>ZSH</application> including
 <filename>/etc/zshenv</filename>, <filename>/etc/zprofile</filename>,
 <filename>/etc/zshrc</filename>, <filename>/etc/zlogin</filename> and
Index: postlfs/shells/zsh/zsh-desc.xml
===================================================================
--- postlfs/shells/zsh/zsh-desc.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/shells/zsh/zsh-desc.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The <application>zsh</application> package contains <command>zsh</command>.</para>
+<para>The <application>ZSH</application> package contains <command>zsh</command>.</para>
 
 </sect2>
Index: postlfs/shells/zsh/zsh-inst.xml
===================================================================
--- postlfs/shells/zsh/zsh-inst.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/shells/zsh/zsh-inst.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Installation of <application>zsh</application></title>
+<title>Installation of <application>ZSH</application></title>
 
-<para>Install <application>zsh</application> by running the following commands:</para>
+<para>Install <application>ZSH</application> by running the following commands:</para>
 
 <screen><userinput><command>./configure --prefix=/usr &amp;&amp;
Index: postlfs/shells/zsh/zsh-intro.xml
===================================================================
--- postlfs/shells/zsh/zsh-intro.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ postlfs/shells/zsh/zsh-intro.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -1,11 +1,10 @@
 <sect2>
-<title>Introduction to <application>zsh</application></title>
+<title>Introduction to <application>ZSH</application></title>
 
-<para>The <application>zsh</application> package contains the
-<command>zsh</command> shell.  <command>zsh</command> is a command
+<para>The <application>ZSH</application> package contains a command
 interpreter (shell) usable as an interactive login shell and as
 a shell script command processor.  Of the standard shells,
-<application>zsh</application> most
-closely resembles <application>ksh</application> but includes many enhancements.</para>
+<application>ZSH</application> most
+closely resembles <application>KSH</application> but includes many enhancements.</para>
 
 <sect3><title>Package information</title>
Index: server/mail/mail.xml
===================================================================
--- server/mail/mail.xml	(revision 984a23f4ae3d4f940517c3185995a39bc0800459)
+++ server/mail/mail.xml	(revision 79f87f948f702a18a6372ab2b2033fef0d6e7e42)
@@ -8,6 +8,6 @@
 
 <para>As well as <acronym>SMTP</acronym> servers there is a
-<acronym>POP</acronym> server (qpopper). An <acronym>IMAP</acronym>
-server (Courier-<acronym>IMAP</acronym>) is available for inclusion in the next version.</para>
+<acronym>POP</acronym> server (qpopper) and an <acronym>IMAP</acronym>
+server (Courier-<acronym>IMAP</acronym>).</para>
 
 &postfix;
