Index: introduction/introduction.xml
===================================================================
--- introduction/introduction.xml	(revision 24ca7aa4ad919fb6a85acc1a1e1953ca2ea70d83)
+++ introduction/introduction.xml	(revision a71ee9cb3733a0b81276d856b60b48c91f0f519e)
@@ -16,8 +16,8 @@
     <title>Welcome to BLFS</title>
 
-    <para>The Beyond Linux From Scratch book is designed to carry on from 
-    where the LFS book leaves off.  But unlike the LFS book, it isn't designed to 
+    <para>The Beyond Linux From Scratch book is designed to carry on from
+    where the LFS book leaves off.  But unlike the LFS book, it isn't designed to
     be followed straight through.  Reading the <xref
-    linkend="intro-welcome-whichsections"/> part of this chapter should help 
+    linkend="intro-welcome-whichsections"/> part of this chapter should help
     guide you through the book.</para>
 
Index: introduction/welcome/acknowledgments.xml
===================================================================
--- introduction/welcome/acknowledgments.xml	(revision 24ca7aa4ad919fb6a85acc1a1e1953ca2ea70d83)
+++ introduction/welcome/acknowledgments.xml	(revision a71ee9cb3733a0b81276d856b60b48c91f0f519e)
@@ -21,11 +21,11 @@
   <itemizedlist>
     <listitem>
-      <para>All those people listed on the Credits page for submitting patches, 
-      instructions and corrections to the book.  The former editor would especially 
+      <para>All those people listed on the Credits page for submitting patches,
+      instructions and corrections to the book.  The former editor would especially
       like to thank Bruce, Larry and Billy for their enormous inputs to the project.</para>
     </listitem>
     <listitem>
       <para><ulink url="mailto:strider@linux.com">Mark Stone</ulink>
-      &lt;mstone &lt;at&gt; linux.com&gt; for donating the linuxfromscratch.org 
+      &lt;mstone &lt;at&gt; linux.com&gt; for donating the linuxfromscratch.org
       servers.</para>
     </listitem>
@@ -38,5 +38,5 @@
       <para><ulink url="mailto:highos@linuxfromscratch.org">Jesse
       Tie-Ten-Quee</ulink> &lt;higho &lt;at&gt; @linuxfromscratch.org&gt; for answering
-      many questions on IRC, having a great deal of patience and for not killing 
+      many questions on IRC, having a great deal of patience and for not killing
       the former editor for the joke in the original BLFS announcement!</para>
     </listitem>
@@ -52,5 +52,5 @@
     <listitem>
       <para><ulink url="mailto:bkenoah@oswd.org">Frank Skettino</ulink>
-      &lt;bkenoah &lt;at&gt; oswd.org&gt; at <ulink  url="http://www.oswd.org">OSWD</ulink> for 
+      &lt;bkenoah &lt;at&gt; oswd.org&gt; at <ulink  url="http://www.oswd.org">OSWD</ulink> for
       coming up the initial design of the LFS and BLFS  websites.</para>
     </listitem>
@@ -60,10 +60,10 @@
     </listitem>
     <listitem>
-      <para>Jeff Bauman (former co-editor of the book) for his assistance 
+      <para>Jeff Bauman (former co-editor of the book) for his assistance
       with getting BLFS off the ground.</para>
     </listitem>
     <listitem>
-      <para>Countless other people on the various LFS 
-      and BLFS mailing lists who are making this book happen by 
+      <para>Countless other people on the various LFS
+      and BLFS mailing lists who are making this book happen by
       giving their suggestions, testing the book and submitting bug reports.</para>
     </listitem>
Index: introduction/welcome/askhelp.xml
===================================================================
--- introduction/welcome/askhelp.xml	(revision 24ca7aa4ad919fb6a85acc1a1e1953ca2ea70d83)
+++ introduction/welcome/askhelp.xml	(revision a71ee9cb3733a0b81276d856b60b48c91f0f519e)
@@ -17,9 +17,9 @@
 
   <para>If you encounter a problem while using this book, and your problem
-  is not listed in the FAQ (<ulink url="http://www.linuxfromscratch.org/faq"/>), 
-  you will find that most of the people on Internet Relay Chat (IRC) and on the 
-  mailing lists are willing to help you. An overview of the LFS mailing 
-  lists can be found in <xref linkend="intro-welcome-maillists"/>. To assist us 
-  in diagnosing and solving your problem, include as much relevant information as 
+  is not listed in the FAQ (<ulink url="http://www.linuxfromscratch.org/faq"/>),
+  you will find that most of the people on Internet Relay Chat (IRC) and on the
+  mailing lists are willing to help you. An overview of the LFS mailing
+  lists can be found in <xref linkend="intro-welcome-maillists"/>. To assist us
+  in diagnosing and solving your problem, include as much relevant information as
   possible in your request for help.</para>
 
@@ -36,23 +36,23 @@
         should use <command>lsmod</command> as root to see if it's loaded. Check the
         <filename>sys.log</filename> or run <command>modprobe &lt;driver&gt;
-        </command> to review any error message.  If it loads properly, you may need 
+        </command> to review any error message.  If it loads properly, you may need
         to add the <command>modprobe</command> to your boot scripts.</para>
       </listitem>
       <listitem>
-        <para>Are your permissions properly set, especially for devices? LFS 
-        uses groups to make these settings easier, but it also adds the step of 
-        adding users to groups to allow access. A simple <command>moduser 
-        -G audio &lt;user&gt;</command> may be all that's necessary for that 
-        user to have access to the sound system.  Any question that starts 
+        <para>Are your permissions properly set, especially for devices? LFS
+        uses groups to make these settings easier, but it also adds the step of
+        adding users to groups to allow access. A simple <command>moduser
+        -G audio &lt;user&gt;</command> may be all that's necessary for that
+        user to have access to the sound system.  Any question that starts
         out with "It works as root, but not as ..." requires a thorough review
         of permissions prior to asking.</para>
       </listitem>
       <listitem>
-        <para>BLFS liberally uses <filename>/opt/&lt;package&gt;</filename>. 
-        The main objection to this centers around the need to expand your 
+        <para>BLFS liberally uses <filename>/opt/&lt;package&gt;</filename>.
+        The main objection to this centers around the need to expand your
         environment variables for each package placed there (e.g.,
         PATH=$PATH:/opt/kde/bin).  In some cases, the package will walk you
         through the changes, but some will not.  The section called "<ulink
-        url="beyond.html">Going Beyond BLFS</ulink>" is available to help 
+        url="beyond.html">Going Beyond BLFS</ulink>" is available to help
         you check.</para>
       </listitem>
@@ -83,19 +83,19 @@
 
     <para>(Note that saying that you've deviated from the book doesn't mean
-    that we won't help you. It'll just help us to see other possible causes 
+    that we won't help you. It'll just help us to see other possible causes
     of your problem.)</para>
 
     <para>Expect guidance instead of specific instructions. If you are
     instructed to read something, please do so. It generally implies that
-    the answer was way too obvious and that the question would not have 
-    been asked if a little research was done prior to asking. The volunteers 
-    in the mailing list prefer not to be used as an alternative to doing 
-    reasonable research on your end.  In addition, the quality of your 
-    experience with BLFS  is also greatly enhanced by this research, and 
-    the quality of volunteers is enhanced because they don't feel that their 
+    the answer was way too obvious and that the question would not have
+    been asked if a little research was done prior to asking. The volunteers
+    in the mailing list prefer not to be used as an alternative to doing
+    reasonable research on your end.  In addition, the quality of your
+    experience with BLFS  is also greatly enhanced by this research, and
+    the quality of volunteers is enhanced because they don't feel that their
     time has been abused, so they are far more likely to participate.</para>
 
     <para>An excellent article on asking for help on the Internet in general
-    has been written by Eric S. Raymond. It is available online at 
+    has been written by Eric S. Raymond. It is available online at
     <ulink url="http://www.catb.org/~esr/faqs/smart-questions.html"/>.
     Read and follow the hints in that document and you are much more likely
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 24ca7aa4ad919fb6a85acc1a1e1953ca2ea70d83)
+++ introduction/welcome/changelog.xml	(revision a71ee9cb3733a0b81276d856b60b48c91f0f519e)
@@ -38,5 +38,5 @@
 
     <listitem>
-      <para>May 29th, 2005 [randy]: Updated to Gnumeric-1.4.3 and changed the 
+      <para>May 29th, 2005 [randy]: Updated to Gnumeric-1.4.3 and changed the
       installation path to /usr (thanks to Bruce Dubbs, David Jensen and Jody
       Goldberg for their input); added popt to the libgnomeprint depedencies,
@@ -54,10 +54,10 @@
 
     <listitem>
-      <para>May 25th, 2005 [randy]: Updated installation commands in the 
+      <para>May 25th, 2005 [randy]: Updated installation commands in the
       FreeTTS instructions.</para>
     </listitem>
 
     <listitem>
-      <para>May 23rd, 2005 [randy]: Updated to libgail-gnome-1.1.1 and 
+      <para>May 23rd, 2005 [randy]: Updated to libgail-gnome-1.1.1 and
       Java Access Bridge-1.4.5.</para>
     </listitem>
Index: introduction/welcome/contact.xml
===================================================================
--- introduction/welcome/contact.xml	(revision 24ca7aa4ad919fb6a85acc1a1e1953ca2ea70d83)
+++ introduction/welcome/contact.xml	(revision a71ee9cb3733a0b81276d856b60b48c91f0f519e)
@@ -16,6 +16,6 @@
   <title>Contact Information</title>
 
-  <para>Please direct your emails to one of the BLFS mailing lists. See 
-  <xref linkend="intro-welcome-maillists"/> for more information on 
+  <para>Please direct your emails to one of the BLFS mailing lists. See
+  <xref linkend="intro-welcome-maillists"/> for more information on
   the available mailing lists.</para>
 
Index: introduction/welcome/conventions.xml
===================================================================
--- introduction/welcome/conventions.xml	(revision 24ca7aa4ad919fb6a85acc1a1e1953ca2ea70d83)
+++ introduction/welcome/conventions.xml	(revision a71ee9cb3733a0b81276d856b60b48c91f0f519e)
@@ -22,15 +22,15 @@
 
   <blockquote>
-    <para>This form of text is designed to be typed exactly 
-    as seen unless otherwise noted in the surrounding text.  It is also used 
+    <para>This form of text is designed to be typed exactly
+    as seen unless otherwise noted in the surrounding text.  It is also used
     in the explanation sections to identify references to specific commands.</para>
   </blockquote>
 
-<screen><computeroutput>install-info: unknown option 
+<screen><computeroutput>install-info: unknown option
 `--dir-file=/mnt/lfs/usr/info/dir'</computeroutput></screen>
 
   <blockquote>
-    <para>This form of text (fixed width text) is showing screen 
-    output, probably as the result of commands issued and is also used to 
+    <para>This form of text (fixed width text) is showing screen
+    output, probably as the result of commands issued and is also used to
     show filenames such as <filename>/boot/grub/grub.conf</filename></para>
   </blockquote>
@@ -39,6 +39,6 @@
 
   <blockquote>
-    <para>This form of text is used for several purposes in the 
-    book but mainly to emphasize important points or to give examples as to 
+    <para>This form of text is used for several purposes in the
+    book but mainly to emphasize important points or to give examples as to
     what to type.</para>
   </blockquote>
@@ -47,5 +47,5 @@
 
   <blockquote>
-    <para>This form of text is used for hypertext links, both within 
+    <para>This form of text is used for hypertext links, both within
     the book and to external pages such as HowTo's, download locations,
     websites, etc.</para>
@@ -59,8 +59,8 @@
 
   <blockquote>
-    <para>This type of section is used mainly when creating 
-    configuration files.  The first command (in bold) tells the system to create 
-    the file <filename>$LFS/etc/group</filename> from whatever is typed on the 
-    following lines until the sequence EOF is encountered. 
+    <para>This type of section is used mainly when creating
+    configuration files.  The first command (in bold) tells the system to create
+    the file <filename>$LFS/etc/group</filename> from whatever is typed on the
+    following lines until the sequence EOF is encountered.
     Therefore, this whole section is generally typed as seen.</para>
   </blockquote>
Index: introduction/welcome/credits.xml
===================================================================
--- introduction/welcome/credits.xml	(revision 24ca7aa4ad919fb6a85acc1a1e1953ca2ea70d83)
+++ introduction/welcome/credits.xml	(revision a71ee9cb3733a0b81276d856b60b48c91f0f519e)
@@ -16,8 +16,8 @@
   <title>Credits</title>
 
-  <para>Many people have contributed both directly and indirectly to 
+  <para>Many people have contributed both directly and indirectly to
   BLFS. This page lists all of those we can think of.  We may well have
   left people out and if you feel this is the case, drop us line.  Many
-  thanks to all of the LFS community for their assistance with 
+  thanks to all of the LFS community for their assistance with
   this project.  If you are in the list and wish to have your email address
   included, again please drop us a line to &maintainer-address; and we'll
@@ -30,9 +30,9 @@
     <itemizedlist>
       <listitem>
-        <para><emphasis>Editor:</emphasis> Bruce Dubbs <ulink 
+        <para><emphasis>Editor:</emphasis> Bruce Dubbs <ulink
         url="mailto:&maintainer-address;">&lt;&maintainer-address;&gt;</ulink></para>
       </listitem>
       <listitem>
-        <para><emphasis>Co-Editors:</emphasis> Randy McMurchy, 
+        <para><emphasis>Co-Editors:</emphasis> Randy McMurchy,
         Larry Lawrence, Igor Zivkovic, DJ Lucas, and Manuel Canales Esparcia.</para>
       </listitem>
@@ -47,91 +47,91 @@
 
       <listitem>
-        <para>Chapter 01.  Based on the LFS introductory text by 
-        <emphasis> Gerard Beekmans</emphasis>, modified by 
+        <para>Chapter 01.  Based on the LFS introductory text by
+        <emphasis> Gerard Beekmans</emphasis>, modified by
         <emphasis>Mark Hymers</emphasis> for BLFS.</para>
       </listitem>
 
       <listitem>
-        <para>Chapter 02: The /usr versus /usr/local debate: 
+        <para>Chapter 02: The /usr versus /usr/local debate:
         <emphasis>Andrew McMurry</emphasis>.</para>
       </listitem>
 
       <listitem>
-        <para>Chapter 02: Going beyond BLFS: 
+        <para>Chapter 02: Going beyond BLFS:
         <emphasis>Tushar Teredesai</emphasis>.</para>
       </listitem>
 
       <listitem>
-        <para>Chapter 02: Package Management: 
+        <para>Chapter 02: Package Management:
         <emphasis>Tushar Teredesai</emphasis>.</para>
       </listitem>
 
       <listitem>
-        <para>Chapter 03: /etc/inputrc: 
+        <para>Chapter 03: /etc/inputrc:
         <emphasis>Chris Lynn</emphasis>.</para>
       </listitem>
 
       <listitem>
-        <para>Chapter 03: Customizing your logon &amp; vimrc: 
+        <para>Chapter 03: Customizing your logon &amp; vimrc:
         <emphasis>Mark Hymers</emphasis>.</para>
       </listitem>
 
       <listitem>
-        <para>Chapter 03: /etc/shells: 
+        <para>Chapter 03: /etc/shells:
         <emphasis>Igor Zivkovic</emphasis>.</para>
       </listitem>
 
       <listitem>
-        <para>Chapter 03: Random number script 
+        <para>Chapter 03: Random number script
         <emphasis>Larry Lawrence</emphasis>.</para>
       </listitem>
 
       <listitem>
-        <para>Chapter 03: Creating a Custom Boot Device 
-        <emphasis>Bruce Dubbs</emphasis>.</para>
-      </listitem>
-
-      <listitem>
-        <para>Chapter 03: The Bash Shell Startup Files 
-        <emphasis>James Robertson</emphasis> revised by 
-        <emphasis>Bruce Dubbs</emphasis>.</para>
-      </listitem>
-
-      <listitem>
-        <para>Chapter 03: Compressed docs 
+        <para>Chapter 03: Creating a Custom Boot Device
+        <emphasis>Bruce Dubbs</emphasis>.</para>
+      </listitem>
+
+      <listitem>
+        <para>Chapter 03: The Bash Shell Startup Files
+        <emphasis>James Robertson</emphasis> revised by
+        <emphasis>Bruce Dubbs</emphasis>.</para>
+      </listitem>
+
+      <listitem>
+        <para>Chapter 03: Compressed docs
         <emphasis>Olivier Peres</emphasis>.</para>
       </listitem>
 
       <listitem>
-        <para>Chapter 04: Firewalling: 
-        <emphasis>Henning Rohde</emphasis> with thanks to 
-        <emphasis>Jeff Bauman</emphasis>. Revised by 
-        <emphasis>Bruce Dubbs</emphasis>.</para>
-      </listitem>
-
-      <listitem>
-        <para>Chapter 11: Which 
-        <emphasis>Mark Hymers</emphasis> with many thanks to 
-        <emphasis>Seth Klein</emphasis> and 
+        <para>Chapter 04: Firewalling:
+        <emphasis>Henning Rohde</emphasis> with thanks to
+        <emphasis>Jeff Bauman</emphasis>. Revised by
+        <emphasis>Bruce Dubbs</emphasis>.</para>
+      </listitem>
+
+      <listitem>
+        <para>Chapter 11: Which
+        <emphasis>Mark Hymers</emphasis> with many thanks to
+        <emphasis>Seth Klein</emphasis> and
         <emphasis>Jesse Tie-Ten-Quee</emphasis>.</para>
       </listitem>
 
       <listitem>
-        <para>Chapter 25: X Window System Environment: 
-        <emphasis>Bruce Dubbs</emphasis>.</para>
-      </listitem>
-
-      <listitem>
-        <para>Chapter 27: Intro to Window Managers: 
-        <emphasis>Bruce Dubbs</emphasis>.</para>
-      </listitem>
-
-      <listitem>
-        <para>Chapters 28 and 29: KDE: 
-        <emphasis>Bruce Dubbs</emphasis>.</para>
-      </listitem>
-
-      <listitem>
-        <para>Chapters 30, 31, and 32: GNOME: 
+        <para>Chapter 25: X Window System Environment:
+        <emphasis>Bruce Dubbs</emphasis>.</para>
+      </listitem>
+
+      <listitem>
+        <para>Chapter 27: Intro to Window Managers:
+        <emphasis>Bruce Dubbs</emphasis>.</para>
+      </listitem>
+
+      <listitem>
+        <para>Chapters 28 and 29: KDE:
+        <emphasis>Bruce Dubbs</emphasis>.</para>
+      </listitem>
+
+      <listitem>
+        <para>Chapters 30, 31, and 32: GNOME:
         <emphasis>Larry Lawrence</emphasis>.</para>
       </listitem>
@@ -148,47 +148,47 @@
       <listitem>
         <para>aalib, Alsa, ffmpeg, gocr, MPlayer, opendivx, transcode,
-        xvid and xsane: 
+        xvid and xsane:
         <emphasis>Alex Kloss</emphasis></para>
       </listitem>
 
       <listitem>
-        <para>AbiWord, at-spi, ATK, audiofile, avifile, bc, bonobo-activation, 
-        bug-buddy, cdrdao, cdrtools, cpio, curl, dhcp, enlightenment, eog, esound, 
-        fcron, fluxbox, FNLIB, gail, galeon, gconf-editor, gdbm, gedit, gimp, GLib2, 
-        gmp, gnet, gnome-applets, gnome-desktop, gnome-games, gnome-icon-theme, 
+        <para>AbiWord, at-spi, ATK, audiofile, avifile, bc, bonobo-activation,
+        bug-buddy, cdrdao, cdrtools, cpio, curl, dhcp, enlightenment, eog, esound,
+        fcron, fluxbox, FNLIB, gail, galeon, gconf-editor, gdbm, gedit, gimp, GLib2,
+        gmp, gnet, gnome-applets, gnome-desktop, gnome-games, gnome-icon-theme,
         gnome-libs, gnome-media, gnome-mime-data, gnome-panel, gnome-session,
         gnome-system-monitor, gnome-terminal, gnome-themes, gnome-utils, gnome-vfs,
-        gnome2-user-docs, gnumeric, GTK+2, gtk-doc, gtk-engines, gtk-thinice-engine, 
-        eel, imlib, intltool, lame, libao, libart_lgpl, libbonobo, libbonoboui, 
-        libgail-gnome, libglade2, libgnome, libgnomecanvas, libgnomeprint, 
-        libgnomeprintui, libgnomeui, libgsf, libgtkhtml, libgtop, libIDL, libogg, 
+        gnome2-user-docs, gnumeric, GTK+2, gtk-doc, gtk-engines, gtk-thinice-engine,
+        eel, imlib, intltool, lame, libao, libart_lgpl, libbonobo, libbonoboui,
+        libgail-gnome, libglade2, libgnome, libgnomecanvas, libgnomeprint,
+        libgnomeprintui, libgnomeui, libgsf, libgtkhtml, libgtop, libIDL, libogg,
         librep, librsvg, libvorbis, libwnck, libxml2, libxslt, linc, LPRng, Linux_PAM,
-        metacity, MIT Kerberos 5,MPlayer, mutt, nautilus, nautilus-media, oaf, OpenJade, 
+        metacity, MIT Kerberos 5,MPlayer, mutt, nautilus, nautilus-media, oaf, OpenJade,
         OpenSP, OpenSSH, ORBit, ORBit2, pan, Pango, pccts, pcre, pkgconfig, postfix,
         procmail, Python, QT, rep-gtk, ruby, sawfish, scrollkeeper, sgml-common,
-        sgml-dtd, shadow, startup-notification, unzip, vorbis-tools, vte, wget, XFce, 
-        xine, xml-dtd, yelp and zip: 
+        sgml-dtd, shadow, startup-notification, unzip, vorbis-tools, vte, wget, XFce,
+        xine, xml-dtd, yelp and zip:
         <emphasis>Larry Lawrence</emphasis></para>
       </listitem>
 
       <listitem>
-        <para>CDParanoia, mpg123, SDL and XMMS: 
+        <para>CDParanoia, mpg123, SDL and XMMS:
         <emphasis>Jeroen Coumans</emphasis></para>
       </listitem>
 
       <listitem>
-        <para>alsa, cvs, dhcpcd, gpm, hdparm, libjpeg, libmng, libpng, 
-        libtiff, libungif, giflib, links, lynx, openssl, tcsh, which, zsch, zlib: 
+        <para>alsa, cvs, dhcpcd, gpm, hdparm, libjpeg, libmng, libpng,
+        libtiff, libungif, giflib, links, lynx, openssl, tcsh, which, zsch, zlib:
         <emphasis>Mark Hymers</emphasis></para>
       </listitem>
 
       <listitem>
-        <para>traceroute: 
+        <para>traceroute:
         <emphasis>Jeff Bauman</emphasis></para>
       </listitem>
 
       <listitem>
-        <para>db and lcms: 
-        <emphasis>Jeremy Jones</emphasis> and 
+        <para>db and lcms:
+        <emphasis>Jeremy Jones</emphasis> and
         <emphasis>Mark Hymers</emphasis></para>
       </listitem>
@@ -196,57 +196,57 @@
       <listitem>
         <para>aspell, balsa, bind, bonobo, bonobo-conf, cvs server,
-        db-3.3.11, db-3.1.17, emacs, evolution, exim, expat, gal, gnome-print, 
-        GnuCash, gtkhtml, guppi, guile, guppi, g-wrap, leafnode, lesstif, 
-        libcapplet, libesmtp, libfam, libghttp, libglade, pine, portmap, 
-        PostgreSQL, pspell, qpopper, readline, reiserfs, Samba, sendmail, 
-        slrn, soup, tex, tcp-wrappers, and xinetd: 
+        db-3.3.11, db-3.1.17, emacs, evolution, exim, expat, gal, gnome-print,
+        GnuCash, gtkhtml, guppi, guile, guppi, g-wrap, leafnode, lesstif,
+        libcapplet, libesmtp, libfam, libghttp, libglade, pine, portmap,
+        PostgreSQL, pspell, qpopper, readline, reiserfs, Samba, sendmail,
+        slrn, soup, tex, tcp-wrappers, and xinetd:
         <emphasis>Billy O'Connor</emphasis></para>
       </listitem>
 
       <listitem>
-        <para>ProFTPD and rsync: 
+        <para>ProFTPD and rsync:
         <emphasis>Daniel Baumann</emphasis></para>
       </listitem>
 
       <listitem>
-        <para>ESP Ghostscript: 
+        <para>ESP Ghostscript:
         <emphasis>Matt Rogers</emphasis></para>
       </listitem>
 
       <listitem>
-        <para>ALSA Tools, Apache Ant, Cyrus-SASL, DejaGnu, desktop-file-utils, 
-        DocBook DSSSL Stylesheets, DocBook-utils, Ethereal, Evolution Data 
-        Server, Exim (many additions), Expect, FOP, FreeTTS, gnome-audio, 
-        gnome-backgrounds, gnome-menus, GNOME Doc Utils, GnuCash (many 
-        additions), Heimdal, HTML Tidy, JadeTeX, Java Access Bridge, LessTif 
-        (rewrite), libgail-gnome, libgnomecups, MPlayer (extensive overhaul), 
-        PDL, Perl Modules, pilot-link, Samba 3 (many additions), Shadow 
-        (rewrite), SANE (original instructions by Alex Kloss), SLIB, Stunnel, 
-        Sysstat and system-tools-backends: 
+        <para>ALSA Tools, Apache Ant, Cyrus-SASL, DejaGnu, desktop-file-utils,
+        DocBook DSSSL Stylesheets, DocBook-utils, Ethereal, Evolution Data
+        Server, Exim (many additions), Expect, FOP, FreeTTS, gnome-audio,
+        gnome-backgrounds, gnome-menus, GNOME Doc Utils, GnuCash (many
+        additions), Heimdal, HTML Tidy, JadeTeX, Java Access Bridge, LessTif
+        (rewrite), libgail-gnome, libgnomecups, MPlayer (extensive overhaul),
+        PDL, Perl Modules, pilot-link, Samba 3 (many additions), Shadow
+        (rewrite), SANE (original instructions by Alex Kloss), SLIB, Stunnel,
+        Sysstat and system-tools-backends:
         <emphasis>Randy McMurchy</emphasis></para>
       </listitem>
 
       <listitem>
-        <para>Screen: 
+        <para>Screen:
         <emphasis>Andreas Pedersen</emphasis></para>
       </listitem>
 
       <listitem>
-        <para>PHP: 
+        <para>PHP:
         <emphasis>Jeremy Utley</emphasis></para>
       </listitem>
 
       <listitem>
-        <para>Gimp-Print, libusb: 
+        <para>Gimp-Print, libusb:
         <emphasis>Alexander E. Patrakov</emphasis></para>
       </listitem>
 
       <listitem>
-        <para>fetchmail and wvdial: 
+        <para>fetchmail and wvdial:
         <emphasis>Paul Campbell</emphasis></para>
       </listitem>
 
       <listitem>
-        <para>udftools, perl modules: 
+        <para>udftools, perl modules:
         <emphasis>Richard Downing</emphasis></para>
       </listitem>
@@ -263,53 +263,53 @@
 
       <listitem>
-        <para>tripwire: 
+        <para>tripwire:
         <emphasis>Manfred Glombowski</emphasis></para>
       </listitem>
 
       <listitem>
-        <para>ALSA Firmware, ALSA OSS, inetutils, gdk, GLib, GTK+, 
-        libxml and vim: 
+        <para>ALSA Firmware, ALSA OSS, inetutils, gdk, GLib, GTK+,
+        libxml and vim:
         <emphasis>James Iwanek</emphasis></para>
       </listitem>
 
       <listitem>
-        <para>iptables: 
+        <para>iptables:
         <emphasis>Henning Rohde</emphasis></para>
       </listitem>
 
       <listitem>
-        <para>joe, nano, nmap, slang, w3m  and whois: 
+        <para>joe, nano, nmap, slang, w3m  and whois:
         <emphasis>Timothy Bauscher</emphasis></para>
       </listitem>
 
       <listitem>
-        <para>MySQL: 
+        <para>MySQL:
         <emphasis>Jesse Tie-Ten-Quee</emphasis></para>
       </listitem>
 
       <listitem>
-        <para>fontconfig, gcc, gcc2, jdk, mozilla, nas, openoffice, ispell, 
-        nail, ImageMagick, hd2u, STLport, tcl, tk and bind-utils: 
+        <para>fontconfig, gcc, gcc2, jdk, mozilla, nas, openoffice, ispell,
+        nail, ImageMagick, hd2u, STLport, tcl, tk and bind-utils:
         <emphasis>Tushar Teredesai</emphasis></para>
       </listitem>
 
       <listitem>
-        <para>cracklib, libpcap, ncpfs, netfs, ppp(update), RP-PPPoE, 
-        Samba-3 and Subversion: 
+        <para>cracklib, libpcap, ncpfs, netfs, ppp(update), RP-PPPoE,
+        Samba-3 and Subversion:
         <emphasis>DJ Lucas</emphasis></para>
       </listitem>
 
       <listitem>
-        <para>ntp: 
+        <para>ntp:
         <emphasis>Eric Konopka</emphasis></para>
       </listitem>
 
       <listitem>
-        <para>nfs-utils: 
+        <para>nfs-utils:
         <emphasis>Reinhard</emphasis></para>
       </listitem>
 
       <listitem>
-        <para>courier: 
+        <para>courier:
         <emphasis>Jim Gifford</emphasis></para>
       </listitem>
@@ -326,5 +326,5 @@
       <listitem>
         <para><emphasis>Fernando Arbeiza</emphasis>
-        for doing great quality assurance on Shadow utilizing PAM.  The 
+        for doing great quality assurance on Shadow utilizing PAM.  The
         machine access he saved may have been yours.</para>
       </listitem>
@@ -332,5 +332,5 @@
       <listitem>
         <para><emphasis>Archaic</emphasis>
-        for trouble shooting the mozilla section by performing multiple builds 
+        for trouble shooting the mozilla section by performing multiple builds
         and for providing a description of the various mozilla extensions.</para>
       </listitem>
@@ -338,5 +338,5 @@
       <listitem>
         <para><emphasis>Gerard Beekmans</emphasis>
-        for generally putting up with us and for running the whole LFS 
+        for generally putting up with us and for running the whole LFS
         project.</para>
       </listitem>
@@ -358,6 +358,6 @@
 
       <listitem>
-        <para><emphasis>Nathan Coulson</emphasis>, 
-        <emphasis>DJ Lucas</emphasis> and 
+        <para><emphasis>Nathan Coulson</emphasis>,
+        <emphasis>DJ Lucas</emphasis> and
         <emphasis>Zack Winkles</emphasis>
         for reworking the bootscripts used throughout the book.</para>
@@ -366,5 +366,5 @@
       <listitem>
         <para><emphasis>Jim Harris</emphasis>
-        for writing the dig-nslookup-host.txt hint on which the bind-utils 
+        for writing the dig-nslookup-host.txt hint on which the bind-utils
         instructions are based.</para>
       </listitem>
@@ -372,5 +372,5 @@
       <listitem>
         <para><emphasis>Lee Harris</emphasis>
-        for writing the gpm.txt hint on which our gpm instructions 
+        for writing the gpm.txt hint on which our gpm instructions
         are based.</para>
       </listitem>
@@ -378,5 +378,5 @@
       <listitem>
         <para><emphasis>Marc Heerdink</emphasis>
-        for creating patches for tcp_wrappers and portmap and for writing 
+        for creating patches for tcp_wrappers and portmap and for writing
         the gpm2.txt hint on which our gpm instruction are based..</para>
       </listitem>
@@ -390,5 +390,5 @@
       <listitem>
         <para><emphasis>J_Man</emphasis>
-        for submitting a gpm-1.19.3.diff file on which our gpm instructions 
+        for submitting a gpm-1.19.3.diff file on which our gpm instructions
         are based.</para>
       </listitem>
@@ -396,5 +396,5 @@
       <listitem>
         <para><emphasis>Jeremy Jones</emphasis>
-        (otherwise known as <emphasis>mca</emphasis>) 
+        (otherwise known as <emphasis>mca</emphasis>)
         for hacking Makefiles and general assistance.</para>
       </listitem>
@@ -410,16 +410,16 @@
       </listitem>
 
-<!-- 
+<!--
       <listitem>
         <para><emphasis>DJ Lucas</emphasis>
-        for contributing to dhcpcd patch and many contributions while 
+        for contributing to dhcpcd patch and many contributions while
         DHCP section was being developed and beyond.</para>
       </listitem>
 -->
 
-<!-- 
+<!--
       <listitem>
         <para><emphasis>Randy McMurchy</emphasis>
-        for writing the Heimdal hint and for proofreading the book from cover 
+        for writing the Heimdal hint and for proofreading the book from cover
         to cover for grammatical errors.</para>
       </listitem>
@@ -428,13 +428,13 @@
       <listitem>
         <para><emphasis>Scot McPherson</emphasis>
-        for writing the gnome-1.4.txt hint from which was gathered useful information 
-        and for warning us that GNOME Version 2.0 may not be ready to put in the 
+        for writing the gnome-1.4.txt hint from which was gathered useful information
+        and for warning us that GNOME Version 2.0 may not be ready to put in the
         book.</para>
       </listitem>
 
-<!-- 
+<!--
       <listitem>
         <para><emphasis>Billy O'Connor</emphasis>
-        for building GNOME 2.0 so many times and being very helpful with 
+        for building GNOME 2.0 so many times and being very helpful with
         his comments on that section.</para>
       </listitem>
@@ -443,5 +443,5 @@
       <listitem>
         <para><emphasis>Alexander E. Patrakov</emphasis>
-        for patches and suggestions to improve the book content and increasing 
+        for patches and suggestions to improve the book content and increasing
         the l10n awareness.</para>
       </listitem>
@@ -449,5 +449,5 @@
       <listitem>
         <para><emphasis>Ted Riley</emphasis>
-        for writing the Linux-PAM + CrackLib + Shadow hint on which 
+        for writing the Linux-PAM + CrackLib + Shadow hint on which
         reinstalling shadow to use PAM is based.</para>
       </listitem>
@@ -456,6 +456,6 @@
       <listitem>
         <para><emphasis>Tushar Teredesai</emphasis>
-        for writing the Compiling Java 2 SDK from Scratch hint on which jdk is 
-        based and for writing the docbook hint used throughout the typesetting 
+        for writing the Compiling Java 2 SDK from Scratch hint on which jdk is
+        based and for writing the docbook hint used throughout the typesetting
         chapter.</para>
       </listitem>
Index: introduction/welcome/newsserver.xml
===================================================================
--- introduction/welcome/newsserver.xml	(revision 24ca7aa4ad919fb6a85acc1a1e1953ca2ea70d83)
+++ introduction/welcome/newsserver.xml	(revision a71ee9cb3733a0b81276d856b60b48c91f0f519e)
@@ -16,6 +16,6 @@
   <title>News Server</title>
 
-  <para>All the mailing lists hosted at linuxfromscratch.org are also 
-  accessible via the NNTP server. All messages posted to a mailing 
+  <para>All the mailing lists hosted at linuxfromscratch.org are also
+  accessible via the NNTP server. All messages posted to a mailing
   list will be copied to its correspondent newsgroup, and vice versa.</para>
 
Index: introduction/welcome/packages.xml
===================================================================
--- introduction/welcome/packages.xml	(revision 24ca7aa4ad919fb6a85acc1a1e1953ca2ea70d83)
+++ introduction/welcome/packages.xml	(revision a71ee9cb3733a0b81276d856b60b48c91f0f519e)
@@ -19,11 +19,11 @@
   finding the source files for the package&mdash;a http link and an ftp link.
   Every effort has been made to ensure that these links are accurate.
-  Howerver, the World Wide Web is in continuous flux.  Packages are 
+  Howerver, the World Wide Web is in continuous flux.  Packages are
   moved or updated and the exact URL specified is not always available.</para>
 
   <para>To overcome this problem, the BLFS Team, with the assistance of <ulink
   url='http://www.serverbeach.com'>Server Beach</ulink>, has made a http/ftp site
-  available at <emphasis>anduin.linuxfromscratch.org</emphasis>.  This site 
-  has all the sources of the exact versions of the packages used in BLFS.  If 
+  available at <emphasis>anduin.linuxfromscratch.org</emphasis>.  This site
+  has all the sources of the exact versions of the packages used in BLFS.  If
   you can't find the BLFS package you need, get it there.</para>
 
Index: introduction/welcome/which.xml
===================================================================
--- introduction/welcome/which.xml	(revision 24ca7aa4ad919fb6a85acc1a1e1953ca2ea70d83)
+++ introduction/welcome/which.xml	(revision a71ee9cb3733a0b81276d856b60b48c91f0f519e)
@@ -16,16 +16,16 @@
   <title>Which Sections of the Book Do I Want?</title>
 
-  <para>Unlike the Linux From Scratch book, BLFS isn't designed to be 
-  followed in a linear manner.  This is because LFS  provides instructions 
-  on how to create a base system which is capable of turning into anything 
-  from a web server to a multimedia desktop system.  BLFS is where we try 
-  to guide you in the process of going from the base system to your intended 
+  <para>Unlike the Linux From Scratch book, BLFS isn't designed to be
+  followed in a linear manner.  This is because LFS  provides instructions
+  on how to create a base system which is capable of turning into anything
+  from a web server to a multimedia desktop system.  BLFS is where we try
+  to guide you in the process of going from the base system to your intended
   destination. Choice is very much involved.</para>
 
   <para>Everyone who reads the book will want to read certain sections.  The
   <xref linkend="introduction"/> part&ndash;which you are currently
-  reading&ndash;contains generic information.  Especially take note of the 
-  information in Important Information (<xref linkend="intro-important"/>), as 
-  this contains comments about how to unpack software and various other aspects 
+  reading&ndash;contains generic information.  Especially take note of the
+  information in Important Information (<xref linkend="intro-important"/>), as
+  this contains comments about how to unpack software and various other aspects
   which apply throughout the book.</para>
 
@@ -39,26 +39,26 @@
   system.</para>
 
-<para>Following these basic items, most people will want to at least browse 
+<para>Following these basic items, most people will want to at least browse
   through the <xref linkend="general"/> part of the book.  This part contains
   information on many items which are prerequisites for other sections of the
-  book as well as some items (such as Programming (<xref linkend="general-prog"/>) 
-  which are useful in their own right.  Note that you don't have to install all 
+  book as well as some items (such as Programming (<xref linkend="general-prog"/>)
+  which are useful in their own right.  Note that you don't have to install all
   of these libraries and packages found in this part to start with, each
-  BLFS install procedure tells you which packages 
-  it depends upon so you can choose the program you want to install and see 
+  BLFS install procedure tells you which packages
+  it depends upon so you can choose the program you want to install and see
   what it needs.</para>
 
-  <para>Likewise, most people will probably want to look at the <xref 
+  <para>Likewise, most people will probably want to look at the <xref
   linkend="connect"/> and <xref linkend="basicnet"/> parts.  The first of
   these deals with connecting to the Internet or your LAN
-  using a variety of methods such as DHCP 
-  (<xref linkend="connect-dhcp"/>) and Dial-Up Connections (<xref 
-  linkend="connect-dialup"/>).  The second of these parts deals with items 
-  such as Networking Libraries (<xref linkend="basicnet-netlibs"/>) and various 
+  using a variety of methods such as DHCP
+  (<xref linkend="connect-dhcp"/>) and Dial-Up Connections (<xref
+  linkend="connect-dialup"/>).  The second of these parts deals with items
+  such as Networking Libraries (<xref linkend="basicnet-netlibs"/>) and various
   basic networking programs and utilities.</para>
 
   <para>Once you have dealt with these basics, you may wish to configure
-  more advanced network services.  These are dealt with in the <xref 
-  linkend="server"/> part of the book.  Those wanting to build servers 
+  more advanced network services.  These are dealt with in the <xref
+  linkend="server"/> part of the book.  Those wanting to build servers
   should find  a good starting point there.  Note that <xref linkend="server"/>
   also contains information on various database packages.</para>
@@ -73,9 +73,9 @@
   packages. Note that many people may want to use the <xref linkend="alsa"/>
   instructions from this chapter quite near the start of their BLFS
-  journey; they are placed here simply because it is the most logical 
+  journey; they are placed here simply because it is the most logical
   place for them.</para>
 
-  <para>The final part of the main BLFS book deals with <xref 
-  linkend="pst"/>.  This is useful for most people with desktop systems and 
+  <para>The final part of the main BLFS book deals with <xref
+  linkend="pst"/>.  This is useful for most people with desktop systems and
   even those who are creating mainly server systems will find it useful.</para>
 
