Index: server/mail/courier/courier-config.xml
===================================================================
--- server/mail/courier/courier-config.xml	(revision a8d6ef3ada5e91dea01119e40091bf6287051877)
+++ server/mail/courier/courier-config.xml	(revision 65df9fca7b49a35cec75c260931e9af291f3ede4)
@@ -131,6 +131,7 @@
 <screen><userinput>postmaster: <replaceable>[your administrator email]</replaceable></userinput></screen>
 
-<para>If you want to deny access from some hosts from sending mail you
-will need to edit the <filename>/etc/courier/smtpaccess/default</filename>.</para>
+<para>If you want to deny access from some hosts from sending mail, you
+will need to edit the
+<filename>/etc/courier/smtpaccess/default</filename> file.</para>
 
 <para>After the above steps are completed you will need to run the
@@ -187,5 +188,5 @@
 
 
-<para>This section will explain on how to create MailDirs for
+<para>This section will explain how to create MailDirs for
 your system users.</para>
 
@@ -294,9 +295,9 @@
 the easiest to use. It will automatically create missing data files, and 
 <acronym>SSL</acronym> certificates if they are missing. To install the 
-init.d file for <application>Courier</application> you will need to use the 
-follow commands:</para>
+init.d file for <application>Courier</application>, you will need to use the 
+following commands:</para>
 
 <screen><userinput><command>cp /usr/src/courier-&courier-version;/courier.sysvinit /etc/rc.d/init.d/courier &amp;&amp;
-chmod 755 /etc/rc.d/init.d/courier</command></userinput></screen>
+chmod 754 /etc/rc.d/init.d/courier</command></userinput></screen>
 
 <para>Create the symbolic links to this file in the relevant
Index: server/mail/courier/courier-desc.xml
===================================================================
--- server/mail/courier/courier-desc.xml	(revision a8d6ef3ada5e91dea01119e40091bf6287051877)
+++ server/mail/courier/courier-desc.xml	(revision 65df9fca7b49a35cec75c260931e9af291f3ede4)
@@ -89,9 +89,9 @@
 
 <sect3><title>lockmail</title>
-<para><command>lockmail</command> is a helper utility for working with mailbox files..</para></sect3>
+<para><command>lockmail</command> is a helper utility for working with mailbox files.</para></sect3>
 
 <sect3><title>mailbot</title>
 <para><command>mailbot</command> reads an E-mail message on standard input and creates an E-mail message
-replying to the original message's sender..</para></sect3>
+replying to the original message's sender.</para></sect3>
 
 <sect3><title>maildirkw</title>
@@ -107,27 +107,28 @@
 
 <sect3><title>makealiases</title>
-<para><command>makealiases</command> Build a list of aliases from <filename>/etc/courier/aliases</filename>
+<para><command>makealiases</command> Build a list of aliases from the <filename>/etc/courier/aliases</filename>
 or <filename>/etc/courier/aliasdir</filename> directories.</para></sect3>
 
 <sect3><title>makehosteddomains</title>
-<para><command>makehostedomains</command> Build a database of hosted domains from <filename>hosteddomains</filename>
-.</para></sect3>
+<para><command>makehostedomains</command> Build a database of hosted domains from <filename>hosteddomains</filename>.</para></sect3>
 
 <sect3><title>makepercentrelay</title>
-<para><command>makepercentrelay</command> Build a list of %-relayed domains from <filename>percentrelay.dir</filename>
+<para><command>makepercentrelay</command> Build a list of %-relayed
+domains from the <filename>percentrelay.dir</filename>
 directory.</para></sect3>
 
 <sect3><title>makesmtpaccess</title>
-<para><command>makesmtpacces</command> Build ESMTP server access file from <filename>/etc/courier/smtpaccess</filename>
+<para><command>makesmtpaccess</command> Build ESMTP server access file
+from the <filename>/etc/courier/smtpaccess</filename>
 directory.</para></sect3>
 
 <sect3><title>makesmtpaccess-msa</title>
-<para><command>makesmtpaccess-msa</command> Build ESMTP server access file from <filename>/etc/courier/smtpaccess</filename>
+<para><command>makesmtpaccess-msa</command> Build ESMTP server access
+file from the <filename>/etc/courier/smtpaccess</filename>
 directory. This esmtp list is for the MSA protocol.</para></sect3>
 
 <sect3><title>makeuucpneighbors</title>
 <para><command>makeuucpneighbors</command> Builds a list of
-<acronym>UUCP</acronym> recipient's using <filename>/etc/courier/uucpneighbors
-</filename>.</para></sect3>
+<acronym>UUCP</acronym> recipients using <filename>/etc/courier/uucpneighbors</filename>.</para></sect3>
 
 <sect3><title>reformail</title>
Index: server/mail/courier/courier-inst.xml
===================================================================
--- server/mail/courier/courier-inst.xml	(revision a8d6ef3ada5e91dea01119e40091bf6287051877)
+++ server/mail/courier/courier-inst.xml	(revision 65df9fca7b49a35cec75c260931e9af291f3ede4)
@@ -9,6 +9,6 @@
 useradd -c 'Courier Mail Server' -d /dev/null -g courier -s /bin/false courier</command></userinput></screen>
 
-<para> You also need to create a bin user. If you already have a user named bin
-this step can be safely ignored.</para>
+<para> You also need to create a bin user. If you already have a user
+named bin, this step can be safely ignored.</para>
 
 <screen><userinput><command>useradd -c 'bin' -d /dev/null -g bin -u 1 bin</command></userinput></screen>
@@ -18,5 +18,5 @@
 all the <application>Courier</application> <acronym>MTA</acronym> pid
 files will exist. This will allow <filename>courierfilter.pid</filename>
-to be created. Without the <command>courierfilter</command> running the
+to be created. Without the <command>courierfilter</command> running, the
 <application>Courier</application> MTA will not work. Issue the
 following commands to create
Index: server/mail/exim/exim-config.xml
===================================================================
--- server/mail/exim/exim-config.xml	(revision a8d6ef3ada5e91dea01119e40091bf6287051877)
+++ server/mail/exim/exim-config.xml	(revision 65df9fca7b49a35cec75c260931e9af291f3ede4)
@@ -25,5 +25,5 @@
 
 <para>To automate the running of exim at startup,
-install <filename>/etc/rc.d/init.d/exim</filename>
+install the <filename>/etc/rc.d/init.d/exim</filename>
 init script included in the <xref linkend="intro-important-bootscripts"/> package.</para>
                                                                                                                 
Index: server/mail/mail.xml
===================================================================
--- server/mail/mail.xml	(revision a8d6ef3ada5e91dea01119e40091bf6287051877)
+++ server/mail/mail.xml	(revision 65df9fca7b49a35cec75c260931e9af291f3ede4)
@@ -4,6 +4,6 @@
 
 <para><acronym>MTA</acronym>s are the programs which transport mail from one machine to the
-other.  The traditional <acronym>MTA</acronym> is <command>sendmail</command> 
-however there are several other choices.</para>
+other.  The traditional <acronym>MTA</acronym> is
+<command>sendmail</command>, however there are several other choices.</para>
 
 <para>As well as <acronym>SMTP</acronym> servers there is a
Index: server/mail/postfix/postfix-config.xml
===================================================================
--- server/mail/postfix/postfix-config.xml	(revision a8d6ef3ada5e91dea01119e40091bf6287051877)
+++ server/mail/postfix/postfix-config.xml	(revision 65df9fca7b49a35cec75c260931e9af291f3ede4)
@@ -10,5 +10,5 @@
 <sect3><title>Configuration Information</title>
 
-<screen><userinput><command>cat &gt; /etc/aliases &lt;&lt; "EOF"</command>
+<screen><userinput><command>cat &gt;&gt; /etc/aliases &lt;&lt; "EOF"</command>
 # Begin /etc/aliases
 
@@ -20,6 +20,12 @@
 <command>EOF</command></userinput></screen>
 
-<para>The <filename>/etc/aliases</filename> file that was just created,
-the <filename>main.cf</filename> and the <filename>master.cf</filename>
+<note><para>To protect an existing <filename>/etc/aliases</filename>
+file, we will append these aliases to it if it exists. This file
+should be checked and duplicate aliases removed, if
+present.</para></note>
+
+<para>The <filename>/etc/aliases</filename> file that was just created
+or appended, the <filename>main.cf</filename> and the
+<filename>master.cf</filename>
 must be personalized for your system. The <filename>aliases</filename> file 
 needs your non-root login identity so mail addressed to root can be forwarded 
@@ -44,5 +50,5 @@
 <sect3><title>Postfix init.d script</title>
 
-<para>To automate the running of Postfix at startup, install <filename>/etc/rc.d/init.d/postfix</filename>
+<para>To automate the running of Postfix at startup, install the  <filename>/etc/rc.d/init.d/postfix</filename>
 init script included in the <xref linkend="intro-important-bootscripts"/> package.</para>
 
Index: server/mail/sendmail/sendmail-config.xml
===================================================================
--- server/mail/sendmail/sendmail-config.xml	(revision a8d6ef3ada5e91dea01119e40091bf6287051877)
+++ server/mail/sendmail/sendmail-config.xml	(revision 65df9fca7b49a35cec75c260931e9af291f3ede4)
@@ -17,5 +17,5 @@
 newaliases -v</command></userinput></screen>
 
-<para>To automate the running of Sendmail at startup, install <filename>/etc/rc.d/init.d/sendmail</filename>
+<para>To automate the running of Sendmail at startup, install the <filename>/etc/rc.d/init.d/sendmail</filename>
 init script included in the <xref linkend="intro-important-bootscripts"/> package.</para>
                                                                                                                 
@@ -25,5 +25,5 @@
 how often Sendmail will process the mail queue. A default of 5
 minutes is used in the init script. Individual workstation users may want to set
-this as low as 1 minute, large installations handling more mail will
+this as low as 1 minute, large installations handling more mail may
 want to set it higher.</para></note>
 
Index: server/other/bind/bind-config.xml
===================================================================
--- server/other/bind/bind-config.xml	(revision a8d6ef3ada5e91dea01119e40091bf6287051877)
+++ server/other/bind/bind-config.xml	(revision 65df9fca7b49a35cec75c260931e9af291f3ede4)
@@ -112,5 +112,5 @@
 servers. This file must be updated periodically with the
 <command>dig</command> utility.
-Consult the <application><acronym>BIND</acronym></application> 9 Administrator Reference Manual for
+Consult the <ulink url="http://www.bind9.net/Bv9ARM.html"><application><acronym>BIND</acronym></application> 9 Administrator Reference Manual</ulink> for
 details.</para>
 
@@ -141,5 +141,5 @@
 <screen><userinput><command>cp /etc/resolv.conf /etc/resolv.conf.bak &amp;&amp;
 cat &gt; /etc/resolv.conf &lt;&lt; "EOF"</command>
-search yourdomain.com
+search <replaceable>[yourdomain.com]</replaceable>
 nameserver 127.0.0.1
 <command>EOF</command></userinput></screen>
@@ -150,5 +150,5 @@
 <screen><userinput><command>chown -R named.named /home/named</command></userinput></screen>
 
-<para>To start the DNS server at boot, install <filename>/etc/rc.d/init.d/bind</filename>
+<para>To start the DNS server at boot, install the <filename>/etc/rc.d/init.d/bind</filename>
 init script included in the <xref linkend="intro-important-bootscripts"/> package.</para>
                                                                                                                 
Index: server/other/cvsserver/cvsserver-exp.xml
===================================================================
--- server/other/cvsserver/cvsserver-exp.xml	(revision a8d6ef3ada5e91dea01119e40091bf6287051877)
+++ server/other/cvsserver/cvsserver-exp.xml	(revision 65df9fca7b49a35cec75c260931e9af291f3ede4)
@@ -2,11 +2,11 @@
 <title>Command explanations</title>
 
-<para><command>mkdir /cvsroot</command>: Create the <acronym>CVS</acronym> 
+<para><command>mkdir /home/cvsroot</command>: Create the <acronym>CVS</acronym> 
 repository directory.</para>
 
-<para><command>chmod 1777 /cvsroot</command>: Sticky bit permissions for 
+<para><command>chmod 1777 /home/cvsroot</command>: Set sticky bit permissions for 
 <envar>CVSROOT</envar>.</para>
 
-<para><command>export CVSROOT=/cvsroot</command>: Specify new <envar>CVSROOT
+<para><command>export CVSROOT=/home/cvsroot</command>: Specify new <envar>CVSROOT
 </envar> for all <command>cvs</command> commands.</para>
 
@@ -17,8 +17,8 @@
 releasetag</command>: All source code modules must be imported
 into the <acronym>CVS</acronym> repository before use, with the
-<command>cvs import</command> command.  the <userinput>-m</userinput> 
+<command>cvs import</command> command.  The <userinput>-m</userinput> 
 flags specifies an initial descriptive entry for the new module.
-the "cvstest" parameter is the name used for the module in all
-subsequent <command>cvs</command> commands.  the "vendortag" and "releasetag" 
+The "cvstest" parameter is the name used for the module in all
+subsequent <command>cvs</command> commands.  The "vendortag" and "releasetag" 
 parameters are used to further identify each <acronym>CVS</acronym> module and 
 are mandatory whether used or not.</para>
@@ -28,9 +28,9 @@
 create one if not found.</para>
 
-<para><command>echo anonymous: &gt; /cvsroot/CVSROOT/passwd
+<para><command>echo anonymous: &gt; /home/cvsroot/CVSROOT/passwd
 </command>: Add the anonymous user to the <acronym>CVS</acronym> passwd file, 
 which is unused for anything else in this configuration.</para>
 
-<para><command>echo anonymous &gt; /cvsroot/CVSROOT/readers</command>: Add the 
+<para><command>echo anonymous &gt; /home/cvsroot/CVSROOT/readers</command>: Add the 
 anonymous user to the <acronym>CVS</acronym> readers file, a list of
 users who have read only access to the repository.</para>
Index: server/other/cvsserver/cvsserver-inst.xml
===================================================================
--- server/other/cvsserver/cvsserver-inst.xml	(revision a8d6ef3ada5e91dea01119e40091bf6287051877)
+++ server/other/cvsserver/cvsserver-inst.xml	(revision 65df9fca7b49a35cec75c260931e9af291f3ede4)
@@ -2,5 +2,5 @@
 <title>Setting up a <acronym>CVS</acronym> server.</title>
 
-<para>We will discuss setting up a <acronym>CVS</acronym> server using OpenSSH 
+<para>A <acronym>CVS</acronym> server will be set up using OpenSSH 
 as the remote access method.  Other access methods, including :pserver: and
 :server: will not be used for write access to the <acronym>CVS</acronym> 
@@ -10,13 +10,13 @@
 :pserver: can be found at the end of this section.</para>
 
-<para>Configuration of our <acronym>CVS</acronym> server consists of four 
+<para>Configuration of the <acronym>CVS</acronym> server consists of four 
 steps:</para>
 
 <sect3><title>1. Create a repository.</title>
 <para>Create a new <acronym>CVS</acronym> repository with the following 
-commands, logged in as root:</para>
-<screen><userinput><command>mkdir /cvsroot &amp;&amp;
-chmod 1777 /cvsroot &amp;&amp;
-export CVSROOT=/cvsroot &amp;&amp;
+commands:</para>
+<screen><userinput><command>mkdir /home/cvsroot &amp;&amp;
+chmod 1777 /home/cvsroot &amp;&amp;
+export CVSROOT=/home//cvsroot &amp;&amp;
 cvs init</command></userinput></screen></sect3>
 
@@ -26,7 +26,7 @@
 <acronym>CVS</acronym> repository:</para>
 
-<screen><userinput><command>export CVSROOT=/cvsroot &amp;&amp;
-cd sourcedir &amp;&amp;
-cvs import -m "repository test" cvstest vendortag releasetag</command></userinput></screen></sect3>
+<screen><userinput><command>export CVSROOT=/home/cvsroot &amp;&amp;
+cd <replaceable>[sourcedir]</replaceable> &amp;&amp;
+cvs import -m <replaceable>["repository test"] [cvstest] [vendortag] [releasetag]</replaceable></command></userinput></screen></sect3>
 
 <sect3><title>3. Verify local repository access.</title>
@@ -57,6 +57,6 @@
 
 <screen><userinput><command>(grep anonymous /etc/passwd || useradd anonymous -s /bin/false) &amp;&amp;
-echo anonymous: &gt; /cvsroot/CVSROOT/passwd &amp;&amp;
-echo anonymous &gt; /cvsroot/CVSROOT/readers</command></userinput></screen>
+echo anonymous: &gt; /home/cvsroot/CVSROOT/passwd &amp;&amp;
+echo anonymous &gt; /home/cvsroot/CVSROOT/readers</command></userinput></screen>
 
 <para>If you use <command>inetd</command>, the following command will add the 
@@ -64,5 +64,5 @@
 
 <screen><userinput><command>echo "2401  stream  tcp  nowait  root  /usr/bin/cvs cvs -f \
-        --allow-root=/cvsroot pserver" &gt;&gt; /etc/inetd.conf</command></userinput></screen>
+        --allow-root=/home/cvsroot pserver" &gt;&gt; /etc/inetd.conf</command></userinput></screen>
 
 <para>Issue a <command>killall -HUP inetd</command> to reread the changed
@@ -82,5 +82,5 @@
           passenv     = PATH
           server      = /usr/bin/cvs
-         server_args = -f --allow-root=/cvsroot pserver
+         server_args = -f --allow-root=/home/cvsroot pserver
      }
 <command>EOF</command></userinput></screen>
@@ -91,9 +91,9 @@
 on another machine that can reach the <acronym>CVS</acronym> server via 
 network.  No account on the <acronym>CVS</acronym> repository is needed.  To 
-test anonymous access to the <acronym>CVS</acronym> repository log in to 
+test anonymous access to the <acronym>CVS</acronym> repository, log in to 
 another machine as an unprivileged user and execute the following command:
 </para>
 
-<screen><userinput><command>cvs -d:pserver:anonymous@<replaceable>[servername]</replaceable>:/cvsroot co cvstest</command></userinput></screen>
+<screen><userinput><command>cvs -d:pserver:anonymous@<replaceable>[servername]</replaceable>:/home/cvsroot co cvstest</command></userinput></screen>
 <note><para>Replace <replaceable>[servername]</replaceable> with the <acronym>IP</acronym> address or 
 hostname of the <acronym>CVS</acronym> server</para></note>
Index: server/other/dhcp/dhcp-config.xml
===================================================================
--- server/other/dhcp/dhcp-config.xml	(revision a8d6ef3ada5e91dea01119e40091bf6287051877)
+++ server/other/dhcp/dhcp-config.xml	(revision 65df9fca7b49a35cec75c260931e9af291f3ede4)
@@ -9,5 +9,5 @@
 
 <para>Information on configuring the <acronym>DHCP</acronym> client can be 
-found in Chapter 14.</para>
+found in <xref linkend="connect-dhcp"/>.</para>
 
 <para>Note that you only need the <acronym>DHCP</acronym> server if 
@@ -17,5 +17,5 @@
 interface, which may need to be modified for your hardware configuration.</para>
 
-<para>Install <filename>/etc/rc.d/init.d/dhcp</filename>
+<para>Install the <filename>/etc/rc.d/init.d/dhcp</filename>
 init script included in the <xref linkend="intro-important-bootscripts"/> package.</para>
                                                                                                                 
@@ -27,5 +27,5 @@
 <screen><userinput><command>touch /var/state/dhcp/dhcpd.leases</command></userinput></screen>
 
-<para>The follow commands will create a base configuration file for a
+<para>The following commands will create a base configuration file for a
 <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 
@@ -37,8 +37,8 @@
 ddns-update-style ad-hoc;
 
-subnet 192.168.5.0 netmask 255.255.255.0 {
-  range 192.168.5.10 192.168.5.240;
-  option broadcast-address 195.168.5.255;
-  option routers 192.168.5.1;
+subnet <replaceable>[192.168.5.0]</replaceable> netmask <replaceable>[255.255.255.0]</replaceable> {
+  range <replaceable>[192.168.5.10] [192.168.5.240]</replaceable>;
+  option broadcast-address <replaceable>[195.168.5.255]</replaceable>;
+  option routers <replaceable>[192.168.5.1]</replaceable>;
 }
 <command>EOF</command></userinput></screen>
Index: server/other/dhcp/dhcp-desc.xml
===================================================================
--- server/other/dhcp/dhcp-desc.xml	(revision a8d6ef3ada5e91dea01119e40091bf6287051877)
+++ server/other/dhcp/dhcp-desc.xml	(revision 65df9fca7b49a35cec75c260931e9af291f3ede4)
@@ -3,6 +3,5 @@
 
 <para>The <application><acronym>DHCP</acronym></application> package contains 
-<command>dhclient</command>, <command>dhcpd</command> and <command>dhcrelay
-</command>.</para>
+<command>dhclient</command>, <command>dhcpd</command> and <command>dhcrelay</command>.</para>
 
 </sect2>
Index: server/other/leafnode/leafnode-config.xml
===================================================================
--- server/other/leafnode/leafnode-config.xml	(revision a8d6ef3ada5e91dea01119e40091bf6287051877)
+++ server/other/leafnode/leafnode-config.xml	(revision 65df9fca7b49a35cec75c260931e9af291f3ede4)
@@ -3,6 +3,6 @@
 
 <sect3><title>Config files</title>
-<para><filename>/etc/leafnode/config</filename>,
-<filename>/etc/inetd.conf</filename> and
+<para><filename>/etc/news/config</filename>,
+<filename>/etc/inetd.conf</filename> or
 <filename>/etc/xinetd.conf</filename></para>
 
@@ -14,4 +14,7 @@
 <screen><userinput><command>echo "nntp stream tcp nowait news /usr/sbin/tcpd /usr/sbin/leafnode" \
 &gt;&gt; /etc/inetd.conf</command></userinput></screen>
+
+<para>Issue a <command>killall -HUP inetd</command> to reread the
+changed <filename>inetd.conf</filename> file.</para>
 
 <para>Alternatively, <application>Leafnode</application> may be configured to 
@@ -34,4 +37,7 @@
 <command>EOF</command></userinput></screen>
 
+<para>Issue a <command>killall -HUP xinetd</command> to reread the
+changed <filename>xinetd.conf</filename> file.</para>
+
 <para>The <filename>/etc/news/config</filename> file must be
 edited to reflect the name of the upstream <acronym>NNTP</acronym>
@@ -49,5 +55,5 @@
 <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
+so add the following to <filename>/etc/profile</filename> or
 <filename>$HOME/.bash_profile</filename>:</para>
 
Index: server/other/leafnode/leafnode-intro.xml
===================================================================
--- server/other/leafnode/leafnode-intro.xml	(revision a8d6ef3ada5e91dea01119e40091bf6287051877)
+++ server/other/leafnode/leafnode-intro.xml	(revision 65df9fca7b49a35cec75c260931e9af291f3ede4)
@@ -16,5 +16,5 @@
 <sect3><title><application>Leafnode</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="pcre"/>
+<para><xref linkend="pcre"/> and <xref linkend="tcpwrappers"/>
 </para></sect4>
 </sect3>
Index: server/other/openssh/openssh-config.xml
===================================================================
--- server/other/openssh/openssh-config.xml	(revision a8d6ef3ada5e91dea01119e40091bf6287051877)
+++ server/other/openssh/openssh-config.xml	(revision 65df9fca7b49a35cec75c260931e9af291f3ede4)
@@ -15,5 +15,5 @@
 <sect3><title>sshd init.d script</title>
 
-<para>To start the SSH Server at boot, install <filename>/etc/rc.d/init.d/sshd</filename>
+<para>To start the SSH Server at boot, install the <filename>/etc/rc.d/init.d/sshd</filename>
 init script included in the <xref linkend="intro-important-bootscripts"/> package.</para>
                                                                                                                 
Index: server/other/openssh/openssh-desc.xml
===================================================================
--- server/other/openssh/openssh-desc.xml	(revision a8d6ef3ada5e91dea01119e40091bf6287051877)
+++ server/other/openssh/openssh-desc.xml	(revision 65df9fca7b49a35cec75c260931e9af291f3ede4)
@@ -17,5 +17,5 @@
 
 <sect3><title>sshd</title>
-<para>The daemon that permits you to login.</para></sect3>
+<para>The daemon that listens for ssh login requests.</para></sect3>
 
 <sect3><title>ssh-agent</title>
@@ -27,5 +27,5 @@
 <sect3><title>sftp</title>
 <para><acronym>FTP</acronym>-like program that works over
-<acronym>SSH</acronym>1 and <acronym>SSH</acronym>2 protocol.</para></sect3>
+<acronym>SSH</acronym>1 and <acronym>SSH</acronym>2 protocols.</para></sect3>
 
 <sect3><title>scp</title>
Index: server/other/openssh/openssh-exp.xml
===================================================================
--- server/other/openssh/openssh-exp.xml	(revision a8d6ef3ada5e91dea01119e40091bf6287051877)
+++ server/other/openssh/openssh-exp.xml	(revision 65df9fca7b49a35cec75c260931e9af291f3ede4)
@@ -13,5 +13,5 @@
 
 <para><parameter>--libexecdir=/usr/sbin</parameter>:
-<application>Open<acronym>SSH</acronym></application> puts
+<application>Open<acronym>SSH</acronym></application> installs
 programs called by programs in <filename class="directory">/usr/libexec</filename>.
 <command>sftp-server</command> is a <command>sshd</command>
Index: server/other/openssh/openssh-inst.xml
===================================================================
--- server/other/openssh/openssh-inst.xml	(revision a8d6ef3ada5e91dea01119e40091bf6287051877)
+++ server/other/openssh/openssh-inst.xml	(revision 65df9fca7b49a35cec75c260931e9af291f3ede4)
@@ -18,5 +18,5 @@
 linked <application>OpenSSL</application> libraries. If you recompile
 <application>OpenSSL</application>, <application>OpenSSH</application> may
-fail to startup. An alternative is to link against static <application>OpenSSL</application>
+fail to startup. An alternative is to link against the static <application>OpenSSL</application>
 library. To link against the static library, execute the following command:</para>
 
Index: server/other/openssh/openssh-intro.xml
===================================================================
--- server/other/openssh/openssh-intro.xml	(revision a8d6ef3ada5e91dea01119e40091bf6287051877)
+++ server/other/openssh/openssh-intro.xml	(revision 65df9fca7b49a35cec75c260931e9af291f3ede4)
@@ -4,5 +4,5 @@
 <para>The <application>Open<acronym>SSH</acronym></application> package 
 contains <command>ssh</command> clients and the <command>sshd</command> daemon.
-This is useful for encrypting all traffic over a network.</para>
+This is useful for encrypting authentication and subsequent traffic over a network.</para>
 
 <sect3><title>Package information</title>
@@ -23,5 +23,5 @@
 <xref linkend="tcpwrappers"/>,
 X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>),
-<ulink url="http://web.mit.edu/kerberos/www/">MIT Kerberos</ulink> and
+<xref linkend="mitkrb"/> or <xref linkend="heimdal"/> and
 <ulink url="http://www.opensc.org/">OpenSC</ulink>
 </para></sect4>
Index: server/other/rsync.xml
===================================================================
--- server/other/rsync.xml	(revision a8d6ef3ada5e91dea01119e40091bf6287051877)
+++ server/other/rsync.xml	(revision 65df9fca7b49a35cec75c260931e9af291f3ede4)
@@ -5,5 +5,4 @@
 &rsync-intro;
 &rsync-inst;
-&rsync-exp;
 &rsync-config;
 &rsync-desc;
Index: server/other/rsync/rsync-config.xml
===================================================================
--- server/other/rsync/rsync-config.xml	(revision a8d6ef3ada5e91dea01119e40091bf6287051877)
+++ server/other/rsync/rsync-config.xml	(revision 65df9fca7b49a35cec75c260931e9af291f3ede4)
@@ -36,5 +36,5 @@
 script to be used.</para>
 
-<para>Install <filename>/etc/rc.d/init.d/rsyncd</filename>
+<para>Install the <filename>/etc/rc.d/init.d/rsyncd</filename>
 init script included in the <xref linkend="intro-important-bootscripts"/> package.</para>
                                                                                                                 
Index: server/other/rsync/rsync-desc.xml
===================================================================
--- server/other/rsync/rsync-desc.xml	(revision a8d6ef3ada5e91dea01119e40091bf6287051877)
+++ server/other/rsync/rsync-desc.xml	(revision 65df9fca7b49a35cec75c260931e9af291f3ede4)
@@ -13,5 +13,5 @@
 uses the "rsync algorithm" which provides a very fast method of syncing remote
 files. It does this by sending just the differences in the files across the
-link, without requiring that both sets of files are present at one of the ends
+link, without requiring that both sets of files are present at one end
 of the link beforehand.</para></sect3>
 
Index: server/other/rsync/rsync-exp.xml
===================================================================
--- server/other/rsync/rsync-exp.xml	(revision a8d6ef3ada5e91dea01119e40091bf6287051877)
+++ 	(revision )
@@ -1,8 +1,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para><parameter>--prefix=/usr</parameter>: This installs rsync in
-<filename class="directory">/usr</filename> instead of
-<filename class="directory">/usr/local</filename>.</para>
-
-</sect2>
Index: server/other/rsync/rsync-inst.xml
===================================================================
--- server/other/rsync/rsync-inst.xml	(revision a8d6ef3ada5e91dea01119e40091bf6287051877)
+++ server/other/rsync/rsync-inst.xml	(revision 65df9fca7b49a35cec75c260931e9af291f3ede4)
@@ -2,6 +2,7 @@
 <title>Installation of <application>rsync</application></title>
 
-<para>For security reasons, running <application>rsync</application> server as 
-an unprivileged user and group is encouraged.</para>
+<para>For security reasons, running the <application>rsync</application> server as 
+an unprivileged user and group is encouraged.  Create the rsyncd user
+and group with the following commands:</para>
 
 <screen><userinput><command>groupadd rsyncd &amp;&amp;
Index: server/other/samba3/samba3-config.xml
===================================================================
--- server/other/samba3/samba3-config.xml	(revision a8d6ef3ada5e91dea01119e40091bf6287051877)
+++ server/other/samba3/samba3-config.xml	(revision 65df9fca7b49a35cec75c260931e9af291f3ede4)
@@ -27,4 +27,6 @@
 <screen><userinput><command>echo "swat stream tcp nowait.400 root /usr/sbin/swat swat" \
     &gt;&gt; /etc/inetd.conf</command></userinput></screen>
+<para>Issue a <command>killall -HUP inetd</command> to reread the
+changed <filename>inetd.conf</filename> file.</para>
 
 <para>If <command>xinetd</command> is used, the following command will 
@@ -43,4 +45,7 @@
 }
 <command>EOF</command></userinput></screen>
+
+<para>Issue a <command>killall -HUP xinetd</command> to reread the
+changed <filename>xinetd.conf</filename> file.</para>
 
 <para><acronym>SWAT</acronym> can be launched by pointing your web
Index: server/other/samba3/samba3-exp.xml
===================================================================
--- server/other/samba3/samba3-exp.xml	(revision a8d6ef3ada5e91dea01119e40091bf6287051877)
+++ server/other/samba3/samba3-exp.xml	(revision 65df9fca7b49a35cec75c260931e9af291f3ede4)
@@ -5,7 +5,4 @@
 needed for proper operation of the <command>smbd</command> and 
 <command>nmbd</command> daemons.</para>
-
-<para><parameter>--prefix=/usr</parameter>: Sets the prefix for almost
-all the file paths to <filename class="directory">/usr</filename>.</para>
 
 <para><parameter>--sysconfdir=/etc</parameter>: Sets the configuration
@@ -25,5 +22,5 @@
 
 <para><command>install -m755 nsswitch/libnss_win{s,bind}.so /lib</command>:
-The nss libs are not installed by default.  If you intend to use
+The nss libraries are not installed by default.  If you intend to use
 winbindd for domain auth, and/or <acronym>WINS</acronym> name resolution, 
 you need these libraries.</para> 
@@ -31,5 +28,5 @@
 <para><command>ln -sf libnss_winbind.so /lib/libnss_winbind.so.2</command> 
 and <command>ln -sf libnss_wins.so /lib/libnss_wins.so.2</command>:
-These symlinks are required by glibc to use the nss libs.</para>
+These symlinks are required by glibc to use the nss libraries.</para>
 
 <para><command>cp ../examples/smb.conf.default /etc/samba</command>:
Index: server/other/xinetd/xinetd-config.xml
===================================================================
--- server/other/xinetd/xinetd-config.xml	(revision a8d6ef3ada5e91dea01119e40091bf6287051877)
+++ server/other/xinetd/xinetd-config.xml	(revision 65df9fca7b49a35cec75c260931e9af291f3ede4)
@@ -10,7 +10,8 @@
 <sect3><title>Configuration Information</title>
 
-<para>Ensure the path to all daemons are in <filename
+<para>Ensure the path to all daemons is <filename
 class="directory">/usr/sbin</filename>, rather than the default path of
-<filename class="directory">/usr/etc</filename>:</para>
+<filename class="directory">/usr/etc</filename> by running the following
+command:</para>
 
 <screen><userinput><command>sed -e 's/etc/sbin/g' xinetd/sample.conf &gt; /etc/xinetd.conf</command>
@@ -21,5 +22,5 @@
 found at <ulink url="http://www.xinetd.org"/>.</para>
 
-<para>Install <filename>/etc/rc.d/init.d/xinetd</filename>
+<para>Install the <filename>/etc/rc.d/init.d/xinetd</filename>
 init script included in the <xref linkend="intro-important-bootscripts"/> package.</para>
                                                                                                                 
@@ -41,6 +42,6 @@
 executable [line=42]</userinput></screen>
 
-<para>These errors are due to the fact that we don't have most of the
-servers that <command>xinetd</command> is trying to control installed yet.</para>
+<para>These errors are because most of the
+servers <command>xinetd</command> is trying to control are not installed yet.</para>
 
 </sect3>
