Index: basicnet/connect/dhcpcd.xml
===================================================================
--- basicnet/connect/dhcpcd.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ basicnet/connect/dhcpcd.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -82,5 +82,5 @@
       SYSCONFDIR=/etc/dhcpcd install</userinput></screen>
 
-    <para>By default, a plain text lease info file isn't created but the 
+    <para>By default, a plain text lease info file isn't created but the
       <application>dhcpcd</application> provides a hook which can be used for creating
       such a file. Install the hook by running the following
@@ -160,5 +160,5 @@
         <para id="dhcpcd-config3">The default behavior of <command>dhcpcd</command>
         is to overwrite <filename>/etc/resolv.conf</filename>. All modifications on
-        system configuration files like <filename>/etc/resolv.conf</filename>, 
+        system configuration files like <filename>/etc/resolv.conf</filename>,
         <filename>/etc/yp.conf</filename> and <filename>/etc/ntp.conf</filename> are
         done by hooks which are stored in <filename class="directory">/lib/dhcpcd/dhcpcd-hooks</filename>.
Index: basicnet/connect/ppp.xml
===================================================================
--- basicnet/connect/ppp.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ basicnet/connect/ppp.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -421,5 +421,5 @@
       <para>In order to establish a PPP connection described by the
       <filename>/etc/ppp/peers/<replaceable>peername</replaceable></filename>
-      file run (as <systemitem class="username">root</systemitem> or as a member 
+      file run (as <systemitem class="username">root</systemitem> or as a member
       of the <systemitem class="groupname">pppusers</systemitem> group):</para>
 <screen><userinput>pon <replaceable>peername</replaceable></userinput></screen>
Index: basicnet/mailnews/mutt.xml
===================================================================
--- basicnet/mailnews/mutt.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ basicnet/mailnews/mutt.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -59,5 +59,5 @@
       </listitem>
     </itemizedlist>
-	
+
     <bridgehead renderas="sect3">Mutt Dependencies</bridgehead>
 
@@ -197,5 +197,5 @@
     be needed for POP3 or IMAP. However, it is needed for SMTP
     authentication.</para>
-    
+
     <para><parameter>--with-slang</parameter>: Use <application>S-Lang
     </application> instead of <application>Ncurses</application>.</para>
@@ -242,16 +242,16 @@
 <screen><userinput>cat /usr/share/doc/mutt-&mutt-version;/samples/gpg.rc &gt;&gt; ~/.muttrc</userinput></screen>
 
-      <para><application>Mutt</application> uses <command>gpg</command> in the 
-      imported sample. If you have <xref linkend="gnupg2"/> installed and you 
+      <para><application>Mutt</application> uses <command>gpg</command> in the
+      imported sample. If you have <xref linkend="gnupg2"/> installed and you
       do not have <xref linkend="gnupg"/> installed you can create a symlink
-      to satisfy this condition:</para> 
+      to satisfy this condition:</para>
 
       <screen role="root"><userinput>ln -v -s gpg2 /usr/bin/gpg</userinput></screen>
 
-      <para>If, however, you have <xref linkend="gnupg"/> installed and you wish 
-      to use <xref linkend="gnupg2"/>, then you should edit 
-      <filename>~/.muttrc</filename> by hand and change all occurances of 
+      <para>If, however, you have <xref linkend="gnupg"/> installed and you wish
+      to use <xref linkend="gnupg2"/>, then you should edit
+      <filename>~/.muttrc</filename> by hand and change all occurances of
       <command>gpg</command> to <command>gpg2</command>.</para>
-      
+
     </sect3>
 
Index: basicnet/mailnews/procmail.xml
===================================================================
--- basicnet/mailnews/procmail.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ basicnet/mailnews/procmail.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -112,5 +112,5 @@
       <title>Configuration Information</title>
 
-      <para>Recipes have to be written and placed in 
+      <para>Recipes have to be written and placed in
       <filename>~/.procmailrc</filename> for execution. The procmailex man
       page is the starting place to learn how to write recipes.
Index: basicnet/netlibs/curl.xml
===================================================================
--- basicnet/netlibs/curl.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ basicnet/netlibs/curl.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -71,5 +71,5 @@
     <xref linkend="libidn"/>,
     <xref linkend="mitkrb"/> or <xref linkend="heimdal"/>,
-    <ulink url="http://www.libssh2.org">libssh2</ulink> 
+    <ulink url="http://www.libssh2.org">libssh2</ulink>
     (for secure transfers),
     <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>,
Index: basicnet/netlibs/libpcap.xml
===================================================================
--- basicnet/netlibs/libpcap.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ basicnet/netlibs/libpcap.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -64,5 +64,5 @@
     <ulink url="http://www.endace.com/">DAG</ulink> and
     <ulink url="http://www.intel.com/">Septel</ulink> range of passive
-    network monitoring cards and 
+    network monitoring cards and
     <ulink url="http://www.bluez.org">BlueZ</ulink></para>
 
Index: basicnet/netlibs/libsoup.xml
===================================================================
--- basicnet/netlibs/libsoup.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ basicnet/netlibs/libsoup.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -105,6 +105,6 @@
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
-    <para><option>--without-gnome</option>: Use this parameter if you will 
-    <emphasis role="strong">NOT</emphasis> be installing 
+    <para><option>--without-gnome</option>: Use this parameter if you will
+    <emphasis role="strong">NOT</emphasis> be installing
     <application>GNOME</application>.</para>
 
Index: basicnet/netprogs/subversion.xml
===================================================================
--- basicnet/netprogs/subversion.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ basicnet/netprogs/subversion.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -112,5 +112,5 @@
     <xref linkend="apache"/> (if you have <application>Apache Portable
     Runtime</application> installed), and
-    <ulink url="http://www.webdav.org/neon/">neon</ulink> or 
+    <ulink url="http://www.webdav.org/neon/">neon</ulink> or
     <ulink url="http://code.google.com/p/serf/">serf</ulink></para>
 
Index: basicnet/netutils/whois.xml
===================================================================
--- basicnet/netutils/whois.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ basicnet/netutils/whois.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -78,5 +78,5 @@
     Control your choice of what is installed with the following commands issued
     as the <systemitem class="username">root</systemitem> user:</para>
-  
+
     <note><para>Installing this version of <command>mkpasswd</command> will
     overwrite the same command installed by <xref
Index: basicnet/textweb/lynx.xml
===================================================================
--- basicnet/textweb/lynx.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ basicnet/textweb/lynx.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -209,5 +209,5 @@
       <quote>jpico</quote>, <quote>jstar</quote>, <quote>nano</quote>,
       <quote>pico</quote>, <quote>rjoe</quote>, <quote>vi</quote> (but not
-      <quote>vim</quote>: in order to position the cursor in 
+      <quote>vim</quote>: in order to position the cursor in
       <xref linkend="vim"/>, set this option to <quote>vi</quote>).</para>
 
Index: general.ent
===================================================================
--- general.ent	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ general.ent	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -486,5 +486,5 @@
 <!ENTITY luit-version                 "1.0.4">
 <!ENTITY xcursor-themes-version       "1.0.2">
-<!ENTITY xkeyboard-config-version     "1.7"> 
+<!ENTITY xkeyboard-config-version     "1.7">
 <!ENTITY xbitmaps-version             "1.1.0">
 <!ENTITY xorg-server-version          "1.7.1">
Index: general/genlib/glib2.xml
===================================================================
--- general/genlib/glib2.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ general/genlib/glib2.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -35,5 +35,5 @@
     event loop, threads, dynamic loading, and an object system.</para>
 
-    <!-- Compiled against PCRE, Python, and desktop-file-utils. 
+    <!-- Compiled against PCRE, Python, and desktop-file-utils.
          All 76 tests passed -->
 
@@ -76,5 +76,5 @@
     <xref linkend="gtk-doc"/></para>
 
-    <para><application>Gamin</application> requires 
+    <para><application>Gamin</application> requires
     <application>GLib</application> in order to compile; therefore, you must
     first install <application>GLib</application>, then compile
@@ -146,7 +146,7 @@
       linkend="locale-wrong-filename-encoding"/> section of the <xref
       linkend="locale-issues"/> page for more details on this kind of
-      issue. In order to tell <application>GLib</application> and 
-      applications that use it that filenames are in the default locale 
-      encoding, set the variable <envar>G_FILENAME_ENCODING</envar> to the 
+      issue. In order to tell <application>GLib</application> and
+      applications that use it that filenames are in the default locale
+      encoding, set the variable <envar>G_FILENAME_ENCODING</envar> to the
       value "@locale":</para>
 
@@ -172,7 +172,7 @@
         <seg>glib-genmarshal, glib-gettextize, glib-mkenums,
         gobject-query, gtester and gtester-report</seg>
-        <seg>libgio-2.0.so, libglib-2.0.so, libgobject-2.0.so, 
+        <seg>libgio-2.0.so, libglib-2.0.so, libgobject-2.0.so,
         libgmodule-2.0.so, and libgthread-2.0.so</seg>
-        <seg>/usr/include/gio-unix-2.0, /usr/include/glib-2.0, 
+        <seg>/usr/include/gio-unix-2.0, /usr/include/glib-2.0,
         /usr/lib/gio, /usr/lib/glib-2.0, /usr/share/glib-2.0,
         /usr/share/gtk-doc/html/gio, /usr/share/gtk-doc/html/glib,
Index: general/genlib/libcroco.xml
===================================================================
--- general/genlib/libcroco.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ general/genlib/libcroco.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -78,9 +78,9 @@
 make</userinput></screen>
 
-    <para>To test the results, issue: 
+    <para>To test the results, issue:
     <command>LD_LIBRARY_PATH=$(pwd)/src/.libs make test</command>.</para>
 
-    <para>If there are test failures, issue: 
-    <command>patch -Np1 -i tests/tests-error.log</command>. 
+    <para>If there are test failures, issue:
+    <command>patch -Np1 -i tests/tests-error.log</command>.
     This will update the failed tests from CVS. You should now rerun the test.
     </para>
Index: general/genlib/libgcrypt.xml
===================================================================
--- general/genlib/libgcrypt.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ general/genlib/libgcrypt.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -86,5 +86,5 @@
     <para>Only <command>info</command> documentation is shipped in the package
     tarball. If you wish to build alternate formats of the documentation,
-    (you must have <xref linkend="tetex"/> installed to build the PDF and 
+    (you must have <xref linkend="tetex"/> installed to build the PDF and
     PostScript), then issue the following commands:</para>
 
Index: general/genlib/libgpg-error.xml
===================================================================
--- general/genlib/libgpg-error.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ general/genlib/libgpg-error.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -121,7 +121,7 @@
         <listitem>
           <para>is a utility used to configure and build applications based on
-          the <application>Libgpg-error</application> library. It can be used 
-          to query the C compiler and linker flags which are required to correctly 
-          compile and link the application against the 
+          the <application>Libgpg-error</application> library. It can be used
+          to query the C compiler and linker flags which are required to correctly
+          compile and link the application against the
           <application>Libgpg-error</application> library.</para>
           <indexterm zone="libgpg-error gpg-error-config">
Index: general/genlib/libtasn1.xml
===================================================================
--- general/genlib/libtasn1.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ general/genlib/libtasn1.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -146,5 +146,5 @@
         <term><command>asn1Parser</command></term>
         <listitem>
-          <para>is an ASN.1 syntax tree generator for 
+          <para>is an ASN.1 syntax tree generator for
           <application>libtasn1</application>.</para>
           <indexterm zone="libtasn1 asn1Parser">
Index: general/genlib/libusb-compat.xml
===================================================================
--- general/genlib/libusb-compat.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ general/genlib/libusb-compat.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -31,5 +31,5 @@
 
     <para>The <application>libusb-compat</application> package aims to look,
-    feel and behave exactly like <application>libusb-0.1</application>. It is a 
+    feel and behave exactly like <application>libusb-0.1</application>. It is a
     compatibility layer needed by packages that have not upgraded to the
     <application>libusb-1</application> API.</para>
@@ -110,5 +110,5 @@
         <term><filename class='libraryfile'>libusb.{so,a}</filename></term>
         <listitem>
-          <para>Libraries that are compatible with 
+          <para>Libraries that are compatible with
           <application>libusb-0.1</application>, but use
           <application>libusb-1.0</application> to provide functionality.</para>
Index: general/genlib/libxcb.xml
===================================================================
--- general/genlib/libxcb.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ general/genlib/libxcb.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -64,5 +64,5 @@
     <xref linkend="libXdmcp"/>,
     <xref linkend="libpthread-stubs"/>,
-    <xref linkend="libxslt"/>, and 
+    <xref linkend="libxslt"/>, and
     <xref linkend="xcb-proto"/></para>
 
Index: general/genutils/rarian.xml
===================================================================
--- general/genutils/rarian.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ general/genutils/rarian.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -250,5 +250,5 @@
         <term><command>rarian-sk-update</command></term>
         <listitem>
-          <para>is compatible with the <command>scrollkeeper-update</command> 
+          <para>is compatible with the <command>scrollkeeper-update</command>
           script that's required to be run when installing new omf files.  It
           converts the omf files into new-style scrolls.</para>
Index: general/genutils/tidy.xml
===================================================================
--- general/genutils/tidy.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ general/genutils/tidy.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -140,5 +140,5 @@
 
 install -v -m644 -D htmldoc/tidy.1 \
-                    /usr/share/man/man1/tidy.1 &amp;&amp; 
+                    /usr/share/man/man1/tidy.1 &amp;&amp;
 install -v -m755 -d /usr/share/doc/tidy-&tidy-version; &amp;&amp;
 install -v -m644    htmldoc/*.{html,gif,css} \
Index: general/graphlib/lcms.xml
===================================================================
--- general/graphlib/lcms.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ general/graphlib/lcms.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -103,5 +103,5 @@
     <title>Command Explanations</title>
 
-    <para><option>--with-python</option>: Use this parameter if 
+    <para><option>--with-python</option>: Use this parameter if
     <application>Python</application> and
     <application>SWIG</application> are installed.</para>
Index: general/graphlib/libpng.xml
===================================================================
--- general/graphlib/libpng.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ general/graphlib/libpng.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -64,5 +64,5 @@
         url="&patch-root;/libpng-&libpng-version;-apng-1.patch"/></para>
         <para>Although rejected by upstream, the patch is required if you want
-        to use the system <application>libpng</application> in 
+        to use the system <application>libpng</application> in
         <application>Firefox</application> 3.</para>
       </listitem>
Index: general/graphlib/librsvg.xml
===================================================================
--- general/graphlib/librsvg.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ general/graphlib/librsvg.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -105,5 +105,5 @@
 
     <para><parameter>--disable-mozilla-plugin</parameter>: This parameter prevents
-    building the browser plugin as <application>Firefox</application> and 
+    building the browser plugin as <application>Firefox</application> and
     <application>SeaMonkey</application> have built-in SVG render capability.</para>
 
Index: general/graphlib/poppler.xml
===================================================================
--- general/graphlib/poppler.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ general/graphlib/poppler.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -142,5 +142,5 @@
          and zlib is not needed
     <para><parameter>-enable-zlib</parameter>: This parameter forces the build
-    to link with the system-installed 
+    to link with the system-installed
     <filename class='libraryfile'>libz</filename> library to enable compressed
     PDF functionality.</para> -->
@@ -157,6 +157,6 @@
     being built and installed.</para>
 
-    <para><parameter>--enable-xpdf-headers</parameter>: Install old 
-    <application>Xpdf</application> headers required by certain programs. These 
+    <para><parameter>--enable-xpdf-headers</parameter>: Install old
+    <application>Xpdf</application> headers required by certain programs. These
     are unsupported by <application>Poppler</application>.</para>
 
@@ -187,7 +187,7 @@
       <seglistitem>
         <seg><xref linkend="xpdf-content"/></seg>
-        <seg>libpoppler.{so,a}, libpoppler-glib.{so,a}, libpoppler-qt.{so,a} 
+        <seg>libpoppler.{so,a}, libpoppler-glib.{so,a}, libpoppler-qt.{so,a}
         and libpoppler-qt4.{so,a}</seg>
-        <seg>/usr/include/poppler, /usr/share/doc/poppler-&poppler-version;, 
+        <seg>/usr/include/poppler, /usr/share/doc/poppler-&poppler-version;,
         /usr/share/gtk-doc/html/poppler and /usr/share/poppler</seg>
       </seglistitem>
Index: general/prog/guile.xml
===================================================================
--- general/prog/guile.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ general/prog/guile.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -161,5 +161,5 @@
     <para><option>-enable-networking</option>: Enable networking interfaces.</para>
 
-    <para><option>-enable-regex</option>: Enable regular expression interfaces.</para>    
+    <para><option>-enable-regex</option>: Enable regular expression interfaces.</para>
 
   </sect2>
Index: general/prog/slang.xml
===================================================================
--- general/prog/slang.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ general/prog/slang.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -97,5 +97,5 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-    
+
     <para><command>sed -i 's/&lt;=/&lt;/' src/slagetput.inc</command>:
     This sed fixes a buffer-overflow bug.</para>
Index: general/sysutils/gpm.xml
===================================================================
--- general/sysutils/gpm.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ general/sysutils/gpm.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -102,5 +102,5 @@
 
 install -v -m755 -d /usr/share/doc/gpm-&gpm-version;                      &amp;&amp;
-chmod   -v   755    doc/{changes,support}                          &amp;&amp; 
+chmod   -v   755    doc/{changes,support}                          &amp;&amp;
 chmod   -v   644    doc/{changes/*,support/*,FAQ,HACK_GPM,README*} &amp;&amp;
 cp      -v -R       doc/{FAQ,HACK_GPM,README*,changes,support} \
Index: general/sysutils/pciutils.xml
===================================================================
--- general/sysutils/pciutils.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ general/sysutils/pciutils.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -88,6 +88,6 @@
     <title>Command Explanations</title>
 
-    <para><parameter>ZLIB=no</parameter>: This parameter prevents compression of 
-    the <filename>pci.ids</filename> file which is needed by other applications 
+    <para><parameter>ZLIB=no</parameter>: This parameter prevents compression of
+    the <filename>pci.ids</filename> file which is needed by other applications
     such as <xref linkend="hal"/>.</para>
   </sect2>
Index: general/sysutils/usbutils.xml
===================================================================
--- general/sysutils/usbutils.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ general/sysutils/usbutils.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -89,6 +89,6 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--disable-zlib</parameter>: This stops 
-    <application>usbutils</application> from installing a compressed usb.ids 
+    <para><parameter>--disable-zlib</parameter>: This stops
+    <application>usbutils</application> from installing a compressed usb.ids
     alongside the uncompressed one.</para>
 
@@ -163,5 +163,5 @@
           connected to them. It is designed to be used if /proc/bus/usb/devices
           is not available on your system.</para>
-          <!-- /proc/bus/usb/devices is scheduled to be moved from usbfs to 
+          <!-- /proc/bus/usb/devices is scheduled to be moved from usbfs to
                debugfs in linux-2.6.31. -->
           <indexterm zone="usbutils usb-devices">
Index: general/sysutils/zip.xml
===================================================================
--- general/sysutils/zip.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ general/sysutils/zip.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -7,5 +7,5 @@
   <!-- <!ENTITY zip-download-http "http://www.mirrorservice.org/sites/ftp.info-zip.org/pub/infozip/src/zip232.tar.gz"> -->
   <!ENTITY zip-download-http "&sourceforge-repo;/infozip/zip30.tar.gz">
-  <!ENTITY zip-download-ftp "ftp://ftp.info-zip.org/pub/infozip/src/zip30.tgz"> 
+  <!ENTITY zip-download-ftp "ftp://ftp.info-zip.org/pub/infozip/src/zip30.tgz">
   <!ENTITY zip-md5sum "7b74551e63f8ee6aab6fbc86676c0d37">
   <!ENTITY zip-size "1.1 MB">
Index: introduction/important/important.xml
===================================================================
--- introduction/important/important.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ introduction/important/important.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -21,5 +21,5 @@
 
   <!-- Moved to LFS
-     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgmgt.xml"/> 
+     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgmgt.xml"/>
   -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="building-notes.xml"/>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ introduction/welcome/changelog.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -2088,5 +2088,5 @@
         </listitem>
         <listitem>
-          <para>[gdalziel] - Updated to pciutils-3.1.3. Thanks to Matthew for 
+          <para>[gdalziel] - Updated to pciutils-3.1.3. Thanks to Matthew for
           the hint about install-lib.</para>
         </listitem>
@@ -2297,9 +2297,9 @@
       <itemizedlist>
         <listitem>
-          <para>[gdalziel] - Added a patch to Mutt to fix an SMTP issue causing 
+          <para>[gdalziel] - Added a patch to Mutt to fix an SMTP issue causing
           Mutt to be unusable for scripted email.</para>
         </listitem>
         <listitem>
-          <para>[gdalziel] - Updated to ZSH-4.3.10</para> 
+          <para>[gdalziel] - Updated to ZSH-4.3.10</para>
         </listitem>
       </itemizedlist>
@@ -2328,5 +2328,5 @@
       <itemizedlist>
         <listitem>
-          <para>[ag] - Updated to ed-1.3.</para> 
+          <para>[ag] - Updated to ed-1.3.</para>
         </listitem>
         <listitem>
@@ -2981,5 +2981,5 @@
       </itemizedlist>
     </listitem>
-    
+
     <listitem>
       <para>December 20th, 2008</para>
Index: kde/add/kdepim.xml
===================================================================
--- kde/add/kdepim.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ kde/add/kdepim.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -127,5 +127,5 @@
 
     <para><command>sed -i ... funopen.c</command>: This prevents an error
-    during build that is caused by <command>configure</command> not 
+    during build that is caused by <command>configure</command> not
     properly detecting a capability built into <filename>glibc</filename>.
     </para>
Index: kde/core/arts.xml
===================================================================
--- kde/core/arts.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ kde/core/arts.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -114,6 +114,6 @@
     speeds up one time builds.</para>
 
-    <para><parameter>--enable-final</parameter>: This option combines 
-    source code during compilation speeding up the build.  It also 
+    <para><parameter>--enable-final</parameter>: This option combines
+    source code during compilation speeding up the build.  It also
     avoids a problem with missing headers in some files.</para>
 
Index: kde/core/kdebase.xml
===================================================================
--- kde/core/kdebase.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ kde/core/kdebase.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -154,5 +154,5 @@
 
     This is not true.  If KDE is configured correctly according to the
-    instructions, the libraries are found just fine.  See the 
+    instructions, the libraries are found just fine.  See the
     KDE Pre-installation Configuration section.
 
Index: kde/core/kdelibs.xml
===================================================================
--- kde/core/kdelibs.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ kde/core/kdelibs.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -148,5 +148,5 @@
       versions 1.5.8 and earlier.</emphasis>  There is a symbolic link in the
       <filename class='directory'>kdeprint</filename> directory that is not
-      handled properly.  To fix this, either update to the current version of 
+      handled properly.  To fix this, either update to the current version of
       <application>doxygen</application> or delete the link, generate the
       documentation, and recreate the symbolic link:</para>
@@ -185,5 +185,5 @@
     <para><command>sed -i ... kio/kio/kdirwatch.cpp</command>: This command is
     necessary to prevent a conflict in linux headers.  The equivalent
-    instructions that are deleted are now within glibc.</para> 
+    instructions that are deleted are now within glibc.</para>
 
     <para><parameter>--prefix=&kde-dir;</parameter>: This option tells the process
Index: kde/devel/kdevelop.xml
===================================================================
--- kde/devel/kdevelop.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ kde/devel/kdevelop.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -128,5 +128,5 @@
     documentation to fail.</para>
 
-    <!-- 
+    <!--
 
     This is surely wrong.  I can find a reference to kdevbdb at all, but
Index: kde/kde-intro.xml
===================================================================
--- kde/kde-intro.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ kde/kde-intro.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -15,5 +15,5 @@
 
   <note><para>A preliminary set of instructions for building KDE-4.3.x
-  are in the BLFS wiki: 
+  are in the BLFS wiki:
   <ulink url="&blfs-wiki;/KDE-4.3.x"/>.</para></note>
 
Index: multimedia/audioutils/lame.xml
===================================================================
--- multimedia/audioutils/lame.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ multimedia/audioutils/lame.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -102,5 +102,5 @@
     being built and installed.</para>
 
-    <para><parameter>--enable-nasm</parameter>: Enable the use of 
+    <para><parameter>--enable-nasm</parameter>: Enable the use of
     <xref linkend="NASM"/> to compile optimized assembly routines.</para>
 
Index: multimedia/cdwriteutils/cdrtools.xml
===================================================================
--- multimedia/cdwriteutils/cdrtools.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ multimedia/cdwriteutils/cdrtools.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -115,5 +115,5 @@
 <screen><userinput>patch -Np1 -i ../cdrtools-&cdrtools-version;-ascii-2.patch</userinput></screen>
 
-    <para>Cdrtools contains several functions that conflict with functions in 
+    <para>Cdrtools contains several functions that conflict with functions in
     Glibc. Apply the following patch to correct this:</para>
 
Index: multimedia/libdriv/alsa-plugins.xml
===================================================================
--- multimedia/libdriv/alsa-plugins.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ multimedia/libdriv/alsa-plugins.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -114,5 +114,5 @@
         <seg>Numerous libasound_module_<replaceable>&lt;module&gt;</replaceable>.so
         modules including ctl_oss, pcm_oss, pcm_upmix, pcm_usb_stream, pcm_vdownmix,
-        rate_speexrate, rate_speexrate_best, rate_speexrate_medium, and optionally 
+        rate_speexrate, rate_speexrate_best, rate_speexrate_medium, and optionally
         ctl_pulse, pcm_pulse, pcm_a52, pcm_jack and
         rate_samplerate*</seg>
Index: multimedia/libdriv/alsa-utils.xml
===================================================================
--- multimedia/libdriv/alsa-utils.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ multimedia/libdriv/alsa-utils.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -58,5 +58,5 @@
 
     <bridgehead renderas="sect3">ALSA Utilities Dependencies</bridgehead>
-  
+
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="alsa-lib"/></para>
Index: multimedia/libdriv/gst-plugins-base.xml
===================================================================
--- multimedia/libdriv/gst-plugins-base.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ multimedia/libdriv/gst-plugins-base.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -142,5 +142,5 @@
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
-    <para><option>sed -i 's/\(.*gtkdoc-rebase --relative.* \)\(;.*\)/\1|| true\2/' \ 
+    <para><option>sed -i 's/\(.*gtkdoc-rebase --relative.* \)\(;.*\)/\1|| true\2/' \
     docs/libs/Makefile.in</option>: This Makefile tests if
     <command>gtkdoc-rebase</command> is present, and only uses it if it is,
Index: multimedia/libdriv/gst-plugins-good.xml
===================================================================
--- multimedia/libdriv/gst-plugins-good.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ multimedia/libdriv/gst-plugins-good.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -81,5 +81,5 @@
     <xref linkend="flac"/>,
     <xref linkend="gtk2"/> (required to build the examples),
-    <xref linkend="hal"/>, 
+    <xref linkend="hal"/>,
     <ulink url="http://www.ladspa.org/">LADSPA</ulink>,
     <ulink url="http://sourceforge.net/projects/libavc1394/">libavc1394</ulink>
Index: multimedia/libdriv/gstreamer.xml
===================================================================
--- multimedia/libdriv/gstreamer.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ multimedia/libdriv/gstreamer.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -184,5 +184,5 @@
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
-    <para><option>sed -i 's/\(.*gtkdoc-rebase --relative.* \)\(;.*\)/\1|| true\2/' \ 
+    <para><option>sed -i 's/\(.*gtkdoc-rebase --relative.* \)\(;.*\)/\1|| true\2/' \
     docs/{gst,libs}/Makefile.in</option>: Two of the Makefiles test if
     <command>gtkdoc-rebase</command> is present, and only use it if it is,
Index: multimedia/libdriv/libmad.xml
===================================================================
--- multimedia/libdriv/libmad.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ multimedia/libdriv/libmad.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -104,5 +104,5 @@
     <title>Command Explanations</title>
 
-    <para><command>sed -i '/-fforce-mem/d'</command>: This removes an obsolete 
+    <para><command>sed -i '/-fforce-mem/d'</command>: This removes an obsolete
     compilation option that causes compilation to fail under GCC 4.4.x</para>
 
Index: multimedia/libdriv/libquicktime.xml
===================================================================
--- multimedia/libdriv/libquicktime.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ multimedia/libdriv/libquicktime.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -76,5 +76,5 @@
     <xref linkend="ffmpeg"/>,
     <ulink url="http://developers.videolan.org/x264.html">x264</ulink>,
-    <xref linkend="faac"/>, 
+    <xref linkend="faac"/>,
     <xref linkend="faad2"/>, and
     <ulink url="http://www.diracvideo.org">Schroedinger</ulink></para>
Index: multimedia/libdriv/nas.xml
===================================================================
--- multimedia/libdriv/nas.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ multimedia/libdriv/nas.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -41,5 +41,5 @@
 
     <para><application>NAS</application> is an older sound server included
-    in BLFS primarily because it is an optional dependency for several 
+    in BLFS primarily because it is an optional dependency for several
     packages.  Unless you know you need <application>NAS</application>, it
     is probably not needed at all.</para>
@@ -126,5 +126,5 @@
     based applications.</para>
 
-    <para><option>XPLIB=</option>: This option is necessary to prevent the 
+    <para><option>XPLIB=</option>: This option is necessary to prevent the
     build system from trying to link to an unused and deprecated library.</para>
 
Index: postlfs/config/devices.xml
===================================================================
--- postlfs/config/devices.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ postlfs/config/devices.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -76,7 +76,7 @@
     libgphoto2) containing userspace USB device drivers also ship udev rules
     that change the permissions of the controlled raw USB devices. That is, rules
-    installed by SANE change permissions for known scanners, but not printers.  
+    installed by SANE change permissions for known scanners, but not printers.
     If a package maintainer forgot to write a rule for your device,
-    report a bug to both BLFS (if the package is there) and upstream, and 
+    report a bug to both BLFS (if the package is there) and upstream, and
     you will need to write your own rule.</para>
 
@@ -89,7 +89,7 @@
     devices are going to be connected to the guest operating system. You can
     either write separate udev rules for all needed USB devices yourself, or
-    use the default catch-all "usb" group, members of which can send 
+    use the default catch-all "usb" group, members of which can send
     arbitrary commands to all USB devices. </para>
-    
+
     <para>Before Linux-2.6.15, raw USB device access was performed not with
     /dev/bus/usb/BBB/DDD device nodes, but with /proc/bus/usb/BBB/DDD
@@ -105,5 +105,5 @@
     can bypass access restrictions imposed through the driver-specific USB
     device nodes. For instance, they can read sensitive data from USB hard drives
-    without being in the "disk" group. Avoid adding users to this group, if 
+    without being in the "disk" group. Avoid adding users to this group, if
     you can.</para></note>
 
Index: postlfs/security/consolekit.xml
===================================================================
--- postlfs/security/consolekit.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ postlfs/security/consolekit.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -115,5 +115,5 @@
     <application>xmlto</application> is installed and you wish to build the API
     documentation.</para>
- 
+
   </sect2>
 
Index: postlfs/security/gnupg.xml
===================================================================
--- postlfs/security/gnupg.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ postlfs/security/gnupg.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -125,5 +125,5 @@
     chmod -v 4755 /usr/bin/gpg &amp;&amp;
     -->
-        
+
 <screen role="root"><userinput>cp -v -R doc/gnupg1.{html,pdf} /usr/share/doc/gnupg-&gnupg-version;</userinput></screen>
 
Index: postlfs/security/gnupg2.xml
===================================================================
--- postlfs/security/gnupg2.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ postlfs/security/gnupg2.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -73,7 +73,7 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="pth"/>, 
-    <xref linkend="libassuan"/>, 
-    <xref linkend="libgcrypt"/>, and 
+    <para role="required"><xref linkend="pth"/>,
+    <xref linkend="libassuan"/>,
+    <xref linkend="libgcrypt"/>, and
     <xref linkend="libksba"/></para>
 
@@ -83,11 +83,11 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="openldap"/>, 
-    <xref linkend="libusb-compat"/>, 
+    <para role="optional"><xref linkend="openldap"/>,
+    <xref linkend="libusb-compat"/>,
     <xref linkend="curl"/>,
     <ulink url="http://www.chiark.greenend.org.uk/~ian/adns/">GNU
-    adns</ulink>, and an 
+    adns</ulink>, and an
     <xref linkend="server-mail"/></para>
- 
+
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/gnupg2"/></para>
@@ -162,9 +162,9 @@
     <filename class="directory">/usr/libexec</filename>.</para>
 
-    <para><parameter>--docdir=/usr/share/doc/gnupg-&gnupg2-version;</parameter>: 
+    <para><parameter>--docdir=/usr/share/doc/gnupg-&gnupg2-version;</parameter>:
     This switch changes the default docdir to <filename
     class="directory">/usr/share/doc/gnupg-&gnupg2-version;</filename>.</para>
 
-    <para><parameter>--enable-symcryptrun</parameter>: This switch enables 
+    <para><parameter>--enable-symcryptrun</parameter>: This switch enables
     building the symcryptrun program.</para>
 
Index: postlfs/security/iptables.xml
===================================================================
--- postlfs/security/iptables.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ postlfs/security/iptables.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -129,13 +129,13 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--bindir=/sbin</parameter>, 
+    <para><parameter>--bindir=/sbin</parameter>,
     <parameter>--sbindir=/sbin</parameter>:  Ensure all the executables go
     in <filename class="directory">/sbin</filename>.</para>
 
-    <para><parameter>--libdir=/lib</parameter>, 
-    <parameter>--libexecdir=/lib</parameter>:  Ensure all the libraries are 
+    <para><parameter>--libdir=/lib</parameter>,
+    <parameter>--libexecdir=/lib</parameter>:  Ensure all the libraries are
     in the <filename class="directory">/lib</filename> directory tree.</para>
 
-    <para><parameter>--with-pkgconfigdir=/usr/lib/pkgconfig</parameter>:  
+    <para><parameter>--with-pkgconfigdir=/usr/lib/pkgconfig</parameter>:
     Ensure all the pkgconfig files are in the standard location.</para>
 
@@ -174,6 +174,6 @@
 
       <seglistitem>
-        <seg>iptables, iptables-restore, iptables-save, iptables-xml, 
-        iptables-multi, ip6tables, ip6tables-restore, ip6tables-save, 
+        <seg>iptables, iptables-restore, iptables-save, iptables-xml,
+        iptables-multi, ip6tables, ip6tables-restore, ip6tables-save,
         and ip6tables-multii</seg>
         <seg>libip4tc.so, libip6tc.so, libiptc.so, libxtables.so,
@@ -192,5 +192,5 @@
         <listitem>
           <para>is used to set up, maintain, and inspect the tables of
-          IP packet filter rules in the Linux kernel.  It is a 
+          IP packet filter rules in the Linux kernel.  It is a
           symbolic link to iptables-multi.</para>
           <indexterm zone="iptables iptables-prog">
@@ -205,5 +205,5 @@
           <para>is used to restore IP Tables from data
           specified on STDIN. Use I/O redirection provided by your
-          shell to read from a file. It is a symbolic link to 
+          shell to read from a file. It is a symbolic link to
           iptables-multi.</para>
           <indexterm zone="iptables iptables-restore">
@@ -244,5 +244,5 @@
         <listitem>
           <para>are a set of commands for IPV6 that parallel the iptables
-          commands above.  All of these commands are symbolic 
+          commands above.  All of these commands are symbolic
           links to ip6tables-multi.</para>
           <indexterm zone="iptables ip6tables">
Index: postlfs/security/nss.xml
===================================================================
--- postlfs/security/nss.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ postlfs/security/nss.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -154,10 +154,10 @@
     and that the default compiler optimizations are used.</para>
 
-    <para><command>export NSPR_INCLUDE_DIR=/usr/include/nspr</command>: This 
+    <para><command>export NSPR_INCLUDE_DIR=/usr/include/nspr</command>: This
     command sets the location of the nspr headers.</para>
 
     <para><command>export USE_SYSTEM_*</command>: These commands ensure that
     the system installed libraries are used instead of the in-tree
-    versions.</para> 
+    versions.</para>
 
     <para><command>export ZLIB_LIBS=-lz</command>: This command provides the
Index: postlfs/security/openssl.xml
===================================================================
--- postlfs/security/openssl.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ postlfs/security/openssl.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -111,5 +111,5 @@
     <!-- <para>To test the results, issue: <command>make test</command>.  Note that the
     test results/output depend on the availability of /etc/ssl/openssl.cnf.  If
-    running the tests for the first time run the following as the 
+    running the tests for the first time run the following as the
     <systemitem class="username">root</systemitem> user before running the
     tests:</para>
@@ -142,5 +142,5 @@
     <para>
     <command>tar -vxf ../BLFS-ca-bundle-&ca-bundle-version;.tar.bz2</command>:
-    <application>OpenSSL</application> no longer includes any root certificates. 
+    <application>OpenSSL</application> no longer includes any root certificates.
     This package adds root certificates as provided by mozilla.org.</para>
 
@@ -170,5 +170,5 @@
 
     <!-- <para><option>zlib-dynamic</option>: When added to the
-    <command>./config</command> command, this switch will enable 
+    <command>./config</command> command, this switch will enable
     use of <filename>libz.so</filename> for compression/decompression.</para> -->
 
@@ -179,5 +179,5 @@
 
     <para><command>for pem in /etc/ssl/certs/*.pem...</command>: This group of
-    commands creates a single-file certificate bundle 
+    commands creates a single-file certificate bundle
     (<filename>/etc/ssl/ca-bundle.crt</filename>) that is usable by many
     other software packages.  <filename>ca-bundle.crt</filename> should be
Index: postlfs/security/policykit.xml
===================================================================
--- postlfs/security/policykit.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ postlfs/security/policykit.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -297,5 +297,5 @@
         <listitem>
           <para>contains functions for obtaining seat, session and caller
-          information via <application>D-Bus</application> and 
+          information via <application>D-Bus</application> and
           <application>ConsoleKit</application>.</para>
           <indexterm zone="policykit libpolkit-dbus">
Index: postlfs/shells/dash.xml
===================================================================
--- postlfs/shells/dash.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ postlfs/shells/dash.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -93,5 +93,5 @@
 
     <note><para>If you create the symbolic link from <command>dash</command>
-    to  <command>sh</command>, you will need to reset the link to 
+    to  <command>sh</command>, you will need to reset the link to
     <command>bash</command> to build LFS.  </para></note>
 
Index: postlfs/shells/zsh.xml
===================================================================
--- postlfs/shells/zsh.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ postlfs/shells/zsh.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -165,8 +165,8 @@
     the <application>PCRE</application> regular expression library in shell
     builtins.</para>
-      
+
     <sect3 id="mountpoints">
       <title>Multiple partitions</title>
-     
+
       <para>Linking <application>ZSH</application> dynamically against
       <application>PCRE</application> and/or <application>GDBM</application>
@@ -188,5 +188,5 @@
 </screen>
 
-      <para>Alternatively you can statically link <application>ZSH</application> 
+      <para>Alternatively you can statically link <application>ZSH</application>
       against <application>PCRE</application> and <application>GDBM</application>
       if you modify the <filename>config.modules</filename> file (you need first
Index: pst/printing/gs.xml
===================================================================
--- pst/printing/gs.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ pst/printing/gs.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -159,5 +159,5 @@
       <application>Zlib</application> from the source tree. There doesn't
       appear to be an easy way to use system-installed copies of these libraries
-      without doing some hacking of the sources.</para>      
+      without doing some hacking of the sources.</para>
     </note>
 
@@ -248,6 +248,6 @@
       <seglistitem>
         <seg>bdftops, dumphint, dvipdf, eps2eps, fixmswrd.pl, font2c, gs, gsbj,
-        gsdj, gsdj500, gslj, gslp, gsnd, lprsetup.sh, pdf2dsc, pdf2ps, pdfopt, 
-        pf2afm, pfbtopfa, printafm, ps2ascii, ps2epsi, ps2pdf, ps2pdf12, 
+        gsdj, gsdj500, gslj, gslp, gsnd, lprsetup.sh, pdf2dsc, pdf2ps, pdfopt,
+        pf2afm, pfbtopfa, printafm, ps2ascii, ps2epsi, ps2pdf, ps2pdf12,
         ps2pdf13, ps2pdf14, ps2pdfwr, ps2ps, ps2ps2, pv.sh, unix-lpr.sh, and
         wftopfa</seg>
@@ -290,6 +290,6 @@
 
    <para><application>GPL Ghostscript</application> provides many different
-   scripts used to convert PostScript, PDF, and other formats. Please refer to 
-   the HTML documentation or the man pages for information about the 
+   scripts used to convert PostScript, PDF, and other formats. Please refer to
+   the HTML documentation or the man pages for information about the
    capabilities provided.</para>
 
Index: pst/ps/a2ps.xml
===================================================================
--- pst/ps/a2ps.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ pst/ps/a2ps.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -154,5 +154,5 @@
     that there is no working mktime function.</para>
 
-    <para><command>sed -i "s/GPERF --version |/&amp; head -n 1 |/" configure</command>: 
+    <para><command>sed -i "s/GPERF --version |/&amp; head -n 1 |/" configure</command>:
     This fixes a bug in the handling of the version output of
     <command>gperf</command>.</para>
Index: pst/ps/epdfview.xml
===================================================================
--- pst/ps/epdfview.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ pst/ps/epdfview.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -30,8 +30,8 @@
     <title>Introduction to ePDFView</title>
 
-    <para><application>ePDFView</application> is a free standalone lightweight 
-    PDF document viewer using <application>Poppler</application> and 
-    <application>GTK+</application> libraries. It is a good replacement for 
-    <application>Evince</application> as it does not rely upon 
+    <para><application>ePDFView</application> is a free standalone lightweight
+    PDF document viewer using <application>Poppler</application> and
+    <application>GTK+</application> libraries. It is a good replacement for
+    <application>Evince</application> as it does not rely upon
     <application>GNOME</application> libraries.</para>
 
Index: pst/ps/gsview.xml
===================================================================
--- pst/ps/gsview.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ pst/ps/gsview.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -94,5 +94,5 @@
 <screen><userinput>sed -i 's:netscape:<replaceable>&lt;browser&gt;</replaceable>:' srcunx/gvxreg.c</userinput></screen>
 
-    <!-- Pending investigation as to whether or not this is necessary for GPL 
+    <!-- Pending investigation as to whether or not this is necessary for GPL
          Ghostscript.
 
Index: pst/scanning/sane.xml
===================================================================
--- pst/scanning/sane.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ pst/scanning/sane.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -198,5 +198,5 @@
     <title>Command Explanations</title>
 
-    <para><command>sed -i 's/SYSFS/ATTRS/g' tools/sane-desc.c</command>: This 
+    <para><command>sed -i 's/SYSFS/ATTRS/g' tools/sane-desc.c</command>: This
     command fixes an obsolete <application>udev</application> parameter.</para>
 
Index: server/databases/mysql.xml
===================================================================
--- server/databases/mysql.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ server/databases/mysql.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -67,5 +67,5 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Required Patches: 
+        <para>Required Patches:
         <ulink  url="&patch-root;/mysql-&mysql-version;-logevent-1.patch"/>
          <ulink url="&patch-root;/mysql-&mysql-version;-client-1.patch"/>
@@ -144,5 +144,5 @@
 ln -v -sf mysql/libmysqlclient{,_r}.so* . &amp;&amp;
 popd &amp;&amp;
- 
+
 pushd /usr/share/info &amp;&amp;
 rm -v dir &amp;&amp;
@@ -155,6 +155,6 @@
       <para>The only documentation shipped in the source tarball are
       <filename>mysql.info</filename>, <filename>manual.chm</filename>
-      (Microsoft Help format) files, and man pages. You can download various 
-      formats of the <application>MySQL</application> Reference Manual 
+      (Microsoft Help format) files, and man pages. You can download various
+      formats of the <application>MySQL</application> Reference Manual
       from <ulink url="http://dev.mysql.com/doc/"/>.</para>
     </tip>
Index: server/major/apache.xml
===================================================================
--- server/major/apache.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ server/major/apache.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -143,5 +143,5 @@
       <para>While it is not built by default when using the following commands,
       the ISAPI DSO module can be created by adding the <option>--enable-isapi</option>
-      option. Even the module will compile, install and load fine, the module is 
+      option. Even the module will compile, install and load fine, the module is
       <emphasis>only</emphasis> supported and functional in Win32
       environments.</para>
Index: server/major/openssh.xml
===================================================================
--- server/major/openssh.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ server/major/openssh.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -127,6 +127,6 @@
     test suite will fail. Additionally, the testsuite requires an installed
     copy of <command>scp</command> to complete the multiplexing tests.  To
-    run the test suite, first copy the scp program to  
-    <filename class="directory">/usr/bin</filename>, making sure that you 
+    run the test suite, first copy the scp program to
+    <filename class="directory">/usr/bin</filename>, making sure that you
     back up any existing copy first.</para>
 
@@ -184,5 +184,5 @@
     </para>
 
-    <para><parameter>--with-kerberos5=/usr</parameter>: This option is used to 
+    <para><parameter>--with-kerberos5=/usr</parameter>: This option is used to
     include Heimdal support in the build.</para>
 
Index: x/installing/xkeyboard-config.xml
===================================================================
--- x/installing/xkeyboard-config.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ x/installing/xkeyboard-config.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -61,5 +61,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="intltool"/> and 
+    <para role="required"><xref linkend="intltool"/> and
     <xref linkend="xorg7-app"/></para>
 
Index: x/lib/cairo.xml
===================================================================
--- x/lib/cairo.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ x/lib/cairo.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -72,5 +72,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="libpng"/>,
-    <xref linkend="pixman"/>, and 
+    <xref linkend="pixman"/>, and
     <xref linkend="fontconfig"/></para>
     <!--  and <xref linkend="pkgconfig"/></para> -->
@@ -92,5 +92,5 @@
     <para role="optional"><xref linkend="gtk2"/> (for testing the PDF backend),
     <xref linkend="poppler"/> (for testing the PDF backend), and
-    <xref linkend="librsvg"/> (for testing the SVG backend) 
+    <xref linkend="librsvg"/> (for testing the SVG backend)
     <!-- [ comment this pending clarification - not presently required] , and
     <ulink url="http://ltp.sourceforge.net/">LTP</ulink>--></para>
Index: x/lib/gtk+2.xml
===================================================================
--- x/lib/gtk+2.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ x/lib/gtk+2.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -149,12 +149,12 @@
 
       <seglistitem>
-        <seg>gdk-pixbuf-csource, gdk-pixbuf-query-loaders, 
-        gtk-builder-convert, gtk-demo, gtk-query-immodules-2.0, 
+        <seg>gdk-pixbuf-csource, gdk-pixbuf-query-loaders,
+        gtk-builder-convert, gtk-demo, gtk-query-immodules-2.0,
         and gtk-update-icon-cache</seg>
         <seg>libgailutil.so, libgdk-x11-2.0.so, libgdk_pixbuf-2.0.so,
-        libgdk_pixbuf_xlib-2.0.so, libgtk-x11-2.0.so, and numerous engine, 
+        libgdk_pixbuf_xlib-2.0.so, libgtk-x11-2.0.so, and numerous engine,
         module, and loader plugins</seg>
-        <seg>/etc/gtk-2.0, /usr/include/gail-1.0, /usr/include/gtk-2.0, 
-        /usr/include/gtk-unix-print-2.0, /usr/lib/gtk-2.0, 
+        <seg>/etc/gtk-2.0, /usr/include/gail-1.0, /usr/include/gtk-2.0,
+        /usr/include/gtk-unix-print-2.0, /usr/lib/gtk-2.0,
         /usr/share/doc/gtk+-&gtk2-version;, /usr/share/gtk-2.0,
         /usr/share/gtk-doc/html/{gail-libgail-util,gdk,gdk-pixbuf,gtk},
@@ -195,5 +195,5 @@
         <term><command>gtk-builder-convert</command></term>
         <listitem>
-          <para>converts glade files into XML files which can be loaded with 
+          <para>converts glade files into XML files which can be loaded with
           GtkBuilder.</para>
           <indexterm zone="gtk2 gtk-builder-convert">
@@ -207,5 +207,5 @@
         <term><command>gtk-demo</command></term>
         <listitem>
-          <para>demonstrates <application>GTK+</application> functionality and 
+          <para>demonstrates <application>GTK+</application> functionality and
           provides code for the examples.</para>
           <indexterm zone="gtk2 gtk-demo">
Index: x/lib/pango.xml
===================================================================
--- x/lib/pango.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ x/lib/pango.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -209,5 +209,5 @@
         <term><command>pango-view</command></term>
         <listitem>
-          <para>renders a given file through <application>Pango</application> 
+          <para>renders a given file through <application>Pango</application>
           for viewing purposes.</para>
           <indexterm zone="pango pango-view">
Index: x/lib/qt4.xml
===================================================================
--- x/lib/qt4.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ x/lib/qt4.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -116,9 +116,9 @@
       <para>There is no conflict between the <application>Qt3</application>
       and <application>Qt4</application> applications and headers so both
-      can be installed at the same time.  This may be necessary to build or 
-      run Qt3 applications like <application>KDE3</application> and 
+      can be installed at the same time.  This may be necessary to build or
+      run Qt3 applications like <application>KDE3</application> and
       <application>Qt4</application> applications like
       <application>Doxygen</application>'s <application>doxywizard</application>
-      on the same system.  
+      on the same system.
       </para>
 
Index: x/lib/xulrunner.xml
===================================================================
--- x/lib/xulrunner.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ x/lib/xulrunner.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -264,5 +264,5 @@
 EOF</userinput></screen>
 
-    <para>If you did not install <xref linkend="nspr"/> and 
+    <para>If you did not install <xref linkend="nspr"/> and
     <xref linkend="nss"/>, then apply the patch with the following
     command:</para>
@@ -274,5 +274,5 @@
 
 <screen><userinput>sed 's@stable@unstable@' \
-    -i xulrunner/installer/mozilla-js.pc.in &amp;&amp; 
+    -i xulrunner/installer/mozilla-js.pc.in &amp;&amp;
 echo "Requires: nspr" >>xulrunner/installer/libxul-embedding.pc.in &amp;&amp;
 make -f client.mk build</userinput></screen>
@@ -291,5 +291,5 @@
                     /usr/lib</userinput></screen>
 
-    <para>If you've elected to use the included NSPR and NSS, while still the 
+    <para>If you've elected to use the included NSPR and NSS, while still the
     <systemitem class="username">root</systemitem> user, complete the
     installation with the following commands:</para>
Index: x/wm/fluxbox.xml
===================================================================
--- x/wm/fluxbox.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ x/wm/fluxbox.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -287,5 +287,5 @@
         <term><command>fluxbox-remote</command></term>
         <listitem>
-          <para>provides command line access to key commands for 
+          <para>provides command line access to key commands for
           <application>Fluxbox</application>.</para>
           <indexterm zone="fluxbox fluxbox-remote">
Index: xsoft/graphweb/firefox.xml
===================================================================
--- xsoft/graphweb/firefox.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ xsoft/graphweb/firefox.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -283,5 +283,5 @@
 EOF</userinput></screen>
 
-    <para>If you did not install <xref linkend="xulrunner"/> or 
+    <para>If you did not install <xref linkend="xulrunner"/> or
     <xref linkend="nspr"/> and <xref linkend="nss"/>, then fix a couple of build
     errors with the following commands:</para>
Index: xsoft/graphweb/seamonkey.xml
===================================================================
--- xsoft/graphweb/seamonkey.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ xsoft/graphweb/seamonkey.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -15,5 +15,5 @@
   <!ENTITY seamonkey-enigmail-download  "http://www.mozilla-enigmail.org/download/source/enigmail-&seamonkey-enigmail-version;.tar.gz">
   <!ENTITY seamonkey-enigmail-md5sum    "cfbe6ff77f80a349b396829757ad952a"> -->
-]> 
+]>
 
 <sect1 id="seamonkey" xreflabel="SeaMonkey-&seamonkey-version;">
@@ -507,5 +507,5 @@
     <tip>
       <para>There is a multitude of configuration parameters you can tweak to
-      customize <application>SeaMonkey</application>. A very extensive list 
+      customize <application>SeaMonkey</application>. A very extensive list
       of these parameters can be found at <ulink
       url="http://preferential.mozdev.org/preferences.html"/>.</para>
Index: xsoft/other/thunderbird.xml
===================================================================
--- xsoft/other/thunderbird.xml	(revision e05cd03f9c2b94b51f6abc857025212e15013ff5)
+++ xsoft/other/thunderbird.xml	(revision a41f64326a4ca1de7129c1da8a3d0d09a9bf813f)
@@ -16,5 +16,5 @@
   <!ENTITY thunderbird-enigmail-download "http://www.mozilla-enigmail.org/download/source/enigmail-&thunderbird-enigmail-version;.tar.gz">
   <!ENTITY thunderbird-enigmail-md5sum   "508ca9ab0396afb49e82eda88014924b">
-  <!ENTITY thunderbird-enigmail-size     "1.1 MB"> 
+  <!ENTITY thunderbird-enigmail-size     "1.1 MB">
 ]>
 
@@ -68,5 +68,5 @@
     by the <application>GnuPG</application> package. The Enigmail extension
     will not operate correctly unless you have <xref linkend="gnupg"/> or
-    <xref linkend="gnupg2"/> installed.</para> 
+    <xref linkend="gnupg2"/> installed.</para>
 
     <itemizedlist spacing='compact'>
