Index: server/other/bind.xml
===================================================================
--- server/other/bind.xml	(revision 19234f156373b47212a169568319e2cafe967abf)
+++ server/other/bind.xml	(revision 40330fcd2fe93432069ade921101831ce0f2220b)
@@ -1,5 +1,5 @@
 <sect1 id="bind" xreflabel="bind-&bind-version;">
 <?dbhtml filename="bind.html" dir="server"?>
-<title>BIND &bind-version;</title>
+<title><acronym>BIND</acronym>-&bind-version;</title>
 
 &bind-intro;
Index: server/other/cvsserver/cvsserver-intro.xml
===================================================================
--- server/other/cvsserver/cvsserver-intro.xml	(revision 19234f156373b47212a169568319e2cafe967abf)
+++ server/other/cvsserver/cvsserver-intro.xml	(revision 40330fcd2fe93432069ade921101831ce0f2220b)
@@ -5,7 +5,8 @@
 a <acronym>CVS</acronym> server.</para>
 
-<screen>CVS server depends on: 
-<xref linkend="cvs"/> and <xref linkend="openssh"/>
-</screen>
+<sect3><title><application>template</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="cvs"/> and <xref linkend="openssh"/></para></sect4>
+</sect3>
 
 </sect2>
Index: server/other/dhcp.xml
===================================================================
--- server/other/dhcp.xml	(revision 19234f156373b47212a169568319e2cafe967abf)
+++ server/other/dhcp.xml	(revision 40330fcd2fe93432069ade921101831ce0f2220b)
@@ -1,5 +1,5 @@
-<sect1 id="dhcp" xreflabel="dhcp-&dhcp-version;">
+<sect1 id="dhcp" xreflabel="DHCP-&dhcp-version;">
 <?dbhtml filename="dhcp.html" dir="server"?>
-<title>dhcp-&dhcp-version;</title>
+<title><acronym>DHCP</acronym>-&dhcp-version;</title>
 
 &dhcp-intro;
Index: server/other/dhcp/dhcp-config.xml
===================================================================
--- server/other/dhcp/dhcp-config.xml	(revision 19234f156373b47212a169568319e2cafe967abf)
+++ server/other/dhcp/dhcp-config.xml	(revision 40330fcd2fe93432069ade921101831ce0f2220b)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring dhcp</title>
+<title>Configuring <application><acronym>DHCP</acronym></application></title>
 
 <sect3><title>Config files</title>
@@ -8,15 +8,16 @@
 <sect3><title>Configuration Information</title>
 
-<para>Information on configuring the dhcp client can be found in
-Chapter 14.</para>
+<para>Information on configuring the <acronym>DHCP</acronym> client can be 
+found in Chapter 14.</para>
 
-<para>Note that you only want to start the dhcp server if you want to
-issue LAN addresses over your network.  The dhcp client doesn't need
-this script to be used.  Also note that this script is coded for the
-'eth1' INTERFACE, which may need to be modified for your hardware
-configuration. With that in mind the dhcp init.d script can be created
+<para>Note that you only want to start the <acronym>DHCP</acronym> server if 
+you want to issue <acronym>LAN</acronym> addresses over your network.  The 
+<acronym>DHCP</acronym> client doesn't need this script to be used.  Also note 
+that this script is coded for the <emphasis role="strong">eth1</emphasis> 
+interface, which may need to be modified for your hardware configuration. 
+With that in mind the <command>dhcp</command> init.d script can be created
 using the following commands.</para>
 
-<para><screen><userinput>cat &gt; /etc/rc.d/init.d/dhcp &lt;&lt; "EOF"</userinput>
+<screen><userinput><command>cat &gt; /etc/rc.d/init.d/dhcp &lt;&lt; "EOF"</command>
 #!/bin/sh
 # Begin $rc_base/init.d/dhcp
@@ -61,18 +62,18 @@
 
 # End $rc_base/init.d/dhcp
-<userinput>EOF
-chmod 755 /etc/rc.d/init.d/dhcp</userinput></screen></para>
+<command>EOF
+chmod 755 /etc/rc.d/init.d/dhcp</command></userinput></screen>
 
 <para>The lease file must exist on startup.  The following command will
 satisfy that requirement:</para>
 
-<para><screen><userinput>touch /var/state/dhcp/dhcpd.leases</userinput></screen></para>
+<screen><userinput><command>touch /var/state/dhcp/dhcpd.leases</command></userinput></screen>
 
 <para>The follow commands will create a base configuration file for a
-dhcp server.  There are several options that you may want to
-add (information that is passed back to the dhcp client) and those are
-covered in the man pages for <filename>dhcp.conf</filename>.</para>
+<acronym>DHCP</acronym> server.  There are several options that you may want to
+add (information that is passed back to the <acronym>DHCP</acronym> client) and 
+those are covered in the man pages for <filename>dhcp.conf</filename>.</para>
 
-<para><screen><userinput>cat &gt; /etc/dhcpd.conf &lt;&lt; "EOF"</userinput>
+<screen><userinput><command>cat &gt; /etc/dhcpd.conf &lt;&lt; "EOF"</command>
 default-lease-time 72000;
 max-lease-time 144000;
@@ -84,5 +85,5 @@
   option routers 192.168.5.1;
 }
-<userinput>EOF</userinput></screen></para>
+<command>EOF</command></userinput></screen>
 
 <para>All addresses should be changed to meet your circumstance.</para>
Index: server/other/dhcp/dhcp-desc.xml
===================================================================
--- server/other/dhcp/dhcp-desc.xml	(revision 19234f156373b47212a169568319e2cafe967abf)
+++ server/other/dhcp/dhcp-desc.xml	(revision 40330fcd2fe93432069ade921101831ce0f2220b)
@@ -2,7 +2,7 @@
 <title>Contents</title>
 
-<para>The dhcp package contains <userinput>dhclient</userinput>,
-<userinput>dhcpd</userinput>
-and <userinput>dhcrelay</userinput>.</para>
+<para>The <application><acronym>DHCP</acronym></application> package contains 
+<command>dhclient</command>, <command>dhcpd</command> and <command>dhcrelay
+</command>.</para>
 
 </sect2>
@@ -11,15 +11,17 @@
 
 <sect3><title>dhclient</title>
-<para>dhclient is the implementation of the DHCP client.</para></sect3>
+<para><command>dhclient</command> is the implementation of the
+<acronym>DHCP</acronym> client.</para></sect3>
 
 <sect3><title>dhcpd</title>
-<para>dhcpd implements Dynamic Host Configuration Protocol (DHCP)
-and Internet Bootstrap Protocol (BOOTP) requests for network
-addresses.</para></sect3>
+<para><command>dhcpd</command> implements Dynamic Host Configuration Protocol 
+(<acronym>DHCP</acronym>) and Internet Bootstrap Protocol
+(<acronym>BOOTP</acronym>) requests for network addresses.</para></sect3>
 
 <sect3><title>dhcrelay</title>
-<para>dhcrelay provides a means to accept DHCP and BOOTP requests on a
-subnet without a DHCP server and relay them to a DHCP server on another
-subnet.</para></sect3>
+<para><command>dhcrelay</command> provides a means to accept <acronym>DHCP
+</acronym> and <acronym>BOOTP</acronym> requests on a subnet without a 
+<acronym>DHCP</acronym> server and relay them to a <acronym>DHCP</acronym> 
+server on another subnet.</para></sect3>
 
 </sect2>
Index: server/other/dhcp/dhcp-exp.xml
===================================================================
--- server/other/dhcp/dhcp-exp.xml	(revision 19234f156373b47212a169568319e2cafe967abf)
+++ server/other/dhcp/dhcp-exp.xml	(revision 40330fcd2fe93432069ade921101831ce0f2220b)
@@ -2,5 +2,5 @@
 <title>Command explanations</title>
 
-<para><userinput>LIBDIR=/usr/lib INCDIR=/usr/include</userinput> : This
+<para><command>LIBDIR=/usr/lib INCDIR=/usr/include</command> : This
 command installs the library and include files in <filename
 class="directory">/usr</filename> instead of <filename
Index: server/other/dhcp/dhcp-inst.xml
===================================================================
--- server/other/dhcp/dhcp-inst.xml	(revision 19234f156373b47212a169568319e2cafe967abf)
+++ server/other/dhcp/dhcp-inst.xml	(revision 40330fcd2fe93432069ade921101831ce0f2220b)
@@ -1,10 +1,13 @@
 <sect2>
-<title>Installation of dhcp</title>
+<title>Installation of <application><acronym>DHCP</acronym></application></title>
 
-<para>Install dhcp by running the following commands:</para>
+<note><para>You must have Packet Socket support compiled in the kernel and 
+Socket Filtering either compiled in or as a kernel module.</para></note>
+                                                                                
+<para>Install <application><acronym>DHCP</acronym></application> by running the following commands:</para>
 
-<para><screen><userinput>./configure &amp;&amp;
+<screen><userinput><command>./configure &amp;&amp;
 make &amp;&amp;
-make LIBDIR=/usr/lib INCDIR=/usr/include install</userinput></screen></para>
+make LIBDIR=/usr/lib INCDIR=/usr/include install</command></userinput></screen>
 
 </sect2>
Index: server/other/dhcp/dhcp-intro.xml
===================================================================
--- server/other/dhcp/dhcp-intro.xml	(revision 19234f156373b47212a169568319e2cafe967abf)
+++ server/other/dhcp/dhcp-intro.xml	(revision 40330fcd2fe93432069ade921101831ce0f2220b)
@@ -1,19 +1,25 @@
 <sect2>
-<title>Introduction to dhcp</title>
+<title>Introduction to <application><acronym>DHCP</acronym></application></title>
 
-<screen>Download location (HTTP):       <ulink url="&dhcp-download-http;"/>
-Download location (FTP):        <ulink url="&dhcp-download-ftp;"/>
-Version used:                   &dhcp-version;
-Package size:                   &dhcp-size;
-Estimated Disk space required:  &dhcp-buildsize;</screen>
+<para>The <application><acronym>DHCP</acronym></application> package contains 
+both the client and server programs for <acronym>DHCP</acronym>.
+<command>dhclient</command> (the client) is useful for connecting your computer 
+to a network which uses <acronym>DHCP</acronym> to assign network addresses. 
+<command>dhcpd</command> (the server) is useful for assigning network addresses 
+on your private network.</para>
 
-<para>The dhcp package contains both the client and server programs for
-DHCP. dhclient (the client) is useful for connecting your computer to a
-network which uses DHCP to assign network addresses. dhcpd (the server)
-is useful for assigning network addresses on your private network.</para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&dhcp-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&dhcp-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &dhcp-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&dhcp-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&dhcp-time;</para></listitem></itemizedlist>
+</sect3>
 
-<screen>dhcp needs nothing to compile but you must have Packet Socket
-support compiled in the kernel and Socket Filtering either compiled in
-or as a kernel module to use it.</screen>
 
 </sect2>
Index: server/other/leafnode.xml
===================================================================
--- server/other/leafnode.xml	(revision 19234f156373b47212a169568319e2cafe967abf)
+++ server/other/leafnode.xml	(revision 40330fcd2fe93432069ade921101831ce0f2220b)
@@ -1,5 +1,5 @@
-<sect1 id="leafnode" xreflabel="leafnode-&leafnode-version;">
+<sect1 id="leafnode" xreflabel="Leafnode-&leafnode-version;">
 <?dbhtml filename="leafnode.html" dir="server"?>
-<title>leafnode-&leafnode-version;</title>
+<title>Leafnode-&leafnode-version;</title>
 
 &leafnode-intro;
Index: server/other/leafnode/leafnode-config.xml
===================================================================
--- server/other/leafnode/leafnode-config.xml	(revision 19234f156373b47212a169568319e2cafe967abf)
+++ server/other/leafnode/leafnode-config.xml	(revision 40330fcd2fe93432069ade921101831ce0f2220b)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring leafnode</title>
+<title>Configuring <application>Leafnode</application></title>
 
 <sect3><title>Config files</title>
@@ -7,5 +7,6 @@
 <filename>/etc/xinetd.conf</filename></para>
 
-<para>leafnode may be configured to use inetd by adding a leafnode entry
+<para><application>Leafnode</application> may be configured to use
+<command>inetd</command> by adding an entry
 to the <filename>/etc/inetd.conf</filename> file with the following
 command:</para>
@@ -14,9 +15,9 @@
 &gt;&gt; /etc/inetd.conf</command></userinput></screen>
 
-<para>Alternatively, leafnode may be configured to use xinetd by 
-adding a leafnode entry to the <filename>/etc/xinetd.conf</filename>
-file with the following command:</para>
+<para>Alternatively, <application>Leafnode</application> may be configured to 
+use <command>xinetd</command> by adding an entry to the <filename>
+/etc/xinetd.conf</filename> file with the following command:</para>
 
-<screen><userinput><command>cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"
+<screen><userinput><command>cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF" </command>
         service nntp
         {
@@ -31,5 +32,5 @@
            per_source      = 3
         }
-EOF</command></userinput></screen>
+<command>EOF</command></userinput></screen>
 
 <para>The <filename>/etc/news/config</filename> file must be
@@ -39,14 +40,14 @@
 and save the original for reference: </para>
 
-<screen><userinput><command>cp /etc/news/config.example /etc/news/config</command>
-</userinput></screen>
+<screen><userinput><command>cp /etc/news/config.example /etc/news/config
+</command></userinput></screen>
 
 <para>Change the
-<screen><userinput><command>server = </command></userinput></screen>
+<screen><userinput>server = </userinput></screen>
 entry to reflect your news provider.</para>
 
-<para>The <envar>NNTPSERVER</envar> environment variable must be set to 127.0.0.1 to
-prevent news clients from reading news from the upstream feed, add the
-following to <filename>/etc/profile</filename> or
+<para>The <envar>NNTPSERVER</envar> environment variable must be set to 
+127.0.0.1 to prevent news clients from reading news from the upstream feed, 
+add the following to <filename>/etc/profile</filename> or
 <filename>$HOME/.bash_profile</filename>:</para>
 
Index: server/other/leafnode/leafnode-desc.xml
===================================================================
--- server/other/leafnode/leafnode-desc.xml	(revision 19234f156373b47212a169568319e2cafe967abf)
+++ server/other/leafnode/leafnode-desc.xml	(revision 40330fcd2fe93432069ade921101831ce0f2220b)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The leafnode package contains
+<para>The <application>Leafnode</application> package contains
 <command>leafnode-version</command>,
 <command>leafnode</command>,
Index: server/other/leafnode/leafnode-inst.xml
===================================================================
--- server/other/leafnode/leafnode-inst.xml	(revision 19234f156373b47212a169568319e2cafe967abf)
+++ server/other/leafnode/leafnode-inst.xml	(revision 40330fcd2fe93432069ade921101831ce0f2220b)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Installation of <application>leafnode</application></title>
+<title>Installation of <application>Leafnode</application></title>
 
 <para>Create the group and user news, if not present:</para>
@@ -7,5 +7,6 @@
 useradd -g news news</command></userinput></screen>
 
-<para>Install <application>leafnode</application> by running the following commands:</para>
+<para>Install <application>Leafnode</application> by running the following 
+commands:</para>
 
 <screen><userinput><command>./configure --prefix=/usr --localstatedir=/var \
Index: server/other/leafnode/leafnode-intro.xml
===================================================================
--- server/other/leafnode/leafnode-intro.xml	(revision 19234f156373b47212a169568319e2cafe967abf)
+++ server/other/leafnode/leafnode-intro.xml	(revision 40330fcd2fe93432069ade921101831ce0f2220b)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Introduction to <application>leafnode</application></title>
+<title>Introduction to <application>Leafnode</application></title>
 
-<para><application>leafnode</application> is an <acronym>NNTP</acronym>
+<para><application>Leafnode</application> is an <acronym>NNTP</acronym>
 server designed for small sites to provide a local USENET spool.</para>
 
@@ -14,5 +14,5 @@
 </sect3>
 
-<sect3><title><application>leafnode</application> dependencies</title>
+<sect3><title><application>Leafnode</application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="pcre"/>
Index: server/other/openssh.xml
===================================================================
--- server/other/openssh.xml	(revision 19234f156373b47212a169568319e2cafe967abf)
+++ server/other/openssh.xml	(revision 40330fcd2fe93432069ade921101831ce0f2220b)
@@ -1,5 +1,5 @@
 <sect1 id="openssh" xreflabel="OpenSSH-&openssh-version;">
 <?dbhtml filename="openssh.html" dir="server"?>
-<title>OpenSSH-&openssh-version;</title>
+<title>Open<acronym>SSH</acronym>-&openssh-version;</title>
 
 &openssh-intro;
Index: server/other/samba.xml
===================================================================
--- server/other/samba.xml	(revision 19234f156373b47212a169568319e2cafe967abf)
+++ server/other/samba.xml	(revision 40330fcd2fe93432069ade921101831ce0f2220b)
@@ -1,3 +1,3 @@
-<sect1 id="samba" xreflabel="samba-&samba-version;">
+<sect1 id="samba" xreflabel="Samba-&samba-version;">
 <?dbhtml filename="samba.html" dir="server"?>
 <title>Samba-&samba-version;</title>
Index: server/other/samba/samba-config-exp.xml
===================================================================
--- server/other/samba/samba-config-exp.xml	(revision 19234f156373b47212a169568319e2cafe967abf)
+++ server/other/samba/samba-config-exp.xml	(revision 40330fcd2fe93432069ade921101831ce0f2220b)
@@ -1,36 +1,38 @@
 <sect2>
 <title>Configuration command explanations</title>
-<para><userinput>cat &gt; /etc/samba/smb.conf &lt;&lt; "EOF"</userinput>
-: Create a default Samba configuration file.  This configuration will
-allow Samba to act as a Primary Domain Controller for a Microsoft
-Windows based network.  If this is not desired, a simpler default
-smb.conf file is bundled with the Samba distribution.  See the
+<para><command>cat &gt; /etc/samba/smb.conf &lt;&lt; "EOF"</command>
+: Create a default <application>Samba</application> configuration file.  This 
+configuration will allow <application>Samba</application> to act as a Primary 
+Domain Controller for a Microsoft Windows based network.  If this is not 
+desired, a simpler default <filename>smb.conf</filename> file is bundled with 
+the Samba distribution.  See the 
 <filename>samba&samba-version;/examples/smb.conf.default</filename>
 file.  Primary Domain Controller configuration is slightly more
 complicated than ordinary member server configuration, so instructions
-for PDC configuration will be given here.</para>
+for <acronym>PDC</acronym> configuration will be given here.</para>
 
 
-<para><userinput>cat &gt; /etc/rc.d/init.d/samba &lt;&lt;
-"EOF"</userinput> : Create the Samba boot script, used to start and stop Samba
-automatically on machine startup and shutdown.</para>
+<para><command>cat &gt; /etc/rc.d/init.d/samba &lt;&lt;
+"EOF"</command> : Create the <application>Samba</application> boot script, 
+used to start and stop <application>Samba</application> automatically on 
+machine startup and shutdown.</para>
 
-<para><screen><userinput>/usr/sbin/useradd -g 100 -d /dev/null -c \
-    "Win2k Server" -s /bin/false win2kbox$</userinput></screen>
+<para><screen><command>/usr/sbin/useradd -g 100 -d /dev/null -c \
+    "Win2k Server" -s /bin/false win2kbox$</command></screen>
 This command creates a machine trust account, necessary only for
-Windows 2000/NT servers to authenticate to our new PDC.  Machine trust
-accounts are not necessary for Win95/98 clients.</para>
+Windows 2000/NT servers to authenticate to our new <acronym>PDC</acronym>.  
+Machine trust accounts are not necessary for Win95/98 clients.</para>
 
-<para>
-<userinput>echo "swat 901/tcp" &gt;&gt; /etc/services</userinput> : Register the swat service to run on port 901.</para> 
+<para><command>echo "swat 901/tcp" &gt;&gt; /etc/services</command> : Register 
+the swat service to run on port 901.</para> 
 
-<para><userinput>echo "swat stream tcp nowait.400 root /usr/sbin/swat swat" &gt;&gt;
-/etc/inetd.conf</userinput> : Instruct inetd where to find and how to
+<para><command>echo "swat stream tcp nowait.400 root /usr/sbin/swat swat" 
+&gt;&gt; /etc/inetd.conf</command> : Instruct <command>inetd</command> where to find and how to
 run swat.</para> 
 
-<para>
-<userinput>ln -s  /etc/rc.d/init.d/samba
-/etc/rc.d/rc3.d/S600samba</userinput> etc. : Create the Samba boot scripts, used to start and stop Samba
-automatically on machine startup and shutdown.</para>
+<para><command>ln -s  /etc/rc.d/init.d/samba /etc/rc.d/rc3.d/S600samba
+</command> etc. : Create the <application>Samba</application> boot scripts, 
+used to start and stop <application>Samba</application> automatically on 
+machine startup and shutdown.</para>
 </sect2>
 
Index: server/other/samba/samba-config.xml
===================================================================
--- server/other/samba/samba-config.xml	(revision 19234f156373b47212a169568319e2cafe967abf)
+++ server/other/samba/samba-config.xml	(revision 40330fcd2fe93432069ade921101831ce0f2220b)
@@ -1,7 +1,7 @@
 <sect2>
-<title>Configuring Samba</title>
-<para>We will configure one Samba server (SAMBABOX) to act as a primary
-domain controller, as well as configure one domain client running
-Windows 2000 Server(WIN2KBOX) and acting as a member server of the
+<title>Configuring <application>Samba</application></title>
+<para>We will configure one <application>Samba</application> server (SAMBABOX) 
+to act as a primary domain controller, as well as configure one domain client 
+running Windows 2000 Server(WIN2KBOX) and acting as a member server of the
 domain.  Detailed instructions will be given for adding WIN2KBOX to
 the domain due to the extra steps necessary.  Instructions for adding
@@ -9,5 +9,5 @@
 documentation by pointing a web browser to:</para>
 
-<screen><userinput><command>file:///usr/share/samba/swat/using_samba/ch03_01.html#ch03-55770.</command></userinput></screen>
+<screen><userinput>file:///usr/share/samba/swat/using_samba/ch03_01.html#ch03-55770.</userinput></screen>
 
 <sect3><title>Config files</title>
@@ -15,5 +15,6 @@
 <filename>/etc/rc.d/init.d/samba </filename></para>
 
-<para>First we set up some directories needed by Samba:</para>
+<para>First we set up some directories needed by <application>Samba
+</application>:</para>
 <screen><userinput><command>mkdir /var/lib/samba &amp;&amp;
 mkdir /var/lib/samba/netlogon &amp;&amp;
@@ -22,5 +23,5 @@
 chmod -R 1777 /var/lib/samba</command></userinput></screen>
 
-<para>And the Samba configuration file: </para>
+<para>And the <application>Samba</application> configuration file: </para>
 <screen><userinput><command>cat &gt; /etc/samba/smb.conf &lt;&lt; "EOF"</command>
 [global]
@@ -68,5 +69,5 @@
 smbpasswd -a -m win2kbox</command></userinput></screen>
 
-<para>Create the Samba boot script:</para>
+<para>Create the <application>Samba</application> boot script:</para>
 <screen><userinput><command>cat &gt; /etc/rc.d/init.d/samba &lt;&lt; "EOF"</command>
 #!/bin/bash
@@ -121,15 +122,17 @@
 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>Now, we'll use our new boot script to start <application>Samba
+</application>: </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>We have to add the SAMBABOX root account to the <application>Samba
+</application> user list first in order to join WIN2KBOX to the DOMAIN01 
+domain: </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>After starting <application>Samba</application> and adding root to
+the <application>Samba</application> 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>
 <screen><userinput>1.  Right click on My Computer.
 2.  Click on Properties.
@@ -186,11 +189,12 @@
 <command>EOF</command></userinput></screen>
 
-<para>The Samba Web Administration Tool, swat, can be launched with the
-following command on SAMBABOX: </para>
+<para>The Samba Web Administration Tool, <acronym>SWAT</acronym>, can be 
+launched with the following command on SAMBABOX: </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>
-<para>The lynx browser is used in this demonstration, but is not
-necessary.</para></sect3>
+<note><para>Be sure <command>inetd</command> is running, and issue a
+<command>killall -HUP inetd</command> before starting
+<acronym>SWAT</acronym>.</para></note>
+<para>The <application>Lynx</application> browser is used in this 
+demonstration, but is not necessary.</para></sect3>
 
 </sect2>
Index: server/other/samba/samba-desc.xml
===================================================================
--- server/other/samba/samba-desc.xml	(revision 19234f156373b47212a169568319e2cafe967abf)
+++ server/other/samba/samba-desc.xml	(revision 40330fcd2fe93432069ade921101831ce0f2220b)
@@ -2,23 +2,23 @@
 <title>Contents</title>
 
-<para>The Samba package contains
-<userinput>make_smbcodepage</userinput>,
-<userinput>make_unicodemap</userinput>,
-<userinput>mount.smbfs</userinput>,
-<userinput>nmbd</userinput>,
-<userinput>nmblookup</userinput>,
-<userinput>rpcclient</userinput>,
-<userinput>smbcacls</userinput>,
-<userinput>smbclient</userinput>,
-<userinput>smbcontrol</userinput>,
-<userinput>smbd</userinput>,
-<userinput>smbpasswd</userinput>,
-<userinput>smbspool</userinput>,
-<userinput>smbstatus</userinput>,
-<userinput>swat</userinput>,
-<userinput>testparm</userinput>,
-<userinput>testprns</userinput>,
-<userinput>wbinfo</userinput> and
-<userinput>winbindd.</userinput></para>
+<para>The <application>Samba</application> package contains
+<command>make_smbcodepage</command>,
+<command>make_unicodemap</command>,
+<command>mount.smbfs</command>,
+<command>nmbd</command>,
+<command>nmblookup</command>,
+<command>rpcclient</command>,
+<command>smbcacls</command>,
+<command>smbclient</command>,
+<command>smbcontrol</command>,
+<command>smbd</command>,
+<command>smbpasswd</command>,
+<command>smbspool</command>,
+<command>smbstatus</command>,
+<command>swat</command>,
+<command>testparm</command>,
+<command>testprns</command>,
+<command>wbinfo</command> and
+<command>winbindd.</command></para>
 
 </sect2>
@@ -27,48 +27,57 @@
 
 <sect3><title>make_smbcodepage</title>
-<para>make_smbcodepage converts text descriptions of code pages to
-binary code page files and vice versa.</para></sect3>
+<para><command>make_smbcodepage</command> converts text descriptions of code 
+pages to binary code page files and vice versa.</para></sect3>
 <sect3><title>make_unicodemap</title>
-<para>make_unicodemap converts text unicode map files to binary, for
-use in mapping characters to 16 bit unicode.</para></sect3>
+<para><command>make_unicodemap</command> converts text unicode map files to 
+binary, for use in mapping characters to 16 bit unicode.</para></sect3>
 <sect3><title>mount.smbfs</title>
-<para>mount.smbfs provides /bin/mount with a way to mount remote
-windows (or samba) fileshares.</para></sect3>
+<para><command>mount.smbfs</command> provides <command>/bin/mount</command> 
+with a way to mount remote windows (or samba) fileshares.</para></sect3>
 <sect3><title>nmbd</title>
-<para>nmbd is the Samba NetBIOS name server.</para></sect3>
+<para><command>nmbd</command> is the Samba Net<acronym>BIOS</acronym> name 
+server.</para></sect3>
 <sect3><title>nmblookup</title>
-<para>nmblookup is used to query NetBIOS names and map them to IP
+<para><command>nmblookup</command> is used to query
+Net<acronym>BIOS</acronym> names and map them to <acronym>IP</acronym>
 addresses.</para></sect3>
 <sect3><title>rpcclient</title>
-<para>rpcclient is used to execute MS-RPC client side
-functions.</para></sect3>
+<para><command>rpcclient</command> is used to execute
+MS-<acronym>RPC</acronym> client side functions.</para></sect3>
 <sect3><title>smbcacls</title>
-<para>smbcacls is used to manipulate NT access control
+<para><command>smbcacls</command> is used to manipulate NT access control
 lists.</para></sect3>
 <sect3><title>smbclient</title>
-<para>smbclient is a SMB/CIFS access utility, similar to
-FTP.</para></sect3>
+<para><command>smbclient</command> is a <acronym>SMB</acronym>/<acronym>CIFS
+</acronym> access utility, similar to <acronym>FTP</acronym>.</para></sect3>
 <sect3><title>smbcontrol</title>
-<para>smbcontrol is used to control running smbd, nmbd and winbindd
+<para><command>smbcontrol</command> is used to control running <command>smbd
+</command>, <command>nmbd</command> and <command>winbindd</command>
 daemons.</para></sect3>
 <sect3><title>smbd</title>
-<para>smbd is the main Samba daemon.</para></sect3>
+<para><command>smbd</command> is the main
+<application>Samba</application> daemon.</para></sect3>
 <sect3><title>smbpasswd</title>
-<para>smbpasswd changes a user's Samba password.</para></sect3>
+<para><command>smbpasswd</command> changes a user's <application>Samba
+</application> password.</para></sect3>
 <sect3><title>smbspool</title>
-<para>smbspool sends a print job to an SMB printer.</para></sect3>
+<para><command>smbspool</command> sends a print job to an <acronym>SMB
+</acronym> printer.</para></sect3>
 <sect3><title>smbstatus</title>
-<para>smbstatus reports current Samba connections.</para></sect3>
+<para><command>smbstatus</command> reports current
+<application>Samba</application> connections.</para></sect3>
 <sect3><title>swat</title>
-<para>swat is the Samba Web Administration Tool.</para></sect3>
+<para><command>swat</command> is the Samba Web Administration Tool.</para>
+</sect3>
 <sect3><title>testparm</title>
-<para>testparm checks an smb.conf file for proper
-syntax.</para></sect3>
+<para><command>testparm</command> checks an <filename>smb.conf</filename> file 
+for proper syntax.</para></sect3>
 <sect3><title>testprns</title>
-<para>testprns tests printer names.</para></sect3>
+<para><command>testprns</command> tests printer names.</para></sect3>
 <sect3><title>wbinfo</title>
-<para>wbinfo queries a running winbindd daemon.</para></sect3>
+<para><command>wbinfo</command> queries a running <command>winbindd</command> 
+daemon.</para></sect3>
 <sect3><title>winbindd</title>
-<para>winbindd resolves names from NT servers.</para></sect3>
+<para><command>winbindd</command> resolves names from NT servers.</para></sect3>
 </sect2>
 
Index: server/other/samba/samba-exp.xml
===================================================================
--- server/other/samba/samba-exp.xml	(revision 19234f156373b47212a169568319e2cafe967abf)
+++ server/other/samba/samba-exp.xml	(revision 40330fcd2fe93432069ade921101831ce0f2220b)
@@ -2,22 +2,27 @@
 <title>Installation command explanations</title>
 
-<para><screen><userinput>mkdir -p /etc/samba/private
-mkdir -p /var/cache/samba</userinput></screen>
-Directories needed for proper operation of the smbd and nmbd daemons.</para>
+<para><screen><command>mkdir -p /etc/samba/private
+mkdir -p /var/cache/samba</command></screen>
+Directories needed for proper operation of the <command>smbd</command>
+and <command>nmbd</command> daemons.</para>
 
-<para><userinput>--prefix=/usr</userinput> : Sets the prefix for almost
+<para><command>--prefix=/usr</command> : Sets the prefix for almost
 all the file paths to <filename>/usr</filename>.</para>
 
-<para><userinput>--sysconfdir=/etc</userinput> : Sets the configuration
+<para><command>--sysconfdir=/etc</command> : Sets the configuration
 file directory to avoid the default of <filename>/usr/etc</filename>.</para>
 
-<para><userinput>--localstatedir=/var</userinput> : Sets the variable
+<para><command>--localstatedir=/var</command> : Sets the variable
 data directory to avoid the default of <filename>/usr/var</filename>.</para>
 
-<para><userinput>--with-fhs</userinput> : Assigns all other file paths in a manner compliant with the Filesystem Hierarchy Standard.</para>
+<para><command>--with-fhs</command> : Assigns all other file paths in a manner 
+compliant with the Filesystem Hierarchy Standard (FHS).</para>
 
-<para><userinput>--with-smbmount</userinput> : Orders the creation of an extra binary for use by the mount command so that mounting remote SMB (windows) shares becomes no more complex than mounting remote NFS shares.</para>
+<para><command>--with-smbmount</command> : Orders the creation of an extra 
+binary for use by the <command>mount</command> command so that mounting remote 
+<acronym>SMB</acronym> (windows) shares becomes no more complex than mounting 
+remote <acronym>NFS</acronym> shares.</para>
 
-<para><userinput>rm -rf /usr/private</userinput> : Removes a directory
+<para><command>rm -rf /usr/private</command> : Removes a directory
 erroneously created by <filename>source/scripts/installbin.sh</filename> during the make install.</para>
 
Index: server/other/samba/samba-inst.xml
===================================================================
--- server/other/samba/samba-inst.xml	(revision 19234f156373b47212a169568319e2cafe967abf)
+++ server/other/samba/samba-inst.xml	(revision 40330fcd2fe93432069ade921101831ce0f2220b)
@@ -1,12 +1,13 @@
 <sect2>
-<title>Installation of Samba</title>
+<title>Installation of <application>Samba</application></title>
 
-<para>Install Samba by running the following commands:</para>
-<note><para>
-Samba is installed from the <filename
-class="directory">samba-&samba-version;/source</filename> directory.
+<para>Install <application>Samba</application> by running the following 
+commands:</para>
+
+<note><para><application>Samba</application> is installed from the 
+<filename class="directory">samba-&samba-version;/source</filename> directory.
 </para></note>
 
-<para><screen><userinput>mkdir -p /etc/samba/private &amp;&amp;
+<screen><userinput><command>mkdir -p /etc/samba/private &amp;&amp;
 mkdir -p /var/cache/samba &amp;&amp;
 ./configure \
@@ -23,5 +24,5 @@
 echo "swat 901/tcp" &gt;&gt; /etc/services &amp;&amp;
 echo "swat stream tcp nowait.400 root /usr/sbin/swat swat" &gt;&gt; \
-   /etc/inetd.conf</userinput></screen></para>
+   /etc/inetd.conf</command></userinput></screen>
 </sect2>
 
Index: server/other/samba/samba-intro.xml
===================================================================
--- server/other/samba/samba-intro.xml	(revision 19234f156373b47212a169568319e2cafe967abf)
+++ server/other/samba/samba-intro.xml	(revision 40330fcd2fe93432069ade921101831ce0f2220b)
@@ -1,12 +1,21 @@
 <sect2>
-<title>Introduction to Samba</title>
+<title>Introduction to <application>Samba</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&samba-download-http;"/>
-Download location (FTP):        <ulink url="&samba-download-ftp;"/>
-Version used:                   &samba-version;
-Package size:                   &samba-size;
-Estimated Disk space required:  &samba-buildsize;
-Estimated build time:           &samba-time;</screen>
+<para>The <application>Samba</application> package provides file and print 
+services to <acronym>SMB</acronym>/<acronym>CIFS</acronym> clients.</para>
 
-<para>The Samba package provides file and print services to SMB/CIFS
-clients.</para></sect2>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&samba-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&samba-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &samba-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&samba-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&samba-time;</para></listitem></itemizedlist>
+</sect3>
+
+
+</sect2>
