Index: basicnet/mailnews/fetchmail/fetchmail-config.xml
===================================================================
--- basicnet/mailnews/fetchmail/fetchmail-config.xml	(revision 52b9837fef8e339c07f568394b6714afdf880aad)
+++ basicnet/mailnews/fetchmail/fetchmail-config.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
@@ -20,5 +20,6 @@
 can add as many users and servers as you need using the same syntax.</para>
 
-<para><userinput>man fetchmail</userinput> : Look for the section near the bottom named <userinput>CONFIGURATION EXAMPLES</userinput> it gives some quick 
+<para><userinput>man fetchmail</userinput> : Look for the section near
+the bottom named <emphasis role="strong">CONFIGURATION EXAMPLES</emphasis> it gives some quick 
 examples too. There are countless other config options once you get used to 
 it.</para>
Index: basicnet/netlibs/curl/curl-desc.xml
===================================================================
--- basicnet/netlibs/curl/curl-desc.xml	(revision 52b9837fef8e339c07f568394b6714afdf880aad)
+++ basicnet/netlibs/curl/curl-desc.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
@@ -3,5 +3,5 @@
 
 <para>The curl package contains <userinput>curl</userinput>, <userinput>curl-config</userinput> and the
-<filename>curl</filename> library.</para>
+<filename>libcurl</filename> libraries.</para>
 
 </sect2>
Index: basicnet/netlibs/gnet/gnet-desc.xml
===================================================================
--- basicnet/netlibs/gnet/gnet-desc.xml	(revision 52b9837fef8e339c07f568394b6714afdf880aad)
+++ basicnet/netlibs/gnet/gnet-desc.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The gnet package contains <filename>gnet</filename> libraries.</para>
+<para>The gnet package contains <filename>libgnet</filename> libraries.</para>
 
 </sect2>
Index: basicnet/netlibs/wvstreams/wvstreams-desc.xml
===================================================================
--- basicnet/netlibs/wvstreams/wvstreams-desc.xml	(revision 52b9837fef8e339c07f568394b6714afdf880aad)
+++ basicnet/netlibs/wvstreams/wvstreams-desc.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
@@ -3,6 +3,7 @@
 
 <para>The wvstreams package contains the
-<filename>wvcrypto</filename>, <filename>wvstreams</filename> and
-<filename>wvutils</filename> libraries.</para>
+<filename>libwvcrypto</filename> libraries,
+<filename>libwvstreams</filename> libraries and
+<filename>libwvutils</filename> libraries.</para>
 
 </sect2>
Index: basicnet/netprogs/ncftp/ncftp-config.xml
===================================================================
--- basicnet/netprogs/ncftp/ncftp-config.xml	(revision 52b9837fef8e339c07f568394b6714afdf880aad)
+++ basicnet/netprogs/ncftp/ncftp-config.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
@@ -17,5 +17,5 @@
 the splash screen advertising the NcFTPd server.</para>
 
-<para>There are other options in the prefs_v3 file.  Most of these are
+<para>There are other options in the <filename>prefs_v3</filename> file.  Most of these are
 self-explanatory.</para>
 </sect3>
Index: basicnet/netprogs/tcpwrappers/tcpwrappers-config.xml
===================================================================
--- basicnet/netprogs/tcpwrappers/tcpwrappers-config.xml	(revision 52b9837fef8e339c07f568394b6714afdf880aad)
+++ basicnet/netprogs/tcpwrappers/tcpwrappers-config.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
@@ -19,5 +19,5 @@
 <note><para>The finger server is used as an example here.</para></note>
 <para>Similar changes must be made if xinetd is used, with the
-emphasis being on calling /usr/sbin/tcpd instead of calling the
+emphasis being on calling <command>/usr/sbin/tcpd</command> instead of calling the
 service daemon directly, and passing the name of the service daemon to
 tcpd.</para>
Index: basicnet/textweb/lynx/lynx-inst.xml
===================================================================
--- basicnet/textweb/lynx/lynx-inst.xml	(revision 52b9837fef8e339c07f568394b6714afdf880aad)
+++ basicnet/textweb/lynx/lynx-inst.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
@@ -2,8 +2,5 @@
 <title>Installation of lynx</title>
 
-<para>Install lynx by running the following commands.  If you don't have
-openssl or zlib, miss out the <userinput>--with-ssl</userinput> or
-<userinput>--with-zlib</userinput> part of the configure command as
-appropriate.</para>
+<para>Install lynx by running the following commands.</para>
 
 <para><screen><userinput>./configure --prefix=/usr --libdir=/etc --with-ssl --with-zlib &amp;&amp;
Index: content/databases/mysql/mysql-config.xml
===================================================================
--- content/databases/mysql/mysql-config.xml	(revision 52b9837fef8e339c07f568394b6714afdf880aad)
+++ content/databases/mysql/mysql-config.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
@@ -102,5 +102,6 @@
 chmod 755 /etc/rc.d/init.d/mysql</userinput></screen>
 
-<para>Create the symbolic links to this file in the relevant rc.d directory
+<para>Create the symbolic links to this file in the relevant
+<filename>rc.d</filename> directory
 with the following commands:</para>
 
Index: server/mail/exim/exim-exp.xml
===================================================================
--- server/mail/exim/exim-exp.xml	(revision 52b9837fef8e339c07f568394b6714afdf880aad)
+++ server/mail/exim/exim-exp.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
@@ -2,6 +2,5 @@
 <title>Installation command explanations</title>
 
-<para><screen><userinput>
-groupadd exim
+<para><screen><userinput>groupadd exim
 useradd -g exim exim</userinput></screen>
 Create the group and user exim which will run the exim
Index: server/mail/postfix/postfix-config.xml
===================================================================
--- server/mail/postfix/postfix-config.xml	(revision 52b9837fef8e339c07f568394b6714afdf880aad)
+++ server/mail/postfix/postfix-config.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
@@ -25,6 +25,5 @@
 non-root login identity so mail addressed to root can be forwarded to 
 you at the user level.  The <filename>main.cf</filename> file needs your fully qualified 
-hostname.  The <filename>master.cf</filename> needs to be modified to prevent your machine from 
-becoming a relay for unauthorized entities.  All of these edits can be done 
+hostname.  All of these edits can be done 
 with sed commands entered into the console with appropriate substitutions of 
 your non-root login name for [user] and your fully qualified hostname for 
Index: server/other/bind/bind-config.xml
===================================================================
--- server/other/bind/bind-config.xml	(revision 52b9837fef8e339c07f568394b6714afdf880aad)
+++ server/other/bind/bind-config.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
@@ -92,5 +92,5 @@
 <userinput>EOF</userinput></screen></para>
 
-<para>Create the rndc.conf with the following commands:</para>
+<para>Create the <filename>rndc.conf</filename> with the following commands:</para>
 <para><screen><userinput>cat &gt; /etc/rndc.conf &lt;&lt; "EOF"</userinput>
 key rndc_key {
@@ -105,5 +105,5 @@
 <userinput>EOF</userinput></screen></para>
 
-<para>Create or modify resolv.conf to use the new name server with the
+<para>Create or modify <filename>resolv.conf</filename> to use the new name server with the
 following commands: </para>
 <note><para>Replace yourdomain.com with your own valid domain
@@ -174,5 +174,5 @@
 <sect3><title>Testing BIND</title>
 <para>Test out the new BIND 9 installation.  First query the local
-host address with dig:</para>
+host address with <command>dig</command>:</para>
 <para><screen><userinput>dig -x 127.0.0.1</userinput></screen></para>
 <para>Now try an external name lookup, taking note of the speed
@@ -182,5 +182,6 @@
 dig beyond.linuxfromscratch.org</userinput></screen>
 You can see almost instantaneous results with the named caching
-lookups.  Consult bind-&bind-version;/doc/arm/Bv9ARM.html, the BIND
+lookups.  Consult
+<filename>bind-&bind-version;/doc/arm/Bv9ARM.html</filename>, the BIND
 Administrator Reference Manual for further configuration options.
 </para></sect3>
Index: server/other/cvsserver/cvsserver-inst.xml
===================================================================
--- server/other/cvsserver/cvsserver-inst.xml	(revision 52b9837fef8e339c07f568394b6714afdf880aad)
+++ server/other/cvsserver/cvsserver-inst.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
@@ -60,14 +60,15 @@
 
 <para>If you use inetd, the following command will add the pserver
-entry to /etc/inetd.conf:</para>
+entry to <filename>/etc/inetd.conf</filename>:</para>
 
 <para><screen><userinput>echo "2401  stream  tcp  nowait  root  /usr/bin/cvs cvs -f \
         --allow-root=/cvsroot pserver" &gt;&gt; /etc/inetd.conf</userinput></screen></para>
 
-<para>Issue a killall -HUP inetd to reread the changed inetd.conf
+<para>Issue a <userinput>killall -HUP inetd</userinput> to reread the changed
+<filename>inetd.conf</filename>
 file.</para>
 
 <para>If you use xinetd, the following command will add the pserver
-entry to /etc/xinetd.conf:</para>
+entry to <filename>/etc/xinetd.conf</filename>:</para>
 
 <para><screen><userinput>cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"</userinput>
@@ -84,5 +85,6 @@
      }
 <userinput>EOF</userinput></screen></para>
-<para>Issue a killall -HUP xinetd to reread the changed xinetd.conf
+<para>Issue a <userinput>killall -HUP xinetd</userinput> to reread the changed
+<filename>xinetd.conf</filename>
 file.</para>
 
Index: server/other/leafnode/leafnode-exp.xml
===================================================================
--- server/other/leafnode/leafnode-exp.xml	(revision 52b9837fef8e339c07f568394b6714afdf880aad)
+++ server/other/leafnode/leafnode-exp.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
@@ -10,7 +10,9 @@
 ignored.</para> 
 
-<para><userinput> --prefix=/usr</userinput> : Change the default installation directory of /usr/local.</para>
+<para><userinput> --prefix=/usr</userinput> : Change the default
+installation directory of <filename>/usr/local</filename>.</para>
 
-<para><userinput> --localstatedir=/var</userinput> : Change the default spool directory of /usr/var.</para>
+<para><userinput> --localstatedir=/var</userinput> : Change the default
+spool directory of <filename>/usr/var</filename>.</para>
 
 <para><userinput> --sysconfdir=/etc/news</userinput> : leafnode reads its configuration data from an file called
Index: server/other/openldap/openldap-desc.xml
===================================================================
--- server/other/openldap/openldap-desc.xml	(revision 52b9837fef8e339c07f568394b6714afdf880aad)
+++ server/other/openldap/openldap-desc.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
@@ -3,5 +3,5 @@
 
 <para>The OpenLDAP package contains <userinput>slapd</userinput>,
-<userinput>slurpd</userinput>, <filename>LDAP</filename> libraries and
+<userinput>slurpd</userinput>, <filename>libldap</filename> libraries and
 various utilities, tools, and sample clients.</para>
 
Index: server/other/openldap/openldap-exp.xml
===================================================================
--- server/other/openldap/openldap-exp.xml	(revision 52b9837fef8e339c07f568394b6714afdf880aad)
+++ server/other/openldap/openldap-exp.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
@@ -3,11 +3,12 @@
 
 <para><userinput>--prefix=/usr</userinput> : Sets the prefix for almost all the file 
-paths to /usr.</para>
+paths to <filename class="directory">/usr</filename>.</para>
 
 <para><userinput>--sysconfdir=/etc</userinput> : Sets the configuration file directory to 
-avoid the default of /usr/etc.</para>
+avoid the default of <filename class="directory">/usr/etc</filename>.</para>
 
 <para><userinput>--libexecdir=/usr/sbin</userinput> : Puts the server executables in 
-/usr/sbin instead of /usr/libexec.</para>
+<filename class="directory">/usr/sbin</filename> instead of <filename
+class="directory">/usr/libexec</filename>.</para>
 
 <para><userinput>--enable-ldbm</userinput> : Enable the most recent version of the Berkeley DB.</para> 
Index: server/other/openssh/openssh-config.xml
===================================================================
--- server/other/openssh/openssh-config.xml	(revision 52b9837fef8e339c07f568394b6714afdf880aad)
+++ server/other/openssh/openssh-config.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
@@ -65,5 +65,6 @@
 chmod 755 /etc/rc.d/init.d/sshd</userinput></screen></para>
 
-<para>Create the symbolic links to this file in the relevant rc.d directories with the following commands:
+<para>Create the symbolic links to this file in the relevant <filename
+class="directory">rc.d</filename> directories with the following commands:
 <screen><userinput>cd /etc/rc.d/init.d &amp;&amp;
 ln -sf ../init.d/sshd ../rc0.d/K30sshd &amp;&amp;
Index: server/other/openssh/openssh-exp.xml
===================================================================
--- server/other/openssh/openssh-exp.xml	(revision 52b9837fef8e339c07f568394b6714afdf880aad)
+++ server/other/openssh/openssh-exp.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
@@ -3,5 +3,5 @@
 
 <para><userinput>--sysconfigdir=/etc/ssh</userinput> : This prevents the 
-configuration files from going to /usr/etc.</para>
+configuration files from going to <filename>/usr/etc</filename>.</para>
 
 <para><userinput>--with-md5-passwords</userinput> : This is required
@@ -12,5 +12,5 @@
 
 <para><userinput>--libexecdir=/usr/sbin</userinput> : OpenSSH puts
-programs called by programs in /usr/libexec.  sftp-server is a sshd
+programs called by programs in <filename class="directory">/usr/libexec</filename>.  sftp-server is a sshd
 utility and ssh-askpass is a ssh-add utility that is installed as a
 link to X11-ssh-askpass.  Both of these should go in <filename
Index: server/other/samba/samba-inst.xml
===================================================================
--- server/other/samba/samba-inst.xml	(revision 52b9837fef8e339c07f568394b6714afdf880aad)
+++ server/other/samba/samba-inst.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
@@ -4,5 +4,6 @@
 <para>Install Samba by running the following commands:</para>
 <note><para>
-Samba is installed from the samba-&samba-version;/source directory.
+Samba is installed from the <filename
+class="directory">samba-&samba-version;/source</filename> directory.
 </para></note>
 
Index: x/installing/xfree86/xfree86-intro.xml
===================================================================
--- x/installing/xfree86/xfree86-intro.xml	(revision 52b9837fef8e339c07f568394b6714afdf880aad)
+++ x/installing/xfree86/xfree86-intro.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
@@ -39,5 +39,6 @@
 diff md5sums SUMS.md5sum</screen>
 The only differences you should see are for <filename>README</filename>, 
-<filename>doctools-1.3.1.tgz</filename>, and utils-1.1.0.tgz files if you did
+<filename>doctools-1.3.1.tgz</filename>, and
+<filename>utils-1.1.0.tgz</filename> files if you did
 not download them.
 </para>
Index: x/lib/lesstif/lesstif-config.xml
===================================================================
--- x/lib/lesstif/lesstif-config.xml	(revision 52b9837fef8e339c07f568394b6714afdf880aad)
+++ x/lib/lesstif/lesstif-config.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
@@ -12,5 +12,6 @@
 <sect2><title>Testing Lesstif</title>
 <para>It is advisable to test the installation of lesstif with the
-test suite located in lesstif-&lesstif-version;/test.  It is not
+test suite located in
+<filename>lesstif-&lesstif-version;/test</filename>.  It is not
 required to install any of the resulting binaries to validate the
 installation, the following commands, executed in
