Index: multimedia/audioutils/audioutils.xml
===================================================================
--- multimedia/audioutils/audioutils.xml	(revision e2952b249855804b951d05b5a699dc201b515ae8)
+++ multimedia/audioutils/audioutils.xml	(revision d7ecaa6d999ae2926d87db31c9b2d7f8c6f93121)
@@ -18,10 +18,10 @@
   installed.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mpg123.xml"/> 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="vorbistools.xml"/> 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xmms.xml"/> 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="lame.xml"/> 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cdparanoia.xml"/> 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="freetts.xml"/> 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mpg123.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="vorbistools.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xmms.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="lame.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cdparanoia.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="freetts.xml"/>
 
 </chapter>
Index: multimedia/audioutils/cdparanoia.xml
===================================================================
--- multimedia/audioutils/cdparanoia.xml	(revision e2952b249855804b951d05b5a699dc201b515ae8)
+++ multimedia/audioutils/cdparanoia.xml	(revision d7ecaa6d999ae2926d87db31c9b2d7f8c6f93121)
@@ -31,5 +31,5 @@
 
     <para>The <application>CDParanoia</application> package contains a CD 
-    audio exraction tool. This is useful for extracting <filename>.wav</filename> 
+    audio exraction tool. This is useful for extracting <filename>.wav</filename>
     files from audio CDs.  A CDDA capable CDROM drive is needed. 
     Practically all drives supported by Linux can be used.</para>
@@ -97,5 +97,5 @@
       <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"/>
 
     </sect3>
Index: multimedia/audioutils/freetts.xml
===================================================================
--- multimedia/audioutils/freetts.xml	(revision e2952b249855804b951d05b5a699dc201b515ae8)
+++ multimedia/audioutils/freetts.xml	(revision d7ecaa6d999ae2926d87db31c9b2d7f8c6f93121)
@@ -36,10 +36,10 @@
 
     <para>The <application>FreeTTS</application> package contains a speech 
-    synthesis system written entirely in the <application>Java</application> 
+    synthesis system written entirely in the <application>Java</application>
     programming language. It is based upon 
     <ulink url="http://www.cmuflite.org/">Flite</ulink>: a small run-time 
     speech synthesis engine developed at Carnegie Mellon University. 
     <application>Flite</application> is derived from the 
-    <ulink url="http://www.cstr.ed.ac.uk/projects/festival/">Festival</ulink> 
+    <ulink url="http://www.cstr.ed.ac.uk/projects/festival/">Festival</ulink>
     Speech Synthesis System from the University of Edinburgh and the 
     <ulink url ="http://festvox.org/">FestVox</ulink> project from Carnegie 
@@ -86,5 +86,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para><xref linkend="apache-ant"/> (and 
-    <ulink url="http://www.junit.org/">JUnit</ulink> 
+    <ulink url="http://www.junit.org/">JUnit</ulink>
     to run the test suite), 
     <xref linkend="unzip"/> and working audio hardware/software.</para>
@@ -149,5 +149,5 @@
     <para><command>yes | sh jsapi.sh</command>: This command installs the 
     <application>Java Speech API</application> into the 
-    <application>FreeTTS</application> source tree. <command>yes</command> 
+    <application>FreeTTS</application> source tree. <command>yes</command>
     is piped so that this command can be scripted and will automatically
     agree to the JSAPI license terms. You can view the license you are
Index: multimedia/audioutils/xmms.xml
===================================================================
--- multimedia/audioutils/xmms.xml	(revision e2952b249855804b951d05b5a699dc201b515ae8)
+++ multimedia/audioutils/xmms.xml	(revision d7ecaa6d999ae2926d87db31c9b2d7f8c6f93121)
@@ -160,5 +160,5 @@
         <term><command>wmxmms</command></term>
         <listitem>
-          <para>is a dock applet for the <application>Window Maker</application> 
+          <para>is a dock applet for the <application>Window Maker</application>
           window manager. From the applet you 
           can start and control <command>xmms</command>.</para>
Index: multimedia/cdwriteutils/cdrdao.xml
===================================================================
--- multimedia/cdwriteutils/cdrdao.xml	(revision e2952b249855804b951d05b5a699dc201b515ae8)
+++ multimedia/cdwriteutils/cdrdao.xml	(revision d7ecaa6d999ae2926d87db31c9b2d7f8c6f93121)
@@ -81,5 +81,5 @@
     <bridgehead renderas="sect4">Optional (Required to Build the 'gcdmaster'
     Program)</bridgehead>
-    
+
     <para><emphasis>Note: all the following packages must be built in 
     the order listed.</emphasis></para>
@@ -169,5 +169,5 @@
         <term><command>toc2cddb</command></term>
         <listitem>
-        <para>converts a <application>Cdrdao</application> 
+        <para>converts a <application>Cdrdao</application>
           TOC file into a cddb file and prints it to stdout.</para>
           <indexterm zone="cdrdao toc2cddb">
Index: multimedia/cdwriteutils/cdwriteutils.xml
===================================================================
--- multimedia/cdwriteutils/cdwriteutils.xml	(revision e2952b249855804b951d05b5a699dc201b515ae8)
+++ multimedia/cdwriteutils/cdwriteutils.xml	(revision d7ecaa6d999ae2926d87db31c9b2d7f8c6f93121)
@@ -28,7 +28,7 @@
   </itemizedlist>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cdrtools.xml"/>  
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cdrdao.xml"/>  
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="udftools.xml"/>  
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cdrtools.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cdrdao.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="udftools.xml"/>
 
 </chapter>
Index: multimedia/cdwriteutils/udftools.xml
===================================================================
--- multimedia/cdwriteutils/udftools.xml	(revision e2952b249855804b951d05b5a699dc201b515ae8)
+++ multimedia/cdwriteutils/udftools.xml	(revision d7ecaa6d999ae2926d87db31c9b2d7f8c6f93121)
@@ -195,5 +195,5 @@
 mount /dev/pktcdvd0 /mnt/cdrom -t udf -o rw,noatime</userinput></screen>
 
-          <para>associates the physical device <filename>/dev/scd0</filename> 
+          <para>associates the physical device <filename>/dev/scd0</filename>
           with the kernel packet driver <filename>/dev/pktcdvd0</filename>, then 
           mounts a UDF formatted CD-RW for read/write access.</para>
Index: multimedia/libdriv/alsa-lib.xml
===================================================================
--- multimedia/libdriv/alsa-lib.xml	(revision e2952b249855804b951d05b5a699dc201b515ae8)
+++ multimedia/libdriv/alsa-lib.xml	(revision d7ecaa6d999ae2926d87db31c9b2d7f8c6f93121)
@@ -68,5 +68,5 @@
 
     <para>In the <quote>Sound</quote> section of the kernel configuration, edit 
-    <emphasis role="bold">Advanced Linux Sound Architecture</emphasis> 
+    <emphasis role="bold">Advanced Linux Sound Architecture</emphasis>
     options to match your audio hardware and disable deprecated 
     <emphasis role="bold">Open Sound System</emphasis>. 
@@ -95,5 +95,5 @@
 
     <para>If you have <application>JACK</application> installed 
-    and you wish to build the <application>JACK</application> 
+    and you wish to build the <application>JACK</application>
     PCM plugin library, run the following commands:</para>
 
Index: multimedia/libdriv/alsa-tools.xml
===================================================================
--- multimedia/libdriv/alsa-tools.xml	(revision e2952b249855804b951d05b5a699dc201b515ae8)
+++ multimedia/libdriv/alsa-tools.xml	(revision d7ecaa6d999ae2926d87db31c9b2d7f8c6f93121)
@@ -79,5 +79,5 @@
     <para>The <application>ALSA Tools</application> package is 
     only needed by those with advanced requirements for their sound card.  The 
-    tools are not all built together, instead you need to <command>cd</command> 
+    tools are not all built together, instead you need to <command>cd</command>
     into the directory of each tool you wish to compile and run the following 
     commands:</para>
Index: multimedia/libdriv/arts.xml
===================================================================
--- multimedia/libdriv/arts.xml	(revision e2952b249855804b951d05b5a699dc201b515ae8)
+++ multimedia/libdriv/arts.xml	(revision d7ecaa6d999ae2926d87db31c9b2d7f8c6f93121)
@@ -28,5 +28,5 @@
   standalone package. The installation instructions for 
   <application>aRts</application> can be found in the 
-  <xref linkend="aRts"/> portion of the <application>KDE</application> 
+  <xref linkend="aRts"/> portion of the <application>KDE</application>
   installation instructions.</para>
 
Index: multimedia/libdriv/esound.xml
===================================================================
--- multimedia/libdriv/esound.xml	(revision e2952b249855804b951d05b5a699dc201b515ae8)
+++ multimedia/libdriv/esound.xml	(revision d7ecaa6d999ae2926d87db31c9b2d7f8c6f93121)
@@ -247,5 +247,5 @@
         <term><filename class='libraryfile'>libesd.[so,a]</filename></term>
         <listitem>
-          <para>contains functions used by the <application>EsounD</application> 
+          <para>contains functions used by the <application>EsounD</application>
           programs as well as other programs to read, write and play various sound 
           format files.</para>
Index: multimedia/libdriv/gst-plugins.xml
===================================================================
--- multimedia/libdriv/gst-plugins.xml	(revision e2952b249855804b951d05b5a699dc201b515ae8)
+++ multimedia/libdriv/gst-plugins.xml	(revision d7ecaa6d999ae2926d87db31c9b2d7f8c6f93121)
@@ -33,5 +33,5 @@
     graphics and multimedia CODEC interface modules for the 
     <application>GStreamer</application> package. There are over 160 different 
-    modules that can be built, providing <application>GStreamer</application> 
+    modules that can be built, providing <application>GStreamer</application>
     the capability to create a pipeline for almost every known media stream.</para>
 
@@ -160,5 +160,5 @@
 
     <para><option>--with-gconf-schema-file-dir=/etc/gnome/gconf/schemas</option>: 
-    Use this option if you have the <application>GNOME-2</application> 
+    Use this option if you have the <application>GNOME-2</application>
     <application>GConf</application> package installed.</para>
 
@@ -181,8 +181,8 @@
     of <application>libmusepack</application> breaks the build.</para>
 
-    <para>Note: all other modules are built if the <command>configure</command> 
+    <para>Note: all other modules are built if the <command>configure</command>
     script discovers the required package. To prevent a module from being built, 
     pass <option>--disable-<replaceable>[module]</replaceable></option> to 
-    <command>configure</command>. Run <command>configure --help</command> 
+    <command>configure</command>. Run <command>configure --help</command>
     for all the available module names.</para>
 
@@ -225,5 +225,5 @@
         <term><command>gst-visualise-0.8</command></term>
         <listitem>
-          <para>is used to run a basic <application>GStreamer</application> 
+          <para>is used to run a basic <application>GStreamer</application>
           pipeline to display a graphical visualisation of an audio stream.</para>
           <indexterm zone="gst-plugins gst-visualise">
Index: multimedia/libdriv/gstreamer.xml
===================================================================
--- multimedia/libdriv/gstreamer.xml	(revision e2952b249855804b951d05b5a699dc201b515ae8)
+++ multimedia/libdriv/gstreamer.xml	(revision d7ecaa6d999ae2926d87db31c9b2d7f8c6f93121)
@@ -106,10 +106,10 @@
     <para><parameter>--localstatedir=/var</parameter>: This switch puts 
     <command>gst-register</command>'s cache in 
-    <filename class="directory">/var/cache/gstreamer-0.8</filename> 
+    <filename class="directory">/var/cache/gstreamer-0.8</filename>
     instead of 
     <filename class="directory">/usr/cache/gstreamer-0.8</filename>.</para>
 
     <para><parameter>--sysconfdir=/etc</parameter>: This switch puts configuration 
-    files in <filename class="directory">/etc</filename> 
+    files in <filename class="directory">/etc</filename>
     instead of <filename class="directory">/usr/etc</filename>.</para>
 
@@ -153,5 +153,5 @@
         <listitem>
           <para>is a utility enabling <command>bash</command> to provide 
-          context sensitive tab completion for <command>gst-launch</command> 
+          context sensitive tab completion for <command>gst-launch</command>
           command lines.</para>
           <indexterm zone="gstreamer gst-complete">
@@ -164,5 +164,5 @@
         <term><command>gst-compprep-0.8</command></term>
         <listitem>
-          <para>builds a registry of <application>GStreamer</application> 
+          <para>builds a registry of <application>GStreamer</application>
           elements and their features that is used by 
           <command>gst-complete</command>.</para>
@@ -176,5 +176,5 @@
         <term><command>gst-feedback-0.8</command></term>
         <listitem>
-          <para>generates debug info for <application>GStreamer</application> 
+          <para>generates debug info for <application>GStreamer</application>
           bug reports.</para>
           <indexterm zone="gstreamer gst-feedback">
@@ -220,5 +220,5 @@
         <term><command>gst-register-0.8</command></term>
         <listitem>
-          <para>is used to register all the <application>GStreamer</application> 
+          <para>is used to register all the <application>GStreamer</application>
           plugins on the system. It creates a listing of their properties so that when a 
           <application>GStreamer</application> based application is started, it 
@@ -234,5 +234,5 @@
         <listitem>
           <para>uses the <application>GStreamer</application> type finding 
-          system to determine the relevant <application>GStreamer</application> 
+          system to determine the relevant <application>GStreamer</application>
           plugin to parse or decode a file, and determine the corresponding 
           MIME type.</para>
@@ -246,5 +246,5 @@
         <term><command>gst-xmlinspect-0.8</command></term>
         <listitem>
-          <para>prints information about a <application>GStreamer</application> 
+          <para>prints information about a <application>GStreamer</application>
           plugin or element in XML document format.</para>
           <indexterm zone="gstreamer gst-xmlinspect">
@@ -257,5 +257,5 @@
         <term><command>gst-xmllaunch-0.8</command></term>
         <listitem>
-          <para>is used to build and run a basic <application>GStreamer</application> 
+          <para>is used to build and run a basic <application>GStreamer</application>
           pipeline, loading it from an XML description.</para>
           <indexterm zone="gstreamer gst-xmllaunch">
Index: multimedia/libdriv/libdriv.xml
===================================================================
--- multimedia/libdriv/libdriv.xml	(revision e2952b249855804b951d05b5a699dc201b515ae8)
+++ multimedia/libdriv/libdriv.xml	(revision d7ecaa6d999ae2926d87db31c9b2d7f8c6f93121)
@@ -17,32 +17,32 @@
   enable it to support certain functionality.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alsa.xml"/> 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alsa-lib.xml"/>  
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alsa-utils.xml"/>  
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alsa-tools.xml"/>  
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alsa-firmware.xml"/>  
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alsa-oss.xml"/>  
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="arts.xml"/> 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="audiofile.xml"/> 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="esound.xml"/> 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sdl.xml"/> 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libao.xml"/> 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libogg.xml"/> 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libvorbis.xml"/> 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="nas.xml"/> 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libmpeg3.xml"/> 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libmad.xml"/> 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="openquicktime.xml"/> 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libfame.xml"/> 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="speex.xml"/> 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="id3lib.xml"/> 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="flac.xml"/> 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libdvdcss.xml"/> 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libdvdread.xml"/> 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libdv.xml"/> 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="liba52.xml"/> 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xvid.xml"/> 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xine-lib.xml"/> 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libmikmod.xml"/> 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alsa.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alsa-lib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alsa-utils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alsa-tools.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alsa-firmware.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alsa-oss.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="arts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="audiofile.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="esound.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sdl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libao.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libogg.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libvorbis.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="nas.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libmpeg3.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libmad.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="openquicktime.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libfame.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="speex.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="id3lib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="flac.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libdvdcss.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libdvdread.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libdv.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="liba52.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xvid.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xine-lib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libmikmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gstreamer.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gst-plugins.xml"/>
Index: multimedia/libdriv/libdv.xml
===================================================================
--- multimedia/libdriv/libdv.xml	(revision e2952b249855804b951d05b5a699dc201b515ae8)
+++ multimedia/libdriv/libdv.xml	(revision d7ecaa6d999ae2926d87db31c9b2d7f8c6f93121)
@@ -81,5 +81,5 @@
     <note>
       <para>The <command>configure</command> check for 
-      <application>GTK+</application> is broken. If <application>GTK+</application> 
+      <application>GTK+</application> is broken. If <application>GTK+</application>
       is not installed, also pass <option>--disable-gtk</option> to the 
       <command>configure</command> script.</para>
Index: multimedia/libdriv/libvorbis.xml
===================================================================
--- multimedia/libdriv/libvorbis.xml	(revision e2952b249855804b951d05b5a699dc201b515ae8)
+++ multimedia/libdriv/libvorbis.xml	(revision d7ecaa6d999ae2926d87db31c9b2d7f8c6f93121)
@@ -64,5 +64,5 @@
     <para><xref linkend="pkgconfig"/>, and 
     <xref linkend="libxslt"/> and 
-    <ulink url="http://www.tei-c.org/Software/passivetex/">PassiveTeX</ulink> 
+    <ulink url="http://www.tei-c.org/Software/passivetex/">PassiveTeX</ulink>
     (to build the PDF documentation)</para>
 
Index: multimedia/libdriv/nas.xml
===================================================================
--- multimedia/libdriv/nas.xml	(revision e2952b249855804b951d05b5a699dc201b515ae8)
+++ multimedia/libdriv/nas.xml	(revision d7ecaa6d999ae2926d87db31c9b2d7f8c6f93121)
@@ -96,5 +96,5 @@
 
     <para><command>xmkmf</command>; <command>make World</command>: 
-    These commands use the standard for compiling <application>X</application> 
+    These commands use the standard for compiling <application>X</application>
     based applications.</para>
 
Index: multimedia/libdriv/sdl.xml
===================================================================
--- multimedia/libdriv/sdl.xml	(revision e2952b249855804b951d05b5a699dc201b515ae8)
+++ multimedia/libdriv/sdl.xml	(revision d7ecaa6d999ae2926d87db31c9b2d7f8c6f93121)
@@ -30,5 +30,5 @@
     <title>Introduction to SDL</title>
 
-    <para>The Simple DirectMedia Layer (<application>SDL</application> 
+    <para>The Simple DirectMedia Layer (<application>SDL</application>
     for short) is a cross-platform library designed to make it easy to write 
     multimedia software, such as games and emulators.</para>
@@ -140,5 +140,5 @@
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
-   
+
       <seglistitem>
         <seg>sdl-config</seg>
@@ -147,10 +147,10 @@
       </seglistitem>
     </segmentedlist>
-    
+
     <variablelist>
       <bridgehead renderas="sect3">Short Descriptions</bridgehead>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-      
+
       <varlistentry id="sdl-config">
         <term><command>sdl-config</command></term>
@@ -176,5 +176,5 @@
         </listitem>
       </varlistentry>
- 
+
     </variablelist>
 
Index: multimedia/videoutils/avifile.xml
===================================================================
--- multimedia/videoutils/avifile.xml	(revision e2952b249855804b951d05b5a699dc201b515ae8)
+++ multimedia/videoutils/avifile.xml	(revision d7ecaa6d999ae2926d87db31c9b2d7f8c6f93121)
@@ -255,5 +255,5 @@
         <term><command>kv41setup</command></term>
         <listitem>
-          <para>is a small tool which tells <application>video4linux</application> 
+          <para>is a small tool which tells <application>video4linux</application>
           about the current video mode.</para>
           <indexterm zone="avifile kv41setup">
Index: multimedia/videoutils/ffmpeg.xml
===================================================================
--- multimedia/videoutils/ffmpeg.xml	(revision e2952b249855804b951d05b5a699dc201b515ae8)
+++ multimedia/videoutils/ffmpeg.xml	(revision d7ecaa6d999ae2926d87db31c9b2d7f8c6f93121)
@@ -227,5 +227,5 @@
         <term><filename class='libraryfile'>libavcodec.so</filename></term>
         <listitem>
-          <para>is a library containing the <application>FFmpeg</application> 
+          <para>is a library containing the <application>FFmpeg</application>
           codecs (both encoding and decoding).</para>
           <indexterm zone="ffmpeg libavcodec">
Index: multimedia/videoutils/mplayer.xml
===================================================================
--- multimedia/videoutils/mplayer.xml	(revision e2952b249855804b951d05b5a699dc201b515ae8)
+++ multimedia/videoutils/mplayer.xml	(revision d7ecaa6d999ae2926d87db31c9b2d7f8c6f93121)
@@ -78,5 +78,5 @@
 
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    
+
     <itemizedlist spacing='compact'>
       <title>Patches</title>
@@ -146,5 +146,5 @@
 
     <bridgehead renderas="sect3">MPlayer Dependencies</bridgehead>
-    
+
     <bridgehead renderas="sect4">Optional Input Drivers and Libraries</bridgehead>
     <para><xref linkend="cdparanoia"/>, 
@@ -153,10 +153,10 @@
     <xref linkend="samba3"/>, 
     <ulink url="http://www.live.com/mplayer/">LIVE.COM Streaming Media</ulink>, 
-    <ulink url="http://www.matroska.org/downloads/linux.html">libmatroska</ulink> 
+    <ulink url="http://www.matroska.org/downloads/linux.html">libmatroska</ulink>
     (requires 
     <ulink url="http://dl.matroska.org/downloads/libebml/">libebml</ulink>), 
-    <ulink url="http://www.linuxtv.org/">DVB drivers</ulink> 
+    <ulink url="http://www.linuxtv.org/">DVB drivers</ulink>
     and <ulink url="http://www.metzlerbros.org/dvb/">DVB</ulink></para>
-    
+
     <bridgehead renderas="sect4">Optional Audio Output Drivers and Libraries</bridgehead>
     <para><xref linkend="alsa"/>, 
@@ -169,5 +169,5 @@
     <ulink url="http://bio2jack.sourceforge.net/">bio2jack</ulink> (requires 
     <ulink url="http://jackit.sourceforge.net/">JACK</ulink>)</para>
-    
+
     <bridgehead renderas="sect4">Optional Video Output Drivers and Libraries</bridgehead>
     <para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>), 
@@ -189,5 +189,5 @@
     <ulink url="http://freedesktop.org/Software/FriBidi">FriBidi</ulink> and 
     <ulink url="http://trific.ath.cx/software/enca/">Enca</ulink></para>
-    
+
     <bridgehead renderas="sect4">Optional CODECs</bridgehead>
     <para><xref linkend="libvorbis"/>, 
@@ -202,5 +202,5 @@
     <ulink url="http://www.divx.com/divx/linux/">DivX4Linux</ulink>, 
     <ulink url="http://sourceforge.net/projects/toolame">TooLAME</ulink>, 
-    <ulink url="http://www.dolda2000.cjb.net/~fredrik/lirccd/">lirccd</ulink> 
+    <ulink url="http://www.dolda2000.cjb.net/~fredrik/lirccd/">lirccd</ulink>
     and <ulink url="http://www.lirc.org/">LIRC</ulink></para>
 
@@ -215,5 +215,5 @@
       <para>If you downloaded any proprietary CODECs (which can provide support 
       for additional audio and video formats such as Real, Indeo and QuickTime), 
-      extract them to <filename class="directory">/usr/lib/mplayer/codecs</filename> 
+      extract them to <filename class="directory">/usr/lib/mplayer/codecs</filename>
       using the following commands as the <systemitem 
       class="username">root</systemitem> user (substitute and/or add different 
@@ -226,5 +226,5 @@
 
       <para>If you installed any CODECs, ensure you add 
-      <option>--with-codecsdir=/usr/lib/mplayer/codecs</option> 
+      <option>--with-codecsdir=/usr/lib/mplayer/codecs</option>
       to the <command>configure</command> script.</para>
 
@@ -236,5 +236,5 @@
       <para>To enable building the GUI version of 
       <application>MPlayer</application> (requires <xref linkend="GTK"/>), add 
-      <option>--enable-gui</option> to the <command>configure</command> 
+      <option>--enable-gui</option> to the <command>configure</command>
       script. You'll also need to extract at least one skin. Extract the desired 
       skin and create the default location (as the <systemitem 
@@ -254,5 +254,5 @@
 
       <para>To enable OSD (On Screen Display) and subtitles support, add 
-      <option>--enable-menu</option> to the <command>configure</command> 
+      <option>--enable-menu</option> to the <command>configure</command>
       script. You'll also need to set up at least one font (see font installation 
       instructions a little later).</para>
@@ -270,8 +270,8 @@
       <para><application>MPlayer</application> can build a shared post-processing 
       library from the internal <application>FFmpeg</application> package which 
-      other packages can link to. This requires <application>MPlayer</application> 
+      other packages can link to. This requires <application>MPlayer</application>
       to link dynamically to this library instead of the default statically linked method. 
-      If you desire to build the shared library, add <option>--enable-shared-pp</option> 
-      and <option>--disable-fastmemcpy</option> to the <command>configure</command> 
+      If you desire to build the shared library, add <option>--enable-shared-pp</option>
+      and <option>--disable-fastmemcpy</option> to the <command>configure</command>
       script. The <option>--disable-fastmemcpy</option> parameter is required to 
       avoid <computeroutput>undefined reference</computeroutput> errors when other 
@@ -367,7 +367,7 @@
 <screen role="root"><userinput>cat &gt;&gt; /etc/udev/rules.d/24-dvd.rules &lt;&lt; "EOF"
 <literal># Create a /dev/dvd symlink 
- 
+
 KERNEL="<replaceable>[dvd drive]</replaceable>", SYMLINK="dvd"</literal>
- 
+
 EOF
 udevstart</userinput></screen>
@@ -483,5 +483,5 @@
         <term><command>mencoder</command></term>
         <listitem>
-          <para>is used to encode any <application>MPlayer</application> 
+          <para>is used to encode any <application>MPlayer</application>
           playable movie to DivX4, <application>XviD</application> or any 
           CODEC in <filename class='libraryfile'>libavcodec</filename> with
Index: multimedia/videoutils/videoutils.xml
===================================================================
--- multimedia/videoutils/videoutils.xml	(revision e2952b249855804b951d05b5a699dc201b515ae8)
+++ multimedia/videoutils/videoutils.xml	(revision d7ecaa6d999ae2926d87db31c9b2d7f8c6f93121)
@@ -18,9 +18,9 @@
   CODEC to install.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ffmpeg.xml"/>  
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="avifile.xml"/>  
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mplayer.xml"/>  
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xine-ui.xml"/>  
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="transcode.xml"/>  
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ffmpeg.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="avifile.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mplayer.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xine-ui.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="transcode.xml"/>
 
 </chapter>
Index: multimedia/videoutils/xine-ui.xml
===================================================================
--- multimedia/videoutils/xine-ui.xml	(revision e2952b249855804b951d05b5a699dc201b515ae8)
+++ multimedia/videoutils/xine-ui.xml	(revision d7ecaa6d999ae2926d87db31c9b2d7f8c6f93121)
@@ -86,5 +86,5 @@
 
 <!-- 
-    <para>Apply the following patch if you have <application>cURL</application> 
+    <para>Apply the following patch if you have <application>cURL</application>
     installed and you wish to utilize it:</para>
 
