Index: content/web/proftpd.xml
===================================================================
--- content/web/proftpd.xml	(revision ce4eef0d3e447c902333b7032b5d2ccaea006d73)
+++ content/web/proftpd.xml	(revision 1586494b11a736d54b3116961a7caed817b4ceb6)
@@ -18,34 +18,43 @@
 </sect1info>
 <?dbhtml filename="proftpd.html"?>
-<title>ProFTPD-&proftpd-version;</title>
-
-<sect2>
-<title>Introduction to ProFTPD</title>
-
-<para>The <application>ProFTPD</application> package contains a secure and
-highly configurable FTP daemon. This is useful for serving large file archives
-over a network.</para>
+<title><application>Pro<acronym>FTP</acronym>D</application>-&proftpd-version;</title>
+
+<sect2>
+<title>Introduction to 
+<application>Pro<acronym>FTP</acronym>D</application></title>
+
+<para>The <application>Pro<acronym>FTP</acronym>D</application> package 
+contains a secure and highly configurable <acronym>FTP</acronym> daemon. This 
+is useful for serving large file archives over a network.</para>
 
 <sect3><title>Package information</title>
 <itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP):<ulink url="&proftpd-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&proftpd-download-ftp;"/></para></listitem>
+<listitem><para>Download (HTTP): 
+<ulink url="&proftpd-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): 
+<ulink url="&proftpd-download-ftp;"/></para></listitem>
 <listitem><para>Download size: &proftpd-size;</para></listitem>
-<listitem><para>Estimated Disk space required: &proftpd-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &proftpd-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application>ProFTPD</application> dependencies</title>
+<listitem><para>Estimated disk space required: 
+&proftpd-buildsize;</para></listitem>
+<listitem><para>Estimated build time: 
+&proftpd-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>Pro<acronym>FTP</acronym>D</application> 
+dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="Linux_PAM"/></para></sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>ProFTPD</application></title>
-
-<para>For security reasons, running <application>ProFTPD</application>
-as an unprivileged user and group using its own login shell is encouraged.</para>
+<para><xref linkend="Linux_PAM"/></para>
+</sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of 
+<application>Pro<acronym>FTP</acronym>D</application></title>
+
+<para>For security reasons, running 
+<application>Pro<acronym>FTP</acronym>D</application> as an unprivileged user 
+and group using its own login shell is encouraged.</para>
 
 <screen><userinput><command>groupadd proftpd &amp;&amp;
@@ -55,5 +64,6 @@
 </userinput></screen>
 
-<para>Install <application>ProFTPD</application> by running the following commands:</para>
+<para>Install <application>Pro<acronym>FTP</acronym>D</application> by running 
+the following commands:</para>
 
 <screen><userinput><command>install_user=proftpd install_group=proftpd \
@@ -69,5 +79,6 @@
 
 <para><parameter>install_user=proftpd install_group=proftpd</parameter>:
-Specify the user and group identity for ProFTPD.</para>
+Specify the user and group identity for 
+<application>Pro<acronym>FTP</acronym>D</application>.</para>
 
 <para><parameter>--sysconfdir=/etc</parameter>:
@@ -82,10 +93,10 @@
 
 <sect2>
-<title>Configuring <application>ProFTPD</application></title>
+<title>Configuring <application>Pro<acronym>FTP</acronym>D</application></title>
 
 <sect3><title>proftpd init.d script</title>
-<para>Install the <filename>/etc/rc.d/init.d/proftpd</filename>
-init script included in the <xref linkend="intro-important-bootscripts"/> package.</para>
-                                                                                                                
+<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>
 
@@ -93,10 +104,13 @@
 
 <sect3><title>Config files</title>
-
 <para><filename>/etc/proftpd.conf</filename></para>
-<para>This is a simple, download-only sample configuration. See the ProFTPD
-documentation in <filename class="directory">/usr/share/doc/proftpd</filename>
-and consult the website at <ulink url="http://www.proftpd.org/"/>
- for example configurations.</para>
+</sect3>
+
+<sect3><title>Configuration information</title>
+<para>This is a simple, download-only sample configuration. See the 
+<application>Pro<acronym>FTP</acronym>D</application> documentation in 
+<filename class="directory">/usr/share/doc/proftpd</filename> and consult the 
+website at <ulink url="http://www.proftpd.org/"/> for example 
+configurations.</para>
 
 <screen><userinput><command>cat &gt; /etc/proftpd.conf &lt;&lt; "EOF"</command>
@@ -126,5 +140,5 @@
 Group                           proftpd
 
-# Normally, we want files to be overwritable.
+# Normally, files should be overwritable.
 &lt;Directory /*&gt;
   AllowOverwrite                on
@@ -135,5 +149,5 @@
   User                          proftpd
   Group                         proftpd
-  # We want clients to be able to login with "anonymous" as well as "proftpd"
+  # Clients should be able to login with "anonymous" as well as "proftpd"
   UserAlias                     anonymous proftpd
 
@@ -141,5 +155,5 @@
   MaxClients                    10
 
-  # We want 'welcome.msg' displayed at login, and '.message' displayed
+  # 'welcome.msg' should be displayed at login, and '.message' displayed
   # in each newly chdired directory.
   DisplayLogin                  welcome.msg
@@ -158,5 +172,5 @@
 <title>Contents</title>
 
-<para>The <application>ProFTPD</application> package contains
+<para>The <application>Pro<acronym>FTP</acronym>D</application> package contains
 <command>ftpcount</command>, <command>ftpshut</command>,
 <command>ftptop</command>, <command>ftpwho</command> and
@@ -168,12 +182,14 @@
 
 <sect3><title>ftpcount</title>
-<para><command>ftpcount</command> shows the 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
-given time.</para></sect3>
+<para><command>ftpshut</command> shuts down all <command>proftpd</command> 
+servers at a given time.</para></sect3>
 
 <sect3><title>ftptop</title>
-<para><command>ftptop</command> displays running status on connections.</para></sect3>
+<para><command>ftptop</command> displays running status on 
+connections.</para></sect3>
 
 <sect3><title>ftpwho</title>
@@ -182,5 +198,6 @@
 
 <sect3><title>proftpd</title>
-<para><command>proftpd</command> is the daemon itself.</para></sect3>
+<para><command>proftpd</command> is the <acronym>FTP</acronym> 
+daemon.</para></sect3>
 
 </sect2>
Index: content/web/vsftpd.xml
===================================================================
--- content/web/vsftpd.xml	(revision ce4eef0d3e447c902333b7032b5d2ccaea006d73)
+++ content/web/vsftpd.xml	(revision 1586494b11a736d54b3116961a7caed817b4ceb6)
@@ -9,5 +9,5 @@
   <!ENTITY vsftpd-size          "148 KB">
   <!ENTITY vsftpd-buildsize     "492 KB">
-  <!ENTITY vsftpd-time          "0.0 SBU">
+  <!ENTITY vsftpd-time          "0.01 SBU">
 ]>
 
@@ -18,19 +18,25 @@
 </sect1info>
 <?dbhtml filename="vsftpd.html"?>
-<title>vsFTPD-&vsftpd-version;</title>
+<title><application>vs<acronym>FTP</acronym>D</application>-&vsftpd-version;</title>
 
 <sect2>
-<title>Introduction to vsFTPD</title>
+<title>Introduction to 
+<application>vs<acronym>FTP</acronym>D</application></title>
 
-<para>The <application>vsFTPD</application> package contains a very secure and
-very small FTP daemon. This is useful for serving files over a network.</para>
+<para>The <application>vs<acronym>FTP</acronym>D</application> package 
+contains a very secure and very small <acronym>FTP</acronym> daemon. This is 
+useful for serving files over a network.</para>
 
 <sect3><title>Package information</title>
 <itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP):<ulink url="&vsftpd-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&vsftpd-download-ftp;"/></para></listitem>
+<listitem><para>Download (HTTP): 
+<ulink url="&vsftpd-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): 
+<ulink url="&vsftpd-download-ftp;"/></para></listitem>
 <listitem><para>Download size: &vsftpd-size;</para></listitem>
-<listitem><para>Estimated Disk space required: &vsftpd-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &vsftpd-time;</para></listitem></itemizedlist>
+<listitem><para>Estimated disk space required: 
+&vsftpd-buildsize;</para></listitem>
+<listitem><para>Estimated build time: 
+&vsftpd-time;</para></listitem></itemizedlist>
 </sect3>
 
@@ -39,5 +45,6 @@
 <para><xref linkend="Linux_PAM"/>,
 <xref linkend="openssl"/>, and
-<xref linkend="tcpwrappers"/></para></sect4>
+<xref linkend="tcpwrappers"/></para>
+</sect4>
 </sect3>
 
@@ -47,17 +54,19 @@
 <title>Installation of <application>vsFTPD</application></title>
 
-<para>For security reasons, running <application>vsFTPD</application> as an
-unprivileged user and group is encouraged. Also, we need a user to map
-anonymous users to.</para>
+<para>For security reasons, running 
+<application>vs<acronym>FTP</acronym>D</application> as an unprivileged user 
+and group is encouraged. Also, a user to map anonymous users to should be
+created.</para>
 
 <screen><userinput><command>install -d -m 0755 /var/ftp/empty &amp;&amp;
 install -d -m 0755 /home/ftp &amp;&amp;
 groupadd vsftpd &amp;&amp;
-useradd -d /dev/null -g vsftpd -s /bin/false vsftpd &amp;&amp;
+useradd -d /dev/null -c "vsFTPD User" -g vsftpd -s /bin/false vsftpd &amp;&amp;
 groupadd ftp &amp;&amp;
 useradd -c anonymous_user -d /home/ftp -g ftp -s /bin/false ftp</command>
 </userinput></screen>
 
-<para>Install <application>vsFTPD</application> by running the following commands:</para>
+<para>Install <application>vs<acronym>FTP</acronym>D</application> by running 
+the following commands:</para>
 
 <screen><userinput><command>make &amp;&amp;
@@ -65,6 +74,5 @@
 install -m 644 vsftpd.8 /usr/share/man/man8 &amp;&amp;
 install -m 644 vsftpd.conf.5 /usr/share/man/man5 &amp;&amp;
-install -m 644 vsftpd.conf /etc
-</command></userinput></screen>
+install -m 644 vsftpd.conf /etc</command></userinput></screen>
 
 </sect2>
@@ -74,6 +82,7 @@
 
 <para><parameter>install -d [...]</parameter>: This creates the directory that
-anonymous users will use (/home/ftp) and the directory the daemon will chroot
-into (/var/ftp/empty).</para>
+anonymous users will use (<filename class='directory'>/home/ftp</filename>) 
+and the directory the daemon will chroot into 
+(<filename class='directory'>/var/ftp/empty</filename>).</para>
 
 <note><para><filename class="directory">/home/ftp</filename> should not be
@@ -81,21 +90,27 @@
 
 <para><parameter>echo "#define VSF_BUILD_TCPWRAPPERS" >>builddefs.h</parameter>:
-Use this prior to make to add support for tcpwrappers.</para>
+Use this prior to <command>make</command> to add support for 
+<application>tcpwrappers</application>.</para>
 
 <para><parameter>echo "#define VSF_BUILD_SSL" >>builddefs.h</parameter>:
-Use this prior to make to add support for SSL.</para>
+Use this prior to <command>make</command> to add support for 
+<acronym>SSL</acronym>.</para>
 
 <para><parameter>install -m [...]</parameter>:
-The Makefile hardwires /usr/local (if it exists). We want the files in /usr.</para>
+The <filename>Makefile</filename> hardwires 
+<filename class='directory'>/usr/local</filename> (if it exists). These 
+commands install the files in 
+<filename class='directory'>/usr</filename>.</para>
 
 </sect2>
 
 <sect2>
-<title>Configuring <application>vsFTPD</application></title>
+<title>Configuring <application>vs<acronym>FTP</acronym>D</application></title>
 
 <sect3><title>vsftpd init.d script</title>
 <para>Install the <filename>/etc/rc.d/init.d/vsftpd</filename>
-init script included in the <xref linkend="intro-important-bootscripts"/> package.</para>
-                                                                                                                
+init script included in the 
+<xref linkend="intro-important-bootscripts"/> package.</para>
+
 <screen><userinput><command>make install-vsftpd</command></userinput></screen>
 
@@ -103,12 +118,16 @@
 
 <sect3><title>Config files</title>
+<para><filename>/etc/vsftpd.conf</filename></para>
+</sect3>
 
-<para><filename>/etc/vsftpd.conf</filename></para> <para>vsFTPD comes with a
-basic anonymous-only configuration file that was copied to /etc above. We will
-modify this file because it is now recommended to run vsFTPD in standalone mode
-as opposed to inetd/xinetd mode. Also, we need to specify the priviledge
-separation user we created above. Finally, we need to specify the chroot
-directory.  <command>man vsftpd.conf</command> will give you all the
-details.</para>
+<sect3><title>Configuration information</title>
+<para><application>vs<acronym>FTP</acronym>D</application> comes with a basic 
+anonymous-only configuration file that was copied to 
+<filename class='directory'>/etc</filename> above. This file should be modified 
+because it is now recommended to run <command>vsftpd</command> in standalone 
+mode as opposed to <command>inetd</command>/<command>xinetd</command> mode. 
+Also, you should specify the privilege separation user created above. Finally, 
+you should specify the <command>chroot</command> directory. 
+<command>man vsftpd.conf</command> will give you all the details.</para>
 
 <screen><userinput><command>cat &gt;&gt; /etc/vsftpd.conf &lt;&lt; "EOF"</command>
@@ -117,5 +136,6 @@
 nopriv_user=vsftpd
 secure_chroot_dir=/var/ftp/empty
-<command>EOF</command></userinput></screen></sect3>
+<command>EOF</command></userinput></screen>
+</sect3>
 
 </sect2>
@@ -124,5 +144,5 @@
 <title>Contents</title>
 
-<para>The <application>vsFTPD</application> package contains
+<para>The <application>vs<acronym>FTP</acronym>D</application> package contains 
 <command>vsftpd</command>.</para>
 
@@ -132,5 +152,6 @@
 
 <sect3><title>vsftpd</title>
-<para><command>vsftpd</command> is the daemon itself.</para></sect3>
+<para><command>vsftpd</command> is the <acronym>FTP</acronym> 
+daemon.</para></sect3>
 
 </sect2>
Index: general/sysutils/fcron.xml
===================================================================
--- general/sysutils/fcron.xml	(revision ce4eef0d3e447c902333b7032b5d2ccaea006d73)
+++ general/sysutils/fcron.xml	(revision 1586494b11a736d54b3116961a7caed817b4ceb6)
@@ -10,5 +10,4 @@
 <!ENTITY fcron-buildsize "3.4 MB">
 <!ENTITY fcron-time "0.10 SBU">
-
 ]>
 
@@ -19,75 +18,80 @@
 </sect1info>
 <?dbhtml filename="fcron.html"?>
-<title>Fcron-&fcron-version;</title>
+<title><application>Fcron</application>-&fcron-version;</title>
 
 <sect2>
 <title>Introduction to <application>Fcron</application></title>
-                                                                               
+
 <para>The <application>Fcron</application> package contains a periodical
 command scheduler which aims at replacing <application>Vixie
 Cron</application>.</para>
-                                                                               
+
 <sect3><title>Package information</title>
 <itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink url="&fcron-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&fcron-download-ftp;"/></para></listitem>
+<listitem><para>Download (HTTP): 
+<ulink url="&fcron-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): 
+<ulink url="&fcron-download-ftp;"/></para></listitem>
 <listitem><para>Download size: &fcron-size;</para></listitem>
-<listitem><para>Estimated disk space required: &fcron-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &fcron-time;</para></listitem></itemizedlist>
+<listitem><para>Estimated disk space required: 
+&fcron-buildsize;</para></listitem>
+<listitem><para>Estimated build time: 
+&fcron-time;</para></listitem></itemizedlist>
 </sect3>
-                                                                               
+
 <sect3><title><application>Fcron</application> dependencies</title>
 <sect4><title>Optional</title>
-<para>
-<ulink url="../server/mail.html">MTA</ulink>,
+<para><ulink url="../server/mail.html">MTA</ulink>, 
 <xref linkend="Linux_PAM"/>,
 <ulink url="http://www.nsa.gov/selinux/">SELinux</ulink>,
 <xref linkend="docbook-utils"/> and
 <ulink url="../postlfs/editors.html">a text editor</ulink> (default is
-<xref linkend="postlfs-editors-vim"/>)
-</para></sect4>
+<xref linkend="postlfs-editors-vim"/>)</para>
+</sect4>
 </sect3>
-                                                                               
+
 </sect2>
 
 <sect2>
 <title>Installation of <application>Fcron</application></title>
-                                                                               
+
 <para><application>Fcron</application> uses the cron facility of
-<command>syslog</command>
-to log all messages. Since <acronym>LFS</acronym> does not set up this
-facility in <filename>/etc/syslog.conf</filename>, it needs to be done
-prior to installing <application>Fcron</application>. This command will append
-the necessary line to the current <filename>/etc/syslog.conf</filename>:</para>                                                                               
+<command>syslog</command> to log all messages. Since <acronym>LFS</acronym> 
+does not set up this facility in <filename>/etc/syslog.conf</filename>, it 
+needs to be done prior to installing <application>Fcron</application>. This 
+command will append the necessary line to the current 
+<filename>/etc/syslog.conf</filename>:</para>
+
 <screen><userinput><command>cat &gt;&gt; /etc/syslog.conf &lt;&lt; "EOF"
 # Begin fcron addition to /etc/syslog.conf
-                                                                               
+
 cron.* -/var/log/cron.log
-                                                                               
+
 # End fcron addition
 EOF</command></userinput></screen>
-                                                                               
+
 <para>The configuration file has been modified, so reloading the
 <command>sysklogd</command> daemon will activate the changes.</para>
-                                                                               
+
 <screen><userinput><command>/etc/rc.d/init.d/sysklogd reload</command></userinput></screen>
-                                                                               
-<para>For security reasons, we need to create an unprivileged user and
-group for <application>fcron</application>:</para>
-                                                                               
+
+<para>For security reasons, an unprivileged user and group for 
+<application>Fcron</application> should be created:</para>
+
 <screen><userinput><command>groupadd fcron &amp;&amp;
-useradd -d /dev/null -g fcron -s /bin/false fcron</command></userinput></screen>
-                                                                               
-<para>Install <application>Fcron</application> by running the following commands:</para>
+useradd -d /dev/null -c "Fcron User" -g fcron -s /bin/false fcron</command></userinput></screen>
+
+<para>Install <application>Fcron</application> by running the following 
+commands:</para>
 
 <screen><userinput><command>./configure --without-sendmail --with-answer-all=no &amp;&amp;
 make &amp;&amp;
 make install</command></userinput></screen>
-                                                                               
+
 </sect2>
 
 <sect2>
 <title>Command explanations</title>
-                                                                               
+
 <para><option>--without-sendmail</option>: <application>Fcron</application>
 will use an installed <acronym>MTA</acronym> to email you the results of the
@@ -95,71 +99,73 @@
 the switch to <parameter>--with-sendmail=<replaceable>[path to your
 MTA]</replaceable></parameter>.</para>
-                                                                               
+
 <para><parameter>--with-answer-all=no</parameter>: After the files are
 installed, the <command>make install</command> script enters into a
-configuration routine.  The first test will be whether to install a boot script in the <filename class="directory">/etc/rc.d/init.d</filename> directory with
-the appropriate symbolic links in run levels 2, 3, 4, and 5. The second is to
-stop any current fcron processes and start a new one. Since this is probably
-your first install and we want a boot script based upon the
-<acronym>BLFS</acronym> template, we answer 'n' to both tests.</para>
-                                                                               
+configuration routine.  The first test will be whether to install a boot 
+script in the <filename class="directory">/etc/rc.d/init.d</filename> 
+directory with the appropriate symbolic links in run levels 2, 3, 4, and 5. 
+The second is to stop any current fcron processes and start a new one. Since 
+this is probably your first install and a boot script based upon the
+<acronym>BLFS</acronym> template is desired, answer 'n' to both tests.</para>
+
 </sect2>
 
 <sect2>
 <title>Configuring <application>Fcron</application></title>
-                                                                               
+
 <sect3><title>Config files</title>
-                                                                               
+
 <para><filename>/etc/fcron.conf</filename>,
-<filename>/etc/fcron.allow</filename>,
+<filename>/etc/fcron.allow</filename> and 
 <filename>/etc/fcron.deny</filename></para>
-                                                                               
+
 </sect3>
-                                                                               
+
 <sect3><title>Configuration Information</title>
-                                                                               
+
 <para>There are no required changes in any of the config files.
 Configuration information can be found in the man page for
 <filename>fcron.conf</filename>.</para>
-                                                                               
-<para><command>fcron</command> scripts are written using <command>fcrontab</command>.
-Refer to the fcrontab man page for proper parameters to address your situation.</para>
-                                                                               
+
+<para><command>fcron</command> scripts are written using 
+<command>fcrontab</command>. Refer to the <command>fcrontab</command> man 
+page for proper parameters to address your situation.</para>
+
 <para>Install the <filename>/etc/rc.d/init.d/fcron</filename>
-init script from the <xref linkend="intro-important-bootscripts"/> package.</para>
-                                                                               
+init script from the <xref linkend="intro-important-bootscripts"/> 
+package.</para>
+
 <screen><userinput><command>make install-fcron</command></userinput></screen>
-                                                                               
+
 </sect3>
-                                                                               
+
 </sect2>
 
 <sect2>
 <title>Contents</title>
-                                                                               
+
 <para>The <application>Fcron</application> package contains
-<command>fcron</command>, <command>fcrontab</command>, <command>fcronsighup
-</command> and <command>fcrondyn.</command></para>
-                                                                               
+<command>fcron</command>, <command>fcrontab</command>, 
+<command>fcronsighup</command> and <command>fcrondyn</command>.</para>
+
 </sect2>
-                                                                               
+
 <sect2><title>Description</title>
-                                                                               
+
 <sect3><title>fcron</title>
-<para><command>fcron</command> is the scheduling daemon.
-</para></sect3>
-                                                                               
+<para><command>fcron</command> is the scheduling daemon.</para></sect3>
+
 <sect3><title>fcrontab</title>
 <para><command>fcrontab</command> is the program used to install, edit, list
 and remove the tables used by <command>fcron</command>.</para></sect3>
-                                                                               
+
 <sect3><title>fcronsighup</title>
 <para><command>fcronsighup</command> instructs <command>fcron</command> to
 reread the fcron tables.</para></sect3>
-                                                                               
+
 <sect3><title>fcrondyn</title>
 <para><command>fcrondyn</command> is a user tool intended to interact with a
 running <command>fcron</command> daemon.</para></sect3>
-                                                                               
+
 </sect2>
 
Index: general/sysutils/pkgconfig.xml
===================================================================
--- general/sysutils/pkgconfig.xml	(revision ce4eef0d3e447c902333b7032b5d2ccaea006d73)
+++ general/sysutils/pkgconfig.xml	(revision 1586494b11a736d54b3116961a7caed817b4ceb6)
@@ -6,5 +6,5 @@
 
 <!ENTITY pkgconfig-download-http "http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-&pkgconfig-version;.tar.gz">
-<!ENTITY pkgconfig-download-ftp " ">
+<!ENTITY pkgconfig-download-ftp "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/pkgconfig-&pkgconfig-version;.tar.gz">
 <!ENTITY pkgconfig-size "604 KB">
 <!ENTITY pkgconfig-buildsize "5.2 MB">
@@ -18,5 +18,5 @@
 </sect1info>
 <?dbhtml filename="pkgconfig.html"?>
-<title>pkgconfig-&pkgconfig-version;</title>
+<title><application>pkgconfig</application>-&pkgconfig-version;</title>
 
 <sect2>
@@ -29,9 +29,13 @@
 <sect3><title>Package information</title>
 <itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink url="&pkgconfig-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&pkgconfig-download-ftp;"/></para></listitem>
+<listitem><para>Download (HTTP): 
+<ulink url="&pkgconfig-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): 
+<ulink url="&pkgconfig-download-ftp;"/></para></listitem>
 <listitem><para>Download size: &pkgconfig-size;</para></listitem>
-<listitem><para>Estimated Disk space required: &pkgconfig-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &pkgconfig-time;</para></listitem></itemizedlist>
+<listitem><para>Estimated disk space required: 
+&pkgconfig-buildsize;</para></listitem>
+<listitem><para>Estimated build time: 
+&pkgconfig-time;</para></listitem></itemizedlist>
 </sect3>
 
@@ -54,5 +58,5 @@
 
 <para>The default setting for <envar>PKG_CONFIG_PATH</envar> is
-<filename>/usr/lib/pkgconfig</filename> because of the prefix we use to
+<filename>/usr/lib/pkgconfig</filename> because of the prefix used to 
 install pkgconfig.  You may add to <envar>PKG_CONFIG_PATH</envar> by exporting
 additional paths on your system where <application>pkgconfig</application> 
Index: general/sysutils/which.xml
===================================================================
--- general/sysutils/which.xml	(revision ce4eef0d3e447c902333b7032b5d2ccaea006d73)
+++ general/sysutils/which.xml	(revision 1586494b11a736d54b3116961a7caed817b4ceb6)
@@ -18,11 +18,11 @@
 </sect1info>
 <?dbhtml filename="which.html"?>
-<title>which-&which-version; and alternatives</title>
+<title><application>which</application>-&which-version; and alternatives</title>
 
-<para>The presence or absence of the which program in the main <acronym>LFS
-</acronym> book is probably one of the most contentious issues we have on the 
-mailing lists.  It has resulted in at least one flame war in the past.
-To hopefully put an end to this once and for all, we here present two of
-the options for equipping your system with "which". The question of which "which"
+<para>The presence or absence of the which program in the main 
+<acronym>LFS</acronym> book is probably one of the most contentious issues on 
+the mailing lists.  It has resulted in at least one flame war in the past. 
+To hopefully put an end to this once and for all, presented here are two 
+options for equipping your system with "which". The question of which "which" 
 is for you to decide.</para>
 
@@ -32,5 +32,5 @@
 <sect2>
 <title>Introduction to <application>which</application></title>
-                                                                               
+
 <sect3><title>Package information</title>
 <itemizedlist spacing='compact'>
@@ -40,39 +40,38 @@
 url="&which-download-ftp;"/></para></listitem>
 <listitem><para>Download size: &which-size;</para></listitem>
-<listitem><para>Estimated Disk space required:
+<listitem><para>Estimated disk space required:
 &which-buildsize;</para></listitem>
 <listitem><para>Estimated build time:
 &which-time;</para></listitem></itemizedlist>
 </sect3>
-                                                                               
-                                                                               
+
 </sect2>
 
 <sect2>
 <title>Installation of <application>which</application></title>
-                                                                               
+
 <para>Install <application>which</application> by running the following
 commands:</para>
-                                                                               
+
 <screen><userinput><command>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
 make install</command></userinput></screen>
-                                                                               
+
 </sect2>
-
 
 <sect2>
 <title>Contents</title>
-                                                                               
-<para>The <application>which</application> package contains <command>which</command>.</para>
-                                                                               
+
+<para>The <application>which</application> package contains 
+<command>which</command>.</para>
+
 </sect2>
-                                                                               
+
 <sect2><title>Description</title>
-                                                                               
+
 <sect3><title>which</title>
 <para><command>which</command> shows the full path of (shell) commands.</para>
 </sect3>
-                                                                               
+
 </sect2>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision ce4eef0d3e447c902333b7032b5d2ccaea006d73)
+++ introduction/welcome/changelog.xml	(revision 1586494b11a736d54b3116961a7caed817b4ceb6)
@@ -24,6 +24,7 @@
 
 <listitem><para>December 21st, 2004 [randy]: Updated to KOffice-1.3.5 and 
-cpio-2.6; added MD5 sums and updated dependencies to GNOME-1.4 
-packages.</para></listitem>
+cpio-2.6; added MD5 sums and updated dependencies to GNOME-1.4 packages; 
+spelling, grammar, tag and excessive whitespace corrections to various 
+package instructions.</para></listitem>
 
 <listitem><para>December 20th, 2004 [bdubbs]: Updated license of book to
Index: server/mail/exim.xml
===================================================================
--- server/mail/exim.xml	(revision ce4eef0d3e447c902333b7032b5d2ccaea006d73)
+++ server/mail/exim.xml	(revision 1586494b11a736d54b3116961a7caed817b4ceb6)
@@ -10,5 +10,4 @@
 <!ENTITY exim-buildsize "11 MB">
 <!ENTITY exim-time "0.27 SBU">
-
 ]>
 
@@ -19,33 +18,39 @@
 </sect1info>
 <?dbhtml filename="exim.html"?>
-<title>Exim-&exim-version;</title>
+<title><application>Exim</application>-&exim-version;</title>
 
 <sect2>
 <title>Introduction to <application>Exim</application></title>
 
-<para>The <application>Exim</application> package contains a Mail Transport Agent written by the
-University of Cambridge, released under the <acronym>GNU</acronym> Public License.</para>
+<para>The <application>Exim</application> package contains a Mail Transport 
+Agent written by the University of Cambridge, released under the 
+<acronym>GNU</acronym> Public License.</para>
 
 <sect3><title>Package information</title>
 <itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink url="&exim-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&exim-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &exim-size;</para></listitem>
-<listitem><para>Estimated Disk space required: &exim-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &exim-time;</para></listitem></itemizedlist>
+<listitem><para>Download (HTTP): 
+<ulink url="&exim-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): 
+<ulink url="&exim-download-ftp;"/></para></listitem>
+<listitem><para>Download size: 
+&exim-size;</para></listitem>
+<listitem><para>Estimated disk space required: 
+&exim-buildsize;</para></listitem>
+<listitem><para>Estimated build time: 
+&exim-time;</para></listitem></itemizedlist>
 </sect3>
 
 <sect3><title><application>Exim</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="db"/>
-</para></sect4>
+<para><xref linkend="db"/></para>
+</sect4>
+
 <sect4><title>Optional</title>
-<para>
-X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>),
+<para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>), 
 <xref linkend="openldap"/>,
 <xref linkend="mysql"/>,
 <xref linkend="tcpwrappers"/> and
-<xref linkend="Linux_PAM"/>
-</para></sect4>
+<xref linkend="Linux_PAM"/></para>
+</sect4>
 </sect3>
 
@@ -55,16 +60,17 @@
 <title>Installation of <application>Exim</application></title>
 
-<para>Before building <application>Exim</application>, we need to 
+<para>Before building <application>Exim</application>, you should 
 create the group and user exim which will run the exim daemon:</para>
 
 <screen><userinput><command>groupadd exim &amp;&amp;
-useradd -d /dev/null -g exim -s /bin/false exim</command></userinput></screen>
-
-<para>Install <application>Exim</application> with the following commands:</para>
-
-<screen><userinput><command>sed -e 's/^BIN_DIR.*$/BIN_DIRECTORY=\/usr\/sbin/' src/EDITME | \
-  sed -e 's/^CONF.*$/CONFIGURE_FILE=\/etc\/exim.conf/' | \
-  sed -e 's/^EXIM_USER.*$/EXIM_USER=exim/' | \
-  sed -e 's/^EXIM_MONITOR/#EXIM_MONITOR/' > Local/Makefile &amp;&amp;
+useradd -d /dev/null -c "Exim Daemon" -g exim -s /bin/false exim</command></userinput></screen>
+
+<para>Install <application>Exim</application> with the following 
+commands:</para>
+
+<screen><userinput><command>sed -e 's,^BIN_DIR.*$,BIN_DIRECTORY=/usr/sbin,' src/EDITME | \
+  sed -e 's,^CONF.*$,CONFIGURE_FILE=/etc/exim.conf,' | \
+  sed -e 's,^EXIM_USER.*$,EXIM_USER=exim,' | \
+  sed -e 's,^EXIM_MONITOR,#EXIM_MONITOR,' > Local/Makefile &amp;&amp;
 make &amp;&amp;
 make install &amp;&amp;
@@ -78,17 +84,16 @@
 <title>Command explanations</title>
 
-<para><command>sed -e ... > Local/Makefile</command>: Many of
-<application>Exim</application>'s
-configuration options are compiled in. Here, we specify the minimum set
-of options, <parameter>BIN_DIRECTORY</parameter>,
-<parameter>CONFIGURE_FILE</parameter> and
-<parameter>EXIM_USER</parameter>. We also defer
-building the <application>Exim</application> monitor program, which
-requires the <application>X</application> Window System
-support, by commenting out the <parameter>EXIM_MONITOR</parameter> line
-in the <filename>Makefile</filename>.</para>
+<para><command>sed -e ... > Local/Makefile</command>: Many of 
+<application>Exim</application>'s configuration options are compiled in. 
+This command specifies the minimum set of options, 
+<parameter>BIN_DIRECTORY</parameter>, <parameter>CONFIGURE_FILE</parameter> 
+and <parameter>EXIM_USER</parameter>. Additionally, building the 
+<application>Exim</application> monitor program is deferred, as it 
+requires <application>X</application> Window System support, by commenting 
+out the <parameter>EXIM_MONITOR</parameter> line in the 
+<filename>Makefile</filename>.</para>
 
 <para><command>ln -s exim /usr/sbin/sendmail</command>:
-Create a link to <command>sendmail</command> for applications which need
+Creates a link to <command>sendmail</command> for applications which need 
 it. <application>Exim</application> will
 accept most <application>Sendmail</application> command-line options.</para>
@@ -101,5 +106,6 @@
 <sect3><title>Config files</title>
 
-<para><filename>/etc/exim.conf</filename>, <filename>/etc/aliases</filename></para>
+<para><filename>/etc/exim.conf</filename> and 
+<filename>/etc/aliases</filename></para>
 
 </sect3>
@@ -107,5 +113,5 @@
 <sect3><title>Configuration Information</title>
 
-<para>Create the Exim configuration files with the following commands:</para> 
+<para>Create the Exim configuration files with the following commands:</para>
 
 <screen><userinput><command>cat &gt;&gt; /etc/aliases &lt;&lt; "EOF"</command>
@@ -116,12 +122,11 @@
 /usr/sbin/exim -bd -q1m</command></userinput></screen>
 
-<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>To automate the running of exim at startup,
-install the <filename>/etc/rc.d/init.d/exim</filename>
-init script included in the <xref linkend="intro-important-bootscripts"/> package.</para>
+<note><para>To protect an existing <filename>/etc/aliases</filename> file, 
+append these aliases to it if it exists. This file should be checked and 
+duplicate aliases removed, if present.</para></note>
+
+<para>To automate the running of <command>exim</command> at startup, 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>
@@ -148,6 +153,5 @@
 <command>exiqgrep</command>,
 <command>exim_lock</command> and
-<command>exim_checkaccess</command>.
-</para>
+<command>exim_checkaccess</command>.</para>
 
 </sect2>
@@ -158,12 +162,14 @@
 
 <sect3><title>exim_dumpdb</title>
-<para><command>exim_dumpdb</command> writes the contents of exim databases to the
-standard output.</para></sect3>
+<para><command>exim_dumpdb</command> writes the contents of 
+<application>Exim</application> databases to the standard output.</para></sect3>
 
 <sect3><title>exim_fixdb</title>
-<para><command>exim_fixdb</command> modifies data in exim databases.</para></sect3>
+<para><command>exim_fixdb</command> modifies data in 
+<application>Exim</application> databases.</para></sect3>
 
 <sect3><title>exim_tidydb</title>
-<para><command>exim_tidydb</command> removes old records from exim databases.</para></sect3>
+<para><command>exim_tidydb</command> removes old records from 
+<application>Exim</application> databases.</para></sect3>
 
 <sect3><title>exinext</title>
@@ -171,23 +177,26 @@
 
 <sect3><title>exiwhat</title>
-<para><command>exiwhat</command> queries running exim processes.</para></sect3>
+<para><command>exiwhat</command> queries running 
+<application>Exim</application> processes.</para></sect3>
 
 <sect3><title>exim_dbmbuild</title>
-<para><command>exim_dbmbuild</command> creates and rebuilds exim
-databases.</para></sect3>
+<para><command>exim_dbmbuild</command> creates and rebuilds 
+<application>Exim</application> databases.</para></sect3>
 
 <sect3><title>exicyclog</title>
-<para><command>exicyclog</command> cycles exim log files.</para></sect3>
+<para><command>exicyclog</command> cycles 
+<application>Exim</application> log files.</para></sect3>
 
 <sect3><title>exigrep</title>
-<para><command>exigrep</command> searches exim log files.</para></sect3>
+<para><command>exigrep</command> searches 
+<application>Exim</application> log files.</para></sect3>
 
 <sect3><title>eximstats</title>
-<para><command>eximstats</command> generates mail statistics from exim log
-files.</para></sect3>
+<para><command>eximstats</command> generates mail statistics from 
+<application>Exim</application> log files.</para></sect3>
 
 <sect3><title>exiqsumm</title>
-<para><command>exiqsumm</command> produces a summary of the messages on the mail
-queue.</para></sect3> 
+<para><command>exiqsumm</command> produces a summary of the messages in the 
+mail queue.</para></sect3> 
 
 <sect3><title>exiqgrep</title>
@@ -199,6 +208,6 @@
 
 <sect3><title>exim_checkaccess</title>
-<para><command>exim_checkaccess</command> states whether a given recipient address from a
-given host is acceptable or not.</para></sect3>
+<para><command>exim_checkaccess</command> states whether a given recipient 
+address from a given host is acceptable or not.</para></sect3>
 
 </sect2>
