grammar corrections

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@2252 af4574ff-66df-0310-9fd7-8a98e5e911e0

content/databases/db-3.3/db-3.3-intro.xml

@@ -17,5 +17,13 @@ url="&db-3.3-download-ftp;"/></para></listitem>
 &db-3.3-time;</para></listitem></itemizedlist>
 </sect3>
 
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Recommended Patch: <ulink
+url="http://www.sleepycat.com/webforms/patchdl.php?src=patch.3.3.11.1"/></para></listitem>
+<listitem><para>Required Patch: <ulink
+url="http://www.sleepycat.com/webforms/patchdl.php?src=patach.3.3.11.2"/></para></listitem>
+</itemizedlist></sect3>
+
 
 </sect2>

content/databases/db/db-exp.xml

@@ -3,8 +3,8 @@
 
 <para><command>cd build_unix &amp;&amp; ../dist/configure --prefix=/usr
 --enable-compat185</command>: 
-This replaces the normal <command>./configure</command> command as
+This replaces the normal <command>./configure</command> command, as
-<application>Berkeley DB</application> comes with the various 
+<application>Berkeley DB</application> comes with various 
 build directories for different platforms.</para>
 
 <para><command>make docdir=/usr/share/doc/db-&db-version; 

content/databases/mysql/mysql-config.xml

@@ -11,12 +11,14 @@
 <sect3>
 <title>Configuration Information</title>
 
-<para>There are several default configurations file available in
+<para>There are several default configuration files available in
-<filename class="directory">/usr/share/mysql</filename> which you can use.</para>
+<filename class="directory">/usr/share/mysql</filename> which you can
+use.  Create <filename>/etc/my.cnf</filename> using the following
+command:</para>
 
 <screen><userinput><command>cp /usr/share/mysql/my-medium.cnf /etc/my.cnf</command></userinput></screen>
 
-<para>We can now install a database and change the ownership to the
+<para>You can now install a database and change the ownership to the
 unprivileged user and group.</para>
 
 <screen><userinput><command>mysql_install_db &amp;&amp;
@@ -26,8 +28,8 @@ chown -R mysql:mysql /var/lib/mysql</command></userinput></screen>
 
 <screen><userinput><command>mysqld_safe --user=mysql 2&gt;&amp;1 &gt;/dev/null &amp;</command></userinput></screen>
 
-<para>A default installation does not setup a password for the administrator
+<para>A default installation does not setup a password for the
-so here we will set one. Replace <replaceable>[new-password]</replaceable>
+administrator, so use the following command to set one. Replace <replaceable>[new-password]</replaceable>
 with your own.</para>
 
 <!--
@@ -51,12 +53,12 @@ bye
 
 <screen><userinput><command>mysqladmin -u root password <replaceable>[new-password]</replaceable></command></userinput></screen>
 
-<para>Now that we are done with the configuration of the server, we can
+<para>Configuration of the server is now finished. Shut the server down
-shut it down.</para>
+using the following command:</para>
 
 <screen><userinput><command>mysqladmin -p shutdown</command></userinput></screen>
 
-<para>Install <filename>/etc/rc.d/init.d/mysql</filename>
+<para>Install the <filename>/etc/rc.d/init.d/mysql</filename>
 init script included in the <xref linkend="intro-important-bootscripts"/> package.</para>
                                                                                                                 
 <screen><userinput><command>make install-mysql</command></userinput></screen>

content/databases/postgresql/postgresql-config.xml

@@ -14,7 +14,7 @@ Details on the format of the files and the options that can be set in
 each can be found in <ulink
 url="file:///usr/share/doc/postgresql/html/index.html"/>.</para>
 
-<para>Install <filename>/etc/rc.d/init.d/postgresql</filename>
+<para>Install the <filename>/etc/rc.d/init.d/postgresql</filename>
 init script included in the <xref linkend="intro-important-bootscripts"/> package.</para>
                                                                                                                 
 <screen><userinput><command>make install-postgresql</command></userinput></screen>

content/databases/postgresql/postgresql-desc.xml

@@ -83,7 +83,7 @@ language.</para></sect3>
 area.</para></sect3>
 
 <sect3><title>ipcclean</title>
-<para><command>ipcclean</command> removes share memory and semaphores left over by an
+<para><command>ipcclean</command> removes shared memory and semaphores left over by an
 aborted database server.</para></sect3>
 
 <sect3><title>pg_config</title>

content/databases/postgresql/postgresql-exp.xml

@@ -1,14 +1,7 @@
 <sect2>
 <title>Command explanations</title>
 
-<para><command>useradd -d /var/pgsql/data postgres</command>: Add an unprivileged user to run the database server. Running the
+<para><command>useradd -d /var/pgsql/data postgres</command>: Add an unprivileged user to run the database server.</para>
-server as root is dangerous, and moreover simply will not work.</para>
-
-<para><command>su - postgres -c '/usr/bin/initdb -D /var/pgsql/data'</command>: Initialize the database tablespace. This command may not be executed
-by root.</para>
-
-<para><command>su - postgres -c '/usr/bin/postmaster -D /var/pgsql/data > 
-/var/pgsql/data/logfile 2>&amp;1 &amp;'</command>: Start the database server. User postgres must execute this command as well.</para>
 
 <para><command>createdb test, create table t1 , insert into t1 values..., select *
 from t1</command>: Create a database, add a table to it, insert some rows into the table

content/databases/postgresql/postgresql-inst.xml

@@ -27,7 +27,7 @@ su - postgres -c '/usr/bin/initdb -D /var/pgsql/data'</command></userinput></scr
 <screen><userinput><command>su - postgres -c '/usr/bin/postmaster -D /var/pgsql/data > \
     /var/pgsql/data/logfile 2&gt;&amp;1 &amp;'</command></userinput></screen>
 
-<para>Now we can create a database and verify the installation:</para>
+<para>Create a database and verify the installation:</para>
 
 <screen><userinput><command>su - postgres -c '/usr/bin/createdb test' &amp;&amp;
 echo "create table t1 ( name varchar(20), state_province varchar(20) );" \

content/databases/postgresql/postgresql-intro.xml

@@ -31,7 +31,7 @@ Site at: <ulink url="http://gborg.postgresql.org" />.</para></note>
 <xref linkend="openssl"/>,
 <xref linkend="Linux_PAM"/>,
 <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink> or
-<ulink url="http://web.mit.edu/kerberos/www/">MIT Kerberos</ulink>,
+<xref linkend="mitkrb"/> or <xref linkend="heimdal"/>,
 <ulink url="http://ant.apache.org/">Ant</ulink> and
 <ulink url="http://rendezvous.sourceforge.net/">Rendezvous</ulink>
 </para></sect4>

content/web/apache/apache-config.xml

@@ -21,7 +21,7 @@ dedicated user:</para>
 detailed instructions on customizing your Apache <acronym>HTTP</acronym>
 server.</para>
 
-<para>Install <filename>/etc/rc.d/init.d/apache</filename>
+<para>Install the <filename>/etc/rc.d/init.d/apache</filename>
 init script included in the <xref linkend="intro-important-bootscripts"/> package.</para>
                                                                                                                 
 <screen><userinput><command>make install-apache</command></userinput></screen>

content/web/apache/apache-desc.xml

@@ -41,18 +41,18 @@ is a tool for building and installing extension modules for the
 
 <sect3><title>dbmmanage</title>
 <para><command>dbmmanage</command> is used to create and update the
-<filename>DBM</filename> format files used to store usernames and password  
+<filename>DBM</filename> format files used to store usernames and passwords  
 for basic authentication of <acronym>HTTP</acronym>
 users.</para></sect3>
 
 <sect3><title>htdigest</title>
 <para><command>htdigest</command> is used to create and update the
-flat-files used to store usernames, realm and password for digest 
+flat-files used to store usernames, realms and passwords for digest 
 authentication of <acronym>HTTP</acronym> users.</para></sect3>
 
 <sect3><title>htpasswd</title>
 <para><command>htpasswd</command> is used to create and update the
-flat-files used to store usernames and password for basic authentication of 
+flat-files used to store usernames and passwords for basic authentication of 
 <acronym>HTTP</acronym> users.</para></sect3>
 
 <sect3><title>httpd</title>

content/web/proftpd/proftpd-config.xml

@@ -2,7 +2,7 @@
 <title>Configuring <application>ProFTPD</application></title>
 
 <sect3><title>proftpd init.d script</title>
-<para>Install <filename>/etc/rc.d/init.d/proftpd</filename>
+<para>Install the <filename>/etc/rc.d/init.d/proftpd</filename>
 init script included in the <xref linkend="intro-important-bootscripts"/> package.</para>
                                                                                                                 
 <screen><userinput><command>make install-proftpd</command></userinput></screen>

content/web/proftpd/proftpd-desc.xml

@@ -11,7 +11,7 @@
 <sect2><title>Description</title>
 
 <sect3><title>ftpcount</title>
-<para><command>ftpcount</command> shows current number of connections.</para></sect3>
+<para><command>ftpcount</command> shows the current number of connections.</para></sect3>
 
 <sect3><title>ftpshut</title>
 <para><command>ftpshut</command> shuts down all proftpd servers at a

content/web/proftpd/proftpd-exp.xml

@@ -4,10 +4,6 @@
 <para><parameter>install_user=proftpd install_group=proftpd</parameter>:
 Specify the user and group identity for ProFTPD.</para>
 
-<para><parameter>--prefix=/usr</parameter>:
-This installs ProFTPD in <filename class="directory">/usr</filename>
-instead of <filename class="directory">/usr/local</filename>.</para>
-
 <para><parameter>--sysconfdir=/etc</parameter>:
 This prevents the configuration files from going to
 <filename class="directory">/usr/etc</filename>.</para>

content/web/web.xml

@@ -3,7 +3,7 @@
 <title>Web serving</title>
 
 <para>This chapter includes applications that respond to requests
-originating from the Internet.  Specifically covered are
+originating from <acronym>LAN</acronym>, intranet and internet clients.  Specifically covered are
 <acronym>HTTP</acronym> requests and <acronym>FTP</acronym>
 requests.</para>
 

server/mail/courier/courier-config.xml

@@ -130,8 +130,9 @@ following entry.</para>
 
 <screen><userinput>postmaster: <replaceable>[your administrator email]</replaceable></userinput></screen>
 
-<para>If you want to deny access from some hosts from sending mail you
+<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>
+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
 following commands:</para>
@@ -186,7 +187,7 @@ Courier</para>
 <para><emphasis>Creating Mail directories for System Users</emphasis></para>
 
 
-<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>
 
 <screen><userinput><command>cd /home/<replaceable>[username]</replaceable> &amp;&amp;
@@ -293,11 +294,11 @@ to use your web based administration tool.</para>
 <para>The startup script from the <application>Courier</application> package is 
 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 
+init.d file for <application>Courier</application>, you will need to use the 
-follow commands:</para>
+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
 <filename>rc.d</filename> directory with the following commands:</para>

server/mail/courier/courier-desc.xml

@@ -88,11 +88,11 @@ mail filters. Global mail filters are used to selectively block unwanted
 mail.</para></sect3>
 
 <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>
 <para><command>maildirkw</command> modifies Courier-IMAP compatible maildir message keywords.</para></sect3>
@@ -106,29 +106,30 @@ language.</para></sect3>
 <filename>/etc/courier/esmtpacceptmailfor.dir</filename> directory.</para></sect3>
 
 <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><command>makehostedomains</command> Build a database of hosted domains from <filename>hosteddomains</filename>.</para></sect3>
-.</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
+<acronym>UUCP</acronym> recipients using <filename>/etc/courier/uucpneighbors</filename>.</para></sect3>
-</filename>.</para></sect3>
 
 <sect3><title>reformail</title>
 <para><command>reformail</command> program reads a message on standard input, reformats it in some way,

server/mail/courier/courier-inst.xml

@@ -8,8 +8,8 @@ and groups with the following commands:</para>
 <screen><userinput><command>groupadd courier &amp;&amp;
 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
+<para> You also need to create a bin user. If you already have a user
-this step can be safely ignored.</para>
+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>
 
@@ -17,7 +17,7 @@ this step can be safely ignored.</para>
 <filename class="directory">/var/run/courier</filename> directory where
 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
 <filename class="directory">/var/run/courier</filename>:</para>

server/mail/exim/exim-config.xml

@@ -24,7 +24,7 @@ should be checked and duplicate aliases removed, if
 present.</para></note>
 
 <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>
                                                                                                                 
 <screen><userinput><command>make install-exim</command></userinput></screen>

server/mail/mail.xml

@@ -3,8 +3,8 @@
 <title>Mail Server Software</title>
 
 <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> 
+other.  The traditional <acronym>MTA</acronym> is
-however there are several other choices.</para>
+<command>sendmail</command>, however there are several other choices.</para>
 
 <para>As well as <acronym>SMTP</acronym> servers there is a
 <acronym>POP</acronym> server (qpopper) and an <acronym>IMAP</acronym>

server/mail/postfix/postfix-config.xml

@@ -9,7 +9,7 @@
 
 <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
 
 MAILER-DAEMON:    postmaster
@@ -19,8 +19,14 @@ root:             LOGIN
 # End /etc/aliases
 <command>EOF</command></userinput></screen>
 
-<para>The <filename>/etc/aliases</filename> file that was just created,
+<note><para>To protect an existing <filename>/etc/aliases</filename>
-the <filename>main.cf</filename> and the <filename>master.cf</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 
 to you at the user level.  The <filename>main.cf</filename> file needs your 
@@ -43,7 +49,7 @@ sed "s/#myhostname = host.domain.tld/myhostname = \
 
 <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>
 
 <screen><userinput><command>make install-postfix</command></userinput></screen>

server/mail/sendmail/sendmail-config.xml

@@ -16,7 +16,7 @@ cp -R cf/* /etc/mail &&
 cp cf/cf/{submit,sendmail}.mc /etc/mail &&
 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>
                                                                                                                 
 <screen><userinput><command>make install-sendmail</command></userinput></screen>
@@ -24,7 +24,7 @@ init script included in the <xref linkend="intro-important-bootscripts"/> packag
 <note><para>The -qNm option to <command>sendmail</command>, where N is number of minutes, controls
 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>
 
 </sect3>

server/other/bind/bind-config.xml

@@ -111,7 +111,7 @@ M.ROOT-SERVERS.NET.     6D  IN      A       202.12.27.33
 <para>The <filename>root.hints</filename> file is a list of root name
 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>
 
 <para>Create the <filename>rndc.conf</filename> with the following commands:</para>
@@ -140,7 +140,7 @@ name.</para></note>
 
 <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>
 
@@ -149,7 +149,7 @@ command:</para>
 
 <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>
                                                                                                                 
 <screen><userinput><command>make install-bind</command></userinput></screen>

server/other/cvsserver/cvsserver-exp.xml

@@ -1,13 +1,13 @@
 <sect2>
 <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>
 
 <para><command>cvs init</command>: Initialize the new <acronym>CVS</acronym> 
@@ -16,10 +16,10 @@ repository.</para>
 <para><command>cvs import -m "repository test" cvstest vendortag
 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
+The "cvstest" parameter is the name used for the module in all
-subsequent <command>cvs</command> commands.  the "vendortag" and "releasetag" 
+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>
 
@@ -27,11 +27,11 @@ are mandatory whether used or not.</para>
 /bin/false)</command>: Check for an existing anonymous user and
 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>
 

server/other/cvsserver/cvsserver-inst.xml

@@ -1,7 +1,7 @@
 <sect2>
 <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> 
 repository.  The :pserver: method sends clear text passwords over the network 
@@ -9,15 +9,15 @@ and the :server: method is not supported in all <acronym>CVS</acronym> ports.
 Instructions for anonymous, read only <acronym>CVS</acronym> access using 
 :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>
+commands:</para>
-<screen><userinput><command>mkdir /cvsroot &amp;&amp;
+<screen><userinput><command>mkdir /home/cvsroot &amp;&amp;
-chmod 1777 /cvsroot &amp;&amp;
+chmod 1777 /home/cvsroot &amp;&amp;
-export CVSROOT=/cvsroot &amp;&amp;
+export CVSROOT=/home//cvsroot &amp;&amp;
 cvs init</command></userinput></screen></sect3>
 
 <sect3><title>2. Import source code into the repository.</title>
@@ -25,9 +25,9 @@ cvs init</command></userinput></screen></sect3>
 commands, issued from a user account on the same machine as the 
 <acronym>CVS</acronym> repository:</para>
 
-<screen><userinput><command>export CVSROOT=/cvsroot &amp;&amp;
+<screen><userinput><command>export CVSROOT=/home/cvsroot &amp;&amp;
-cd sourcedir &amp;&amp;
+cd <replaceable>[sourcedir]</replaceable> &amp;&amp;
-cvs import -m "repository test" cvstest vendortag releasetag</command></userinput></screen></sect3>
+cvs import -m <replaceable>["repository test"] [cvstest] [vendortag] [releasetag]</replaceable></command></userinput></screen></sect3>
 
 <sect3><title>3. Verify local repository access.</title>
 <para>Test access to the <acronym>CVS</acronym> repository from the same user 
@@ -56,14 +56,14 @@ using the :pserver: method by logging on as root and executing the following
 commands:</para> 
 
 <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; /home/cvsroot/CVSROOT/passwd &amp;&amp;
-echo anonymous &gt; /cvsroot/CVSROOT/readers</command></userinput></screen>
+echo anonymous &gt; /home/cvsroot/CVSROOT/readers</command></userinput></screen>
 
 <para>If you use <command>inetd</command>, the following command will add the 
 pserver entry to <filename>/etc/inetd.conf</filename>:</para>
 
 <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
 <filename>inetd.conf</filename> file.</para>
@@ -81,7 +81,7 @@ pserver entry to <filename>/etc/xinetd.conf</filename>:</para>
           user        = root
           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>
 <para>Issue a <command>/etc/rc.d/init.d/xinetd reload</command> to reread the changed
@@ -90,11 +90,11 @@ pserver entry to <filename>/etc/xinetd.conf</filename>:</para>
 <para>Testing anonymous access to the new repository requires an account
 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>
 

server/other/dhcp/dhcp-config.xml

@@ -8,7 +8,7 @@
 <sect3><title>Configuration Information</title>
 
 <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 
 you want to issue <acronym>LAN</acronym> addresses over your network.  The 
@@ -16,7 +16,7 @@ you want to issue <acronym>LAN</acronym> addresses over your network.  The
 that this script is coded for the <emphasis role="strong">eth1</emphasis> 
 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>
                                                                                                                 
 <screen><userinput><command>make install-dhcp</command></userinput></screen>
@@ -26,7 +26,7 @@ satisfy that requirement:</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
+<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 
 those are covered in the man pages for <filename>dhcp.conf</filename>.</para>
@@ -36,10 +36,10 @@ default-lease-time 72000;
 max-lease-time 144000;
 ddns-update-style ad-hoc;
 
-subnet 192.168.5.0 netmask 255.255.255.0 {
+subnet <replaceable>[192.168.5.0]</replaceable> netmask <replaceable>[255.255.255.0]</replaceable> {
-  range 192.168.5.10 192.168.5.240;
+  range <replaceable>[192.168.5.10] [192.168.5.240]</replaceable>;
-  option broadcast-address 195.168.5.255;
+  option broadcast-address <replaceable>[195.168.5.255]</replaceable>;
-  option routers 192.168.5.1;
+  option routers <replaceable>[192.168.5.1]</replaceable>;
 }
 <command>EOF</command></userinput></screen>
 

server/other/dhcp/dhcp-desc.xml

@@ -2,8 +2,7 @@
 <title>Contents</title>
 
 <para>The <application><acronym>DHCP</acronym></application> package contains 
-<command>dhclient</command>, <command>dhcpd</command> and <command>dhcrelay
+<command>dhclient</command>, <command>dhcpd</command> and <command>dhcrelay</command>.</para>
-</command>.</para>
 
 </sect2>
 

server/other/leafnode/leafnode-config.xml

@@ -2,8 +2,8 @@
 <title>Configuring <application>Leafnode</application></title>
 
 <sect3><title>Config files</title>
-<para><filename>/etc/leafnode/config</filename>,
+<para><filename>/etc/news/config</filename>,
-<filename>/etc/inetd.conf</filename> and
+<filename>/etc/inetd.conf</filename> or
 <filename>/etc/xinetd.conf</filename></para>
 
 <para><application>Leafnode</application> may be configured to use
@@ -14,6 +14,9 @@ command:</para>
 <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 
 use <command>xinetd</command> by adding an entry to the <filename>
 /etc/xinetd.conf</filename> file with the following command:</para>
@@ -33,6 +36,9 @@ use <command>xinetd</command> by adding an entry to the <filename>
         }
 <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>
 provider. Copy the
@@ -48,7 +54,7 @@ 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
+so add the following to <filename>/etc/profile</filename> or
 <filename>$HOME/.bash_profile</filename>:</para>
 
 <screen><userinput><command>export NNTPSERVER=127.0.0.1</command></userinput></screen>

server/other/leafnode/leafnode-intro.xml

@@ -15,7 +15,7 @@ server designed for small sites to provide a local USENET spool.</para>
 
 <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>
 

server/other/openssh/openssh-config.xml

@@ -14,7 +14,7 @@ your system. Configuration information can be found in the man pages for
 
 <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>
                                                                                                                 
 <screen><userinput><command>make install-sshd</command></userinput></screen>

server/other/openssh/openssh-desc.xml

@@ -16,7 +16,7 @@
 <para>The basic rlogin/rsh-like client program.</para></sect3>
 
 <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>
 <para>An authentication agent that can store private keys.</para></sect3>
@@ -26,7 +26,7 @@
 
 <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>
 <para>File copy program that acts like rcp.</para></sect3>

server/other/openssh/openssh-exp.xml

@@ -12,7 +12,7 @@ Suite or if you access a <acronym>SSH</acronym> server that authenticates by
 user passwords encrypted with md5. </para>
 
 <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>
 utility and <command>ssh-askpass</command> is a <command>ssh-add</command> 

server/other/openssh/openssh-inst.xml

@@ -17,7 +17,7 @@ useradd -c 'sshd privsep' -d /var/empty -g sshd -s /bin/false sshd</command></us
 <para><application>OpenSSH</application> is very sensitive to changes in the
 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>
 
 <screen><userinput><command>sed -i "s:-lcrypto:/usr/lib/libcrypto.a:g" configure</command></userinput></screen>

server/other/openssh/openssh-intro.xml

@@ -3,7 +3,7 @@
 
 <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>
 <itemizedlist spacing='compact'>
@@ -22,7 +22,7 @@ This is useful for encrypting all traffic over a network.</para>
 <xref linkend="Linux_PAM"/>,
 <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>
 </sect3>

server/other/rsync.xml

@@ -4,7 +4,6 @@
 
 &rsync-intro;
 &rsync-inst;
-&rsync-exp;
 &rsync-config;
 &rsync-desc;
 

server/other/rsync/rsync-config.xml

@@ -35,7 +35,7 @@ server if you want to provide a <application>rsync</application> archive on
 your machine. The <application>rsync</application> client doesn't need this 
 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>
                                                                                                                 
 <screen><userinput><command>make install-rsyncd</command></userinput></screen>

server/other/rsync/rsync-desc.xml

@@ -12,7 +12,7 @@
 </command> (and <command>scp</command>) that has many more features. It
 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>
 
 </sect2>

server/other/rsync/rsync-exp.xml

@@ -1,8 +0,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>

server/other/rsync/rsync-inst.xml

@@ -1,8 +1,9 @@
 <sect2>
 <title>Installation of <application>rsync</application></title>
 
-<para>For security reasons, running <application>rsync</application> server as 
+<para>For security reasons, running the <application>rsync</application> server as 
-an unprivileged user and group is encouraged.</para>
+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;
 useradd -c rsyncd -d /home/rsync -g rsyncd -s /bin/false rsyncd</command>

server/other/samba3/samba3-config.xml

@@ -26,6 +26,8 @@ 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>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 
 add the swat entry to <filename>/etc/xinetd.conf</filename>: </para>
@@ -43,6 +45,9 @@ service swat
 }
 <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
 browser to <ulink url="http://localhost:901"/>.</para>
 

server/other/samba3/samba3-exp.xml

@@ -5,9 +5,6 @@
 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
 file directory to avoid the default of <filename class="directory">/usr/etc</filename>.</para>
 
@@ -24,13 +21,13 @@ binary for use by the <command>mount</command> command so that mounting remote
 remote <acronym>NFS</acronym> shares.</para>
 
 <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> 
 
 <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>:
 This copies a default <filename>smb.conf </filename>into

server/other/xinetd/xinetd-config.xml

@@ -9,9 +9,10 @@
 
 <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>
 </userinput></screen>
@@ -20,7 +21,7 @@ class="directory">/usr/sbin</filename>, rather than the default path of
 documented in the xinetd.conf man page. Further information can be
 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>
                                                                                                                 
 <screen><userinput><command>make install-xinetd</command></userinput></screen>
@@ -40,8 +41,8 @@ DISABLING SERVICE [line=29]
 Aug 22 21:40:21 dps10 xinetd[2696]: Server /usr/sbin/in.rshd is not
 executable [line=42]</userinput></screen>
 
-<para>These errors are due to the fact that we don't have most of the
+<para>These errors are because most of the
-servers that <command>xinetd</command> is trying to control installed yet.</para>
+servers <command>xinetd</command> is trying to control are not installed yet.</para>
 
 </sect3>