Index: archive/acl.xml
===================================================================
--- archive/acl.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ archive/acl.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -111,5 +111,5 @@
     configured with the appropriate ACL options (there are nine different
     options).</para>
-    
+
     <para>To run the standard tests run <command>make tests </command>.  As
     <systemitem class="username">root</systemitem> user, run <command>make
Index: archive/appstream-glib.xml
===================================================================
--- archive/appstream-glib.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ archive/appstream-glib.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -8,6 +8,6 @@
   <!ENTITY TEMPLATE-version "">
   -->
-  
-  <!ENTITY appstream-glib-download-http 
+
+  <!ENTITY appstream-glib-download-http
    "http://people.freedesktop.org/~hughsient/appstream-glib/releases/appstream-glib-&appstream-glib-version;.tar.xz">
   <!ENTITY appstream-glib-download-ftp  " ">
@@ -40,11 +40,11 @@
 
     <para>
-      The <application>appstream-glib</application> provides GObjects and 
-      helper methods to make it easy to read and write AppStream metadata. 
-      It also provides a simple DOM implementation that makes it easy to 
+      The <application>appstream-glib</application> provides GObjects and
+      helper methods to make it easy to read and write AppStream metadata.
+      It also provides a simple DOM implementation that makes it easy to
       edit nodes and convert to and from the standardized XML representation.
     </para>
-    
-    &lfs77_checked; 
+
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -89,5 +89,5 @@
       <xref linkend="libarchive"/>
       <xref linkend="libsoup"/>, and
-      <xref linkend="pango"/> 
+      <xref linkend="pango"/>
     </para>
 
Index: archive/compressdoc.xml
===================================================================
--- archive/compressdoc.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ archive/compressdoc.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -562,5 +562,5 @@
 
 EOF</userinput></screen>
- 
+
   <note>
     <para>
Index: archive/gnome/gnome-power-manager.xml
===================================================================
--- archive/gnome/gnome-power-manager.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ archive/gnome/gnome-power-manager.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -83,6 +83,6 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="docbook-utils"/> (to generate man pages) which will require  
-      <xref linkend="perl-sgmlspm"/> 
+      <xref linkend="docbook-utils"/> (to generate man pages) which will require
+      <xref linkend="perl-sgmlspm"/>
     </para>
 
Index: archive/gnome/grilo-plugins.xml
===================================================================
--- archive/gnome/grilo-plugins.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ archive/gnome/grilo-plugins.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -121,5 +121,5 @@
     <para>
       To test which plugins are installed and that <xref linkend="grilo"/> is
-      working, issue  <command>grl-inspect-0.2</command> or 
+      working, issue  <command>grl-inspect-0.2</command> or
       <command>grilo-test-ui-0.2</command> (the latter, from an X terminal).
     </para>
Index: archive/gnome/totem.xml
===================================================================
--- archive/gnome/totem.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ archive/gnome/totem.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -5,7 +5,7 @@
   %general-entities;
 
-  <!ENTITY totem-download-http 
+  <!ENTITY totem-download-http
      "&gnome-download-http;/totem/&gnome-minor-16;/totem-&totem-version;.tar.xz">
-  <!ENTITY totem-download-ftp  
+  <!ENTITY totem-download-ftp
      "&gnome-download-ftp;/totem/&gnome-minor-16;/totem-&totem-version;.tar.xz">
   <!ENTITY totem-md5sum        "e475febf5f4b709fcd1e90b47fae99d6">
Index: archive/gst-plugins-base.xml
===================================================================
--- archive/gst-plugins-base.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ archive/gst-plugins-base.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -130,5 +130,5 @@
     <para role="optional">
       <xref linkend="gtk-doc"/> and
-      <xref linkend="python2"/> 
+      <xref linkend="python2"/>
     </para>
 
Index: archive/gst-plugins-good.xml
===================================================================
--- archive/gst-plugins-good.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ archive/gst-plugins-good.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -114,5 +114,5 @@
       <ulink url="http://www.jackaudio.org">JACK</ulink>,
       <ulink url="http://sourceforge.net/projects/libavc1394/">libavc1394</ulink>
-      (requires 
+      (requires
          <ulink url="http://www.kernel.org/pub/linux/libs/ieee1394/"> libraw1394</ulink>),
       <ulink url="http://sam.zoy.org/projects/libcaca/">libcaca</ulink>,
@@ -133,5 +133,5 @@
     <para role="optional">
       <xref linkend="gtk-doc"/> and
-      <xref linkend="python2"/> 
+      <xref linkend="python2"/>
     </para>
 
Index: archive/gst-plugins-ugly.xml
===================================================================
--- archive/gst-plugins-ugly.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ archive/gst-plugins-ugly.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -114,5 +114,5 @@
       <ulink url="http://sourceforge.net/projects/opencore-amr/">OpenCore AMR</ulink>,
       <ulink url="http://code.entropywave.com/projects/orc/">ORC</ulink>, and
-      <ulink url="http://sourceforge.net/projects/twolame/">TwoLAME</ulink> 
+      <ulink url="http://sourceforge.net/projects/twolame/">TwoLAME</ulink>
     </para>
 
Index: archive/gstreamer.xml
===================================================================
--- archive/gstreamer.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ archive/gstreamer.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -106,5 +106,5 @@
     <para role="optional">
       <xref linkend="gtk-doc"/> and
-      <xref linkend="python2"/> 
+      <xref linkend="python2"/>
     </para>
 
Index: archive/ibus.xml
===================================================================
--- archive/ibus.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ archive/ibus.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -83,5 +83,5 @@
     <para role="recommended">
       <xref linkend="gobject-introspection"/>,
-      <xref linkend="gtk2"/>, 
+      <xref linkend="gtk2"/>,
       <xref linkend="gtk3"/>, and
       <xref linkend="vala"/>
Index: archive/libnice.xml
===================================================================
--- archive/libnice.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ archive/libnice.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -113,7 +113,7 @@
 
     <para>
-      To test the results, issue: <command>make check</command>.  
+      To test the results, issue: <command>make check</command>.
       Note that two tests, test-io-stream-thread and
-      test-io-stream-pollable, may fail due to test harness 
+      test-io-stream-pollable, may fail due to test harness
       timing issues.
     </para>
Index: archive/libzeitgeist.xml
===================================================================
--- archive/libzeitgeist.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ archive/libzeitgeist.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -121,5 +121,5 @@
 
     <para>
-      <command>sed ... Makefile.in</command>:  PLace the documentation in 
+      <command>sed ... Makefile.in</command>:  PLace the documentation in
       a versioned directory.
     </para>
Index: archive/qtchooser.xml
===================================================================
--- archive/qtchooser.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ archive/qtchooser.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -34,5 +34,5 @@
     <para>
       The <application>qtchooser</application> package contains a wrapper used to select
-      between <application>Qt</application> binary versions.  It is only needed if 
+      between <application>Qt</application> binary versions.  It is only needed if
       both Qt4 and Qt5 are installed for access via the /usr/bin directory.
     </para>
Index: archive/slib.xml
===================================================================
--- archive/slib.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ archive/slib.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -158,6 +158,6 @@
         <seg>slib</seg>
         <seg>a <application>Scheme</application> library system</seg>
-        <seg>/usr/share/slib, 
-             /usr/share/guile/site/2.0, and 
+        <seg>/usr/share/slib,
+             /usr/share/guile/site/2.0, and
              /usr/share/doc/slib-&slib-version;</seg>
       </seglistitem>
Index: archive/soprano.xml
===================================================================
--- archive/soprano.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ archive/soprano.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -163,5 +163,5 @@
       The <command>sopranod</command> accepts some parameters. To configure
       how the bootscript starts <command>sopranod</command>,
-      create a configuration file again as the 
+      create a configuration file again as the
       <systemitem class="username">root</systemitem> user:
     </para>
@@ -193,5 +193,5 @@
         automatically when the system is booted, install the
         <filename>/etc/rc.d/init.d/soprano</filename> init script included
-        in the <xref linkend="bootscripts"/> package as the  
+        in the <xref linkend="bootscripts"/> package as the
         <systemitem class="username">root</systemitem> user:
       </para>
Index: archive/udev-extras-old.xml
===================================================================
--- archive/udev-extras-old.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ archive/udev-extras-old.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -89,10 +89,10 @@
 make</userinput></screen>
 
-   <caution><para>If you maintained the default System V/systemd 
+   <caution><para>If you maintained the default System V/systemd
    installation in LFS, do not run <userinput>make install</userinput>.
-   It will overwrite the symbolic links needed to switch boot 
+   It will overwrite the symbolic links needed to switch boot
    systems.</para></caution>
 
-   <para>Now install gudev as the <systemitem class="username">root</systemitem> 
+   <para>Now install gudev as the <systemitem class="username">root</systemitem>
    user:</para>
 
Index: archive/udev-extras.xml
===================================================================
--- archive/udev-extras.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ archive/udev-extras.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -61,5 +61,5 @@
          For in-system updates to Eudev, you may want to consult <ulink
          url="http:wiki.gentoo.org/wiki/Udev/upgrade">the Gentoo page</ulink>
-         about upgrading Udev. 
+         about upgrading Udev.
       </para>
     </caution>
@@ -141,5 +141,5 @@
    <para>To test the results, issue: <command>make check</command>.</para>
 
-   <para>Now re-install as the <systemitem class="username">root</systemitem> 
+   <para>Now re-install as the <systemitem class="username">root</systemitem>
    user:</para>
 
Index: general/genlib/apr.xml
===================================================================
--- general/genlib/apr.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/genlib/apr.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -129,5 +129,5 @@
         </seg>
         <seg>
-          /usr/include/apr-1 and 
+          /usr/include/apr-1 and
           /usr/share/apr-1
         </seg>
Index: general/genlib/enchant.xml
===================================================================
--- general/genlib/enchant.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/genlib/enchant.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -135,5 +135,5 @@
       </para>
 
-<screen><userinput>cat &gt; /tmp/test-enchant.txt &lt;&lt; "EOF" 
+<screen><userinput>cat &gt; /tmp/test-enchant.txt &lt;&lt; "EOF"
 <literal>Tel me more abot linux
 Ther ar so many commads</literal>
Index: general/genlib/glib2.xml
===================================================================
--- general/genlib/glib2.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/genlib/glib2.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -206,6 +206,6 @@
         <listitem>
           <para>
-            can be used to start applications and can be used to send 
-            messages to already-running instances of other applications. 
+            can be used to start applications and can be used to send
+            messages to already-running instances of other applications.
           </para>
           <indexterm zone="glib2 gapplication">
Index: general/genlib/gobject-introspection.xml
===================================================================
--- general/genlib/gobject-introspection.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/genlib/gobject-introspection.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -38,5 +38,5 @@
     </para>
 
-    &lfs78_checked; 
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/genlib/grantlee.xml
===================================================================
--- general/genlib/grantlee.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/genlib/grantlee.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -110,9 +110,9 @@
         <seg>none</seg>
         <seg>
-           libgrantlee_core.so and 
+           libgrantlee_core.so and
            libgrantlee_gui.so
         </seg>
         <seg>
-           /usr/lib/cmake/grantlee, 
+           /usr/lib/cmake/grantlee,
            /usr/lib/grantlee/0.4, and
            /usr/include/grantlee</seg>
Index: general/genlib/libatasmart.xml
===================================================================
--- general/genlib/libatasmart.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/genlib/libatasmart.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -35,5 +35,5 @@
     </para>
 
-    &lfs78_checked; 
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/genlib/libical.xml
===================================================================
--- general/genlib/libical.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/genlib/libical.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -53,5 +53,5 @@
       <filename>libical-&libical-version;.tar.gz</filename>. You can achieve
       this automatically by using the command:</para>
-    
+
  <screen><userinput>wget <ulink url="&libical-download-http;"/> -O libical-&libical-version;.tar.gz</userinput></screen>
     </note>
Index: general/genlib/libsigc++.xml
===================================================================
--- general/genlib/libsigc++.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/genlib/libsigc++.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -103,5 +103,5 @@
 
     <para>
-      <command>sed -i '/type_traits.h/i\#include &lt;sigc++/visit_each.h&gt;' 
+      <command>sed -i '/type_traits.h/i\#include &lt;sigc++/visit_each.h&gt;'
       sigc++/macros/limit_reference.h.m4</command>: This sed fixes a bug
       which prevents <application>inkscape</application> compiling.
Index: general/genlib/libtasn1.xml
===================================================================
--- general/genlib/libtasn1.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/genlib/libtasn1.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -35,5 +35,5 @@
     </para>
 
-     &lfs78_checked; 
+     &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/genlib/libxkbcommon.xml
===================================================================
--- general/genlib/libxkbcommon.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/genlib/libxkbcommon.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -97,5 +97,5 @@
     </para>
 
-<screen><userinput>./configure $XORG_CONFIG     \ 
+<screen><userinput>./configure $XORG_CONFIG     \
             --docdir=/usr/share/doc/libxkbcommon-&libxkbcommon-version; &amp;&amp;
 make</userinput></screen>
Index: general/genlib/ptlib.xml
===================================================================
--- general/genlib/ptlib.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/genlib/ptlib.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -98,6 +98,6 @@
       <xref linkend="pulseaudio"/>,
       <xref linkend="sdl"/>,
-      <xref linkend="unixodbc"/>, 
-      <xref linkend="v4l-utils"/>, 
+      <xref linkend="unixodbc"/>,
+      <xref linkend="v4l-utils"/>,
       <ulink url="http://sourceforge.net/projects/libdc1394/">libdc1394</ulink>, and
       <ulink url="http://www.linux1394.org/">libraw1394</ulink>,
Index: general/genlib/qca.xml
===================================================================
--- general/genlib/qca.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/genlib/qca.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -123,5 +123,5 @@
     building with Qt4 even if Qt5 is found.</para>
 
-    <para><parameter>-DQCA_MAN_INSTALL_DIR:PATH=/usr/share/man</parameter>: 
+    <para><parameter>-DQCA_MAN_INSTALL_DIR:PATH=/usr/share/man</parameter>:
     Install the qca man page in the normal location.</para>
 
Index: general/genlib/qjson.xml
===================================================================
--- general/genlib/qjson.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/genlib/qjson.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -77,6 +77,6 @@
       <xref linkend="qt4"/> and
       <xref linkend="cmake"/>
-    </para>    
-    
+    </para>
+
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/qjson"/>
@@ -110,10 +110,10 @@
 <screen role="root"><userinput>make install</userinput></screen>
   </sect2>
-  
+
   <sect2 role="commands">
     <title>Command Explanations</title>
 
     <para><option>-DCMAKE_BUILD_TYPE=Release</option>: This switch is used to
-    build without debugging symbols and apply a higher level of compiler 
+    build without debugging symbols and apply a higher level of compiler
     optimizations.</para>
 
Index: general/genlib/wayland.xml
===================================================================
--- general/genlib/wayland.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/genlib/wayland.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -163,5 +163,5 @@
         <listitem>
           <para>
-            is a tool to generate proxy methods in wayland-client-protocol.h 
+            is a tool to generate proxy methods in wayland-client-protocol.h
             and wayland-server-protocol.h
           </para>
Index: general/genlib/xapian.xml
===================================================================
--- general/genlib/xapian.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/genlib/xapian.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -81,5 +81,5 @@
 make</userinput></screen>
 
-    
+
 
 
@@ -113,6 +113,6 @@
         </seg>
         <seg>
-          /usr/include/xapian, 
-          /usr/lib/cmake/xapian, and 
+          /usr/include/xapian,
+          /usr/lib/cmake/xapian, and
           /usr/share/doc/xapian-core-&xapian-version;
         </seg>
Index: general/genutils/iso-codes.xml
===================================================================
--- general/genutils/iso-codes.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/genutils/iso-codes.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -39,5 +39,5 @@
     </para>
 
-    &lfs78_checked; 
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/genutils/lsof.xml
===================================================================
--- general/genutils/lsof.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/genutils/lsof.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -96,5 +96,5 @@
     <para>
       <command>./Configure -n linux</command>: Avoid AFS, customization, and
-      inventory checks, and use the linux dialect. 
+      inventory checks, and use the linux dialect.
     </para>
 
Index: general/genutils/pinentry.xml
===================================================================
--- general/genutils/pinentry.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/genutils/pinentry.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -192,5 +192,5 @@
         <term><command>pinentry-gnome3</command></term>
         <listitem>
-          <para> is a <application>GNOME-3</application> 
+          <para> is a <application>GNOME-3</application>
           <application>PIN-Entry</application> helper program.</para>
           <indexterm zone="pinentry pinentry-gnome3">
@@ -203,5 +203,5 @@
         <term><command>pinentry-gtk-2</command></term>
         <listitem>
-          <para> is a <application>GTK+2</application> 
+          <para> is a <application>GTK+2</application>
           <application>PIN-Entry</application> program program.</para>
           <indexterm zone="pinentry pinentry-gtk-2">
@@ -214,5 +214,5 @@
         <term><command>pinentry-qt4</command></term>
         <listitem>
-          <para> is a <application>Qt4</application> 
+          <para> is a <application>Qt4</application>
           <application>PIN-Entry</application> helper program.</para>
           <indexterm zone="pinentry pinentry-qt4">
Index: general/graphlib/fontconfig.xml
===================================================================
--- general/graphlib/fontconfig.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/graphlib/fontconfig.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY fontconfig-download-http 
+  <!ENTITY fontconfig-download-http
            "http://www.freedesktop.org/software/fontconfig/release/fontconfig-&fontconfig-version;.tar.bz2">
   <!ENTITY fontconfig-download-ftp  " ">
@@ -37,5 +37,5 @@
     </para>
 
-    &lfs78_checked; 
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -77,5 +77,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="freetype2"/> 
+      <xref linkend="freetype2"/>
     </para>
 
Index: general/graphlib/graphite2.xml
===================================================================
--- general/graphlib/graphite2.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/graphlib/graphite2.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -46,5 +46,5 @@
     </para>
 
-    &lfs78_checked; 
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/graphlib/newt.xml
===================================================================
--- general/graphlib/newt.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/graphlib/newt.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -35,5 +35,5 @@
       windows, entry widgets, checkboxes, radio buttons, labels, plain text
       fields, scrollbars, etc., to text mode user interfaces.
-      <application>Newt</application> is based on the S-Lang library. 
+      <application>Newt</application> is based on the S-Lang library.
     </para>
 
@@ -115,5 +115,5 @@
 
     <para>
-      This package does not come with a test suite. 
+      This package does not come with a test suite.
     </para>
 
@@ -146,5 +146,5 @@
       <seglistitem>
         <seg> whiptail </seg>
-        <seg> libnewt.so, whiptcl.so, and 
+        <seg> libnewt.so, whiptcl.so, and
         /usr/lib/python{&python2-majorver;,&python3-majorver;}/site-packages/_snack.so </seg>
         <seg> None </seg>
Index: general/graphlib/opencv.xml
===================================================================
--- general/graphlib/opencv.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/graphlib/opencv.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -33,5 +33,5 @@
 
     <para>
-      The <application>opencv</application> package contains graphics libraries 
+      The <application>opencv</application> package contains graphics libraries
       mainly aimed at real-time computer vision.
     </para>
@@ -79,5 +79,5 @@
     </para>
 
-    <bridgehead renderas="sect3">opencv Dependencies</bridgehead> 
+    <bridgehead renderas="sect3">opencv Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -96,6 +96,6 @@
       <xref linkend="libpng"/>,
       <xref linkend="libtiff"/>,
-      <xref linkend="libwebp"/>, 
-      <xref linkend="python2"/>, 
+      <xref linkend="libwebp"/>,
+      <xref linkend="python2"/>,
       <xref linkend="v4l-utils"/>, and
       <xref linkend="xine-lib"/>
@@ -104,7 +104,7 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="apache-ant"/>, 
-      <xref linkend="doxygen"/>, 
-      <xref linkend="java"/>, 
+      <xref linkend="apache-ant"/>,
+      <xref linkend="doxygen"/>,
+      <xref linkend="java"/>,
       <xref linkend="python3"/>,
       <ulink url="https://developer.nvidia.com/cuda-zone">Cuda</ulink>,
Index: general/graphlib/poppler.xml
===================================================================
--- general/graphlib/poppler.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/graphlib/poppler.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -304,5 +304,5 @@
         </seg>
         <seg>
-          libpoppler.so, 
+          libpoppler.so,
           libpoppler-cpp.so,
           libpoppler-glib.so,
@@ -311,6 +311,6 @@
         </seg>
         <seg>
-          /usr/include/poppler, 
-          /usr/share/poppler, 
+          /usr/include/poppler,
+          /usr/share/poppler,
           /usr/share/gtk-doc/html/poppler, and
           /usr/share/doc/poppler-&poppler-version;
Index: general/prog/apache-ant.xml
===================================================================
--- general/prog/apache-ant.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/prog/apache-ant.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -31,5 +31,5 @@
 
     <para>The <application>Apache Ant</application> package is a
-    <application>Java</application>-based build tool. In theory, it is 
+    <application>Java</application>-based build tool. In theory, it is
     like the <command>make</command> command, but without <command>make</command>'s
     wrinkles. <application>Ant</application> is different. Instead of a model
@@ -108,5 +108,5 @@
       <application>Apache Ant</application>. Review the table at
       <ulink url="http://ant.apache.org/manual/install.html#librarydependencies"/>
-      for any prerequisite libraries you may need. Place any needed libraries 
+      for any prerequisite libraries you may need. Place any needed libraries
       in <filename>lib/optional</filename>.</para>
     </note>
Index: general/prog/clisp.xml
===================================================================
--- general/prog/clisp.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/prog/clisp.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -125,5 +125,5 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen> 
+<screen role="root"><userinput>make install</userinput></screen>
   </sect2>
 
Index: general/prog/elfutils.xml
===================================================================
--- general/prog/elfutils.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/prog/elfutils.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -197,5 +197,5 @@
         </listitem>
       </varlistentry>
- 
+
       <varlistentry id="eu-elflint">
         <term><command>eu-elflint</command></term>
@@ -214,5 +214,5 @@
         <listitem>
           <para>
-            locate source of text relocations in FILEs (a.out by default).            
+            locate source of text relocations in FILEs (a.out by default).
           </para>
           <indexterm zone="elfutils eu-findtextrel">
@@ -245,5 +245,5 @@
         </listitem>
       </varlistentry>
- 
+
       <varlistentry id="eu-objdump">
         <term><command>eu-objdump</command></term>
@@ -293,5 +293,5 @@
         </listitem>
       </varlistentry>
- 
+
       <varlistentry id="eu-stack">
         <term><command>eu-stack</command></term>
Index: general/prog/java.xml
===================================================================
--- general/prog/java.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/prog/java.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -36,10 +36,10 @@
     <para>Java is different from most of the packages in LFS and BLFS. It
     is a programming language that works with files of byte codes to obtain
-    instructions and executes then in a Java Virtual Machine (JVM). An 
+    instructions and executes then in a Java Virtual Machine (JVM). An
     introductory java program looks like:</para>
 
-<screen><literal>public class HelloWorld 
+<screen><literal>public class HelloWorld
 {
-    public static void main(String[] args) 
+    public static void main(String[] args)
     {
         System.out.println("Hello, World");
@@ -65,5 +65,5 @@
     jar files. This is a standard list of colon-separated directory names
     similar to the <envar>PATH</envar> environment variable.</para>
- 
+
   </sect2>
 
@@ -73,6 +73,6 @@
     <para>Creating a JVM from source requires a set of circular dependencies.
     The first thing that's needed is a set of programs called a Java Development
-    Kit (JDK).  This set of programs includes <command>java</command>,  
-    <command>javac</command>, <command>jar</command>, and several others. It 
+    Kit (JDK).  This set of programs includes <command>java</command>,
+    <command>javac</command>, <command>jar</command>, and several others. It
     also includes several base <emphasis>jar</emphasis> files.</para>
 
Index: general/prog/junit.xml
===================================================================
--- general/prog/junit.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/prog/junit.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -38,5 +38,5 @@
     </para>
 
-    &lfs78_checked; 
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -66,5 +66,5 @@
       <listitem>
         <para>
-          Required file: <ulink 
+          Required file: <ulink
              url="http://hamcrest.googlecode.com/files/hamcrest-&hamcrest-version;.tgz">
                   http://hamcrest.googlecode.com/files/hamcrest-&hamcrest-version;.tgz </ulink>
@@ -72,5 +72,5 @@
       </listitem>
     </itemizedlist>
- 
+
     <bridgehead renderas="sect3">JUnit Dependencies</bridgehead>
 
@@ -117,5 +117,5 @@
       <systemitem class="username">root</systemitem> user:
     </para>
-    
+
 <screen role="root"><userinput>install -v -m755 -d /usr/share/{doc,java}/junit-&junit-version; &amp;&amp;
 chown -R root:root .                                 &amp;&amp;
@@ -124,5 +124,5 @@
 cp -v junit*/junit*.jar               /usr/share/java/junit-&junit-version; &amp;&amp;
 cp -v hamcrest-&hamcrest-version;/hamcrest-core*.jar /usr/share/java/junit-&junit-version;</userinput></screen>
-    
+
     <para>
       If you have followed the instructions in <xref linkend="ojdk-conf"/>,
Index: general/prog/lua.xml
===================================================================
--- general/prog/lua.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/prog/lua.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -140,5 +140,5 @@
 Description: An Extensible Extension Language
 Version: ${R}
-Requires: 
+Requires:
 Libs: -L${libdir} -llua -lm
 Cflags: -I${includedir}</literal>
Index: general/prog/npapi-sdk.xml
===================================================================
--- general/prog/npapi-sdk.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/prog/npapi-sdk.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -90,5 +90,5 @@
 
     <para>
-      This package does not come with a test suite. 
+      This package does not come with a test suite.
     </para>
 
Index: general/prog/python2.xml
===================================================================
--- general/prog/python2.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/prog/python2.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -114,5 +114,5 @@
       even old maintained versions, so do not xref openssl here -->
         If you are building <xref linkend="thunderbird"/> or
-        <xref linkend="firefox"/> 
+        <xref linkend="firefox"/>
         you must install <application>openssl</application> before you build
         <application>Python 2</application>.
@@ -181,5 +181,5 @@
     <para>
       <option>--with-system-expat</option>: This switch enables linking against
-      system version of <application>Expat</application>. 
+      system version of <application>Expat</application>.
     </para>
 
Index: general/prog/slang.xml
===================================================================
--- general/prog/slang.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/prog/slang.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -76,10 +76,10 @@
     <title>Installation of S-Lang</title>
 
-    <note>                                                                                                                                                                                                                   
+    <note>
       <para>
         This package does not support parallel build.
       </para>
     </note>
-    
+
     <para>Install <application>S-Lang</application> by running the following
     commands:</para>
Index: general/prog/valgrind.xml
===================================================================
--- general/prog/valgrind.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/prog/valgrind.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -35,5 +35,5 @@
       automatically detect many memory management and threading bugs, and
       profile programs in detail. Valgrind can also be used to build new
-      tools. 
+      tools.
     </para>
 
@@ -79,5 +79,5 @@
     <para role="optional">
       <xref linkend="boost"/>,
-      <xref linkend="llvm"/> (with Clang), 
+      <xref linkend="llvm"/> (with Clang),
       <xref linkend="gdb"/> (for tests), and
       <ulink url="http://www.openmp.org">OpenMP</ulink>
@@ -86,5 +86,5 @@
     <bridgehead renderas="sect4">Optional for regenerating the documentation</bridgehead>
     <para role="optional">
-      <xref linkend="libxslt"/> and 
+      <xref linkend="libxslt"/> and
       <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
     </para>
@@ -148,13 +148,13 @@
       <seglistitem>
         <seg>
-          callgrind_annotate, 
-          callgrind_control, 
-          cg_annotate, 
-          cg_diff, 
-          cg_merge, 
-          ms_print, 
-          valgrind, 
+          callgrind_annotate,
+          callgrind_control,
+          cg_annotate,
+          cg_diff,
+          cg_merge,
+          ms_print,
+          valgrind,
           valgrind-di-server,
-          valgrind-listener, and 
+          valgrind-listener, and
           vgdb
         </seg>
@@ -175,5 +175,5 @@
         <seg>
           /usr/lib/valgrind,
-          /usr/include/valgrind, and 
+          /usr/include/valgrind, and
           /usr/share/doc/valgrind-&valgrind-version;
         </seg>
@@ -216,5 +216,5 @@
         <listitem>
           <para>
-            controls programs being run by the <application>Valgrind</application> 
+            controls programs being run by the <application>Valgrind</application>
             tool Callgrind.
           </para>
@@ -229,5 +229,5 @@
         <listitem>
           <para>
-            is a post-processing tool for the <application>Valgrind</application> 
+            is a post-processing tool for the <application>Valgrind</application>
             tool Cachegrind.
           </para>
@@ -279,5 +279,5 @@
         <listitem>
           <para>
-            is a server that reads debuginfo from objects stored on a 
+            is a server that reads debuginfo from objects stored on a
             different machine.
           </para>
Index: general/sysutils/logrotate.xml
===================================================================
--- general/sysutils/logrotate.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/sysutils/logrotate.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -31,6 +31,6 @@
 
     <para>
-      The <application>logrotate</application> package allows automatic rotation, 
-      compression, removal, and mailing of log files. 
+      The <application>logrotate</application> package allows automatic rotation,
+      compression, removal, and mailing of log files.
     </para>
 
@@ -106,5 +106,5 @@
 
     <para>
-      To test the results, issue: <command>make test</command>. 
+      To test the results, issue: <command>make test</command>.
     </para>
 
@@ -130,6 +130,6 @@
      <title>Configuring Logrotate</title>
 
-     <para><application>Logrotate</application> needs a configuration file, 
-     which must be passed as an argument to the command when executed.  Create 
+     <para><application>Logrotate</application> needs a configuration file,
+     which must be passed as an argument to the command when executed.  Create
      the file as the <systemitem class="username">root</systemitem> user:</para>
 
@@ -184,5 +184,5 @@
 <screen role="root"><userinput> mkdir -p /etc/logrotate.d</userinput></screen>
 
-  <para>At this point additional log rotation commands can be entered, typically 
+  <para>At this point additional log rotation commands can be entered, typically
   in the <filename class='directory'>/etc/logrotate.d</filename> directory.
   For example:</para>
@@ -218,5 +218,5 @@
 
   <para>You can use in the same line the list of files: file1 file2 file3.
-  See the logrotate man page or 
+  See the logrotate man page or
   <ulink url='http://www.techrepublic.com/article/manage-linux-log-files-with-logrotate/'/>
   for more examples.</para>
@@ -265,5 +265,5 @@
         <listitem>
           <para>
-            performs the log maintenance functions defined in the 
+            performs the log maintenance functions defined in the
             configuration files.
           </para>
Index: general/sysutils/pm-utils.xml
===================================================================
--- general/sysutils/pm-utils.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/sysutils/pm-utils.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -112,5 +112,5 @@
       (or the user is inactive for some time).
     </para>
-      
+
     <para>
       Suspend to disk (Hibernation) saves the machine's state into swap space
@@ -241,5 +241,5 @@
             is a symlink to pm-action script that puts the computer into
             hibernate mode (the system is fully powered off and system state is
-            saved to disk). 
+            saved to disk).
           </para>
           <indexterm zone="pm-utils pm-hibernate">
Index: general/sysutils/sg3_utils.xml
===================================================================
--- general/sysutils/sg3_utils.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/sysutils/sg3_utils.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -39,5 +39,5 @@
     </para>
 
-    &lfs78_checked; 
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/sysutils/strigi.xml
===================================================================
--- general/sysutils/strigi.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/sysutils/strigi.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -69,5 +69,5 @@
     <para role="recommended">
       <xref linkend="dbus"/> and
-      <xref linkend="qt4"/> 
+      <xref linkend="qt4"/>
     </para>
 
@@ -147,5 +147,5 @@
       <option>-DENABLE_CLUCENE*=OFF</option>: These statements disable the
       package from trying to use <xref linkend="clucene"/> (current stable
-      version). 
+      version).
     </para>
 
@@ -178,5 +178,5 @@
         <term><command>deepfind</command></term>
         <listitem>
-          <para>is a utility for searching for filenames in compressed 
+          <para>is a utility for searching for filenames in compressed
           archives like tar, cpio, and zip</para>
           <indexterm zone="strigi deepfind">
@@ -189,5 +189,5 @@
         <term><command>deepgrep</command></term>
         <listitem>
-          <para>is a utility for searching compressed archives like 
+          <para>is a utility for searching compressed archives like
                     tar, cpio, and zip</para>
           <indexterm zone="strigi deepgrep">
@@ -200,5 +200,5 @@
         <term><command>rdfindexer</command></term>
         <listitem>
-          <para>manages and performs indexing of the RDF data for entities 
+          <para>manages and performs indexing of the RDF data for entities
           present on your site</para>
           <indexterm zone="strigi rdfindexer">
Index: general/sysutils/udisks.xml
===================================================================
--- general/sysutils/udisks.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/sysutils/udisks.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -140,6 +140,6 @@
       <seglistitem>
         <seg>
-          udisks, 
-          udisks-daemon, 
+          udisks,
+          udisks-daemon,
           udisks-tcp-bridge, and
           umount.udisks
Index: general/sysutils/unzip.xml
===================================================================
--- general/sysutils/unzip.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/sysutils/unzip.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -185,5 +185,5 @@
 
     <para>The test suite does not work for present target <quote>generic</quote>.</para>
-    
+
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
Index: general/sysutils/upower.xml
===================================================================
--- general/sysutils/upower.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ general/sysutils/upower.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -37,5 +37,5 @@
     </para>
 
-    &lfs78_checked; 
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: gnome/platform/gnome-icon-theme-symbolic.xml
===================================================================
--- gnome/platform/gnome-icon-theme-symbolic.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ gnome/platform/gnome-icon-theme-symbolic.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -77,5 +77,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gnome-icon-theme"/> 
+      <xref linkend="gnome-icon-theme"/>
     </para>
 
Index: gnome/platform/gsettings-desktop-schemas.xml
===================================================================
--- gnome/platform/gsettings-desktop-schemas.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ gnome/platform/gsettings-desktop-schemas.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -38,5 +38,5 @@
     </para>
 
-    &lfs78_checked; 
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: introduction/important/bootscripts.xml
===================================================================
--- introduction/important/bootscripts.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ introduction/important/bootscripts.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -34,5 +34,5 @@
     <title>Package Information</title>
     <listitem>
-      <para>Download: <ulink 
+      <para>Download: <ulink
         url="&sources-anduin-http;/blfs-bootscripts/blfs-bootscripts-&blfs-bootscripts-version;.tar.bz2"/></para>
     </listitem>
@@ -58,6 +58,6 @@
   <note>
     <para>From time to time the bootscripts are updated to accomodate
-    new packages or to make minor corrections.  All versions of the 
-    bootscripts are located at <ulink 
+    new packages or to make minor corrections.  All versions of the
+    bootscripts are located at <ulink
     url="&sources-anduin-http;/blfs-bootscripts/"/>.</para>
   </note>
Index: introduction/important/building-notes.xml
===================================================================
--- introduction/important/building-notes.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ introduction/important/building-notes.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -407,6 +407,6 @@
 
     <screen><userinput>find /{,usr/}{bin,lib,sbin} -type f -exec strip --strip-unneeded {} \;</userinput></screen>
-    
-    <para>If you install programs in other directories such as /opt or /usr/local, 
+
+    <para>If you install programs in other directories such as /opt or /usr/local,
     you may want to strip the files there too.</para>
 
@@ -422,5 +422,5 @@
     libtool, is that they create many files with an .la extension.  These
     files are not needed in an LFS environment.  If there are conflicts with
-    pkgconfig entries, they can actually prevent successful builds.  You 
+    pkgconfig entries, they can actually prevent successful builds.  You
     may want to consider removing these files periodically:</para>
 
@@ -428,5 +428,5 @@
 
     <para>The above command removes all .la files with the exception of those that have
-    "Image" as a part of the path.  These .la files are used by the 
+    "Image" as a part of the path.  These .la files are used by the
     ImageMagick programs.  There may be other exceptions by packages not in BLFS.</para>
 
Index: introduction/welcome/conventions.xml
===================================================================
--- introduction/welcome/conventions.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ introduction/welcome/conventions.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -107,5 +107,5 @@
 
     <bridgehead renderas="sect3">Recommended Dependencies</bridgehead>
-    
+
     <para>These dependencies are those that the BLFS editors have determined
     are important to give the package reasonable capabilities.  Package
@@ -113,5 +113,5 @@
     package is not desired, the instructions may need to be modified to
     accommodate the missing package.</para>
-    
+
     <bridgehead renderas="sect3">Optional Dependencies</bridgehead>
 
Index: kde/add/add-pkgs.xml
===================================================================
--- kde/add/add-pkgs.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ kde/add/add-pkgs.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -26,5 +26,5 @@
                  &kde-download-ftp;applications/&kde-apps-version;/src/</ulink>.</para>
 
-  <note><para>Some packages, such as konsole, kate, and gwenview listed in the 
+  <note><para>Some packages, such as konsole, kate, and gwenview listed in the
   links above are only for the new KDE Frameworks 5 and cannot be used
   with KDE4.</para></note>
Index: kde/add/gwenview.xml
===================================================================
--- kde/add/gwenview.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ kde/add/gwenview.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -69,5 +69,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-       <xref linkend="libkdcraw"/> and 
+       <xref linkend="libkdcraw"/> and
        <xref linkend="kdelibs"/>
     </para>
Index: kde/add/kdepim-runtime.xml
===================================================================
--- kde/add/kdepim-runtime.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ kde/add/kdepim-runtime.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -107,9 +107,9 @@
 
       <seglistitem>
-        <seg>accountwizard, akonadi_nepomuk_feeder, akonadi_*_agent, 
-        akonadi_*_resource, akonaditray, gidmigrator, 
-        kaddressbookmigrator, kjotsmigrator, kmail-migrator, 
+        <seg>accountwizard, akonadi_nepomuk_feeder, akonadi_*_agent,
+        akonadi_*_resource, akonaditray, gidmigrator,
+        kaddressbookmigrator, kjotsmigrator, kmail-migrator,
         knotes-migrator, and kres-migrator</seg>
-        <seg>libakonadi-xml.so, libkdepim-copy.so, libkmindexreader.so, 
+        <seg>libakonadi-xml.so, libkdepim-copy.so, libkmindexreader.so,
         libmaildir.so, and several in &kde-dir;/lib/kde4</seg>
         <seg>several in &kde-dir;/share</seg>
@@ -205,5 +205,5 @@
         </listitem>
       </varlistentry>
- 
+
       <varlistentry id="kjotsmigrator">
         <term><command>kjotsmigrator</command></term>
@@ -217,5 +217,5 @@
         </listitem>
       </varlistentry>
-    
+
       <varlistentry id="kmail-migrator">
         <term><command>kmail-migrator</command></term>
Index: kde/add/kdepim.xml
===================================================================
--- kde/add/kdepim.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ kde/add/kdepim.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -58,10 +58,10 @@
       </listitem>
     </itemizedlist>
-      
+
     <bridgehead renderas="sect3">Kdepim Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="boost"/>, 
+      <xref linkend="boost"/>,
       <xref linkend="grantlee"/>, and
       <xref linkend="kdepim-runtime"/>
@@ -92,5 +92,5 @@
     <para>Install <application>Kdepim</application> by running
     the following commands:</para>
-    
+
 <screen><userinput>mkdir build &amp;&amp;
 cd    build &amp;&amp;
@@ -118,14 +118,14 @@
 
       <seglistitem>
-        <seg>akonadi_archivemail_agent, akonadi_followupreminder_agent, 
+        <seg>akonadi_archivemail_agent, akonadi_followupreminder_agent,
         akonadi_mailfilter_agent, akonadi_notes_agent, akonadi_sendlater_agent,
         akonadiconsole, akregator, akregatorstorageexporter,
         calendarjanitor, contactthemeeditor, headerthemeeditor,
-        ical2vcal, importwizard, kabc2mutt, kabcclient, kaddressbook, 
+        ical2vcal, importwizard, kabc2mutt, kabcclient, kaddressbook,
         kaddressbook-mobile, kalarm, kalarmautostart, karm,
         kgpgconf, kincidenceeditor, kjotes, kleopatra, kmail, kmail-mobile,
         kmail_antivir.sh, kmail_clamav.sh, kmail_fprot.sh, kmail_sav.sh,
         kmailcvt, knode, knotes, konsolekalendar, kontact, korgac, korganizer,
-        korganizer-mobile, ksendemail, ktimetracker, ktnef, kwatchgnupg, 
+        korganizer-mobile, ksendemail, ktimetracker, ktnef, kwatchgnupg,
         mboximporter, notes-mobile, pimsettingexporter, sieveeditor, storageservicemanger,
         and tasks-mobile</seg>
Index: kde/add/kdeplasma-addons.xml
===================================================================
--- kde/add/kdeplasma-addons.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ kde/add/kdeplasma-addons.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -78,5 +78,5 @@
       <xref linkend="libkexiv2"/>,
       <xref linkend="qjson"/>,
-      <ulink url="http://eigen.tuxfamily.org/">Eigen</ulink> (for the Mandelbrot wallpaper plugin), 
+      <ulink url="http://eigen.tuxfamily.org/">Eigen</ulink> (for the Mandelbrot wallpaper plugin),
       <ulink url="https://github.com/ibus/ibus/wiki">ibus</ulink>,
       <ulink url="&kde-download-http;&kde-version;/src/">Nepomuk</ulink>,
Index: kde/add/libkdcraw.xml
===================================================================
--- kde/add/libkdcraw.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ kde/add/libkdcraw.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -105,5 +105,5 @@
     <para>
       <command>sed ... libkdcraw/CMakeLists.txt</command>: Allow C++ exceptions
-      that are needed for libraw-0.16.2 headers. 
+      that are needed for libraw-0.16.2 headers.
     </para>
 
Index: kde/core/akonadi.xml
===================================================================
--- kde/core/akonadi.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ kde/core/akonadi.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -67,5 +67,5 @@
     <xref linkend="boost"/>, and one of:
      <xref linkend="sqlite"/>,
-     <xref linkend="mariadb"/>, 
+     <xref linkend="mariadb"/>,
      <ulink url="http://www.mysql.com/">MySQL</ulink>, or
      <xref linkend="postgresql"/>
@@ -84,5 +84,5 @@
   <sect2 role="installation">
     <title>Installation of Akonadi</title>
-    
+
     <para>Install <application>Akonadi</application> by running the following
     commands:</para>
Index: kde/core/attica.xml
===================================================================
--- kde/core/attica.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ kde/core/attica.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -104,5 +104,5 @@
       <parameter>-DQT4_BUILD=ON</parameter>: This switch forces the package
       to build against <application>Qt4</application> even if
-      <application>Qt5</application> is present on the system. 
+      <application>Qt5</application> is present on the system.
     </para>
 
Index: kde/core/kde-runtime.xml
===================================================================
--- kde/core/kde-runtime.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ kde/core/kde-runtime.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -62,5 +62,5 @@
     <para role="required">
       <xref linkend="kdelibs"/> and
-      <xref linkend="libgcrypt"/> 
+      <xref linkend="libgcrypt"/>
     </para>
 
Index: kde/core/kde-workspace.xml
===================================================================
--- kde/core/kde-workspace.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ kde/core/kde-workspace.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -79,5 +79,5 @@
       <xref linkend="xcb-util-renderutil"/>,
       <xref linkend="xcb-util-keysyms"/>, and
-      <xref linkend="xcb-util-wm"/>      
+      <xref linkend="xcb-util-wm"/>
     </para>
 
@@ -114,5 +114,5 @@
         <application>Application menu for Qt</application> that allows the
         application menubar to be inserted as a single button in the titlebar.
-        It can be found at 
+        It can be found at
         <ulink url="https://launchpad.net/appmenu-qt">appmenu-qt</ulink>.
       </para>
Index: kde/core/kfilemetadata.xml
===================================================================
--- kde/core/kfilemetadata.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ kde/core/kfilemetadata.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -62,5 +62,5 @@
     <xref linkend="kdelibs"/>
     </para>
-    
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
@@ -107,5 +107,5 @@
     <title>Command Explanations</title>
 
-    <para><option>-DCMAKE_MINIMUM_REQUIRED_VERSION=3.0</option>: This switch is 
+    <para><option>-DCMAKE_MINIMUM_REQUIRED_VERSION=3.0</option>: This switch is
     needed to avoid a cmake error when using cmake-3.3 and later.</para>
 
Index: kde/core/pre-install-config.xml
===================================================================
--- kde/core/pre-install-config.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ kde/core/pre-install-config.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -17,5 +17,5 @@
 
   <note><para>If you did not install <application>Xorg</application> in
-  <filename class="directory">/usr</filename>, some of the 
+  <filename class="directory">/usr</filename>, some of the
   <application>CMake</application> modules in <application>KDE</application>
   look for packages at hard coded locations. To accommodate this issue,
Index: kde/extra-cmake-modules.xml
===================================================================
--- kde/extra-cmake-modules.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ kde/extra-cmake-modules.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -32,10 +32,10 @@
     <para>
       The <application>Extra Cmake Modules</application> package contains
-      extra <application>CMake</application> modules used by 
+      extra <application>CMake</application> modules used by
       <application>KDE Frameworks 5</application> and other packages.
     </para>
 
     &lfs78_checked;
-    
+
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
Index: kde/kde-intro.xml
===================================================================
--- kde/kde-intro.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ kde/kde-intro.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -25,5 +25,5 @@
   built on that base.  For KDE5, the libraries, now called KDE Frameworks
   5 or KF5, are separate from the desktop environment called KDE Plasma 5.
-  Both envionments can be installed, but Plasma is not yet considered 
+  Both envionments can be installed, but Plasma is not yet considered
   stable.</para>
 
Index: kde/kf5-apps/kate5.xml
===================================================================
--- kde/kf5-apps/kate5.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ kde/kf5-apps/kate5.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -152,5 +152,5 @@
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-   
+
       <varlistentry id="kate5-prog">
         <term><command>kate</command></term>
Index: kde/kf5-apps/kf5-apps.xml
===================================================================
--- kde/kf5-apps/kf5-apps.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ kde/kf5-apps/kf5-apps.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -15,5 +15,5 @@
 
   <title>KDE Frameworks 5 Based Applications</title>
- 
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kate5.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdenlive5.xml"/>
Index: kde/kf5/kf5-frameworks.xml
===================================================================
--- kde/kf5/kf5-frameworks.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ kde/kf5/kf5-frameworks.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -83,5 +83,5 @@
     <xref linkend="aspell"/> (Dictionary backend for Sonnet),
     <xref linkend="avahi"/> (DNS-SD backend for KDNSSD),
-    <xref linkend="libdbusmenu-qt"/> (built with qt5), 
+    <xref linkend="libdbusmenu-qt"/> (built with qt5),
     <xref linkend="NetworkManager"/> (needed to build NetworkManager-Qt), and
     <xref linkend="polkit-qt"/> (Authentication backend for KAuth)
@@ -145,9 +145,9 @@
       <command>wget</command> to fetch them all at once:
     </para>
- 
+
 <screen><userinput>url=http://download.kde.org/stable/frameworks/&kf5-short-version;/
 wget -r -nH --cut-dirs=3 -A '*.xz' -np $url</userinput>
 <literal>
-The options used here are: 
+The options used here are:
   -r            recurse through child directories
   -nH           disable generation of host-prefixed directories
@@ -273,5 +273,5 @@
     if $(echo $line | grep -E -q '^ *$|^#' ); then continue; fi
     file=$(echo $line | cut -d" " -f2)
-    
+
     pkg=$(echo $file|sed 's|^.*/||')          # Remove directory
     packagedir=$(echo $pkg|sed 's|\.tar.*||') # Package directory
@@ -288,5 +288,5 @@
             -DLIB_INSTALL_DIR=lib              \
             -DBUILD_TESTING=OFF                \
-            -Wno-dev .. 
+            -Wno-dev ..
       make
       as_root make install
@@ -307,5 +307,5 @@
     If the installed directory is not /usr, rename the directory and create a
     symlink:</para>
-    
+
     <screen><userinput>mv -v /opt/kf5 /opt/kf5-&kf5-version;
 ln -sfvn kf5-&kf5-version; /opt/kf5</userinput></screen>
@@ -349,8 +349,8 @@
       <seglistitem>
         <seg>
-          There are 53 programs installed in /opt/kf5/bin. 
+          There are 53 programs installed in /opt/kf5/bin.
         </seg>
         <seg>
-          There are too many kf5 libraries (79) to list separately. 
+          There are too many kf5 libraries (79) to list separately.
         </seg>
         <seg>
@@ -506,5 +506,5 @@
         <listitem>
           <para>
-            executes kross scripts written in KDE Javascript, Python, Ruby, 
+            executes kross scripts written in KDE Javascript, Python, Ruby,
             Java and Falcon.
           </para>
@@ -690,5 +690,5 @@
           <para>
             is a command line tool to write values in KDE
-            configuration files. 
+            configuration files.
           </para>
           <indexterm zone="kf5-frameworks kwriteconfig5">
@@ -703,5 +703,5 @@
           <para>
             converts DocBook files to HTML.
-          </para> 
+          </para>
           <indexterm zone="kf5-frameworks meinproc5">
             <primary sortas="b-meinproc5">meinproc5</primary>
Index: kde/kf5/kf5.xml
===================================================================
--- kde/kf5/kf5.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ kde/kf5/kf5.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -13,5 +13,5 @@
 <chapter id="kf5">
   <?dbhtml filename="kf5.html"?>
- 
+
   <title>KDE Frameworks 5</title>
 
Index: kde/libdbusmenuqt.xml
===================================================================
--- kde/libdbusmenuqt.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ kde/libdbusmenuqt.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -133,5 +133,5 @@
 
     <para><option>-DCMAKE_BUILD_TYPE=Release</option>: This switch is used to
-    build without debugging symbols and apply a higher level of compiler 
+    build without debugging symbols and apply a higher level of compiler
     optimizations.</para>
 
Index: kde/phonon-backend-gstreamer.xml
===================================================================
--- kde/phonon-backend-gstreamer.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ kde/phonon-backend-gstreamer.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -95,5 +95,5 @@
     <title>Installation of Phonon-backend-gstreamer</title>
 
-    <para>For both build variants, fix the package to work with the 
+    <para>For both build variants, fix the package to work with the
     latest gstreamer:</para>
 
@@ -141,5 +141,5 @@
 
   </sect2>
-  
+
   <sect2 role="commands">
     <title>Command Explanations</title>
@@ -149,5 +149,5 @@
 
     <para><option>-DCMAKE_INSTALL_LIBDIR=lib</option>: This switch is used to
-     get libraries to install to /usr/lib instead of /usr/lib64 on a 64 bit 
+     get libraries to install to /usr/lib instead of /usr/lib64 on a 64 bit
      system.</para>
 
@@ -159,5 +159,5 @@
 
   </sect2>
-  
+
   <sect2 role="content">
     <title>Contents</title>
Index: kde/phonon-backend-vlc.xml
===================================================================
--- kde/phonon-backend-vlc.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ kde/phonon-backend-vlc.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -148,5 +148,5 @@
         <seg>phonon_vlc.so</seg>
         <seg>/usr/lib/kde4/plugins/phonon_backend,
-             /usr/lib/qt5/plugins/phonon4qt5_backend, and 
+             /usr/lib/qt5/plugins/phonon4qt5_backend, and
              /usr/share/kde4/services/phononbackends</seg>
       </seglistitem>
Index: kde/phonon.xml
===================================================================
--- kde/phonon.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ kde/phonon.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -161,15 +161,15 @@
     <para>
      <parameter>-DDBUS_INTERFACES_INSTALL_DIR=/usr/share/dbus-1/interfaces</parameter>:
-      This switch sets the correct installation path for the 
+      This switch sets the correct installation path for the
       <application>D-Bus</application> interfaces file.
     </para>
 
     <para>
-     <parameter>-DPHONON_BUILD_PHONON4QT5=ON</parameter>: This switch is used to 
-     ensure that Qt5 version of the library is built even if Qt4 is present. 
-    </para>
-
-    <para>
-     <parameter>-D__KDE_HAVE_GCC_VISIBILITY=NO</parameter>: This switch is used to 
+     <parameter>-DPHONON_BUILD_PHONON4QT5=ON</parameter>: This switch is used to
+     ensure that Qt5 version of the library is built even if Qt4 is present.
+    </para>
+
+    <para>
+     <parameter>-D__KDE_HAVE_GCC_VISIBILITY=NO</parameter>: This switch is used to
      disable a check that would cause cmake to fail when using Qt-5.4.2
      and later.
@@ -202,5 +202,5 @@
           /usr/lib/cmake/phonon,
           /usr/lib/cmake/phonon4qt5,
-          /usr/share/phonon. amd 
+          /usr/share/phonon. amd
           /usr/share/phonon4qt5
         </seg>
Index: kde/plasma5/plasma-all.xml
===================================================================
--- kde/plasma5/plasma-all.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ kde/plasma5/plasma-all.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -62,15 +62,15 @@
   <bridgehead renderas="sect4">Required</bridgehead>
   <para role="required">
-    <xref linkend="fontforge"/>, 
-    <xref linkend="gtk2"/>, 
-    <xref linkend="gtk3"/>, 
+    <xref linkend="fontforge"/>,
+    <xref linkend="gtk2"/>,
+    <xref linkend="gtk3"/>,
     <xref linkend="kf5-frameworks"/>,
     <xref linkend="libpwquality"/>,
     <xref linkend="libxkbcommon"/>,
     <xref linkend="mesa"/> built with <xref linkend="wayland"/>,
-    <xref linkend="NetworkManager"/>, 
-    <xref linkend="pulseaudio"/>, 
-    <xref linkend="python2"/>, 
-    <xref linkend="taglib"/>, and 
+    <xref linkend="NetworkManager"/>,
+    <xref linkend="pulseaudio"/>,
+    <xref linkend="python2"/>,
+    <xref linkend="taglib"/>, and
     <xref linkend="xcb-util-cursor"/>
   </para>
@@ -78,9 +78,9 @@
   <bridgehead renderas="sect4">Recommended</bridgehead>
   <para role="recommended">
-    <xref linkend="libdbusmenu-qt"/>, 
-    <xref linkend="libcanberra"/>, 
-    <xref linkend="libinput"/>, 
+    <xref linkend="libdbusmenu-qt"/>,
+    <xref linkend="libcanberra"/>,
+    <xref linkend="libinput"/>,
     <xref linkend="linux-pam"/>,
-    <xref linkend="lm_sensors"/>, 
+    <xref linkend="lm_sensors"/>,
     <xref linkend="oxygen-icons"/>, and
     <xref linkend="pciutils"/>
@@ -111,9 +111,9 @@
       <command>wget</command> to fetch them all at once:
     </para>
- 
+
 <screen><userinput>url=http://download.kde.org/stable/plasma/&plasma5-version;/
 wget -r -nH --cut-dirs=3 -A '*.xz' -np $url</userinput>
 <literal>
-The options used here are: 
+The options used here are:
   -r            recurse through child directories
   -nH           disable generation of host-prefixed directories
@@ -196,5 +196,5 @@
     if $(echo $line | grep -E -q '^ *$|^#' ); then continue; fi
     file=$(echo $line | cut -d" " -f2)
-    
+
     pkg=$(echo $file|sed 's|^.*/||')          # Remove directory
     packagedir=$(echo $pkg|sed 's|\.tar.*||') # Package directory
Index: kde/plasma5/plasma5.xml
===================================================================
--- kde/plasma5/plasma5.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ kde/plasma5/plasma5.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -15,5 +15,5 @@
 
   <title>KDE Plasma 5</title>
- 
+
   <para>KDE Plasma 5 is a desktop environment built using KDE Frameworks 5 and
   QML which runs on top of a fully hardware accelerated graphics stack using
@@ -22,5 +22,5 @@
   <para>Because KDE Plasma 5 is so new, there are issues preventing proper
   operation on some systems in the LFS environment.  When these issues are
-  worked out, then the build instructions will be added here.  For more 
+  worked out, then the build instructions will be added here.  For more
   information, see <ulink url="https://www.kde.org/announcements/plasma-5.4.0.php"/>.
   </para>
Index: kde/polkit-qt.xml
===================================================================
--- kde/polkit-qt.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ kde/polkit-qt.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -165,11 +165,11 @@
       <seglistitem>
         <seg>none</seg>
-        <seg>libpolkit-qt-agent-1.so, 
+        <seg>libpolkit-qt-agent-1.so,
              libpolkit-qt5-agent-1.so,
-             libpolkit-qt-core-1.so, 
-             libpolkit-qt5-core-1.so,  
+             libpolkit-qt-core-1.so,
+             libpolkit-qt5-core-1.so,
              libpolkit-qt-gui-1.so, and
              libpolkit-qt5-gui-1.so</seg>
-        <seg>/usr/include/polkit-qt-1, 
+        <seg>/usr/include/polkit-qt-1,
              /usr/include/polkit-qt5-1,
              /usr/lib/cmake/PolkitQt-1, and
Index: lxde/desktop/desktop.xml
===================================================================
--- lxde/desktop/desktop.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ lxde/desktop/desktop.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -17,5 +17,5 @@
 
   <para>
-    LXDE is an extremely fast-performing and energy-saving desktop environment. 
+    LXDE is an extremely fast-performing and energy-saving desktop environment.
   </para>
 
@@ -25,5 +25,5 @@
     less RAM than other environments. It is especially designed for cloud computers
     with low hardware specifications, such as netbooks, mobile devices (e.g. MIDs) or
-    older computers. 
+    older computers.
   </para>
 
Index: lxde/desktop/lxsession.xml
===================================================================
--- lxde/desktop/lxsession.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ lxde/desktop/lxsession.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -183,5 +183,5 @@
         </listitem>
       </varlistentry>
- 
+
       <varlistentry id="lxpolkit">
         <term><command>lxpolkit</command></term>
@@ -269,5 +269,5 @@
         </listitem>
       </varlistentry>
- 
+
       <varlistentry id="lxsession-logout">
         <term><command>lxsession-logout</command></term>
@@ -281,5 +281,5 @@
         </listitem>
       </varlistentry>
- 
+
       <varlistentry id="lxsession-xdg-autostart">
         <term><command>lxsession-xdg-autostart</command></term>
Index: lxqt/apps/lximage-qt.xml
===================================================================
--- lxqt/apps/lximage-qt.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ lxqt/apps/lximage-qt.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -183,5 +183,5 @@
             menu entry at Utilities for the screenshot program. From command
             line, obtain a full screen or window shot by running
-            <command>lximage-qt --screenshot</command>. 
+            <command>lximage-qt --screenshot</command>.
           </para>
           <indexterm zone="lximage-qt lximage-qt-prog">
Index: lxqt/apps/obconf-qt.xml
===================================================================
--- lxqt/apps/obconf-qt.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ lxqt/apps/obconf-qt.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -170,5 +170,5 @@
           <para>
             is a GUI Qt based configuration tool for
-            <application>OpenBox</application>. 
+            <application>OpenBox</application>.
           </para>
           <indexterm zone="obconf-qt obconf-qt-prog">
Index: multimedia/audioutils/amarok.xml
===================================================================
--- multimedia/audioutils/amarok.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ multimedia/audioutils/amarok.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -142,10 +142,10 @@
 
   </sect2>
-  
+
   <sect2 role="commands">
     <title>Command Explanations</title>
 
     <para>
-      <option>-DKDE4_BUILD_TESTS=OFF</option>: This switch disables the 
+      <option>-DKDE4_BUILD_TESTS=OFF</option>: This switch disables the
       integrated tests. The test suite requires Google Mock.
     </para>
Index: multimedia/cdwriteutils/k3b.xml
===================================================================
--- multimedia/cdwriteutils/k3b.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ multimedia/cdwriteutils/k3b.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -112,5 +112,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="libkcompactdisk"/> and 
+      <xref linkend="libkcompactdisk"/> and
       <xref linkend="audiocd-kio"/>,
       <xref linkend="ffmpeg"/>,
Index: multimedia/cdwriteutils/libisofs.xml
===================================================================
--- multimedia/cdwriteutils/libisofs.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ multimedia/cdwriteutils/libisofs.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -36,5 +36,5 @@
     </para>
 
-    &lfs78_checked; 
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: multimedia/cdwriteutils/simpleburn.xml
===================================================================
--- multimedia/cdwriteutils/simpleburn.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ multimedia/cdwriteutils/simpleburn.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -375,5 +375,5 @@
         <listitem>
           <para>
-            is a bash script used to print information about 
+            is a bash script used to print information about
             the content of a video DVD.
           </para>
Index: multimedia/libdriv/alsa-lib.xml
===================================================================
--- multimedia/libdriv/alsa-lib.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ multimedia/libdriv/alsa-lib.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -9,5 +9,5 @@
   <!ENTITY alsa-lib-md5sum        "69515ca73c3c4a212ef45160dea846c1">
   <!ENTITY alsa-lib-size          "912 KB">
-  <!ENTITY alsa-lib-buildsize     "32 MB (additional 36 MB for tests)">  
+  <!ENTITY alsa-lib-buildsize     "32 MB (additional 36 MB for tests)">
   <!ENTITY alsa-lib-time          "0.3 SBU (less than 0.1 SBU for tests)">
 ]>
@@ -78,5 +78,5 @@
     <para role="optional">
       <xref linkend="doxygen"/> and
-      <xref linkend="python2"/> 
+      <xref linkend="python2"/>
     </para>
 
@@ -90,6 +90,6 @@
 
     <para>
-       If needed, enable the following options in the kernel 
-       configuration and recompile the kernel: 
+       If needed, enable the following options in the kernel
+       configuration and recompile the kernel:
     </para>
 
Index: multimedia/libdriv/alsa-plugins.xml
===================================================================
--- multimedia/libdriv/alsa-plugins.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ multimedia/libdriv/alsa-plugins.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -82,6 +82,6 @@
       <xref linkend="ffmpeg"/>,
       <xref linkend="libsamplerate"/>,
-      <xref linkend="pulseaudio"/>, 
-      <xref linkend="speex"/>, 
+      <xref linkend="pulseaudio"/>,
+      <xref linkend="speex"/>,
       <ulink url="http://jackaudio.org/">JACK</ulink>, and
       <ulink url="http://maemo.org/">maemo</ulink>
@@ -141,16 +141,16 @@
         <seg>
           Numerous libasound_module_<replaceable>&lt;module&gt;</replaceable>.so
-          modules including 
-          ctl_oss, 
-          ctl_pulse, 
-          pcm_a52, 
-          pcm_jack, 
+          modules including
+          ctl_oss,
+          ctl_pulse,
+          pcm_a52,
+          pcm_jack,
           pcm_oss,
-          pcm_pulse, 
-          pcm_upmix, 
-          pcm_usb_stream, 
+          pcm_pulse,
+          pcm_upmix,
+          pcm_usb_stream,
           pcm_vdownmix,
           rate_lavcrate*,
-          rate_samplerate*, and 
+          rate_samplerate*, and
           rate_speexrate*
         </seg>
Index: multimedia/libdriv/alsa-tools.xml
===================================================================
--- multimedia/libdriv/alsa-tools.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ multimedia/libdriv/alsa-tools.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -165,5 +165,5 @@
           hdajacksensetest, hdspconf, hdsploader, hdspmixer, hwmixvolume,
           init_audigy, init_audigy_eq10, init_live, lo10k1, ld10k1, ld10k1d,
-          mixartloader, pcxhrloader, 
+          mixartloader, pcxhrloader,
           rmedigicontrol, sbiload, sscape_ctl, us428control,
           usx2yloader, and vxloader
@@ -310,5 +310,5 @@
         <listitem>
           <para>
-            are tools used to initialize Creative cards.            
+            are tools used to initialize Creative cards.
           </para>
           <indexterm zone="alsa-tools init_audigy_progs">
@@ -317,5 +317,5 @@
         </listitem>
       </varlistentry>
- 
+
       <varlistentry id="init_live">
         <term><command>init_live</command></term>
Index: multimedia/libdriv/alsa-utils.xml
===================================================================
--- multimedia/libdriv/alsa-utils.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ multimedia/libdriv/alsa-utils.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -83,5 +83,5 @@
       <xref linkend="libsamplerate"/>,
       <xref linkend="xmlto"/>,
-      <ulink url="http://hightek.org/dialog/">Dialog</ulink>, and 
+      <ulink url="http://hightek.org/dialog/">Dialog</ulink>, and
       <ulink url="http://www.fftw.org/">FFTW</ulink>
     </para>
Index: multimedia/libdriv/fdk-aac.xml
===================================================================
--- multimedia/libdriv/fdk-aac.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ multimedia/libdriv/fdk-aac.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -90,5 +90,5 @@
 
     <para>
-      This package does not come with a test suite. 
+      This package does not come with a test suite.
     </para>
 
Index: multimedia/libdriv/frei0r.xml
===================================================================
--- multimedia/libdriv/frei0r.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ multimedia/libdriv/frei0r.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -67,5 +67,5 @@
       </listitem>
     </itemizedlist>
- 
+
 
     <bridgehead renderas="sect3">Frei0r Dependencies</bridgehead>
Index: multimedia/libdriv/gst10-plugins-bad.xml
===================================================================
--- multimedia/libdriv/gst10-plugins-bad.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ multimedia/libdriv/gst10-plugins-bad.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -199,12 +199,12 @@
         <seg>
           libgstadaptivedemux-1.0.so,
-          libgstbadbase-1.0.so, 
+          libgstbadbase-1.0.so,
           libgstbadvideo-1.0.so,
-          libgstbasecamerabinsrc-1.0.so, 
+          libgstbasecamerabinsrc-1.0.so,
           libgstcodecparsers-1.0.so,
-          libgstgl-1.0.so, 
-          libgstinsertbin-1.0.so, 
+          libgstgl-1.0.so,
+          libgstinsertbin-1.0.so,
           libgstmpegts-1.0.so,
-          libgstphotography-1.0.so, 
+          libgstphotography-1.0.so,
           libgsturidownloader-1.0.so, and
           several plugins under /usr/lib/gstreamer-1.0
Index: multimedia/libdriv/gst10-plugins-base.xml
===================================================================
--- multimedia/libdriv/gst10-plugins-base.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ multimedia/libdriv/gst10-plugins-base.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -107,6 +107,6 @@
       <xref linkend="qt4"/>,
       <xref linkend="valgrind"/>,
-      <ulink url="http://sourceforge.net/projects/libvisual/">libvisual</ulink>, 
-      <ulink url="http://gstreamer.freedesktop.org/src/orc/">Orc</ulink>, and 
+      <ulink url="http://sourceforge.net/projects/libvisual/">libvisual</ulink>,
+      <ulink url="http://gstreamer.freedesktop.org/src/orc/">Orc</ulink>, and
       <ulink url="http://wiki.xiph.org/Tremor">Tremor</ulink>
     </para>
@@ -140,8 +140,8 @@
     <note>
       <para>
-        When installing, the Makefile does some additional 
+        When installing, the Makefile does some additional
         linking.  If you do not have Xorg in /usr, the LIBRARY_PATH
-        variable needs to be defined for the root user.  If 
-        using sudo to assume root, use the -E option to pass 
+        variable needs to be defined for the root user.  If
+        using sudo to assume root, use the -E option to pass
         your current environment variables for the install process.
       </para>
Index: multimedia/libdriv/gst10-plugins-good.xml
===================================================================
--- multimedia/libdriv/gst10-plugins-good.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ multimedia/libdriv/gst10-plugins-good.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -116,5 +116,5 @@
       <ulink url="http://sourceforge.net/projects/libraw1394/">libiec61883</ulink>,
       <ulink url="http://sourceforge.net/projects/libraw1394/">libraw1394</ulink>,
-      <ulink url="http://www.icecast.org/download.php">libshout</ulink>, 
+      <ulink url="http://www.icecast.org/download.php">libshout</ulink>,
       <ulink url="http://gstreamer.freedesktop.org/src/orc/">Orc</ulink>, and
       <ulink url="http://wavpack.com/">WavPack</ulink>
Index: multimedia/libdriv/gst10-plugins-ugly.xml
===================================================================
--- multimedia/libdriv/gst10-plugins-ugly.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ multimedia/libdriv/gst10-plugins-ugly.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -40,5 +40,5 @@
     </para>
 
-    &lfs78_checked; 
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -100,5 +100,5 @@
       <xref linkend="libcdio"/> (for CD-ROM drive access),
       <ulink url="http://packages.debian.org/source/sid/libsidplay">libsidplay</ulink>,
-      <ulink url="http://sourceforge.net/projects/opencore-amr/">OpenCore AMR</ulink>, 
+      <ulink url="http://sourceforge.net/projects/opencore-amr/">OpenCore AMR</ulink>,
       <ulink url="http://gstreamer.freedesktop.org/src/orc/">Orc</ulink>, and
       <ulink url="http://sourceforge.net/projects/twolame/">TwoLame</ulink>
Index: multimedia/libdriv/gstreamer10.xml
===================================================================
--- multimedia/libdriv/gstreamer10.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ multimedia/libdriv/gstreamer10.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -139,5 +139,5 @@
         <seg>
           libgstbase-1.0.so, libgstcheck-1.0.so, libgstcontroller-1.0.so,
-          libgstnet-1.0.so, libgstreamer-1.0.so 
+          libgstnet-1.0.so, libgstreamer-1.0.so
           and /usr/lib/gstreamer-1.0/libgstcoreelements.so
         </seg>
Index: multimedia/libdriv/libass.xml
===================================================================
--- multimedia/libdriv/libass.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ multimedia/libdriv/libass.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -109,5 +109,5 @@
 
     <para>
-      This package does not come with a test suite. 
+      This package does not come with a test suite.
     </para>
 
Index: multimedia/libdriv/libcdio.xml
===================================================================
--- multimedia/libdriv/libcdio.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ multimedia/libdriv/libcdio.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -36,5 +36,5 @@
     bit linear PCM.  </para>
 
-    &lfs78_checked; 
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -65,5 +65,5 @@
         <para>
           Required file:
-          <ulink 
+          <ulink
           url="http://ftp.gnu.org/gnu/libcdio/libcdio-paranoia-10.2+&libcdio-version;+1.tar.bz2"/>
         </para>
@@ -107,5 +107,5 @@
 
     <para>To test the results, issue: <command>make check</command>.</para>
-  
+
     <para>Now, as the <systemitem class="username">root</systemitem>
     user:</para>
@@ -135,9 +135,9 @@
         </seg>
         <seg>
-          libcdio++.so, 
-          libcdio.so,  
-          libcdio_cdda, 
-          libcdio_paranoia, 
-          libiso9660++, 
+          libcdio++.so,
+          libcdio.so,
+          libcdio_cdda,
+          libcdio_paranoia,
+          libiso9660++,
           libiso9660, and
           libudf</seg>
Index: multimedia/libdriv/libdv.xml
===================================================================
--- multimedia/libdriv/libdv.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ multimedia/libdriv/libdv.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -35,5 +35,5 @@
     firewire (IEEE 1394) connection.</para>
 
-    &lfs78_checked; 
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: multimedia/libdriv/libdvdnav.xml
===================================================================
--- multimedia/libdriv/libdvdnav.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ multimedia/libdriv/libdvdnav.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -93,5 +93,5 @@
 
   </sect2>
- 
+
   <sect2 role="content">
     <title>Contents</title>
Index: multimedia/libdriv/mlt.xml
===================================================================
--- multimedia/libdriv/mlt.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ multimedia/libdriv/mlt.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -75,7 +75,7 @@
       <ulink url="http://jackaudio.org">JACK</ulink>,
       <ulink url="http://www.ladspa.org/">LADSPA</ulink>,
-      <ulink url="http://www.ipswitchft.com/moveit-managed-file-transfer/">MOVEit</ulink>, 
+      <ulink url="http://www.ipswitchft.com/moveit-managed-file-transfer/">MOVEit</ulink>,
       <ulink url="http://sox.sourceforge.net/">SoX</ulink>, and
-      <ulink url="http://swfdec.freedesktop.org/wiki/">Swfdec</ulink> 
+      <ulink url="http://swfdec.freedesktop.org/wiki/">Swfdec</ulink>
     </para>
 
Index: multimedia/libdriv/sbc.xml
===================================================================
--- multimedia/libdriv/sbc.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ multimedia/libdriv/sbc.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -143,5 +143,5 @@
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-       
+
       <varlistentry id="sbcdec">
         <term><command>sbcdec</command></term>
Index: multimedia/libdriv/sdl.xml
===================================================================
--- multimedia/libdriv/sdl.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ multimedia/libdriv/sdl.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -34,5 +34,5 @@
     multimedia software, such as games and emulators.</para>
 
-    &lfs78_checked; 
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: multimedia/libdriv/speex.xml
===================================================================
--- multimedia/libdriv/speex.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ multimedia/libdriv/speex.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -43,5 +43,5 @@
     CODECs.</para>
 
-    &lfs78_checked; 
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: multimedia/libdriv/taglib.xml
===================================================================
--- multimedia/libdriv/taglib.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ multimedia/libdriv/taglib.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY taglib-download-http 
+  <!ENTITY taglib-download-http
     "https://github.com/taglib/taglib/releases/download/v&taglib-version;/taglib-&taglib-version;.tar.gz">
   <!ENTITY taglib-download-ftp  " ">
Index: multimedia/libdriv/v4l-utils.xml
===================================================================
--- multimedia/libdriv/v4l-utils.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ multimedia/libdriv/v4l-utils.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -33,5 +33,5 @@
       <application>v4l-utils</application> provides  a series of utilities for
       media devices, allowing to handle the proprietary formats available at
-      most webcams (libv4l), and providing tools to test V4L devices. 
+      most webcams (libv4l), and providing tools to test V4L devices.
     </para>
 
@@ -231,5 +231,5 @@
         <listitem>
           <para>
-            is  command line frequency scanning tool for digital TV 
+            is  command line frequency scanning tool for digital TV
             services that are compliant with version 5 of the DVB API.
           </para>
@@ -244,5 +244,5 @@
         <listitem>
           <para>
-            is a command line tuning tool for digital TV services 
+            is a command line tuning tool for digital TV services
             that is compliant with version 5 of the DVB API.
           </para>
@@ -257,6 +257,6 @@
         <listitem>
           <para>
-            is a tool that lists the Remote Controller devices, allows one 
-            to get/set IR keycode/scancode tables, test events generated by 
+            is a tool that lists the Remote Controller devices, allows one
+            to get/set IR keycode/scancode tables, test events generated by
             IR, and to adjust other Remote Controller options.
           </para>
@@ -273,5 +273,5 @@
             is a utility that can control many card settings, like changing
             the inputs from tuner to svideo or composite, setting video
-            resolution or changing video mode (PAL, SECAM, NTSC). 
+            resolution or changing video mode (PAL, SECAM, NTSC).
           </para>
           <indexterm zone="v4l-utils ivtv-ctl">
Index: multimedia/videoutils/ffmpeg.xml
===================================================================
--- multimedia/videoutils/ffmpeg.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ multimedia/videoutils/ffmpeg.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -116,5 +116,5 @@
       <xref linkend="pulseaudio"/>,
       <xref linkend="speex"/>,
-      <xref linkend="texlive"/> 
+      <xref linkend="texlive"/>
          (or <xref linkend="tl-installer"/>) for PDF and PS documentation,
       <xref linkend="v4l-utils"/>,
@@ -279,5 +279,5 @@
 <screen><userinput><command>rsync -vrltLW  --delete --timeout=60 --contimeout=60 \
       rsync://fate-suite.ffmpeg.org/fate-suite/ fate-suite/</command></userinput></screen>
-      
+
     <para>
       Next, FATE is executed, with the commands (you obtain a number of tests
@@ -287,5 +287,5 @@
 <screen><userinput>make fate THREADS=<replaceable>N</replaceable> SAMPLES=fate-suite/ | tee ../fate.log &amp;&amp;
 grep ^TEST ../fate.log | wc -l</userinput></screen>
-      
+
     <para>
       where <replaceable>N</replaceable> is an integer,
Index: multimedia/videoutils/transcode.xml
===================================================================
--- multimedia/videoutils/transcode.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ multimedia/videoutils/transcode.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -116,5 +116,5 @@
       <xref linkend="sdl"/>,
       <xref linkend="v4l-utils"/>,
-      <xref linkend="x264"/>, 
+      <xref linkend="x264"/>,
       <xref linkend="xvid"/>
       <ulink url="http://sourceforge.net/projects/mjpeg/">MJPEG Tools</ulink>, and
Index: networking/mailnews/fetchmail.xml
===================================================================
--- networking/mailnews/fetchmail.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ networking/mailnews/fetchmail.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -63,5 +63,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="openssl"/> and 
+      <xref linkend="openssl"/> and
       a local MDA (<xref linkend="procmail"/>)
     </para>
@@ -69,5 +69,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="python2"/> and 
+      <xref linkend="python2"/> and
       <xref linkend="tk"/>
     </para>
Index: networking/mailnews/mutt.xml
===================================================================
--- networking/mailnews/mutt.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ networking/mailnews/mutt.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -83,5 +83,5 @@
       an <xref linkend="server-mail"/> (that provides a <command>sendmail</command> command),
       <xref linkend="slang"/>,
-      <xref linkend="openssl"/> or 
+      <xref linkend="openssl"/> or
       <xref linkend="gnutls"/>,
       <xref linkend="db"/> or
Index: networking/netlibs/curl.xml
===================================================================
--- networking/netlibs/curl.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ networking/netlibs/curl.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -140,7 +140,7 @@
 EOF</userinput></screen>
 
-I had the following fail:  
- 300  301  303  304  306 309 310 311  312  325 
- 400  401  403  406  407 408 409 560 1112 2034 
+I had the following fail:
+ 300  301  303  304  306 309 310 311  312  325
+ 400  401  403  406  407 408 409 560 1112 2034
 2035 2037 2038 2041 2042
 
@@ -148,5 +148,5 @@
 
 Tests may be using capabilites removed from recent ssh due to
-security issues.  
+security issues.
 
 
@@ -156,6 +156,6 @@
 
     <para>
-      To run the test suite, issue: <command>make test</command>.  Some 
-      tests (up to 2%) may fail due to timing issues, kernel configuration, 
+      To run the test suite, issue: <command>make test</command>.  Some
+      tests (up to 2%) may fail due to timing issues, kernel configuration,
       or other issues.
     </para>
Index: networking/netlibs/glib-networking.xml
===================================================================
--- networking/netlibs/glib-networking.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ networking/netlibs/glib-networking.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -112,5 +112,5 @@
 
     <para>
-      To test the results, issue: <command>make -k check</command>. 
+      To test the results, issue: <command>make -k check</command>.
     </para>
 
@@ -150,5 +150,5 @@
         </seg>
         <seg>
-          libgiognomeproxy.so and libgiognutls.so 
+          libgiognomeproxy.so and libgiognutls.so
         </seg>
         <seg>
Index: networking/netlibs/ldns.xml
===================================================================
--- networking/netlibs/ldns.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ networking/netlibs/ldns.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -111,5 +111,5 @@
 
     <para>
-      If you have <xref linkend="doxygen"/> installed and want to build 
+      If you have <xref linkend="doxygen"/> installed and want to build
       html documentation, run the following command:
     </para>
@@ -141,5 +141,5 @@
 
     <para>
-      <command>sed ... doc/doxyparse.pl</command>: This command fixes an error 
+      <command>sed ... doc/doxyparse.pl</command>: This command fixes an error
       introduced with perl-5.22.
     </para>
Index: networking/netlibs/libndp.xml
===================================================================
--- networking/netlibs/libndp.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ networking/netlibs/libndp.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -33,8 +33,8 @@
       The <application>libndp</application> package provides a wrapper for IPv6
       Neighbor Discovery Protocol. It also provides a tool named ndptool for
-      sending and receiving NDP messages. 
+      sending and receiving NDP messages.
     </para>
 
-    &lfs78_checked; 
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -92,5 +92,5 @@
 
     <para>
-      This package does not come with a test suite. 
+      This package does not come with a test suite.
     </para>
 
Index: networking/netlibs/libnl.xml
===================================================================
--- networking/netlibs/libnl.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ networking/netlibs/libnl.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -175,16 +175,16 @@
       <seglistitem>
         <seg>
-          genl-ctrl-list, 
+          genl-ctrl-list,
           idiag-socket-details,
-          nl-class-add, 
-          nl-class-delete, 
+          nl-class-add,
+          nl-class-delete,
           nl-classid-lookup,
-          nl-class-list, 
-          nl-cls-add, 
-          nl-cls-delete, 
-          nl-cls-list, 
+          nl-class-list,
+          nl-cls-add,
+          nl-cls-delete,
+          nl-cls-list,
           nl-link-list,
-          nl-pktloc-lookup, 
-          nl-qdisc-add, 
+          nl-pktloc-lookup,
+          nl-qdisc-add,
           nl-qdisc-delete,
           nl-qdisc-list, and 32 other helper programs with nl- and nf- prefixes
@@ -196,5 +196,5 @@
           libnl-idiag-3.so,
           libnl-nf-3.so,
-          libnl-route-3.so, 
+          libnl-route-3.so,
           libnl-xfrm-3.so, and
           cli modules under /usr/lib/libnl/cli tree
Index: networking/netlibs/libtirpc.xml
===================================================================
--- networking/netlibs/libtirpc.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ networking/netlibs/libtirpc.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -37,5 +37,5 @@
     </para>
 
-    &lfs78_checked; 
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -82,5 +82,5 @@
       </listitem>
     </itemizedlist>
- 
+
 
     <!-- Not needed for LFS 7.5, Glibc RPC interface is exported again
@@ -149,5 +149,5 @@
 
     <para>
-      <parameter>--disable-gssapi</parameter>: This switch is needed if 
+      <parameter>--disable-gssapi</parameter>: This switch is needed if
       no GSSAPI is installed. Remove this switch if you have one
       installed (for example <xref linkend="mitkrb"/>) and you wish to use it.
Index: networking/netlibs/serf.xml
===================================================================
--- networking/netlibs/serf.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ networking/netlibs/serf.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -136,5 +136,5 @@
       path from a shared library and the next two commands disable building and
       installing of the static library.
-    </para>    
+    </para>
 
     <para>
Index: networking/netprogs/cifsutils.xml
===================================================================
--- networking/netprogs/cifsutils.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ networking/netprogs/cifsutils.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -90,6 +90,6 @@
       <primary sortas="d-cifsutils">cifs-utils</primary>
     </indexterm>
-                                                                                                                                       
-  </sect2>                                                                                                                             
+
+  </sect2>
 
   <sect2 role="installation">
Index: networking/netprogs/net-tools.xml
===================================================================
--- networking/netprogs/net-tools.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ networking/netprogs/net-tools.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -98,5 +98,5 @@
 
     <para>The patch below cleans up the installation so that it does not
-    overwrite the <application>ifconfig</application> and 
+    overwrite the <application>ifconfig</application> and
     <application>hostname</application> programs that were installed in LFS.</para>
 
@@ -144,5 +144,5 @@
 
       <seglistitem>
-        <seg>arp, 
+        <seg>arp,
         ipmaddr, iptunnel, mii-tool, nameif, netstat,
         plipconfig, rarp, route, and slattach
Index: networking/netprogs/nfs-utils.xml
===================================================================
--- networking/netprogs/nfs-utils.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ networking/netprogs/nfs-utils.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -162,5 +162,5 @@
     linkend="rpcbind"/> needs to be running and the tests need to be run as the
     <systemitem class="username">root</systemitem> user.</para>
-    
+
     <para>To test the results, issue, as root: <command>make check</command>.</para>
 
Index: networking/netprogs/samba.xml
===================================================================
--- networking/netprogs/samba.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ networking/netprogs/samba.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -136,5 +136,5 @@
     this reason, the switch <option>--with-selftest-prefix=/tmp/quick</option>
     (or another path with small number of characters) can be used with
-    configure. Even so, the 
+    configure. Even so, the
     <quote><replaceable>samba3.raw.eas</replaceable></quote> test may fail,
     apparently for the same reason. If one quicktest fails, it can be disabled.
@@ -166,8 +166,8 @@
 install -v -m644    examples/LDAP/README              \
                     /etc/openldap/schema/README.LDAP  &amp;&amp;
-                    
+
 install -v -m644    examples/LDAP/samba*              \
                     /etc/openldap/schema              &amp;&amp;
-                    
+
 install -v -m755    examples/LDAP/{get*,ol*} \
                     /etc/openldap/schema</userinput></screen>
@@ -490,5 +490,5 @@
           under /usr/lib/{python&python2-majorver;,samba}
         </seg>
-        
+
         <seg>
           /etc/samba, /run/samba, /usr/include/samba-4.0,
Index: networking/netutils/avahi.xml
===================================================================
--- networking/netutils/avahi.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ networking/netutils/avahi.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -75,5 +75,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="glib2"/> 
+      <xref linkend="glib2"/>
     </para>
 
Index: networking/netutils/networkmanager.xml
===================================================================
--- networking/netutils/networkmanager.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ networking/netutils/networkmanager.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -97,5 +97,5 @@
       <xref linkend="newt"/> (for <command>nmtui</command>),
       <xref linkend="polkit"/>,
-      <xref linkend="upower"/>, 
+      <xref linkend="upower"/>,
       <xref linkend="vala"/>, and
       <xref linkend="wpa_supplicant"/> (built with D-Bus support),
Index: networking/netutils/traceroute.xml
===================================================================
--- networking/netutils/traceroute.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ networking/netutils/traceroute.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -88,7 +88,7 @@
 rm -fv /usr/share/man/man1/traceroute.1</userinput></screen>
 
-    <para>The traceroute.1 file that was installed in LFS  
+    <para>The traceroute.1 file that was installed in LFS
     by inetutils is no longer relevant.  This package overwrites
-    that version of traceroute and installs the man page in man 
+    that version of traceroute and installs the man page in man
     chapter 8.</para>
   </sect2>
Index: networking/textweb/lynx.xml
===================================================================
--- networking/textweb/lynx.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ networking/textweb/lynx.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -144,10 +144,10 @@
     <para><option>--with-ssl</option>: This enables support for
     linking SSL into <application>Lynx</application>.</para>
-    
+
     <!-- Fixed at version 2.8.8
     <note><para>Due to an error in the <command>configure</command>
     process, building with <application>openssl</application> also requires
     running the following before running <command>make</command>.
-    
+
     <screen><userinput>echo "#define USE_OPENSSL_INCL 1" >> lynx_cfg.h</userinput></screen>
     </para></note>
Index: networking/textweb/w3m.xml
===================================================================
--- networking/textweb/w3m.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ networking/textweb/w3m.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -85,5 +85,5 @@
       <xref linkend="compface"/>, and
       <ulink url="http://packages.debian.org/unstable/text/nkf">nkf</ulink>,
-      a Mail User Agent, and 
+      a Mail User Agent, and
       an External Browser
     </para>
Index: postlfs/config/firmware.xml
===================================================================
--- postlfs/config/firmware.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ postlfs/config/firmware.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -23,6 +23,6 @@
   to make them work at their best. There is a directory, <filename
   class="directory">/lib/firmware</filename>, where the kernel or kernel
-  drivers look for firmware images.</para> 
-  
+  drivers look for firmware images.</para>
+
   <para>Preparing firmware for multiple different machines, as a distro would
   do, is outside the scope of this book.</para>
@@ -35,9 +35,9 @@
   browser at <ulink
   url="&sources-anduin-http;/linux-firmware/"/>.</para>
-  
+
   <para>To get the firmware, either point a browser to one of the above
   repositories and then download the item(s) which you need, or install
   <userinput>git</userinput> and clone that repository.</para>
-  
+
   <para>For some other firmware, particularly for Intel microcode and certain
   wifi devices, the needed firmware is not available in the above repository.
@@ -75,6 +75,6 @@
   </itemizedlist>
 
-  <note><para>Although not needed to load a firmware blob, the following 
-  tools may be useful for determining, obtaining, or preparing the needed 
+  <note><para>Although not needed to load a firmware blob, the following
+  tools may be useful for determining, obtaining, or preparing the needed
   firmware in order to load it into the system:
     <xref linkend="cpio"/>,
@@ -96,5 +96,5 @@
     released. These updates only last until the machine is powered off, so they
     need to be applied on every boot.</para>
-    
+
     <para>There are two ways of loading the microcode, described as 'early' and
     'late'. Early loading happens before userspace has been started, late
@@ -109,10 +109,10 @@
     Broadwell-Y</ulink>.) Without this update glibc can do the wrong thing in
     uncommon situations.</para>
-    
+
     <para>It is much simpler to begin by building a kernel which boots on
     your hardware, try late microcode loading to see if there is an update (in
     many cases the BIOS or UEFI will have already applied any update), and then
     take the extra steps required for early loading.</para>
-    
+
     <para>This means you will be reconfiguring your kernel if you use early
     loading, so keep the built source around to minimise what gets rebuilt, and
@@ -120,5 +120,5 @@
     of the EXTRAVERSION in the kernel configuration, e.g. "EXTRAVERSION -A" if
     nothing was set.</para>
-    
+
     <para>To confirm what processor(s) you have (if more than one, they will be
     identical) look in /proc/cpuinfo.</para>
@@ -146,5 +146,5 @@
       to install it.</para>
 
-      <para>Begin by extracting the tarball and changing to the directory it created. 
+      <para>Begin by extracting the tarball and changing to the directory it created.
       Then change to the source diirectory and run:</para>
 
@@ -201,5 +201,5 @@
     <para>If the microcode was not updated, there is no new microcode for
     this system's processor. If it did get updated, you can now proceed to <xref
-    linkend='early-microcode'/>.</para> 
+    linkend='early-microcode'/>.</para>
 
     </sect3>
@@ -220,5 +220,5 @@
 
       <para>When you configure the kernel, use the following options to try
-      late loading of AMD microcode:</para> 
+      late loading of AMD microcode:</para>
 
 <screen><literal>Processor type and features  ---&gt;
@@ -239,5 +239,5 @@
     <para>If the microcode was not updated, there is no new microcode for
     this system's processor. If it did get updated, you can now proceed to <xref
-    linkend='early-microcode'/>.</para> 
+    linkend='early-microcode'/>.</para>
 
     </sect3>
@@ -255,5 +255,5 @@
       working you can apply the same initrd to later LFS systems or newer
       kernels on this same machine, at least until any newer microcode is
-      released. Use the following commands:</para> 
+      released. Use the following commands:</para>
 
 <screen><userinput>mkdir -p initrd/kernel/x86/microcode
@@ -310,5 +310,5 @@
 
 <screen><literal>[    0.000000] CPU0 microcode updated early to revision 0x29, date = 2013-06-12
-[    0.000000] Linux version 4.0.0-rc6 (ken@jtm1) (gcc version 4.9.2 (GCC) ) 
+[    0.000000] Linux version 4.0.0-rc6 (ken@jtm1) (gcc version 4.9.2 (GCC) )
                #3 SMP PREEMPT Mon Mar 30 21:26:02 BST 2015
 [    0.000000] Command line: BOOT_IMAGE=/vmlinuz-4.0.0-rc6-sda13 root=/dev/sda13 ro
@@ -329,7 +329,7 @@
       kernel on an older version of LFS. Note that here there is no mention of
       the previous microcode version &mdash; compare this output to the AMD
-      late loading messages (above) from the same machine:</para> 
-
-<screen><literal>[    0.000000] Linux version 3.18.11 (ken@milliways) (gcc version 4.9.1 (GCC) ) 
+      late loading messages (above) from the same machine:</para>
+
+<screen><literal>[    0.000000] Linux version 3.18.11 (ken@milliways) (gcc version 4.9.1 (GCC) )
                #4 SMP Thu Apr 9 21:51:05 BST 2015
 [    0.000000] Command line: BOOT_IMAGE=/vmlinuz-3.18.11-sda5 root=/dev/sda5 video=800x600 ro
@@ -348,5 +348,5 @@
   <sect2 id="ati-video-firmware">
     <title>Firmware for ATI video chips (R600 and later)</title>
-    
+
     <para>These instructions do NOT apply to old radeons before the R600
     family. For those, the firmware is in the kernel's <filename
@@ -371,5 +371,5 @@
     Sea Islands use the radeonsi driver) and the specific model.</para>
 
-    <para>Now that you know which controller you are using, consult the 
+    <para>Now that you know which controller you are using, consult the
     <ulink url="https://wiki.gentoo.org/wiki/Radeon#Firmware">Radeon</ulink> page
     of the Gentoo wiki which has a table listing the required firmware blobs
@@ -433,10 +433,10 @@
     online to check which module it uses, which firmware, and where to obtain
     the firmware &mdash; not all of it is in linux-firmware.</para>
-    
+
     <para>If possible, you should begin by using a wired connection when you
     first boot your LFS system. To use a wireless connection you will need to
     use a network tools such as <xref linkend='wireless_tools'/> and <xref
     linkend='wpa_supplicant'/>.</para>
-    
+
     <para>Firmware may also be needed for other devices such as some SCSI
     controllers, bluetooth adaptors, or TV recorders. The same principles
Index: postlfs/config/lsb-release.xml
===================================================================
--- postlfs/config/lsb-release.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ postlfs/config/lsb-release.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -86,6 +86,6 @@
 
       <para>
-        The configuration for this package was done in 
-        <ulink url="&lfs-website;/lfs/view/stable/chapter09/theend.html">LFS</ulink>.  
+        The configuration for this package was done in
+        <ulink url="&lfs-website;/lfs/view/stable/chapter09/theend.html">LFS</ulink>.
         The file <filename>/etc/lsb-release</filename> should already exist.
         Be sure that the DISTRIB_CODENAME entry has been set properly.
Index: postlfs/config/profile.xml
===================================================================
--- postlfs/config/profile.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ postlfs/config/profile.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -220,5 +220,5 @@
       <para>This script adds some useful paths to the <envar>PATH</envar> and
       can be used to customize other PATH related environment variables
-      (e.g. LD_LIBRARY_PATH, etc) that may be needed for all users.</para> 
+      (e.g. LD_LIBRARY_PATH, etc) that may be needed for all users.</para>
 
 <screen role="root"><userinput>cat &gt; /etc/profile.d/extrapaths.sh &lt;&lt; "EOF"
Index: postlfs/editors/emacs.xml
===================================================================
--- postlfs/editors/emacs.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ postlfs/editors/emacs.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -161,14 +161,14 @@
 
       <seglistitem>
-        <seg>ctags, 
-             ebrowse, 
-             emacs (symlink), 
-             emacs&emacs-version;, 
-             emacsclient, 
-             etags, and 
+        <seg>ctags,
+             ebrowse,
+             emacs (symlink),
+             emacs&emacs-version;,
+             emacsclient,
+             etags, and
              grep-changelog</seg>
         <seg>None</seg>
         <seg>/usr/libexec/emacs,
-             /usr/share/emacs, and 
+             /usr/share/emacs, and
              /var/games/emacs</seg>
       </seglistitem>
Index: postlfs/filesystems/filesystems.xml
===================================================================
--- postlfs/filesystems/filesystems.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ postlfs/filesystems/filesystems.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -27,5 +27,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="jfs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lvm2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutlvm.xml"/> 
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutlvm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutraid.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mdadm.xml"/>
Index: postlfs/filesystems/ntfs-3g.xml
===================================================================
--- postlfs/filesystems/ntfs-3g.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ postlfs/filesystems/ntfs-3g.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -34,10 +34,10 @@
       The <application>Ntfs-3g</application> package contains a stable,
       read-write open source driver for NTFS partitions. NTFS partitions are
-      used by most Microsoft operating systems. Ntfs-3g allows you to mount 
+      used by most Microsoft operating systems. Ntfs-3g allows you to mount
       NTFS partitions in read-write mode from your Linux system. It uses the
       FUSE kernel module to be able to implement NTFS support in user space.
     </para>
     <para>
-      This package contains both the NTFS-3g driver itself and various utilities 
+      This package contains both the NTFS-3g driver itself and various utilities
       useful for manipulating NTFS partitions.
     </para>
@@ -154,7 +154,7 @@
       libfuse.
     </para>
-    
-    <para>
-      <option>--disable-ntfsprogs</option>: Disables installation of various 
+
+    <para>
+      <option>--disable-ntfsprogs</option>: Disables installation of various
       utilities used to manipulate NTFS partitions.
     </para>
@@ -192,6 +192,6 @@
 
     <para>
-      In order for a user to be able to mount the usb stick, they will need 
-      to be able to write to <filename class="directory">/mnt/usb</filename>, 
+      In order for a user to be able to mount the usb stick, they will need
+      to be able to write to <filename class="directory">/mnt/usb</filename>,
       so as the <systemitem class="username">root</systemitem> user:
     </para>
Index: postlfs/filesystems/parted.xml
===================================================================
--- postlfs/filesystems/parted.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ postlfs/filesystems/parted.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -91,5 +91,5 @@
   <sect2 role="installation">
     <title>Installation of parted</title>
-            
+
     <para>
       If you want to build without device mapper support, a fix is necessary:
Index: postlfs/filesystems/xfsprogs.xml
===================================================================
--- postlfs/filesystems/xfsprogs.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ postlfs/filesystems/xfsprogs.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -33,5 +33,5 @@
     and debugging tools for the XFS file system.</para>
 
-    &lfs78_checked; 
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: postlfs/security/cacerts.xml
===================================================================
--- postlfs/security/cacerts.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ postlfs/security/cacerts.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -331,5 +331,5 @@
 <screen><userinput>rm -r certs BLFS-ca-bundle*</userinput></screen>
 
-   <para>After installing or updating certificates, if OpenJDK is installed, 
+   <para>After installing or updating certificates, if OpenJDK is installed,
    update the certificates for Java using the procedures at <xref linkend='ojdk-certs'/>.</para>
 
Index: postlfs/security/gnupg2.xml
===================================================================
--- postlfs/security/gnupg2.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ postlfs/security/gnupg2.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -38,5 +38,5 @@
     S/MIME.</para>
 
-    &lfs78_checked; 
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: postlfs/security/gpgme.xml
===================================================================
--- postlfs/security/gpgme.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ postlfs/security/gpgme.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -40,5 +40,5 @@
     </para>
 
-    &lfs78_checked; 
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: postlfs/security/haveged.xml
===================================================================
--- postlfs/security/haveged.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ postlfs/security/haveged.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -154,6 +154,6 @@
         <listitem>
           <para>
-            is a daemon that generates an unpredictable stream of random 
-            numbers harvested from the indirect effects of hardware events 
+            is a daemon that generates an unpredictable stream of random
+            numbers harvested from the indirect effects of hardware events
             based on hidden processor states (caches, branch  predictors, memory
             translation tables, etc).
Index: postlfs/security/libcap.xml
===================================================================
--- postlfs/security/libcap.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ postlfs/security/libcap.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -30,6 +30,6 @@
     <title>Introduction to libcap with PAM</title>
 
-    <para>The <application>libcap</application> package was installed in 
-    LFS, but if PAM support is desired, it needs to be reinstalled after 
+    <para>The <application>libcap</application> package was installed in
+    LFS, but if PAM support is desired, it needs to be reinstalled after
     PAM is built.</para>
 
@@ -93,5 +93,5 @@
 
    <para>
-     Still as the <systemitem class="username">root</systemitem> user, 
+     Still as the <systemitem class="username">root</systemitem> user,
      clean up some library locations and permissions:
    </para>
Index: postlfs/security/libpwquality.xml
===================================================================
--- postlfs/security/libpwquality.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ postlfs/security/libpwquality.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -34,5 +34,5 @@
       functions for password quality checking and also scoring them based on
       their apparent randomness. The library also provides a function for
-      generating random passwords with good pronounceability. 
+      generating random passwords with good pronounceability.
     </para>
 
Index: postlfs/security/linux-pam.xml
===================================================================
--- postlfs/security/linux-pam.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ postlfs/security/linux-pam.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -187,5 +187,5 @@
       Now run the tests by issuing <command>make check</command>.
       Ensure there are no errors produced by the tests before continuing the
-      installation. Note that the checks are quite long.  It may be useful to 
+      installation. Note that the checks are quite long.  It may be useful to
       redirect the output to a log file in order to inspect it thoroughly.
     </para>
@@ -316,5 +316,5 @@
 # End /etc/pam.d/system-password</literal>
 EOF</userinput></screen>
-   
+
         <note>
           <para>
@@ -327,5 +327,5 @@
         </note>
 
-   <para>If <xref linkend="cracklib"/> is <emphasis>NOT</emphasis> installed, 
+   <para>If <xref linkend="cracklib"/> is <emphasis>NOT</emphasis> installed,
    use:</para>
 
@@ -339,5 +339,5 @@
 # End /etc/pam.d/system-password</literal>
 EOF</userinput></screen>
-  
+
       <para>Now add a restrictive <filename>/etc/pam.d/other</filename>
       configuration file.  With this file, programs that are PAM aware will not
Index: postlfs/security/openssl.xml
===================================================================
--- postlfs/security/openssl.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ postlfs/security/openssl.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -108,5 +108,5 @@
      Might break packaging. -->
 
-<!-- Parallel build for version 1.0.2d at -j8 works for me without the patch. 
+<!-- Parallel build for version 1.0.2d at -j8 works for me without the patch.
      But it only reduces build time from 1.0 to 0.7 SBU - Bruce
 
Index: postlfs/security/shadow.xml
===================================================================
--- postlfs/security/shadow.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ postlfs/security/shadow.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -172,5 +172,5 @@
 
     <para>
-      <command>sed -i 's/1000/999/' etc/useradd</command>: Make a minor change 
+      <command>sed -i 's/1000/999/' etc/useradd</command>: Make a minor change
       to make the default useradd consistent with the LFS groups file.
     </para>
@@ -178,5 +178,5 @@
     <para>
       <option>--with-group-name-max-length=32</option>: The maximum user name is
-      32 characters. Make the maximum group name the same. 
+      32 characters. Make the maximum group name the same.
     </para>
 
Index: pst/printing/gutenprint.xml
===================================================================
--- pst/printing/gutenprint.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ pst/printing/gutenprint.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -76,5 +76,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="ijs"/> and 
+      <xref linkend="ijs"/> and
       <ulink url="http://www.linuxprinting.org/foomatic.html">Foomatic</ulink>
     </para>
@@ -283,5 +283,5 @@
         <listitem>
           <para>
-            is a test programm to learn how to use libgutenprint. 
+            is a test programm to learn how to use libgutenprint.
           </para>
           <indexterm zone="gutenprint testpattern">
@@ -290,5 +290,5 @@
         </listitem>
       </varlistentry>
- 
+
    </variablelist>
 
Index: pst/ps/epdfview.xml
===================================================================
--- pst/ps/epdfview.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ pst/ps/epdfview.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -90,5 +90,5 @@
     </para>
 
-    <bridgehead renderas="sect4">Recommended (mainly for 
+    <bridgehead renderas="sect4">Recommended (mainly for
     Desktop Environments)</bridgehead>
     <para role="Recommended">
Index: pst/ps/mupdf.xml
===================================================================
--- pst/ps/mupdf.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ pst/ps/mupdf.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -120,9 +120,9 @@
     </para>
 
-<screen><userinput>rm -rf thirdparty/curl &amp;&amp;
+<screen><userinput>rm -rf thirdparty/curl     &amp;&amp;
 rm -rf thirdparty/freetype &amp;&amp;
-rm -rf thirdparty/jpeg &amp;&amp;
+rm -rf thirdparty/jpeg     &amp;&amp;
 rm -rf thirdparty/openjpeg &amp;&amp;
-rm -rf thirdparty/zlib &amp;&amp;
+rm -rf thirdparty/zlib     &amp;&amp;
 
 patch -Np1 -i ../mupdf-&mupdf-version;-openjpeg21-1.patch &amp;&amp;
Index: pst/ps/psutils.xml
===================================================================
--- pst/ps/psutils.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ pst/ps/psutils.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -160,5 +160,5 @@
         <listitem>
           <para>
-            create an AFM file for a PostScript font. 
+            create an AFM file for a PostScript font.
           </para>
           <indexterm zone="psutils getafm">
@@ -194,5 +194,5 @@
         <listitem>
           <para>
-            is a filter to merge several PostScript files into one. 
+            is a filter to merge several PostScript files into one.
           </para>
           <indexterm zone="psutils psmerge">
Index: pst/sgml/docbook-utils.xml
===================================================================
--- pst/sgml/docbook-utils.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ pst/sgml/docbook-utils.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -141,5 +141,5 @@
 
     <para><option>docdir=/usr/share/doc</option>:
-    This option is placed on the <command>make install</command> line because is is not 
+    This option is placed on the <command>make install</command> line because is is not
     recognized by <command>configure</command>.</para>
 
Index: pst/xml/docbook-xsl.xml
===================================================================
--- pst/xml/docbook-xsl.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ pst/xml/docbook-xsl.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -40,5 +40,5 @@
     performing transformations on XML DocBook files.</para>
 
-    &lfs78_checked; 
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: pst/xml/itstool.xml
===================================================================
--- pst/xml/itstool.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ pst/xml/itstool.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -37,5 +37,5 @@
     </para>
 
-    &lfs78_checked; 
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: pst/xml/xmlto.xml
===================================================================
--- pst/xml/xmlto.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ pst/xml/xmlto.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -35,5 +35,5 @@
     necessary post-processing.</para>
 
-    &lfs78_checked; 
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: server/databases/mariadb.xml
===================================================================
--- server/databases/mariadb.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ server/databases/mariadb.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -443,5 +443,5 @@
           <para>
             is used to check, repair, optimize, sort and get information
-            about Aria tables. 
+            about Aria tables.
           </para>
           <indexterm zone="mariadb aria_chk-mariadb">
@@ -486,5 +486,5 @@
         </listitem>
       </varlistentry>
- 
+
       <varlistentry id="aria_read_log-mariadb">
         <term><command>aria_read_log</command></term>
@@ -546,5 +546,5 @@
         </listitem>
       </varlistentry>
- 
+
       <varlistentry id="myisamchk-mariadb">
         <term><command>myisamchk</command></term>
@@ -571,5 +571,5 @@
         </listitem>
       </varlistentry>
- 
+
       <varlistentry id="myisampack-mariadb">
         <term><command>myisampack</command></term>
@@ -595,5 +595,5 @@
         </listitem>
       </varlistentry>
- 
+
       <varlistentry id="mysql_client_test-mariadb">
         <term><command>mysql_client_test</command></term>
@@ -620,5 +620,5 @@
         </listitem>
       </varlistentry>
- 
+
       <varlistentry id="mysql_config-mariadb">
         <term><command>mysql_config</command></term>
@@ -652,5 +652,5 @@
           <para>
             is a MySQL client statically linked to
-            libmysqld.            
+            libmysqld.
           </para>
           <indexterm zone="mariadb mysql_embedded-mariadb">
@@ -686,5 +686,5 @@
         </listitem>
       </varlistentry>
- 
+
       <varlistentry id="mysql_install_db-mariadb">
         <term><command>mysql_install_db</command></term>
@@ -717,5 +717,5 @@
         <listitem>
           <para>
-            is a tool to improve MySQL installation security. 
+            is a tool to improve MySQL installation security.
           </para>
           <indexterm zone="mariadb mysql_secure_installation-mariadb">
@@ -736,5 +736,5 @@
         </listitem>
       </varlistentry>
- 
+
       <varlistentry id="mysql_tzinfo_to_sql-mariadb">
         <term><command>mysql_tzinfo_to_sql</command></term>
@@ -754,5 +754,5 @@
           <para>
             examines all tables in all databases for incompatibilities with
-            the current version of MySQL Server. 
+            the current version of MySQL Server.
           </para>
           <indexterm zone="mariadb mysql_upgrade-mariadb">
@@ -761,5 +761,5 @@
         </listitem>
       </varlistentry>
- 
+
       <varlistentry id="mysql_waitpid-mariadb">
         <term><command>mysql_waitpid</command></term>
@@ -785,5 +785,5 @@
         </listitem>
       </varlistentry>
- 
+
       <varlistentry id="mysqlaccess-mariadb">
         <term><command>mysqlaccess</command></term>
@@ -810,5 +810,5 @@
         </listitem>
       </varlistentry>
- 
+
       <varlistentry id="mysqlbinlog-mariadb">
         <term><command>mysqlbinlog</command></term>
@@ -822,5 +822,5 @@
         </listitem>
       </varlistentry>
-  
+
       <varlistentry id="mysqlbug-mariadb">
         <term><command>mysqlbug</command></term>
@@ -872,5 +872,5 @@
         </listitem>
       </varlistentry>
- 
+
       <varlistentry id="mysqld_safe-mariadb">
         <term><command>mysqld_safe</command></term>
@@ -897,5 +897,5 @@
         </listitem>
       </varlistentry>
- 
+
       <varlistentry id="mysqldumpslow-mariadb">
         <term><command>mysqldumpslow</command></term>
@@ -923,5 +923,5 @@
         </listitem>
       </varlistentry>
- 
+
       <varlistentry id="mysqlimport-mariadb">
         <term><command>mysqlimport</command></term>
@@ -948,5 +948,5 @@
         </listitem>
       </varlistentry>
- 
+
       <varlistentry id="mysqlslap-mariadb">
         <term><command>mysqlslap</command></term>
@@ -974,5 +974,5 @@
         </listitem>
       </varlistentry>
- 
+
       <varlistentry id="mysqltest_embedded-mariadb">
         <term><command>mysqltest_embedded</command></term>
@@ -1000,5 +1000,5 @@
         </listitem>
       </varlistentry>
- 
+
       <varlistentry id="perror-mariadb">
         <term><command>perror</command></term>
@@ -1006,5 +1006,5 @@
           <para>
             is a utility that displays descriptions for system or storage
-            engine error codes. 
+            engine error codes.
           </para>
           <indexterm zone="mariadb perror-mariadb">
Index: server/mail/sendmail.xml
===================================================================
--- server/mail/sendmail.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ server/mail/sendmail.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -191,5 +191,5 @@
 
     <para><command>sed ... devtools/OS/Linux</command>: The site.config.m4
-    does not honor a change to the man directory, so fix it in the OS 
+    does not honor a change to the man directory, so fix it in the OS
     definitions.</para>
 
Index: server/other/unbound.xml
===================================================================
--- server/other/unbound.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ server/other/unbound.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -124,5 +124,5 @@
 
     <para>
-      If you have <xref linkend="doxygen"/> package installed and want to build 
+      If you have <xref linkend="doxygen"/> package installed and want to build
       html documentation, run the following command:
     </para>
Index: server/other/xinetd.xml
===================================================================
--- server/other/xinetd.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ server/other/xinetd.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -388,5 +388,5 @@
       <para>The format of the <filename>/etc/xinetd.conf</filename> is
       documented in the <filename>xinetd.conf.5</filename> man page.
-      <!-- 13-12-12 the http://www.xinetd.org is broken 
+      <!-- 13-12-12 the http://www.xinetd.org is broken
       Further
       information can be found at <ulink url="http://www.xinetd.org"/>.
Index: x/installing/libevdev.xml
===================================================================
--- x/installing/libevdev.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ x/installing/libevdev.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -37,5 +37,5 @@
       </para>
 
-      &lfs78_checked; 
+      &lfs78_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: x/installing/libinput.xml
===================================================================
--- x/installing/libinput.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ x/installing/libinput.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -35,5 +35,5 @@
       <application>libinput</application> is a library that handles
       input devices for display servers and other applications that
-      need to directly deal with input devices.  It is currently only 
+      need to directly deal with input devices.  It is currently only
       needed for <xref linkend="plasma5-build"/>.
     </para>
Index: x/installing/libva.xml
===================================================================
--- x/installing/libva.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ x/installing/libva.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -38,5 +38,5 @@
     <title>Introduction to libva</title>
 
-    <para> 
+    <para>
        The <application>libva</application> package contains a library which
        provides access to hardware accelerated video processing, using hardware
@@ -166,6 +166,6 @@
 
     <para>
-      The <application>libva-intel-driver</application> is designed 
-      specifically for video cards based on an Intel GPU.  
+      The <application>libva-intel-driver</application> is designed
+      specifically for video cards based on an Intel GPU.
       Unpack the libva-intel tarball using the normal procedures
       and install the driver by running the following commands:
@@ -193,5 +193,5 @@
     <para>
       <command>autoreconf -fi</command>: This command regenerates
-      the configure script to prevent a mandatory test for 
+      the configure script to prevent a mandatory test for
       wayland-scanner when configuring.
     </para>
Index: x/installing/libvdpau-va-gl.xml
===================================================================
--- x/installing/libvdpau-va-gl.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ x/installing/libvdpau-va-gl.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -73,7 +73,7 @@
       </listitem>
     </itemizedlist>
- 
+
     <!-- It's been fixed upstream.  Lets see if it stays fixed ...
-    <note><para>The tarball name for libvdpau-va-gl does not include the 
+    <note><para>The tarball name for libvdpau-va-gl does not include the
     file name, although it does expand to libvdpau-va-gl-&libvdpau-va-gl-version;.
     The file should be renamed after downloading:</para>
@@ -127,5 +127,5 @@
     <para>
       To test the results, issue: <command>make check</command>.  The tests must
-      be run from an Xorg environment. 
+      be run from an Xorg environment.
     </para>
 
@@ -179,5 +179,5 @@
         <listitem>
           <para>
-            contains functions to implement the OpenGL backend to 
+            contains functions to implement the OpenGL backend to
             the VDPAU (Video Decode and Presentation API for Unix) API.
           </para>
Index: x/installing/mesa.xml
===================================================================
--- x/installing/mesa.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ x/installing/mesa.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -111,5 +111,5 @@
       added by the patch above), and
       <ulink url="http://omxil.sourceforge.net/">Bellagio OpenMAX Integration
-      Layer</ulink> (for mobile platforms) 
+      Layer</ulink> (for mobile platforms)
     </para>
 
Index: x/installing/x7app.xml
===================================================================
--- x/installing/x7app.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ x/installing/x7app.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -148,5 +148,5 @@
     implementations.</para>
 
-    &lfs78_checked; 
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/installing/x7driver-intel.xml
===================================================================
--- x/installing/x7driver-intel.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ x/installing/x7driver-intel.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -42,5 +42,5 @@
       &lfs78_checked;
 
-      <note><para>This is a development version of the Intel driver 
+      <note><para>This is a development version of the Intel driver
       which is needed to work properly with the latest hardware.</para></note>
 
Index: x/installing/x7driver-nouveau.xml
===================================================================
--- x/installing/x7driver-nouveau.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ x/installing/x7driver-nouveau.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -15,5 +15,5 @@
 ]>
 
-  
+
  <!-- Begin Xorg Nouveau Driver -->
   <sect2 id="xorg-nouveau-driver" xreflabel="Xorg Nouveau Driver-&xorg-nouveau-driver-version;">
@@ -41,5 +41,5 @@
       </para>
 
-      &lfs78_checked; 
+      &lfs78_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
Index: x/installing/x7driver.xml
===================================================================
--- x/installing/x7driver.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ x/installing/x7driver.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -55,5 +55,5 @@
         In addition to the drivers listed below, there are several other
         drivers for very old hardware that may still be relevant.
-        Instructions for building these now unmaintained drivers may be found in a 
+        Instructions for building these now unmaintained drivers may be found in a
         prior version of BLFS: <ulink url="&BLFS76;">&BLFS76;</ulink>
       </para>
@@ -144,5 +144,5 @@
             <xref linkend="libvdpau"/>
           </para>
-        </listitem> 
+        </listitem>
       </itemizedlist>
 
Index: x/installing/x7lib.xml
===================================================================
--- x/installing/x7lib.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ x/installing/x7lib.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -128,5 +128,5 @@
     routines that are used within all X Window applications.</para>
 
-    &lfs78_checked; 
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/installing/xcb-util-cursor.xml
===================================================================
--- x/installing/xcb-util-cursor.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ x/installing/xcb-util-cursor.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -32,5 +32,5 @@
     <para>
       The <application>xcb-util-cursor</application> package provides a module
-      that implements the XCB cursor library.  It is a the 
+      that implements the XCB cursor library.  It is a the
       <application>XCB</application> replacement for libXcursor.
     </para>
Index: x/installing/xcb-util-image.xml
===================================================================
--- x/installing/xcb-util-image.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ x/installing/xcb-util-image.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -95,5 +95,5 @@
 
     <para>
-      To test the results, issue: 
+      To test the results, issue:
       <command>LD_LIBRARY_PATH=$XORG_PREFIX/lib make check</command>.
     </para>
Index: x/installing/xcb-util-wm.xml
===================================================================
--- x/installing/xcb-util-wm.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ x/installing/xcb-util-wm.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -36,5 +36,5 @@
     </para>
 
-    &lfs78_checked; 
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/installing/xcursor-themes.xml
===================================================================
--- x/installing/xcursor-themes.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ x/installing/xcursor-themes.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -35,5 +35,5 @@
     </para>
 
-    &lfs78_checked; 
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/installing/xorg-config.xml
===================================================================
--- x/installing/xorg-config.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ x/installing/xorg-config.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -121,5 +121,5 @@
       LLVMPipe just make sure that <xref linkend="llvm"/> is present at Mesa
       build time. Note that all decoding is done on the CPU instead of the GPU,
-      so the display will run slower than with hardware acceleration.  
+      so the display will run slower than with hardware acceleration.
       To check if you are using LLVMpipe,
       review the output ot the glxinfo command above.  An example of the
@@ -314,6 +314,6 @@
       font analysis</ulink> site.</para>
 
-      <para>As a font installation example, consider the installation of the 
-      DejaVu fonts.  From the unpacked source directory, run the following 
+      <para>As a font installation example, consider the installation of the
+      DejaVu fonts.  From the unpacked source directory, run the following
       commands as the <systemitem class="username">root</systemitem> user:</para>
 
@@ -353,5 +353,5 @@
   <sect3 id="xdisplay">
   <title>Fine Tuning Display Settings</title>
-  
+
   <para>Again, with modern Xorg, little or no additional configuration is
   necessary. If you should need extra options passed to your video driver,
Index: x/installing/xorg7.xml
===================================================================
--- x/installing/xorg7.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ x/installing/xorg7.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -83,5 +83,5 @@
 
     <note><para>The following instructions assume that the shell
-    startup files have been set up as described in 
+    startup files have been set up as described in
     <xref linkend="postlfs-config-profile" />.
     </para></note>
Index: x/lib/cairo.xml
===================================================================
--- x/lib/cairo.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ x/lib/cairo.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -48,5 +48,5 @@
     </para>
 
-    &lfs78_checked; 
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/lib/clutter.xml
===================================================================
--- x/lib/clutter.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ x/lib/clutter.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -134,5 +134,5 @@
     <para>
       To test the results, issue: <command>make -k check</command> (you must be
-      in an xterm or similar to do this, because it launches some windows). 
+      in an xterm or similar to do this, because it launches some windows).
       <!-- Two tests have been observed to fail. -->
     </para>
Index: x/lib/cogl.xml
===================================================================
--- x/lib/cogl.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ x/lib/cogl.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -174,7 +174,7 @@
         </seg>
         <seg>
-          libcogl-gles2.so, 
+          libcogl-gles2.so,
           libcogl-pango.so,
-          libcogl-path.so, and 
+          libcogl-path.so, and
           libcogl.so, and optional libraries
           libcogl-gst.so and /usr/lib/gstreamer-1.0/libgstcogl.so
Index: x/lib/fltk.xml
===================================================================
--- x/lib/fltk.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ x/lib/fltk.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -32,6 +32,6 @@
     <para>
       FLTK (pronounced "fulltick") is a cross-platform C++ GUI toolkit.
-      FLTK provides modern GUI functionality and supports 3D graphics via 
-      OpenGL and its built-in GLUT emulation libraries used for creating 
+      FLTK provides modern GUI functionality and supports 3D graphics via
+      OpenGL and its built-in GLUT emulation libraries used for creating
       graphical user interfaces for applications.
     </para>
@@ -106,5 +106,5 @@
 
     <note>
-      <para>The tar extraction directory is fltk-&fltk-version; and not 
+      <para>The tar extraction directory is fltk-&fltk-version; and not
       fltk-&fltk-version;-source as indicated by the tarball name.</para>
     </note>
@@ -166,13 +166,13 @@
         <seg>
           blocks,
-          checkers,  
-          fltk-config, 
+          checkers,
+          fltk-config,
           fluid, and
           sudoku
         </seg>
         <seg>
-          libfltk.{a,so}, 
-          libfltk_forms.{a,so}, 
-          libfltk_gl.{a,so}, and 
+          libfltk.{a,so},
+          libfltk_forms.{a,so},
+          libfltk_gl.{a,so}, and
           libfltk_images.{a,so}
         </seg>
Index: x/lib/freeglut.xml
===================================================================
--- x/lib/freeglut.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ x/lib/freeglut.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -128,10 +128,10 @@
     <title>Command Explanations</title>
 
-    <para><parameter>-DFREEGLUT_BUILD_DEMOS=ON</parameter>: Build 
+    <para><parameter>-DFREEGLUT_BUILD_DEMOS=ON</parameter>: Build
     optional demo programs.  Installation of the demo programs must
-    be done manually.  The demo programs are limited and 
+    be done manually.  The demo programs are limited and
     installation is not recommended.</para>
 
-    <para><parameter>-DFREEGLUT_BUILD_STATIC_LIBS=OFF</parameter>: 
+    <para><parameter>-DFREEGLUT_BUILD_STATIC_LIBS=OFF</parameter>:
     Do not build the static library. </para>
 
Index: x/lib/gtksourceview.xml
===================================================================
--- x/lib/gtksourceview.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ x/lib/gtksourceview.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -112,5 +112,5 @@
     <para>
       To test the results, issue <command>make check</command>. The tests need
-      to be run in a graphical environment. 
+      to be run in a graphical environment.
     </para>
 
Index: x/lib/libepoxy.xml
===================================================================
--- x/lib/libepoxy.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ x/lib/libepoxy.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -35,5 +35,5 @@
     </para>
 
-    &lfs78_checked; 
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/lib/qt4.xml
===================================================================
--- x/lib/qt4.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ x/lib/qt4.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -49,5 +49,5 @@
     </para>
 
-    &lfs78_checked; 
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -906,5 +906,5 @@
         <listitem>
           <para>
-            is a tool to replay all drawing operations recording with 
+            is a tool to replay all drawing operations recording with
             <command>-graphicssystem trace</command> into a trace buffer.
           </para>
Index: x/lib/qt5.xml
===================================================================
--- x/lib/qt5.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ x/lib/qt5.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -123,5 +123,5 @@
       <xref linkend="unixodbc"/>,
       <xref linkend="libxkbcommon"/>, and
-      <ulink url="https://github.com/ibus/ibus/wiki">ibus</ulink> 
+      <ulink url="https://github.com/ibus/ibus/wiki">ibus</ulink>
     </para>
 
@@ -131,5 +131,5 @@
   </sect2>
 
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
                href="../../xincludes/qt-alternatives.xml"/>
 
@@ -142,5 +142,5 @@
       The BLFS editors recommend installing <application>Qt5</application> in a
       directory other than <filename class="directory">/usr</filename>, ie
-      <filename class="directory">/opt/qt5</filename>.  To do this,  set the 
+      <filename class="directory">/opt/qt5</filename>.  To do this,  set the
       following environment variable:
     </para>
@@ -303,5 +303,5 @@
 cat &gt; /usr/share/applications/assistant-qt5.desktop &lt;&lt; EOF
 <literal>[Desktop Entry]
-Name=Qt5 Assistant 
+Name=Qt5 Assistant
 Comment=Shows Qt5 documentation and examples
 Exec=$QT5BINDIR/assistant
@@ -342,5 +342,5 @@
 cat &gt; /usr/share/applications/qdbusviewer-qt5.desktop &lt;&lt; EOF
 <literal>[Desktop Entry]
-Name=Qt5 QDbusViewer 
+Name=Qt5 QDbusViewer
 GenericName=D-Bus Debugger
 Comment=Debug D-Bus applications
@@ -502,5 +502,5 @@
     </sect3>
 
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
+   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
                href="../../xincludes/setqt.xml"/>
   </sect2>
@@ -683,5 +683,5 @@
           <para>
             takes a C++ source file and generates a D-Bus XML definition
-            of the interface. 
+            of the interface.
           </para>
           <indexterm zone="qt5 qdbuscpp2xml-qt5">
@@ -728,5 +728,5 @@
         </listitem>
       </varlistentry>
- 
+
       <varlistentry id="qdoc-qt5">
         <term><command>qdoc</command></term>
@@ -760,5 +760,5 @@
           <para>
             is a tool used to generate a <application>Qt</application>
-            compressed help file. 
+            compressed help file.
           </para>
           <indexterm zone="qt5 qhelpgenerator-qt5">
Index: x/wm/fluxbox.xml
===================================================================
--- x/wm/fluxbox.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ x/wm/fluxbox.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -34,5 +34,5 @@
     manager.</para>
 
-    &lfs78_checked; 
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/wm/openbox.xml
===================================================================
--- x/wm/openbox.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ x/wm/openbox.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -37,5 +37,5 @@
     </para>
 
-    &lfs78_checked; 
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -116,5 +116,5 @@
 
     <para>
-      This package does not come with a test suite. 
+      This package does not come with a test suite.
     </para>
 
Index: xfce/apps/xfce4-terminal.xml
===================================================================
--- xfce/apps/xfce4-terminal.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ xfce/apps/xfce4-terminal.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -38,5 +38,5 @@
     </para>
 
-    &lfs78_checked; 
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: xfce/core/libwnck2.xml
===================================================================
--- xfce/core/libwnck2.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ xfce/core/libwnck2.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -77,5 +77,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gtk2"/> 
+      <xref linkend="gtk2"/>
     </para>
 
Index: xfce/core/libxfce4ui.xml
===================================================================
--- xfce/core/libxfce4ui.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ xfce/core/libxfce4ui.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -142,5 +142,5 @@
         </seg>
         <seg>
-          libxfce4kbd-private-{2,3}.so and 
+          libxfce4kbd-private-{2,3}.so and
           libxfce4ui-{1,2}.so
         </seg>
Index: xfce/core/libxfce4util.xml
===================================================================
--- xfce/core/libxfce4util.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ xfce/core/libxfce4util.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -76,5 +76,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="glib2"/> 
+      <xref linkend="glib2"/>
     </para>
 
Index: xfce/core/xfce4-power-manager.xml
===================================================================
--- xfce/core/xfce4-power-manager.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ xfce/core/xfce4-power-manager.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -155,5 +155,5 @@
         <listitem>
           <para>
-            is a helper program for the suspend and hibernate functions of 
+            is a helper program for the suspend and hibernate functions of
             <command>xfce4-power-manager</command>.
           </para>
Index: xfce/core/xfconf.xml
===================================================================
--- xfce/core/xfconf.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ xfce/core/xfconf.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -141,5 +141,5 @@
         </seg>
         <seg>
-          /usr/include/xfconf-0, 
+          /usr/include/xfconf-0,
           /usr/lib/xfce4/xfconf, and
           /usr/share/gtk-doc/html/xfconf
Index: xincludes/qt-alternatives.xml
===================================================================
--- xincludes/qt-alternatives.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ xincludes/qt-alternatives.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [    
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
    <!ENTITY % general-entities SYSTEM "../general.ent">
    %general-entities;
@@ -12,7 +12,7 @@
     <title>Qt Installation Alternatives</title>
 
-    <para>The installation of <application>Qt</application> presents 
+    <para>The installation of <application>Qt</application> presents
     several challenges and choices. Complicating the Qt installation is the fact
-    that there are two versions,  <application>Qt4</application> and 
+    that there are two versions,  <application>Qt4</application> and
     <application>Qt5</application>, that have executable programs with
     identical names.  If both packages are installed on one system,
@@ -23,10 +23,10 @@
     </para>
 
-    <para>If you are only going to install one of the Qt versions, 
-    the choice of installation methods is easier.  You can either 
+    <para>If you are only going to install one of the Qt versions,
+    the choice of installation methods is easier.  You can either
     install the components in the several directories of the <filename
-    class='directory'>/usr</filename> hierarchy or install the 
+    class='directory'>/usr</filename> hierarchy or install the
     entire package in a separate directory of your choice. <!-- We
-    refer to these options below as "Method 1: Installing in /usr" 
+    refer to these options below as "Method 1: Installing in /usr"
     and "Method 2: Installing in /opt". --></para>
 
@@ -47,5 +47,5 @@
     Qt instance cannot be upgraded while it is in use.  For instance, it cannot
     be upgraded from a running KDE environment.  It also precludes having
-    multiple versions of Qt on your system and does not allow reverting to 
+    multiple versions of Qt on your system and does not allow reverting to
     an existing, known working instance of Qt.</para>
 
Index: xincludes/setqt.xml
===================================================================
--- xincludes/setqt.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ xincludes/setqt.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [    
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
    <!ENTITY % general-entities SYSTEM "../general.ent">
    %general-entities;
@@ -13,5 +13,5 @@
 
     <para>If you install both Qt4 and Qt5, you can use some simple
-    scripts to select the currently active set of Qt programs.  As the 
+    scripts to select the currently active set of Qt programs.  As the
     <systemitem class="username">root</systemitem> user, create
     the following scripts:</para>
Index: xsoft/office/office.xml
===================================================================
--- xsoft/office/office.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ xsoft/office/office.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -24,5 +24,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="abiword.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnumeric.xml"/>
-<!-- Hopefully gnucash will come back when updated  
+<!-- Hopefully gnucash will come back when updated
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnucash.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libreoffice.xml"/>
Index: xsoft/other/balsa.xml
===================================================================
--- xsoft/other/balsa.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ xsoft/other/balsa.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -89,5 +89,5 @@
       <xref linkend="openssl"/>,
       <xref linkend="sqlite"/>,
-      <xref linkend="webkitgtk"/>, and 
+      <xref linkend="webkitgtk"/>, and
       <ulink url="&gnome-download-http;/gtkhtml/">GtkHTML</ulink>
     </para>
Index: xsoft/other/gimp.xml
===================================================================
--- xsoft/other/gimp.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ xsoft/other/gimp.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -124,5 +124,5 @@
     <para role="required">
       <xref linkend="gegl"/> and
-      <xref linkend="gtk2"/> 
+      <xref linkend="gtk2"/>
     </para>
 
@@ -216,5 +216,5 @@
       Remove from <envar>ALL_LINGUAS</envar> the codes for any languages which
       you do not wish to install. Alternatively, remove the line starting with
-      <envar>ALL_LINGUAS</envar>, if you wish to build all languages. 
+      <envar>ALL_LINGUAS</envar>, if you wish to build all languages.
     </para>
 
Index: xsoft/other/pidgin.xml
===================================================================
--- xsoft/other/pidgin.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ xsoft/other/pidgin.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -210,7 +210,7 @@
 
     <para>
-      <option>--with-gstreamer=1.0</option>: Remove this switch 
+      <option>--with-gstreamer=1.0</option>: Remove this switch
       and add <option>--disable-gstreamer</option>
-      if you've not installed <xref linkend="gstreamer10"/>. 
+      if you've not installed <xref linkend="gstreamer10"/>.
     </para>
 
@@ -406,5 +406,5 @@
         <listitem>
           <para>
-            calls purple API functions using DBus. As opposed to 
+            calls purple API functions using DBus. As opposed to
             <command>purple-send</command>, it does not print the return value.
           </para>
Index: xsoft/other/rxvt-unicode.xml
===================================================================
--- xsoft/other/rxvt-unicode.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ xsoft/other/rxvt-unicode.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -161,5 +161,5 @@
 Comment=Use the command line
 GenericName=Terminal
-Exec=urxvt 
+Exec=urxvt
 Terminal=false
 Type=Application
Index: xsoft/other/tigervnc.xml
===================================================================
--- xsoft/other/tigervnc.xml	(revision 6c91a92a3351acdf0550d3d061ca3f070ded53f0)
+++ xsoft/other/tigervnc.xml	(revision f34293095bfb5496ca507fa663ee43eb6b8c8310)
@@ -31,7 +31,7 @@
     <title>Introduction to Tigervnc</title>
 
-    <para><application>Tigervnc</application> is an advanced VNC (Virtual 
+    <para><application>Tigervnc</application> is an advanced VNC (Virtual
     Network Computing) implementation.  It allows creation of an Xorg server
-    not tied to a physical console and also provides a client for 
+    not tied to a physical console and also provides a client for
     viewing of the remote graphical desktop.
     </para>
@@ -78,5 +78,5 @@
 
     <note><para>The version of <application>Xorg</application> is a few versions
-    out of date, but is required for the customizations needed for this 
+    out of date, but is required for the customizations needed for this
     package.</para></note>
 
@@ -146,5 +146,5 @@
 [ -e /usr/bin/Xvnc ] || ln -svf $XORG_PREFIX/bin/Xvnc /usr/bin/Xvnc</userinput></screen>
 
-    <para>Finally, create a menu entry.  As the 
+    <para>Finally, create a menu entry.  As the
       <systemitem class="username">root</systemitem> user:</para>
 
@@ -176,6 +176,6 @@
 
     <para><command>[ -e /usr/bin/Xvnc ] || ln ... Xvnc</command>: If the Xvnc server
-    is not installed in the <filename class='directory'>/usr/bin</filename> 
-    directory, then create a link so the <command>vncserver</command> script 
+    is not installed in the <filename class='directory'>/usr/bin</filename>
+    directory, then create a link so the <command>vncserver</command> script
     can find it.</para>
 
@@ -185,8 +185,8 @@
     <title>Configuring Tigervnc</title>
 
-   <para>The user specific configuration files of vncserver resides 
-   in the <filename class='directory'>.vnc</filename> directory in the user's 
+   <para>The user specific configuration files of vncserver resides
+   in the <filename class='directory'>.vnc</filename> directory in the user's
    home directory.  The <filename>xstartup</filename> file in that
-   directory is a script specifying what commands to be run 
+   directory is a script specifying what commands to be run
    when a VNC desktop is started.  If no  <filename>xstartup</filename> file
    exists, <command>vncserver</command> will try to start an xterm in a twm
@@ -194,5 +194,5 @@
 
 <screen>#!/bin/sh
- 
+
 [ -x /etc/vnc/xstartup ] &amp;&amp; exec /etc/vnc/xstartup
 [ -r $HOME/.Xresources ] &amp;&amp; xrdb $HOME/.Xresources
@@ -210,11 +210,11 @@
 
       <seglistitem>
-        <seg>Xvnc, 
-             vncconfig,  
-             vncpasswd,  
-             vncserver,  
-             vncviewer, and 
+        <seg>Xvnc,
+             vncconfig,
+             vncpasswd,
+             vncserver,
+             vncviewer, and
              x0vncserver</seg>
-        
+
         <seg>libvnc.so</seg>
         <seg>None</seg>
@@ -231,5 +231,5 @@
         <listitem>
           <para> is a X VNC (Virtual Network Computing) server.
-          It is based on a standard X server, but it has a 
+          It is based on a standard X server, but it has a
           "virtual" screen rather than a physical one.</para>
           <indexterm zone="tigervnc xvnc">
