Index: multimedia/cdwriteutils/cdrdao.xml
===================================================================
--- multimedia/cdwriteutils/cdrdao.xml	(revision d7ecaa6d999ae2926d87db31c9b2d7f8c6f93121)
+++ multimedia/cdwriteutils/cdrdao.xml	(revision abf7c00fbee9b91b3310f92eb14aa1fd69ca500a)
@@ -31,5 +31,5 @@
 
     <para>The <application>Cdrdao</application> package contains
-    CD recording utilities. These are useful for burning a 
+    CD recording utilities. These are useful for burning a
     CD in disk-at-once mode.</para>
 
@@ -59,13 +59,13 @@
     <itemizedlist spacing='compact'>
       <listitem>
-        <para>Required patch (if building <command>gcdmaster</command>): 
+        <para>Required patch (if building <command>gcdmaster</command>):
         <ulink url="&patch-root;/cdrdao-&cdrdao-version;-gcc34-1.patch"/></para>
       </listitem>
       <listitem>
-        <para>Required patch (if building <command>gcdmaster</command>): 
+        <para>Required patch (if building <command>gcdmaster</command>):
         <ulink url="&patch-root;/libglademm-2.2.0-gcc34-1.patch"/></para>
       </listitem>
       <listitem>
-        <para>Required patch (if building <command>gcdmaster</command>): 
+        <para>Required patch (if building <command>gcdmaster</command>):
         <ulink url="&patch-root;/libgnomecanvasmm-2.0.2-gcc34-1.patch"/></para>
       </listitem>
@@ -75,6 +75,6 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="lame"/> (required to build 
-    <command>toc2mp3</command>) and 
+    <para><xref linkend="lame"/> (required to build
+    <command>toc2mp3</command>) and
     <ulink url="http://www.polhode.com/pccts.html">PCCTS</ulink></para>
 
@@ -82,15 +82,15 @@
     Program)</bridgehead>
 
-    <para><emphasis>Note: all the following packages must be built in 
+    <para><emphasis>Note: all the following packages must be built in
     the order listed.</emphasis></para>
 
-    <para><xref linkend="libgnomeui"/>, 
+    <para><xref linkend="libgnomeui"/>,
     <ulink url="http://ftp.gnome.org/pub/GNOME/sources/libsigc++/1.2/">
-    libsigc++-1.2.5</ulink>, 
-    <ulink url="http://www.gtkmm.org/">gtkmm-2.2.12</ulink>, 
-    <ulink url="http://www.gtkmm.org/">libglademm-2.2.0</ulink>, 
-    <ulink url="http://www.gtkmm.org/">libgnomecanvasmm-2.0.2</ulink>, 
-    <ulink url="http://www.gtkmm.org/">gconfmm-2.0.2</ulink>, 
-    <ulink url="http://www.gtkmm.org/">libgnomemm-2.0.1</ulink> and 
+    libsigc++-1.2.5</ulink>,
+    <ulink url="http://www.gtkmm.org/">gtkmm-2.2.12</ulink>,
+    <ulink url="http://www.gtkmm.org/">libglademm-2.2.0</ulink>,
+    <ulink url="http://www.gtkmm.org/">libgnomecanvasmm-2.0.2</ulink>,
+    <ulink url="http://www.gtkmm.org/">gconfmm-2.0.2</ulink>,
+    <ulink url="http://www.gtkmm.org/">libgnomemm-2.0.1</ulink> and
     <ulink url="http://www.gtkmm.org/">libgnomeuimm-2.0.0</ulink></para>
 
@@ -100,5 +100,5 @@
     <title>Installation of Cdrdao</title>
 
-    <para>Install <application>Cdrdao</application> by running the following 
+    <para>Install <application>Cdrdao</application> by running the following
     commands:</para>
 
@@ -122,5 +122,5 @@
 
       <seglistitem>
-        <seg>cdrdao, cue2toc, toc2cddb, toc2cue and optionally, gcdmaster, and 
+        <seg>cdrdao, cue2toc, toc2cddb, toc2cue and optionally, gcdmaster, and
         toc2mp3</seg>
         <seg>None</seg>
@@ -137,5 +137,5 @@
         <term><command>cdrdao</command></term>
         <listitem>
-          <para>records audio or data CD-Rs in disk-at-once (DAO) mode 
+          <para>records audio or data CD-Rs in disk-at-once (DAO) mode
           based on a textual description of the CD contents.</para>
           <indexterm zone="cdrdao cdrdao-prog">
@@ -158,5 +158,5 @@
         <term><command>gcdmaster</command></term>
         <listitem>
-          <para>is a graphical front end to <command>cdrdao</command> for 
+          <para>is a graphical front end to <command>cdrdao</command> for
           composing audio CDs.</para>
           <indexterm zone="cdrdao gcdmaster">
@@ -190,5 +190,5 @@
         <term><command>toc2mp3</command></term>
         <listitem>
-          <para>converts an audio CD disk image (<filename>.toc</filename> file) 
+          <para>converts an audio CD disk image (<filename>.toc</filename> file)
           to MP3 files (requires <xref linkend="lame"/> to build).</para>
           <indexterm zone="cdrdao toc2mp3">
Index: multimedia/cdwriteutils/cdwriteutils.xml
===================================================================
--- multimedia/cdwriteutils/cdwriteutils.xml	(revision d7ecaa6d999ae2926d87db31c9b2d7f8c6f93121)
+++ multimedia/cdwriteutils/cdwriteutils.xml	(revision abf7c00fbee9b91b3310f92eb14aa1fd69ca500a)
@@ -19,5 +19,5 @@
     <listitem>
       <para><ulink
-      url="http://www.tldp.org/HOWTO/CD-Writing-HOWTO.html">CD-Writing 
+      url="http://www.tldp.org/HOWTO/CD-Writing-HOWTO.html">CD-Writing
       HOWTO</ulink></para>
     </listitem>
Index: multimedia/cdwriteutils/udftools.xml
===================================================================
--- multimedia/cdwriteutils/udftools.xml	(revision d7ecaa6d999ae2926d87db31c9b2d7f8c6f93121)
+++ multimedia/cdwriteutils/udftools.xml	(revision abf7c00fbee9b91b3310f92eb14aa1fd69ca500a)
@@ -30,9 +30,9 @@
     <title>Introduction to UDFtools</title>
 
-    <para>The <application>UDFtools</application> package contains utilities 
+    <para>The <application>UDFtools</application> package contains utilities
     for creating and mounting CD-RW disks with UDF file systems for both
     reading and writing. UDF files systems are used on both CD-RW media and
     on DVD.  For more details of the UDF file system standard see:
-    <ulink url="http://www.osta.org"/> and 
+    <ulink url="http://www.osta.org"/> and
     <ulink url="http://www.ecma-international.org"/>.</para>
 
@@ -81,6 +81,6 @@
 
     <warning>
-      <para>Note that this patch can permanently damage your CD 
-      drive if it is from one of the few mentioned at 
+      <para>Note that this patch can permanently damage your CD
+      drive if it is from one of the few mentioned at
       <ulink url="http://slashdot.org/article.pl?sid=03/10/25/1737244"/>. Do
       not apply the patch without first checking out the article.</para>
@@ -122,5 +122,5 @@
     <title>Installation of UDFtools</title>
 
-    <para>Install <application>UDFtools</application> by 
+    <para>Install <application>UDFtools</application> by
     running the following commands:</para>
 
@@ -158,5 +158,5 @@
         <term><command>cdrwtool</command></term>
         <listitem>
-          <para> provides facilities to manage CD-RW drives, including formatting 
+          <para> provides facilities to manage CD-RW drives, including formatting
           new disks, setting the read and write speeds, etc.</para>
 
@@ -176,5 +176,5 @@
         <term><command>mkudffs</command></term>
         <listitem>
-          <para>is used to create new UDF file systems. It can be used on 
+          <para>is used to create new UDF file systems. It can be used on
           hard disks and CD-Rs as well as CD-RWs.</para>
           <indexterm zone="udftools mkudffs">
@@ -187,5 +187,5 @@
         <term><command>pktsetup</command></term>
         <listitem>
-          <para>is used to establish and break down associations between the 
+          <para>is used to establish and break down associations between the
           kernel packet driver and a physical drive.</para>
 
@@ -196,5 +196,5 @@
 
           <para>associates the physical device <filename>/dev/scd0</filename>
-          with the kernel packet driver <filename>/dev/pktcdvd0</filename>, then 
+          with the kernel packet driver <filename>/dev/pktcdvd0</filename>, then
           mounts a UDF formatted CD-RW for read/write access.</para>
           <indexterm zone="udftools pktsetup">
@@ -207,5 +207,5 @@
         <term><command>udffsck</command></term>
         <listitem>
-          <para>is used to check the integrity and correct errors on 
+          <para>is used to check the integrity and correct errors on
           UDF filesystems.</para>
           <indexterm zone="udftools udffsck">
@@ -228,5 +228,5 @@
         <term><filename class='libraryfile'>libudffs.a</filename></term>
         <listitem>
-          <para>contains functions used by the 
+          <para>contains functions used by the
           <application>UDFtools</application> programs.</para>
           <indexterm zone="udftools libudffs">
