diff --git a/general/graphlib/aalib.xml b/general/graphlib/aalib.xml
index e5b6156673..6ad92ee262 100644
--- a/general/graphlib/aalib.xml
+++ b/general/graphlib/aalib.xml
@@ -14,24 +14,24 @@
 
 <sect1 id="aalib" xreflabel="AAlib-&aalib-version;">
   <?dbhtml filename="aalib.html"?>
-  
+
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
-  
+
   <title>AAlib-&aalib-version;</title>
-  
+
   <indexterm zone="aalib">
     <primary sortas="a-AAlib">AAlib</primary>
   </indexterm>
 
   <sect2 role="package">
     <title>Introduction to AAlib</title>
-    
+
     <para><application>AAlib</application> is a library to render any graphic into
     ASCII Art.</para>
-    
+
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -53,16 +53,16 @@
         <para>Estimated build time: &aalib-time;</para>
       </listitem>
     </itemizedlist>
-    
+
     <bridgehead renderas="sect3">AAlib Dependencies</bridgehead>
-    
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>), 
     <xref linkend="slang"/> and 
     <xref linkend="gpm"/></para>
-    
+
   </sect2>
-  
+
   <sect2 role="installation">
     <title>Installation of AAlib</title>
 
@@ -72,29 +72,29 @@
 <screen><userinput>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
 make install</userinput></screen>
-    
+
   </sect2>
-  
+
   <sect2 role="content">
     <title>Contents</title>
-    
+
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
-      
+
       <seglistitem>
         <seg>aafire, aainfo, aalib-config, aasavefont, and aatest</seg>
         <seg>libaa.[so,a]</seg>
         <seg>Not determined at this time</seg>
       </seglistitem>
     </segmentedlist>
-    
+
     <variablelist>
       <bridgehead renderas="sect3">Short Descriptions</bridgehead>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-     
+
       <varlistentry id="aafire">
         <term><command>aafire</command></term>
         <listitem>
@@ -105,7 +105,7 @@ make install</userinput></screen>
           </indexterm>
         </listitem>
       </varlistentry>
-      
+
       <varlistentry id="aainfo">
         <term><command>aainfo</command></term>
         <listitem>
@@ -116,7 +116,7 @@ make install</userinput></screen>
           </indexterm>
         </listitem>
       </varlistentry>
-      
+
       <varlistentry id="aalib-config">
         <term><command>aalib-config</command></term>
         <listitem>
@@ -126,18 +126,18 @@ make install</userinput></screen>
           </indexterm>
         </listitem>
       </varlistentry>
-      
+
       <varlistentry id="aatest">
         <term><command>aatest</command></term>
         <listitem>
-          <para>shows the abilities of <application>AAlib</application> 
+          <para>shows the abilities of <application>AAlib</application>
           in a little test.</para>
           <indexterm zone="aalib aatest">
             <primary sortas="b-aatest">aatest</primary>
           </indexterm>
         </listitem>
       </varlistentry>
-      
+
       <varlistentry id="libaa">
         <term><filename class='libraryfile'>libaa.[so,a]</filename></term>
         <listitem>
@@ -150,9 +150,9 @@ make install</userinput></screen>
           </indexterm>
         </listitem>
       </varlistentry>
-      
+
     </variablelist>
-    
+
   </sect2>
-  
+
 </sect1>
diff --git a/general/graphlib/freetype2.xml b/general/graphlib/freetype2.xml
index d676bc5a57..aac367234f 100644
--- a/general/graphlib/freetype2.xml
+++ b/general/graphlib/freetype2.xml
@@ -118,7 +118,7 @@ make</userinput></screen>
       <varlistentry id="libfreetype">
         <term><filename class='libraryfile'>libfreetype.[so,a]</filename></term>
         <listitem>
-          <para>contains functions to add <application>TrueType</application> 
+          <para>contains functions to add <application>TrueType</application>
           font capabilities to the X Window system.</para>
           <indexterm zone="freetype2 libfreetype">
             <primary sortas="c-libfreetype">libfreetype.[so,a]</primary>
diff --git a/general/graphlib/libmng.xml b/general/graphlib/libmng.xml
index ba6cca543f..7965c11ae3 100644
--- a/general/graphlib/libmng.xml
+++ b/general/graphlib/libmng.xml
@@ -85,7 +85,7 @@ install -v -m644 doc/*.{png,txt} /usr/share/doc/libmng-&libmng-version;</userinp
     <title>Command Explanations</title>
 
     <para><command>cp makefiles/makefile.linux Makefile</command>: There are no 
-    autotools shipped with this package. The Linux <filename>makefile</filename> 
+    autotools shipped with this package. The Linux <filename>makefile</filename>
     is copied to the root of the source tree, facilitating the installation.</para>
 
     <para><command>install ...</command>: The documentation files are not 
diff --git a/general/graphlib/librsvg.xml b/general/graphlib/librsvg.xml
index e630f78661..ace9a6c3a0 100644
--- a/general/graphlib/librsvg.xml
+++ b/general/graphlib/librsvg.xml
@@ -94,7 +94,7 @@ make</userinput></screen>
     <title>Command Explanations</title>
 
     <para><parameter>--disable-gtk-doc</parameter>: This option prevents 
-    the rebuilding of documentation during the <command>make</command> 
+    the rebuilding of documentation during the <command>make</command>
     command.</para>
 
   </sect2>
@@ -134,7 +134,7 @@ make</userinput></screen>
       <varlistentry id="rsvg-view">
         <term><command>rsvg-view</command></term>
         <listitem>
-          <para>is used to view an SVG file in an <application>X</application> 
+          <para>is used to view an SVG file in an <application>X</application>
           window.</para>
           <indexterm zone="librsvg rsvg-view">
             <primary sortas="b-rsvg-view">rsvg-view</primary>
diff --git a/general/prog/doxygen.xml b/general/prog/doxygen.xml
index 21def01c92..282fb8f86f 100644
--- a/general/prog/doxygen.xml
+++ b/general/prog/doxygen.xml
@@ -94,7 +94,7 @@ make</userinput></screen>
 
     <para>If you wish to generate and install the package documentation (which 
     includes the man pages), ensure the <application>Python</application>, 
-    <application>TeX</application> and <application>GraphViz</application> 
+    <application>TeX</application> and <application>GraphViz</application>
     packages are installed, then substitute the following commands for the 
     <command>make install</command> command above:</para>
 
@@ -125,7 +125,7 @@ make install_docs</userinput></screen>
     man pages and HTML documentation.</para>
 
     <para><command>make pdf</command>: This command builds a 
-    PDF version of the <application>Doxygen</application> 
+    PDF version of the <application>Doxygen</application>
     Manual.</para>
 
     <para><command>install ...</command>: These commands install some files 
diff --git a/general/prog/gcc.xml b/general/prog/gcc.xml
index 0a0a823f44..a890688083 100644
--- a/general/prog/gcc.xml
+++ b/general/prog/gcc.xml
@@ -92,7 +92,7 @@
     <note>
       <para>If you plan to compile Ada, you will need to install 
       <application>GNAT</application> temporarily to satisfy the circular 
-      dependency when you recompile <application>GCC</application> 
+      dependency when you recompile <application>GCC</application>
       to include Ada.</para>
     </note>
 
@@ -135,7 +135,7 @@
     the system <command>gcc</command>, the package will be installed in a separate 
     directory, that can later be removed from the system.</para>
 
-    <para>In response to the questions asked by the <command>doconfig</command> 
+    <para>In response to the questions asked by the <command>doconfig</command>
     script, enter <userinput>3</userinput> in response to the first question
     and <userinput>/opt/gnat</userinput> in response to the second question.</para>
 
@@ -148,7 +148,7 @@
     invoked by executing the <command>gcc</command> binary installed 
     by the above script.</para>
 
-    <para>You may now remove the <application>GNAT</application> 
+    <para>You may now remove the <application>GNAT</application>
     source directory:</para>
 
 <screen><userinput>cd .. &amp;&amp;
@@ -173,8 +173,8 @@ export PATH=/opt/gnat/bin:$PATH</userinput></screen>
       <para>The installation process may overwrite your existing 
       <application>GCC</application> compiler and libraries. It 
       is highly recommended that you have the <application>Tcl</application>, 
-      <application>Expect</application> and <application>DejaGnu</application> 
-      packages installed, as well as unpacking the <application>GCC</application> 
+      <application>Expect</application> and <application>DejaGnu</application>
+      packages installed, as well as unpacking the <application>GCC</application>
       testsuite tarball before beginning the build.</para>
 
       <para>Do not continue with the <command>make install</command> command 
@@ -195,7 +195,7 @@ export PATH=/opt/gnat/bin:$PATH</userinput></screen>
       <application>GCC</application> package but you wish to use the programs 
       from the <application>JDK</application> as the defaults, ensure 
       <filename class='directory'>$JAVA_HOME/bin</filename> is listed before 
-      <filename class='directory'>/usr/bin</filename> in your <envar>PATH</envar> 
+      <filename class='directory'>/usr/bin</filename> in your <envar>PATH</envar>
       variable after the <application>GCC</application> installation is complete.</para>
     </note>
 
@@ -294,7 +294,7 @@ unset PATH_HOLD</userinput></screen>
 
     <para><command>ln -sf gcc /usr/bin/cc; ln -sf g77 /usr/bin/f77</command>: 
     These links are created as some packages refer to the C and Fortran compilers 
-    using an alternate name.</para> 
+    using an alternate name.</para>
 
     <para><command>chown -R root:root /usr/lib/gcc/i686-pc-linux-gnu/...</command>: 
     If the package is built by a user other than root, the ownership of the 
@@ -384,7 +384,7 @@ unset PATH_HOLD</userinput></screen>
       <varlistentry id="gcjh">
         <term><command>gcjh</command></term>
         <listitem>
-          <para>generates header files from <application>Java</application> 
+          <para>generates header files from <application>Java</application>
           class files.</para>
           <indexterm zone="gcc gcjh">
             <primary sortas="b-gcjh">gcjh</primary>
@@ -395,7 +395,7 @@ unset PATH_HOLD</userinput></screen>
       <varlistentry id="gij">
         <term><command>gij</command></term>
         <listitem>
-          <para>is the GNU interpreter for <application>Java</application> 
+          <para>is the GNU interpreter for <application>Java</application>
           bytecode.</para>
           <indexterm zone="gcc gij">
             <primary sortas="b-gij">gij</primary>
@@ -585,7 +585,7 @@ unset PATH_HOLD</userinput></screen>
       <varlistentry id="jcf-dump">
         <term><command>jcf-dump</command></term>
         <listitem>
-          <para>prints information about <application>Java</application> 
+          <para>prints information about <application>Java</application>
           class files.</para>
           <indexterm zone="gcc jcf-dump">
             <primary sortas="b-jcf-dump">jcf-dump</primary>
@@ -606,7 +606,7 @@ unset PATH_HOLD</userinput></screen>
       <varlistentry id="jv-scan">
         <term><command>jv-scan</command></term>
         <listitem>
-          <para>prints information about <application>Java</application> 
+          <para>prints information about <application>Java</application>
           source files.</para>
           <indexterm zone="gcc jv-scan">
             <primary sortas="b-jv-scan">jv-scan</primary>
diff --git a/general/prog/gcc2.xml b/general/prog/gcc2.xml
index 45c783aa4e..867c03e4e2 100644
--- a/general/prog/gcc2.xml
+++ b/general/prog/gcc2.xml
@@ -110,7 +110,7 @@ ln -sf $IL /usr/lib/libstdc++-libc6.3-2.so.3</command></userinput></screen>
 
 <sect3><title>Configuration Information</title>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../../lib-config.xml"/>  
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../../lib-config.xml"/>
 
 <para>The instructions given above make compatibility symlinks that pre-compiled
 packages in <acronym>BLFS</acronym> require. You may create additional
diff --git a/general/prog/gcc3.xml b/general/prog/gcc3.xml
index 046ed894ff..3936ebefa2 100644
--- a/general/prog/gcc3.xml
+++ b/general/prog/gcc3.xml
@@ -31,7 +31,7 @@
 
     <para>The reason for installing 
     <application>GCC</application>-&gcc3-version; is that 
-    some BLFS packages (such as compiled <application>Java</application> 
+    some BLFS packages (such as compiled <application>Java</application>
     and <application>OpenOffice</application>) have not been updated to be 
     compilable by <application>GCC</application>-&gcc-version;. Additionally, 
     some pre-compiled packages may require the 
@@ -95,7 +95,7 @@ make bootstrap</userinput></screen>
     <para>If desired, run the test suite using the following commands. The 
     <command>test_summary</command> commands create log files which can be 
     compared to known good results located at <ulink 
-    url="http://linuxfromscratch.org/~randy/gcc-334-lfs-6.0-test_summary.log"/> 
+    url="http://linuxfromscratch.org/~randy/gcc-334-lfs-6.0-test_summary.log"/>
     and <ulink 
     url="http://linuxfromscratch.org/~randy/gcc-334-lfs-6.0-test_summary_short.log"/>.</para>
 
diff --git a/general/prog/guile.xml b/general/prog/guile.xml
index d880504764..bb1183851a 100644
--- a/general/prog/guile.xml
+++ b/general/prog/guile.xml
@@ -123,7 +123,7 @@ make</userinput></screen>
         <term><command>guile-snarf</command></term>
         <listitem>
           <para>is a script to parse declarations in your 
-          <application>C</application> code for <application>Scheme</application> 
+          <application>C</application> code for <application>Scheme</application>
           visible <application>C</application> functions, i
           <application>Scheme</application> objects to be used by 
           <application>C</application> code, etc.</para>
diff --git a/general/prog/jdk.xml b/general/prog/jdk.xml
index 6b40922ac2..a2a648c6d3 100644
--- a/general/prog/jdk.xml
+++ b/general/prog/jdk.xml
@@ -128,7 +128,7 @@
         (Forces dynamic linking to gcc libs)</para></listitem>
       <listitem>
         <para><ulink 
-        url="&patch-root;/jdk-&jdk-src-version;-xorg-6.8.1-1.patch"/> 
+        url="&patch-root;/jdk-&jdk-src-version;-xorg-6.8.1-1.patch"/>
         (Only required if building agianst <xref linkend="xorg"/>)</para>
       </listitem>
     </itemizedlist>
@@ -357,7 +357,7 @@ EOF</userinput></screen>
 
     <note>
       <para>The plugin must be a symlink for it to work. If not, the browsers
-      just crash when you attempt to load a <application>Java</application> 
+      just crash when you attempt to load a <application>Java</application>
       application.</para>
     </note>
 
@@ -420,12 +420,12 @@ EOF</userinput></screen>
             <primary sortas="b-idlj">idlj</primary>
           </indexterm>
         </listitem>
-      </varlistentry> 
+      </varlistentry>
 
       <varlistentry id="jar">
         <term><command>jar</command></term>
         <listitem>
-          <para>combines multiple files into a single <filename>JAR</filename> 
+          <para>combines multiple files into a single <filename>JAR</filename>
           archive file.</para>
           <indexterm zone="jdk jar">
             <primary sortas="b-jar">jar</primary>
diff --git a/general/prog/pdl.xml b/general/prog/pdl.xml
index a0872d9551..303abe2fc6 100644
--- a/general/prog/pdl.xml
+++ b/general/prog/pdl.xml
@@ -34,7 +34,7 @@
     and quickly manipulate the large N-dimensional data arrays common to 
     scientific computing. <application>PDL</application> turns 
     <application>Perl</application> into an array-oriented, numerical language 
-    similar to such commerical packages as <application>IDL</application> 
+    similar to such commerical packages as <application>IDL</application>
     and <application>MatLab</application>. One can write simple 
     <application>Perl</application> expressions to manipulate entire numerical 
     arrays all at once.</para>
@@ -81,9 +81,9 @@
     <filename>DEPENDENCIES</filename> file, found in the package source tree.</para>
 
     <bridgehead renderas="sect4">PDL::NiceSlice</bridgehead>
-    
+
     <para>The <application>PDL</application>::NiceSlice module is used to 
-    enhance <application>PDL</application>'s slice syntax. <quote>Slicing</quote> 
+    enhance <application>PDL</application>'s slice syntax. <quote>Slicing</quote>
     is a term used in the process of creating a cross-section, or slice, of a 
     <application>PDL</application> object (piddle).</para>
 
@@ -146,7 +146,7 @@
 
     <para>The <application>PDL</application>::Graphics::PGPLOT module is a 
     convenience interface to the <application>PGPLOT</application> commands, 
-    implemented using the object oriented <application>PGPLOT</application> 
+    implemented using the object oriented <application>PGPLOT</application>
     plotting package in the <application>PDL</application>::Graphics::PGPLOT::Window 
     module.</para>
 
@@ -214,7 +214,7 @@
     <bridgehead renderas="sect4">PDL::Graphics::IIS</bridgehead>
 
     <para>The <application>PDL</application>::Graphics::IIS 
-    module provides an interface to any image display <quote>device</quote> 
+    module provides an interface to any image display <quote>device</quote>
     which supports the <quote>IIS protocol</quote>.</para>
 
     <itemizedlist spacing='compact'>
@@ -267,7 +267,7 @@
 
     <para> The <application>PDL</application>::IO::Pic module implements I/O 
     for a number of popular image formats by exploiting the 
-    <command>xxxtopnm</command> and <command>pnmtoxxx</command> 
+    <command>xxxtopnm</command> and <command>pnmtoxxx</command>
     converters from the <application>Netpbm</application> package and the 
     <command>cjpeg</command> and <command>djpeg</command> converters. 
     It also  contains the routine wmpeg to write MPEG movies from piddles 
@@ -306,7 +306,7 @@
 
     <bridgehead renderas="sect4">PDL::GSL</bridgehead>
 
-    <para> The <application>PDL</application>::<application>GSL</application> 
+    <para> The <application>PDL</application>::<application>GSL</application>
     module is an interface to the functions provided by the Gnu Scientific Library.</para>
 
     <itemizedlist spacing='compact'>
@@ -317,7 +317,7 @@
 
     <bridgehead renderas="sect4">PDL::FFTW</bridgehead>
 
-    <para> The <application>PDL</application>::<application>FFTW</application> 
+    <para> The <application>PDL</application>::<application>FFTW</application>
     module is a means to interface <application>PDL</application> with the 
     <application>FFTW</application> library. It's similar to the standard FFT 
     routine but it's usually faster and has support for real transforms. It works 
@@ -460,7 +460,7 @@ make test</userinput></screen>
       <title>Configuration Information</title>
 
       <para>See <ulink 
-      url="http://pdl.sourceforge.net/PDLdocs/perldl.html#the startup file ~/.perldlrc"/> 
+      url="http://pdl.sourceforge.net/PDLdocs/perldl.html#the startup file ~/.perldlrc"/>
       for information about configuring <command>perldl</command> to suit your 
       needs.</para>
 
@@ -525,7 +525,7 @@ make test</userinput></screen>
       <varlistentry id="pptemplate">
         <term><command>pptemplate</command></term>
         <listitem>
-          <para>is a script to generate <filename>Makefile.PL</filename> 
+          <para>is a script to generate <filename>Makefile.PL</filename>
           and PP file skeletons.</para>
           <indexterm zone="pdl pptemplate">
             <primary sortas="b-pptemplate">pptemplate</primary>
diff --git a/general/prog/php.xml b/general/prog/php.xml
index 89b0daf46d..5bb492674f 100644
--- a/general/prog/php.xml
+++ b/general/prog/php.xml
@@ -203,7 +203,7 @@ cp -v php.ini-recommended /etc/php.ini</userinput></screen>
     <sect3>
       <title>Configuration Information</title>
 
-      <para>To enable PHP support in the <application>Apache</application> 
+      <para>To enable PHP support in the <application>Apache</application>
       web server, a new LoadModule (which should be handled automatically by the
       <command>make install</command> command) and AddType directives 
       must be added to the <filename>httpd.conf</filename> file:</para>
@@ -216,7 +216,7 @@ AddType application/x-httpd-php .php</literal></screen>
       <filename>httpd.conf</filename> file.</para>
 
       <para>You'll need to restart the <application>Apache</application> web server 
-      after making any modifications to the <filename>httpd.conf</filename> 
+      after making any modifications to the <filename>httpd.conf</filename>
       file.</para>
 
     </sect3>
diff --git a/general/prog/python.xml b/general/prog/python.xml
index 52f645b7a7..a0c7ce9957 100644
--- a/general/prog/python.xml
+++ b/general/prog/python.xml
@@ -159,7 +159,7 @@ make</userinput></screen>
       <varlistentry id="python2.4">
         <term><command>python2.4</command></term>
         <listitem>
-          <para>is a version-specific name for the <command>python</command> 
+          <para>is a version-specific name for the <command>python</command>
           program.</para>
           <indexterm zone="python python2.4">
             <primary sortas="b-python2.4">python2.4</primary>
diff --git a/general/prog/tcl.xml b/general/prog/tcl.xml
index 3977ee5ab4..c8d3472b94 100644
--- a/general/prog/tcl.xml
+++ b/general/prog/tcl.xml
@@ -157,7 +157,7 @@ unset DIR</userinput></screen>
       <varlistentry id="tclsh">
         <term><command>tclsh</command></term>
         <listitem>
-          <para> is a symlink to the <command>tclsh8.4</command> 
+          <para> is a symlink to the <command>tclsh8.4</command>
           program.</para>
           <indexterm zone="tcl tclsh">
             <primary sortas="g-tclsh">tclsh</primary>
diff --git a/general/sysutils/apache-ant.xml b/general/sysutils/apache-ant.xml
index bc9f88b192..4a285fa900 100644
--- a/general/sysutils/apache-ant.xml
+++ b/general/sysutils/apache-ant.xml
@@ -82,7 +82,7 @@
       <para>You may need additional libraries to satisify the build 
       requirements of various packages installed using 
       <application>Apache Ant</application>. Review the table at 
-      <ulink url="http://ant.apache.org/manual/install.html#librarydependencies"/> 
+      <ulink url="http://ant.apache.org/manual/install.html#librarydependencies"/>
       for any prerequisite libraries you may need. One such library is the 
       <application>JUnit</application> testing framework library. Many Ant-installed 
       packages will use this library to perform the unit tests during the build 
@@ -192,7 +192,7 @@ export ANT_HOME=/opt/ant</literal></screen>
         <term><command>ant</command></term>
         <listitem>
           <para>is a <application>Java</application> based build tool used by 
-          many packages instead of the conventional <command>make</command> 
+          many packages instead of the conventional <command>make</command>
           program.</para>
           <indexterm zone="apache-ant ant">
             <primary sortas="b-ant">ant</primary>
@@ -203,7 +203,7 @@ export ANT_HOME=/opt/ant</literal></screen>
       <varlistentry id="antRun">
         <term><command>antRun</command></term>
         <listitem>
-          <para>is a support script used to start <command>ant</command> 
+          <para>is a support script used to start <command>ant</command>
           build scripts in a given directory.</para>
           <indexterm zone="apache-ant antRun">
             <primary sortas="b-antRun">antRun</primary>
@@ -226,7 +226,7 @@ export ANT_HOME=/opt/ant</literal></screen>
         <term><command>complete-ant-cmd.pl</command></term>
         <listitem>
           <para>is a <application>Perl</application> script that allows 
-          <application>Bash</application> to complete an <command>ant</command> 
+          <application>Bash</application> to complete an <command>ant</command>
           command-line.</para>
           <indexterm zone="apache-ant complete-ant-cmd.pl">
             <primary sortas="b-complete-ant-cmd.pl">complete-ant-cmd.pl</primary>
@@ -259,7 +259,7 @@ export ANT_HOME=/opt/ant</literal></screen>
       <varlistentry id="ant-star">
         <term><filename class='libraryfile'>ant-*.jar</filename></term>
         <listitem>
-          <para>files are the <application>Apache Ant</application> 
+          <para>files are the <application>Apache Ant</application>
           <application>Java</application> class libraries.</para>
           <indexterm zone="apache-ant ant-star">
             <primary sortas="c-ant-star">ant-*.jar</primary>
diff --git a/general/sysutils/fcron.xml b/general/sysutils/fcron.xml
index b94093623e..138dc7ff7c 100644
--- a/general/sysutils/fcron.xml
+++ b/general/sysutils/fcron.xml
@@ -121,13 +121,13 @@ make</userinput></screen>
     <application>Fcron</application> will use an installed MTA 
     to email you the results of the <command>fcron</command> script. Omit the 
     switch and use 
-    <option>--with-sendmail=<replaceable>[/path/to/MTA]</replaceable></option> 
+    <option>--with-sendmail=<replaceable>[/path/to/MTA]</replaceable></option>
     if you wish to utilize this feature.</para>
 
     <para><parameter>--with-answer-all=no</parameter>: After the files are
     installed, the <command>make install</command> script enters into a
     configuration routine.  The first test will be whether to install a boot 
-    script in the <filename class="directory">/etc/rc.d/init.d</filename> 
+    script in the <filename class="directory">/etc/rc.d/init.d</filename>
     directory with the appropriate symbolic links in run levels 2, 3, 4, and 5. 
     The second is to stop any current <command>fcron</command> processes 
     and start a new one. Since this is probably your first install and a boot script 
@@ -170,7 +170,7 @@ make</userinput></screen>
       <command>fcrontab</command>. Refer to the <command>fcrontab</command> man 
       page for proper parameters to address your situation.</para>
 
-      <para id="fcron-pam">If <application>Linux-PAM</application> 
+      <para id="fcron-pam">If <application>Linux-PAM</application>
       is installed, two PAM configuration files are installed in 
       <filename class='directory'>/etc/pam.d</filename>. Alternatively if 
       <filename class='directory'>/etc/pam.d</filename> is not used, the installation 
@@ -191,8 +191,8 @@ make</userinput></screen>
     <sect3  id="fcron-init">
       <title>Boot Script</title>
 
-      <para>Install the <filename>/etc/rc.d/init.d/fcron</filename> 
-      init script from the <xref linkend="intro-important-bootscripts"/> 
+      <para>Install the <filename>/etc/rc.d/init.d/fcron</filename>
+      init script from the <xref linkend="intro-important-bootscripts"/>
       package.</para>
 
       <indexterm zone="fcron fcron-init">
diff --git a/general/sysutils/mc.xml b/general/sysutils/mc.xml
index ed86b13818..c65b2aa438 100644
--- a/general/sysutils/mc.xml
+++ b/general/sysutils/mc.xml
@@ -104,8 +104,8 @@ make install</userinput></screen>
 
       <para>The <filename class="directory">~/.mc</filename> directory and
       its contents are created when you start <command>mc</command> for the
-      first time. Then you can edit the main <filename>~/.mc/ini</filename> 
-      configuration file manually or through the <application>MC</application> 
+      first time. Then you can edit the main <filename>~/.mc/ini</filename>
+      configuration file manually or through the <application>MC</application>
       shell. Consult the mc(1) man page for details.</para>
 
     </sect3>
diff --git a/general/sysutils/pkgconfig.xml b/general/sysutils/pkgconfig.xml
index 2803511354..46594c15fb 100644
--- a/general/sysutils/pkgconfig.xml
+++ b/general/sysutils/pkgconfig.xml
@@ -80,7 +80,7 @@ make</userinput></screen>
     <para>The default setting for <envar>PKG_CONFIG_PATH</envar> is
     <filename>/usr/lib/pkgconfig</filename> because of the prefix used to 
     install pkgconfig.  You may add to <envar>PKG_CONFIG_PATH</envar> by exporting
-    additional paths on your system where <application>pkgconfig</application> 
+    additional paths on your system where <application>pkgconfig</application>
     files are installed. Note that <envar>PKG_CONFIG_PATH</envar> is only needed 
     when compiling packages, not during run-time.</para>
 
diff --git a/general/sysutils/unzip.xml b/general/sysutils/unzip.xml
index 4ed3ccd0ca..4b8b510dff 100644
--- a/general/sysutils/unzip.xml
+++ b/general/sysutils/unzip.xml
@@ -31,7 +31,7 @@
 
     <para>The <application>UnZip</application> package contains 
     <filename>ZIP</filename> extraction utilities. These are useful for extracting 
-    files from <filename>ZIP</filename> archives. <filename>ZIP</filename> 
+    files from <filename>ZIP</filename> archives. <filename>ZIP</filename>
     archives are created with <application>PKZIP</application> or 
     <application>Info-ZIP</application> utilities primarily in a DOS 
     environment. </para>
@@ -152,7 +152,7 @@ cp -v -d libunzip.so* /usr/lib</userinput></screen>
       <varlistentry id="unzip-prog">
         <term><command>unzip</command></term>
         <listitem>
-          <para>lists, tests or extracts files from a <filename>ZIP</filename> 
+          <para>lists, tests or extracts files from a <filename>ZIP</filename>
           archive.</para>
           <indexterm zone="unzip unzip-prog">
             <primary sortas="b-unzip">unzip</primary>
diff --git a/general/sysutils/zip.xml b/general/sysutils/zip.xml
index 9d22f1c49f..9b442c89e7 100644
--- a/general/sysutils/zip.xml
+++ b/general/sysutils/zip.xml
@@ -137,7 +137,7 @@ make prefix=/usr -f unix/Makefile generic_gcc</userinput></screen>
       <varlistentry id="zipnote">
         <term><command>zipnote</command></term>
         <listitem>
-          <para>reads or writes comments stored in a <filename>ZIP</filename> 
+          <para>reads or writes comments stored in a <filename>ZIP</filename>
           file.</para>
           <indexterm zone="zip zipnote">
             <primary sortas="b-zipnote">zipnote</primary>