Index: basicnet/mailnews/fetchmail/fetchmail-desc.xml
===================================================================
--- basicnet/mailnews/fetchmail/fetchmail-desc.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/mailnews/fetchmail/fetchmail-desc.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -10,7 +10,8 @@
 
 <sect3><title>fetchmail</title>
-<para>When executed as a user this will source that users <filename>~/.fetchmailrc</filename> and download the appropriate mail.  When run as root ALL users 
-who have a <filename>.fetchmailrc</filename> will have their mail downloaded 
-and delivered accordingly.</para></sect3>
+<para>When executed as a user, this will source that users
+<filename>~/.fetchmailrc</filename> and download the appropriate mail.
+When run as root, users who have a <filename>.fetchmailrc</filename> will have 
+their mail downloaded and delivered accordingly.</para></sect3>
 
 <sect3><title>fetchmailconf</title>
Index: basicnet/mailnews/mailnews.xml
===================================================================
--- basicnet/mailnews/mailnews.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/mailnews/mailnews.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -2,4 +2,13 @@
 <?dbhtml filename="mailnews.html" dir="basicnet"?>
 <title>Mail/News Clients</title>
+
+<para>Mail Clients help us retreive (Fetchmail), sort (Procmail), read and 
+compose responses (Nail, Mutt, Pine, Kmail, Balsa, Evolution, Mozilla) to
+email.</para>
+
+<para>News clients also help us retreive, sort, read and compose
+responses, but these messages travel through USENET (a worldwide
+bulletin board system) using the Network News Transfer Protocol
+(<acronym>NNTP</acronym>).</para>
 
 &nail;
Index: basicnet/mailnews/mutt.xml
===================================================================
--- basicnet/mailnews/mutt.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/mailnews/mutt.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,5 +1,5 @@
-<sect1 id="mutt" xreflabel="mutt-&mutt-version;">
+<sect1 id="mutt" xreflabel="Mutt-&mutt-version;">
 <?dbhtml filename="mutt.html" dir="basicnet"?>
-<title>mutt-&mutt-version;</title>
+<title>Mutt-&mutt-version;</title>
 
 &mutt-intro;
Index: basicnet/mailnews/mutt/mutt-config.xml
===================================================================
--- basicnet/mailnews/mutt/mutt-config.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/mailnews/mutt/mutt-config.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring <application>mutt</application></title>
+<title>Configuring <application>Mutt</application></title>
 
 <sect3><title>Config files</title>
@@ -11,5 +11,5 @@
 
 <para>No changes in these files are necessary to begin using
-<application>mutt</application>.  When you are ready to make changes, the 
+<application>Mutt</application>.  When you are ready to make changes, the 
 man page for <filename>muttrc</filename> is a good starting place.</para>
 
Index: basicnet/mailnews/mutt/mutt-desc.xml
===================================================================
--- basicnet/mailnews/mutt/mutt-desc.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/mailnews/mutt/mutt-desc.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The <application>mutt</application> package contains <command>mutt</command>,
+<para>The <application>Mutt</application> package contains <command>mutt</command>,
 <command>flea</command>, <command>muttbug</command>,
 <command>mutt_dotlock</command>, <command>pgpwrap</command> and <command>pgpring</command>.</para>
Index: basicnet/mailnews/mutt/mutt-inst.xml
===================================================================
--- basicnet/mailnews/mutt/mutt-inst.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/mailnews/mutt/mutt-inst.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Installation of <application>mutt</application></title>
+<title>Installation of <application>Mutt</application></title>
 
 <para><application>Mutt</application> requires a group named 'mail'.  You can 
@@ -11,5 +11,5 @@
 <screen><userinput><command>chgrp mail /var/mail</command></userinput></screen></para> 
 
-<para>Install <application>mutt</application> by running the following commands:</para>
+<para>Install <application>Mutt</application> by running the following commands:</para>
 
 <screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
Index: basicnet/mailnews/mutt/mutt-intro.xml
===================================================================
--- basicnet/mailnews/mutt/mutt-intro.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/mailnews/mutt/mutt-intro.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Introduction to <application>mutt</application></title>
+<title>Introduction to <application>Mutt</application></title>
 
-<para>The <application>mutt</application> package contains a Mail User Agent. This is useful for reading, writing, replying, saving, and deleting your email.</para>
+<para>The <application>Mutt</application> package contains a Mail User Agent. This is useful for reading, writing, replying, saving, and deleting your email.</para>
 
 <sect3><title>Package information</title>
@@ -16,5 +16,5 @@
 &mutt-time;</para></listitem></itemizedlist>
 </sect3>
-<sect3><title><application>mutt</application> dependencies</title>
+<sect3><title><application>Mutt</application> dependencies</title>
 <sect4><title>Optional</title>
 <para><xref linkend="gnupg"/></para></sect4>
Index: basicnet/mailnews/nail.xml
===================================================================
--- basicnet/mailnews/nail.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/mailnews/nail.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,5 +1,6 @@
-<sect1 id="nail" xreflabel="nail-&nail-version;">
+<sect1 id="nail" xreflabel="Nail-&nail-version;">
 <?dbhtml filename="nail.html" dir="basicnet"?>
-<title>nail-&nail-version;</title>
+<title>Nail-&nail-version;</title>
+
 
 &nail-intro;
Index: basicnet/mailnews/nail/nail-config.xml
===================================================================
--- basicnet/mailnews/nail/nail-config.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/mailnews/nail/nail-config.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring Nail</title>
+<title>Configuring <application>Nail</application></title>
 
 <sect3><title>Config files</title>
Index: basicnet/mailnews/nail/nail-desc.xml
===================================================================
--- basicnet/mailnews/nail/nail-desc.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/mailnews/nail/nail-desc.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,6 +1,7 @@
 <sect2>
 <title>Contents</title>
-<para>The <application>nail</application> package contains <command>nail</command>,
-a program compatible with mail command found on commercial UNIX versions.</para>
+<para>The <application>Nail</application> package contains <command>nail
+</command>, a program compatible with <command>mail</command> found on 
+commercial UNIX versions.</para>
 </sect2>
 
Index: basicnet/mailnews/nail/nail-inst.xml
===================================================================
--- basicnet/mailnews/nail/nail-inst.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/mailnews/nail/nail-inst.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -3,6 +3,7 @@
 
 <para>Install <application>Nail</application> by running the following commands.
-(Note: If you would like nail to be linked against openssl, add --with-openssl
-to the configure command mentioned below.)</para>
+(Note: If you would like nail to be linked against <application>openssl
+</application>, add <userinput>--with-openssl</userinput>to the configure 
+command mentioned below.)</para>
 
 <screen><userinput><command>./configure --prefix=/usr &amp;&amp;
Index: basicnet/mailnews/nail/nail-intro.xml
===================================================================
--- basicnet/mailnews/nail/nail-intro.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/mailnews/nail/nail-intro.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -3,7 +3,7 @@
 
 <para>The <application>Nail</application> package contains a
-command-line Mail User Agent that is compatible with the mail
-command available in commercial UNIX versions. The mail command is
-useful for writing scripts.</para>
+command-line Mail User Agent that is compatible with the <command>mail
+</command> command available in commercial UNIX versions. The <command>
+mail</command> command is useful for writing scripts.</para>
 
 <sect3><title>Package information</title>
@@ -20,5 +20,5 @@
 </sect3>
 
-<sect3><title><application>nail</application> dependencies</title>
+<sect3><title><application>Nail</application> dependencies</title>
 <sect4><title>Optional</title>
 <para><xref linkend="openssl"/></para></sect4>
Index: basicnet/mailnews/other.xml
===================================================================
--- basicnet/mailnews/other.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/mailnews/other.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -3,14 +3,20 @@
 <title>Other mail and news progs</title>
 
-<para><xref linkend="pan"/> is a GTK2 based newsreader program.</para>
+<para><xref linkend="pan"/> is an <acronym>GTK</acronym>2 based newsreader 
+program.</para>
 
-<para>KNode is a QT based newsreader program from <xref linkend="kde-network"/>.</para>
+<para>KNode is a Qt based newsreader program from 
+<xref linkend="kde-network"/>.</para>
 
-<para>KMail is a QT based mail client from <xref linkend="kde-network"/>.</para>
+<para>KMail is a Qt based mail client from <xref linkend="kde-network"/>.</para>
 
-<para><xref linkend="balsa"/> is a GTK2 based mail client.</para>
+<para><xref linkend="balsa"/> is an <acronym>GTK</acronym>2 based mail client.
+</para>
 
+<para><xref linkend="mozilla"/> includes both a mail client and newsreader in 
+its installation.</para>
 
-<para><xref linkend="mozilla"/> includes both a mail client and newsreader in its installation.</para>
+<para><xref linkend="evolution"/> includes an <acronym>GTK</acronym>2
+based mail client.</para> 
 
 </sect1>
Index: basicnet/mailnews/pine.xml
===================================================================
--- basicnet/mailnews/pine.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/mailnews/pine.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,5 +1,5 @@
-<sect1 id="pine" xreflabel="pine-&pine-version;">
+<sect1 id="pine" xreflabel="Pine-&pine-version;">
 <?dbhtml filename="pine.html" dir="basicnet"?>
-<title>pine-&pine-version;</title>
+<title>Pine-&pine-version;</title>
 
 &pine-intro;
Index: basicnet/mailnews/pine/pine-config.xml
===================================================================
--- basicnet/mailnews/pine/pine-config.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/mailnews/pine/pine-config.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring Pine</title>
+<title>Configuring <application>Pine</application></title>
 
 <sect3><title>Config files</title>
Index: basicnet/mailnews/pine/pine-desc.xml
===================================================================
--- basicnet/mailnews/pine/pine-desc.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/mailnews/pine/pine-desc.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,5 +1,5 @@
 <sect2>
 <title>Contents</title>
-<para>The <application>pine</application> package contains
+<para>The <application>Pine</application> package contains
 <command>pine</command>,
 <command>pico</command>,
@@ -31,9 +31,9 @@
 <sect3><title>ipop2d</title>
 <para><command>ipop2d</command> is an <acronym>IMAP</acronym> to
-<acronym>POP2</acronym> conversion server.</para></sect3>
+<acronym>POP</acronym>2 conversion server.</para></sect3>
 
 <sect3><title>ipop3d</title>
 <para><command>ipop3d</command> is an <acronym>IMAP</acronym> to
-<acronym>POP3</acronym> conversion server.</para></sect3>
+<acronym>POP</acronym>3 conversion server.</para></sect3>
 
 <sect3><title>mtest</title>
@@ -49,6 +49,7 @@
 
 <sect3><title>rpdump</title>
-<para><command>rpdump</command> is used to copy data from remote Pine 
-configuration files or address books into a local file.</para></sect3>
+<para><command>rpdump</command> is used to copy data from remote
+<application>Pine</application> configuration files or address books into a 
+local file.</para></sect3>
 
 </sect2>
Index: basicnet/mailnews/pine/pine-exp.xml
===================================================================
--- basicnet/mailnews/pine/pine-exp.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/mailnews/pine/pine-exp.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -6,10 +6,11 @@
 class="directory">/etc</filename> for configuration files.</para>
 
-<para>The build procedure for Pine is somewhat unusual, in that
-options usually passed as <command>./configure</command> options or housed in 
-$<envar>CFLAGS</envar> must all be passed on the command line to the 
-<command>./build</command> script.</para>
+<para>The build procedure for <application>Pine</application> is somewhat 
+unusual, in that options usually passed as <command>./configure</command> 
+options or housed in $<envar>CFLAGS</envar> must all be passed on the command 
+line to the <command>./build</command> script.</para>
 
-<para><command>./build slx</command> : <application>Pine</application> offers quite a few target platforms, slx specifies Linux using
+<para><command>./build slx</command> : <application>Pine</application> offers 
+quite a few target platforms, slx specifies Linux using
 -lcrypt to get the crypt function.  See the
 <filename>doc/pine-ports</filename> file for more information and
Index: basicnet/mailnews/pine/pine-inst.xml
===================================================================
--- basicnet/mailnews/pine/pine-inst.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/mailnews/pine/pine-inst.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -2,5 +2,5 @@
 <title>Installation of <application>Pine</application></title>
 
-<para>Download the <application>pine</application>
+<para>Download the <application>Pine</application>
 <acronym>FHS</acronym> patch from <ulink url="&hfile-root;"/>.</para>
 
Index: basicnet/mailnews/pine/pine-intro.xml
===================================================================
--- basicnet/mailnews/pine/pine-intro.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/mailnews/pine/pine-intro.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -20,5 +20,5 @@
 </sect3>
 
-<sect3><title><application>pine</application> dependencies</title>
+<sect3><title><application>Pine</application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="openssl"/></para></sect4>
Index: basicnet/netlibs/curl.xml
===================================================================
--- basicnet/netlibs/curl.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/netlibs/curl.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,5 +1,5 @@
-<sect1 id="curl" xreflabel="curl-&curl-version;">
+<sect1 id="curl" xreflabel="cURL-&curl-version;">
 <?dbhtml filename="curl.html" dir="basicnet"?>
-<title>curl-&curl-version;</title>
+<title>cURL-&curl-version;</title>
 
 &curl-intro;
Index: basicnet/netlibs/curl/curl-config.xml
===================================================================
--- basicnet/netlibs/curl/curl-config.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/netlibs/curl/curl-config.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring <application>curl</application></title>
+<title>Configuring <application>cURL</application></title>
 
 <sect3><title>Configuration Information</title>
Index: basicnet/netlibs/curl/curl-desc.xml
===================================================================
--- basicnet/netlibs/curl/curl-desc.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/netlibs/curl/curl-desc.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The <application>curl</application> package contains <command>curl</command>, <command>curl-config</command> and the
+<para>The <application>cURL</application> package contains <command>curl</command>, <command>curl-config</command> and the
 <filename class="libraryfile">libcurl</filename> libraries.</para>
 
Index: basicnet/netlibs/curl/curl-inst.xml
===================================================================
--- basicnet/netlibs/curl/curl-inst.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/netlibs/curl/curl-inst.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Installation of <application>curl</application></title>
+<title>Installation of <application>cURL</application></title>
 
-<para>Install <application>curl</application> by running the following commands:</para>
+<para>Install <application>cURL</application> by running the following commands:</para>
 
 <screen><userinput><command>./configure --prefix=/usr &amp;&amp;
Index: basicnet/netlibs/curl/curl-intro.xml
===================================================================
--- basicnet/netlibs/curl/curl-intro.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/netlibs/curl/curl-intro.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Introduction to <application>curl</application></title>
+<title>Introduction to <application>cURL</application></title>
 
-<para>The <application>curl</application> package contains curl and its
+<para>The <application>cURL</application> package contains curl and its
 support library. This is useful for transferring files with
 <acronym>URL</acronym> syntax.
@@ -20,5 +20,5 @@
 </sect3>
 
-<sect3><title><application>curl</application> dependencies</title>
+<sect3><title><application>cURL</application> dependencies</title>
 <sect4><title>Optional</title>
 <para><xref linkend="openssl"/> and <xref linkend="openldap"/></para></sect4>
Index: basicnet/netlibs/gnet.xml
===================================================================
--- basicnet/netlibs/gnet.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/netlibs/gnet.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,5 +1,5 @@
-<sect1 id="gnet" xreflabel="gnet-&gnet-version;">
+<sect1 id="gnet" xreflabel="GNet-&gnet-version;">
 <?dbhtml filename="gnet.html" dir="basicnet"?>
-<title>gnet-&gnet-version;</title>
+<title>GNet-&gnet-version;</title>
 
 &gnet-intro;
Index: basicnet/netlibs/gnet/gnet-config.xml
===================================================================
--- basicnet/netlibs/gnet/gnet-config.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/netlibs/gnet/gnet-config.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring <application>gnet</application></title>
+<title>Configuring <application>GNet</application></title>
 
 <sect3><title>Config files</title>
Index: basicnet/netlibs/gnet/gnet-desc.xml
===================================================================
--- basicnet/netlibs/gnet/gnet-desc.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/netlibs/gnet/gnet-desc.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The <application>gnet</application> package contains <filename>libgnet</filename> libraries.</para>
+<para>The <application>GNet</application> package contains <filename>libgnet</filename> libraries.</para>
 
 </sect2>
Index: basicnet/netlibs/gnet/gnet-inst.xml
===================================================================
--- basicnet/netlibs/gnet/gnet-inst.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/netlibs/gnet/gnet-inst.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Installation of <application>gnet</application></title>
+<title>Installation of <application>GNet</application></title>
 
-<para>Install <application>gnet</application> by running the following commands:
+<para>Install <application>GNet</application> by running the following commands:
 </para>
 
Index: basicnet/netlibs/gnet/gnet-intro.xml
===================================================================
--- basicnet/netlibs/gnet/gnet-intro.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/netlibs/gnet/gnet-intro.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,7 +1,7 @@
 <sect2>
-<title>Introduction to <application>gnet</application></title>
+<title>Introduction to <application>GNet</application></title>
 
 
-<para>The <application>gnet</application> package contains a simple network 
+<para>The <application>GNet</application> package contains a simple network 
 library. This is useful for supporting <acronym>TCP</acronym> sockets,
 <acronym>UDP</acronym> and <acronym>IP</acronym> multicast, asynchronous 
@@ -21,5 +21,5 @@
 </sect3>
 
-<sect3><title><application>gnet</application> dependencies</title>
+<sect3><title><application>GNet</application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="GLib2"/></para></sect4>
Index: basicnet/netlibs/netlibs.xml
===================================================================
--- basicnet/netlibs/netlibs.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/netlibs/netlibs.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -2,4 +2,11 @@
 <?dbhtml filename="netlibs.html" dir="basicnet"?>
 <title>Networking Libraries</title>
+
+<para>These applications are support libraries for other applications in
+the book.  It is unlikely that you would just intall these libraries, you will
+generaly find that you will be referred to this chapter to satisfy a
+dependency of other applications.</para>
+
+
 
 &curl;
Index: basicnet/netlibs/wvstreams.xml
===================================================================
--- basicnet/netlibs/wvstreams.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/netlibs/wvstreams.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,5 +1,5 @@
-<sect1 id="wvstreams" xreflabel="wvstreams-&wvstreams-version;">
+<sect1 id="wvstreams" xreflabel="WvStreams-&wvstreams-version;">
 <?dbhtml filename="wvstreams.html" dir="basicnet"?>
-<title>wvstreams-&wvstreams-version;</title>
+<title>WvStreams-&wvstreams-version;</title>
 
 &wvstreams-intro;
Index: basicnet/netlibs/wvstreams/wvstreams-config.xml
===================================================================
--- basicnet/netlibs/wvstreams/wvstreams-config.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/netlibs/wvstreams/wvstreams-config.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring wvstreams</title>
+<title>Configuring <application>WvStreams</application></title>
 
 <sect3><title>Configuration Information</title>
Index: basicnet/netlibs/wvstreams/wvstreams-desc.xml
===================================================================
--- basicnet/netlibs/wvstreams/wvstreams-desc.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/netlibs/wvstreams/wvstreams-desc.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The wvstreams package contains the
+<para>The <application>WvStreams</application> package contains the
 <filename class="libraryfile">libwvcrypto</filename>,
 <filename class="libraryfile">libwvstreams</filename> and
Index: basicnet/netlibs/wvstreams/wvstreams-exp.xml
===================================================================
--- basicnet/netlibs/wvstreams/wvstreams-exp.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/netlibs/wvstreams/wvstreams-exp.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -4,5 +4,5 @@
 <para><command>make PREFIX=/usr LDFLAGS="-lcrypt"</command> : 
 This fixes <filename class="libraryfile">libwvstreams</filename>' issues 
-with OpenSSL's crypto library.</para>
+with <application>Open<acronym>SSL</acronym></application>'s crypto library.</para>
 
 </sect2>
Index: basicnet/netlibs/wvstreams/wvstreams-inst.xml
===================================================================
--- basicnet/netlibs/wvstreams/wvstreams-inst.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/netlibs/wvstreams/wvstreams-inst.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Installation of <application>wvstreams</application></title>
+<title>Installation of <application>WvStreams</application></title>
 
-<para>Install <application>wvstreams</application> by running the following commands:</para>
+<para>Install <application>WvStreams</application> by running the following commands:</para>
 
 <screen><userinput><command>patch -Np1 -i ../wvstreams-3.70-wvcrypto.patch &amp;&amp;
Index: basicnet/netlibs/wvstreams/wvstreams-intro.xml
===================================================================
--- basicnet/netlibs/wvstreams/wvstreams-intro.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/netlibs/wvstreams/wvstreams-intro.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Introduction to <application>wvstreams</application></title>
+<title>Introduction to <application>WvStreams</application></title>
 
-<para>The <application>wvstreams</application> package contains the 
+<para>The <application>WvStreams</application> package contains the 
 network programming libraries. These are needed to compile wvdial.</para>
 
@@ -22,5 +22,5 @@
 </itemizedlist></sect3>
 
-<sect3><title><application>wvstreams</application> dependencies</title>
+<sect3><title><application>WvStreams</application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="openssl"/>
Index: basicnet/netprogs/ncftp.xml
===================================================================
--- basicnet/netprogs/ncftp.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/netprogs/ncftp.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,5 +1,5 @@
-<sect1 id="ncftp" xreflabel="ncftp-&ncftp-version;">
+<sect1 id="ncftp" xreflabel="NcFTP-&ncftp-version;">
 <?dbhtml filename="ncftp.html" dir="basicnet"?>
-<title>ncftp-&ncftp-version;</title>
+<title>NcFTP-&ncftp-version;</title>
 
 &ncftp-intro;
Index: basicnet/netprogs/ncftp/ncftp-config.xml
===================================================================
--- basicnet/netprogs/ncftp/ncftp-config.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/netprogs/ncftp/ncftp-config.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring <application>ncftp</application></title>
+<title>Configuring <application>Nc<acronym>FTP</acronym></application></title>
 
 <sect3><title>Config files</title>
@@ -9,5 +9,5 @@
 <sect3><title>Configuration Information</title>
 
-<para>Most <application>ncftp</application> configuration is done while in the 
+<para>Most <application>Nc<acronym>FTP</acronym></application> configuration is done while in the 
 program and the configuration files are dealt with automatically.  One 
 exception to this is <filename>~/.ncftp/prefs_v3</filename>.  There are various 
Index: basicnet/netprogs/ncftp/ncftp-desc.xml
===================================================================
--- basicnet/netprogs/ncftp/ncftp-desc.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/netprogs/ncftp/ncftp-desc.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The ncftp package contains <command>ncftp</command>, <command>ncftpbatch
+<para>The <application>Nc<acronym>FTP</acronym></application> package contains <command>ncftp</command>, <command>ncftpbatch
 </command>, <command>ncftpbookmarks</command>,
 <command>ncftpget</command>, <command>ncftpls</command>,
Index: basicnet/netprogs/ncftp/ncftp-inst.xml
===================================================================
--- basicnet/netprogs/ncftp/ncftp-inst.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/netprogs/ncftp/ncftp-inst.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Installation of <application>ncftp</application></title>
+<title>Installation of <application>Nc<acronym>FTP</acronym></application></title>
 
-<para>There are two ways to build <application>ncftp</application>.  The first 
+<para>There are two ways to build <application>Nc<acronym>FTP</acronym></application>.  The first 
 (and optimal) way, builds most of the functionality as a shared library and 
 then builds and installs the program linked against this library.  The second 
@@ -15,5 +15,5 @@
 </para>
 
-<para>To install <application>ncftp</application> using the first (and optimal) 
+<para>To install <application>Nc<acronym>FTP</acronym></application> using the first (and optimal) 
 method, run the following commands:</para>
 
@@ -26,5 +26,5 @@
 make install</command></userinput></screen>
 
-<para>To install <application>ncftp</application> using the second method (with 
+<para>To install <application>Nc<acronym>FTP</acronym></application> using the second method (with 
 the <filename>libncftp</filename> functionality linked in statically) run the 
 following commands:</para>
Index: basicnet/netprogs/ncftp/ncftp-intro.xml
===================================================================
--- basicnet/netprogs/ncftp/ncftp-intro.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/netprogs/ncftp/ncftp-intro.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Introduction to <application>ncftp</application></title>
+<title>Introduction to <application>Nc<acronym>FTP</acronym></application></title>
 
-<para>The <application>ncftp</application> package contains a powerful and 
+<para>The <application>Nc<acronym>FTP</acronym></application> package contains a powerful and 
 flexible interface to the Internet standard File Transfer Protocol.  It is 
 intended to replace or supplement the stock <command>ftp</command> program.
Index: basicnet/netprogs/netprogs.xml
===================================================================
--- basicnet/netprogs/netprogs.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/netprogs/netprogs.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -2,4 +2,9 @@
 <?dbhtml filename="netprogs.html" dir="basicnet"?>
 <title>Basic Networking Programs</title>
+
+<para>These applications are generally client applications used to
+access the appropriate server across the building or across the world.
+Tcpwrappers and portmap are support programs for daemons that you may
+have running on your machine.</para>
 
 &ncftp;
Index: basicnet/textweb/lynx.xml
===================================================================
--- basicnet/textweb/lynx.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/textweb/lynx.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,5 +1,5 @@
-<sect1 id="lynx" xreflabel="lynx-&lynx-version;">
+<sect1 id="lynx" xreflabel="Lynx-&lynx-version;">
 <?dbhtml filename="lynx.html" dir="basicnet"?>
-<title>lynx-&lynx-version;</title>
+<title>Lynx-&lynx-version;</title>
 
 &lynx-intro;
Index: basicnet/textweb/lynx/lynx-config.xml
===================================================================
--- basicnet/textweb/lynx/lynx-config.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/textweb/lynx/lynx-config.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring <application>lynx</application></title>
+<title>Configuring <application>Lynx</application></title>
 
 <sect3><title>Config files</title>
Index: basicnet/textweb/lynx/lynx-desc.xml
===================================================================
--- basicnet/textweb/lynx/lynx-desc.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/textweb/lynx/lynx-desc.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The <application>lynx</application> package contains <command>lynx
+<para>The <application>Lynx</application> package contains <command>lynx
 </command>.</para>
 
Index: basicnet/textweb/lynx/lynx-exp.xml
===================================================================
--- basicnet/textweb/lynx/lynx-exp.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/textweb/lynx/lynx-exp.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -11,5 +11,5 @@
 
 <para><command>--with-zlib</command> : This enables support for
-linking <application>zlib</application> into <application>lynx</application>.</para>
+linking <application>zlib</application> into <application>Lynx</application>.</para>
 
 <para><command>DOCDIR=... HELPDIR=...</command> : We set these
Index: basicnet/textweb/lynx/lynx-inst.xml
===================================================================
--- basicnet/textweb/lynx/lynx-inst.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/textweb/lynx/lynx-inst.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Installation of <application>lynx</application></title>
+<title>Installation of <application>Lynx</application></title>
 
-<para>Install <application>lynx</application> by running the following commands.
+<para>Install <application>Lynx</application> by running the following commands.
 </para>
 
Index: basicnet/textweb/lynx/lynx-intro.xml
===================================================================
--- basicnet/textweb/lynx/lynx-intro.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ basicnet/textweb/lynx/lynx-intro.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Introduction to <application>lynx</application></title>
+<title>Introduction to <application>Lynx</application></title>
 
 <para><application>Lynx</application> is a text based web browser.</para>
@@ -17,5 +17,5 @@
 </sect3>
 
-<sect3><title><application>lynx</application> dependencies</title>
+<sect3><title><application>Lynx</application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="openssl"/></para></sect4>
Index: connect/dialup/wvdial.xml
===================================================================
--- connect/dialup/wvdial.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ connect/dialup/wvdial.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,5 +1,5 @@
-<sect1 id="wvdial" xreflabel="wvdial-&wvdial-version;">
+<sect1 id="wvdial" xreflabel="WvDial-&wvdial-version;">
 <?dbhtml filename="wvdial.html" dir="connect"?>
-<title>wvdial-&wvdial-version;</title>
+<title>WvDial-&wvdial-version;</title>
 
 &wvdial-intro;
Index: connect/dialup/wvdial/wvdial-config.xml
===================================================================
--- connect/dialup/wvdial/wvdial-config.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ connect/dialup/wvdial/wvdial-config.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring wvdial</title>
+<title>Configuring WvDial</title>
 
 <sect3><title>Config files</title>
Index: connect/dialup/wvdial/wvdial-desc.xml
===================================================================
--- connect/dialup/wvdial/wvdial-desc.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ connect/dialup/wvdial/wvdial-desc.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -2,6 +2,6 @@
 <title>Contents</title>
 
-<para>The wvdial package contains the <command>wvdial</command>
-and <command>wvdialconf</command> programs.</para>
+<para>The <application>WvDial</application> package contains the <command>
+wvdial</command> and <command>wvdialconf</command> programs.</para>
 
 </sect2>
@@ -13,5 +13,5 @@
 
 <sect3><title>wvdialconf</title>
-<para>Automates the configuration of wvdial.</para></sect3>
+<para>Automates the configuration of <command>wvdial</command>.</para></sect3>
 
 </sect2>
Index: connect/dialup/wvdial/wvdial-inst.xml
===================================================================
--- connect/dialup/wvdial/wvdial-inst.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ connect/dialup/wvdial/wvdial-inst.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Installation of <application>wvdial</application></title>
+<title>Installation of <application>WvDial</application></title>
 
-<para>Install <application>wvdial</application> by running the following commands:</para>
+<para>Install <application>WvDial</application> by running the following commands:</para>
 
 <screen><userinput><command>make PREFIX=/usr &amp;&amp;
Index: connect/dialup/wvdial/wvdial-intro.xml
===================================================================
--- connect/dialup/wvdial/wvdial-intro.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ connect/dialup/wvdial/wvdial-intro.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,8 +1,10 @@
 <sect2>
-<title>Introduction to <application>wvdial</application></title>
+<title>Introduction to <application>WvDial</application></title>
 
-<para>The <application>wvdial</application> package contains a no nonsense, quick and easy to use 
-alternative to chat and pppd scripts. If you simply want to dial a modem 
-without the fuss and hassle of chat issues, then you'll want this.</para>
+<para>The <application>WvDial</application> package contains a no nonsense, 
+quick and easy to use alternative to <command>chat</command> and
+<command>pppd</command> scripts. If you simply want to dial a modem 
+without the fuss and hassle of <command>chat</command> issues, then you'll 
+want this.</para>
 
 <sect3><title>Package information</title>
@@ -15,5 +17,5 @@
 </sect3>
 
-<sect3><title><application>wvdial</application> dependencies</title>
+<sect3><title><application>WvDial</application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="wvstreams"/> and <xref linkend="ppp"/>
Index: postlfs/security/shadow/shadow-inst.xml
===================================================================
--- postlfs/security/shadow/shadow-inst.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ postlfs/security/shadow/shadow-inst.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -3,5 +3,5 @@
 <application><acronym>PAM</acronym></application></title>
 
-<sect3><title><application>template</application> dependencies</title>
+<sect3><title><application>shadow</application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="Linux_PAM"/></para></sect4>
Index: pst/printing/cups/cups-config.xml
===================================================================
--- pst/printing/cups/cups-config.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ pst/printing/cups/cups-config.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -12,5 +12,5 @@
 want to change it to a more conventional <acronym>LFS</acronym> startup file:</para>
 
-<screen><userinput><command>cat &gt; /etc/rc.d/init.d/cups &lt;&lt; "EOF"
+<screen><userinput><command>cat &gt; /etc/rc.d/init.d/cups &lt;&lt; "EOF"</command>
 #!/bin/sh
 # Begin $rc_base/init.d/cups
@@ -53,5 +53,5 @@
 
 # End $rc_base/init.d/cups startup script.
-EOF</command></userinput></screen>
+<command>EOF</command></userinput></screen>
 
 <para>Create the symbolic links to this file in the relevant
Index: server/mail/exim/exim-config.xml
===================================================================
--- server/mail/exim/exim-config.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ server/mail/exim/exim-config.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -12,8 +12,8 @@
 <para>Create the exim configuration files with the following commands:</para> 
 
-<screen><userinput><command>cat &gt;&gt; /etc/aliases &lt;&lt; "EOF"
+<screen><userinput><command>cat &gt;&gt; /etc/aliases &lt;&lt; "EOF"</command>
 postmaster: root
 MAILER-DAEMON: root
-EOF
+<command>EOF
 exim -v -bi &amp;&amp;
 /usr/sbin/exim -bd -q1m</command></userinput></screen>
@@ -27,5 +27,5 @@
 exim boot script with the following commands:</para>
 
-<screen><userinput><command>cat &gt; /etc/rc.d/init.d/exim &lt;&lt; "EOF"
+<screen><userinput><command>cat &gt; /etc/rc.d/init.d/exim &lt;&lt; "EOF"</command>
 #!/bin/sh
 # Begin $rc_base/init.d/exim
@@ -66,5 +66,5 @@
 
 # End $rc_base/init.d/exim
-EOF
+<command>EOF
 chmod 755 /etc/rc.d/init.d/exim</command></userinput></screen>
 
Index: server/other/samba/samba-config.xml
===================================================================
--- server/other/samba/samba-config.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ server/other/samba/samba-config.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -9,5 +9,5 @@
 documentation by pointing a web browser to:</para>
 
-<para><screen><userinput>file:///usr/share/samba/swat/using_samba/ch03_01.html#ch03-55770.</userinput></screen></para>
+<screen><userinput><command>file:///usr/share/samba/swat/using_samba/ch03_01.html#ch03-55770.</command></userinput></screen>
 
 <sect3><title>Config files</title>
@@ -16,12 +16,12 @@
 
 <para>First we set up some directories needed by Samba:</para>
-<para><screen><userinput>mkdir /var/lib/samba &amp;&amp;
+<screen><userinput><command>mkdir /var/lib/samba &amp;&amp;
 mkdir /var/lib/samba/netlogon &amp;&amp;
 mkdir /var/lib/samba/ntprofile &amp;&amp;
 mkdir /var/lib/samba/profiles &amp;&amp;
-chmod -R 1777 /var/lib/samba</userinput></screen></para>
+chmod -R 1777 /var/lib/samba</command></userinput></screen>
 
 <para>And the Samba configuration file: </para>
-<para><screen><userinput>cat &gt; /etc/samba/smb.conf &lt;&lt; "EOF"</userinput>
+<screen><userinput><command>cat &gt; /etc/samba/smb.conf &lt;&lt; "EOF"</command>
 [global]
     netbios name = SAMBABOX
@@ -60,14 +60,14 @@
         read only = no
         public = no
-<userinput>EOF </userinput></screen></para>
+<command>EOF</command></userinput></screen>
 
 <para>Now add the machine trust account for WIN2KBOX:</para>
-<para><screen><userinput>/usr/sbin/useradd -g 100 -d /dev/null -c \
+<screen><userinput><command>/usr/sbin/useradd -g 100 -d /dev/null -c \
     "machine nickname" -s /bin/false win2kbox$ &amp;&amp;
 passwd -l win2kbox$ &amp;&amp;
-smbpasswd -a -m win2kbox</userinput></screen></para>
+smbpasswd -a -m win2kbox</command></userinput></screen>
 
 <para>Create the Samba boot script:</para>
-<para><screen><userinput>cat &gt; /etc/rc.d/init.d/samba &lt;&lt; "EOF"</userinput>
+<screen><userinput><command>cat &gt; /etc/rc.d/init.d/samba &lt;&lt; "EOF"</command>
 #!/bin/bash
 # Begin $rc_base/init.d/samba
@@ -110,7 +110,7 @@
 esac
 # End $rc_base/init.d/samba
-<userinput>EOF</userinput></screen></para>
+<command>EOF</command></userinput></screen>
 <para>Add the run level symlinks:</para>
-<para><screen><userinput>chmod 754 /etc/rc.d/init.d/samba &amp;&amp;
+<screen><userinput>chmod 754 /etc/rc.d/init.d/samba &amp;&amp;
 ln -s  /etc/rc.d/init.d/samba /etc/rc.d/rc0.d/K48samba &amp;&amp;
 ln -s  /etc/rc.d/init.d/samba /etc/rc.d/rc1.d/K48samba &amp;&amp;
@@ -119,17 +119,18 @@
 ln -s  /etc/rc.d/init.d/samba /etc/rc.d/rc4.d/S24samba &amp;&amp;
 ln -s  /etc/rc.d/init.d/samba /etc/rc.d/rc5.d/S24samba &amp;&amp;
-ln -s  /etc/rc.d/init.d/samba /etc/rc.d/rc6.d/K48samba</userinput></screen></para>
+ln -s  /etc/rc.d/init.d/samba /etc/rc.d/rc6.d/K48samba</userinput></screen>
 
 <para>Now, we'll use our new boot script to start Samba: </para>
-<para><screen><userinput>/etc/rc.d/init.d/samba start</userinput></screen></para>
+<screen><userinput><command>/etc/rc.d/init.d/samba start</command></userinput></screen>
 <para>We have to add the SAMBABOX root account to the Samba user list
 first in order to join WIN2KBOX to the DOMAIN01 domain: </para>
 
-<para><screen><userinput>smbpasswd -a root</userinput></screen></para>
+<screen><userinput><command>smbpasswd -a root</command></userinput></screen>
 
 <para>After starting Samba and adding root to the Samba user list, the
 first machine we'll join to DOMAIN01 will be WIN2KBOX, the Windows
 2000 Server box we created the machine trust account for.  On
-WIN2KBOX:</para><para><screen><userinput>1.  Right click on My Computer.
+WIN2KBOX:</para>
+<screen><userinput>1.  Right click on My Computer.
 2.  Click on Properties.
 3.  Click on the Network Identification notebook tab.
@@ -144,33 +145,33 @@
 9.  Click OK in the reboot reminder dialog box.
 10. Click OK to close the System Properties window.
-11. Click Yes to reboot WIN2KBOX.</userinput></screen></para></sect3>
+11. Click Yes to reboot WIN2KBOX.</userinput></screen></sect3>
 
 <sect3><title>Add a new user to the DOMAIN01 domain.</title>
 <para>Before logging on to WIN2KBOX, we will create a new user with
     the following commands:</para>
-<para><screen><userinput>useradd -m win2kuser01 &amp;&amp;
+<screen><userinput><command>useradd -m win2kuser01 &amp;&amp;
 passwd win2kuser01 &amp;&amp;
-smbpasswd -a win2kuser01</userinput></screen></para></sect3>
+smbpasswd -a win2kuser01</command></userinput></screen></sect3>
 
 <sect3><title>Logging on to DOMAIN01.</title>
 <para>Now we will log on the domain as our newly created user as
     follows:</para> 
-<para><screen><userinput>1. Press Ctrl-Alt-Del to bring up the Log On to Windows dialog box.
+<screen><userinput>1. Press Ctrl-Alt-Del to bring up the Log On to Windows dialog box.
 2. Enter the win2kuser01 name and password.
-3. Select DOMAIN01 from the Log on to: combination box and click OK.</userinput></screen></para>
+3. Select DOMAIN01 from the Log on to: combination box and click OK.</userinput></screen>
 
 <para>Add the swat entry to <filename>/etc/services</filename>with the
 following command: </para>
 
-<para><screen><userinput>echo "swat            901/tcp" &gt;&gt; /etc/services</userinput></screen></para>
+<screen><userinput><command>echo "swat            901/tcp" &gt;&gt; /etc/services</command></userinput></screen>
 
-<para>If inetd is used, the following command will add the swat entry
-to <filename>/etc/inetd.conf</filename>: </para>
-<para><screen><userinput>echo "swat stream tcp nowait.400 root /usr/sbin/swat swat" \
-    &gt;&gt; /etc/inetd.conf</userinput></screen></para>
+<para>If <command>inetd</command> is used, the following command will add the 
+swat entry to <filename>/etc/inetd.conf</filename>: </para>
+<screen><userinput><command>echo "swat stream tcp nowait.400 root /usr/sbin/swat swat" \
+    &gt;&gt; /etc/inetd.conf</command></userinput></screen>
 
 <para>If xinetd is used, the following command will add the swat entry
 to <filename>/etc/xinetd.conf</filename>: </para>
-<para><screen><userinput>cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"</userinput>
+<screen><userinput><command>cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"</command>
 service swat
 {
@@ -183,9 +184,9 @@
     log_on_failure  += USERID
 }
-<userinput>EOF</userinput></screen></para>
+<command>EOF</command></userinput></screen>
 
 <para>The Samba Web Administration Tool, swat, can be launched with the
 following command on SAMBABOX: </para>
-<para><screen><userinput>lynx http://localhost:901 </userinput></screen></para>
+<screen><userinput><command>lynx http://localhost:901</command></userinput></screen>
 <note><para>Be sure inetd is running, and issue a killall -HUP inetd
 before starting swat.</para></note>
Index: xsoft/office/evolution.xml
===================================================================
--- xsoft/office/evolution.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ xsoft/office/evolution.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,5 +1,5 @@
-<sect1 id="evolution" xreflabel="evolution-&evolution-version;">
+<sect1 id="evolution" xreflabel="Evolution-&evolution-version;">
 <?dbhtml filename="evolution.html" dir="xsoft"?>
-<title>evolution-&evolution-version;</title>
+<title>Evolution-&evolution-version;</title>
 
 &db-3.1-intro;
Index: xsoft/office/evolution/evolution-desc.xml
===================================================================
--- xsoft/office/evolution/evolution-desc.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ xsoft/office/evolution/evolution-desc.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The <application>evolution</application> package contains
+<para>The <application>Evolution</application> package contains
 <command>evolution</command>.</para>
 </sect2>
Index: xsoft/office/evolution/evolution-inst.xml
===================================================================
--- xsoft/office/evolution/evolution-inst.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ xsoft/office/evolution/evolution-inst.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Installation of <application>evolution</application></title>
+<title>Installation of <application>Evolution</application></title>
 
-<para>Install <application>evolution</application> by running the following 
+<para>Install <application>Evolution</application> by running the following 
 commands:</para>
 
Index: xsoft/other/balsa/balsa-desc.xml
===================================================================
--- xsoft/other/balsa/balsa-desc.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ xsoft/other/balsa/balsa-desc.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -9,5 +9,5 @@
 
 <sect3><title>balsa</title>
-<para><application>Balsa</application> is the GNOME 2 based mail reader.</para>
+<para><command>balsa</command> is the GNOME 2 based mail reader.</para>
 </sect3>
 
Index: xsoft/other/pan.xml
===================================================================
--- xsoft/other/pan.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ xsoft/other/pan.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,5 +1,5 @@
-<sect1 id="pan" xreflabel="pan-&pan-version;">
+<sect1 id="pan" xreflabel="Pan-&pan-version;">
 <?dbhtml filename="pan.html" dir="xsoft"?>
-<title>pan-&pan-version;</title>
+<title>Pan-&pan-version;</title>
 
 &pan-intro;
Index: xsoft/other/pan/pan-desc.xml
===================================================================
--- xsoft/other/pan/pan-desc.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ xsoft/other/pan/pan-desc.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The <application>pan</application> package contains
+<para>The <application>Pan</application> package contains
 <command>pan</command>.</para>
 
Index: xsoft/other/pan/pan-inst.xml
===================================================================
--- xsoft/other/pan/pan-inst.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ xsoft/other/pan/pan-inst.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Installation of <application>pan</application></title>
+<title>Installation of <application>Pan</application></title>
 
-<para>Install <application>pan</application> by running the following commands:</para>
+<para>Install <application>Pan</application> by running the following commands:</para>
 
 <screen><userinput><command>./configure --prefix=/usr &amp;&amp;
Index: xsoft/other/pan/pan-intro.xml
===================================================================
--- xsoft/other/pan/pan-intro.xml	(revision 178f7b43c87dbb63ffde4fbbe5bf9a802f2203f6)
+++ xsoft/other/pan/pan-intro.xml	(revision 377584f40fadd7d5a0e935a6b1fc0692046973c0)
@@ -1,8 +1,8 @@
 <sect2>
-<title>Introduction to pan</title>
+<title>Introduction to <application>Pan</application></title>
 
-<para>The pan package contains a graphical newsreader.  This is useful
-for reading and writing news, threading articles and replying via
-email.</para>
+<para>The <application>Pan</application> package contains a graphical 
+newsreader.  This is useful for reading and writing news, threading articles 
+and replying via email.</para>
 
 <sect3><title>Package information</title>
@@ -19,5 +19,5 @@
 </sect3>
 
-<sect3><title><application>pan</application> dependencies</title>
+<sect3><title><application>Pan</application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="GTK2"/>, <xref linkend="gnet"/>, <xref
