Index: multimedia/audioutils/cdparanoia.xml
===================================================================
--- multimedia/audioutils/cdparanoia.xml	(revision 71b1a03cb2879f5902501add1f155fb953814374)
+++ multimedia/audioutils/cdparanoia.xml	(revision bbc58b83f991eaa33d4f60136fe942db8b3eaa8c)
@@ -13,122 +13,149 @@
 
 <sect1 id="cdparanoia" xreflabel="CDParanoia-&CDParanoia-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="cdparanoia.html"?>
-<title>CDParanoia-&CDParanoia-version;</title>
-<indexterm zone="cdparanoia">
-<primary sortas="a-CDParanoia">CDParanoia</primary></indexterm>
+  <?dbhtml filename="cdparanoia.html"?>
 
-<sect2>
-<title>Introduction to <application>CDParanoia</application></title>
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
 
-<para>The <application>CDParanoia</application> package contains a 
-<acronym>CD</acronym> audio exraction tool. This is useful for extracting 
-<filename>.wav</filename> files from audio <acronym>CD</acronym>s.  A 
-<acronym>CDDA</acronym> capable <acronym>CDROM</acronym> drive is needed. 
-Practically all drives supported by Linux can be used.</para>
+  <title>CDParanoia-&CDParanoia-version;</title>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&CDParanoia-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&CDParanoia-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &CDParanoia-md5sum;</para></listitem>
-<listitem><para>Download size: &CDParanoia-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&CDParanoia-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&CDParanoia-time;</para></listitem></itemizedlist>
-</sect3>
+  <indexterm zone="cdparanoia">
+    <primary sortas="a-CDParanoia">CDParanoia</primary>
+  </indexterm>
 
-<sect3><title>Additional downloads</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Required Patch: <ulink 
-url="&patch-root;/cdparanoia-III-alpha9.8-includes-1.patch"/></para>
-</listitem>
-<listitem><para>Required Patch: <ulink 
-url="&patch-root;/cdparanoia-III-alpha9.8-gcc34-1.patch"/></para>
-</listitem></itemizedlist>
-</sect3>
+  <sect2 role="package">
+    <title>Introduction to CDParanoia</title>
 
-</sect2>
+    <para>The <application>CDParanoia</application> package contains a CD 
+    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>
 
-<sect2>
-<title>Installation of <application>CDParanoia</application></title>
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&CDParanoia-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&CDParanoia-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &CDParanoia-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &CDParanoia-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &CDParanoia-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &CDParanoia-time;</para>
+      </listitem>
+    </itemizedlist>
 
-<para>Install <application>CDParanoia</application> by running the following 
-commands:</para>
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Required Patch: <ulink 
+        url="&patch-root;/cdparanoia-III-alpha9.8-includes-1.patch"/></para>
+      </listitem>
+      <listitem>
+        <para>Required Patch: <ulink 
+        url="&patch-root;/cdparanoia-III-alpha9.8-gcc34-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
 
-<screen><userinput><command>patch -Np1 -i ../cdparanoia-III-alpha9.8-includes-1.patch &amp;&amp;
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of CDParanoia</title>
+
+    <para>Install <application>CDParanoia</application> by running the following 
+    commands:</para>
+
+<screen><userinput>patch -Np1 -i ../cdparanoia-III-alpha9.8-includes-1.patch &amp;&amp;
 patch -Np1 -i ../cdparanoia-III-alpha9.8-gcc34-1.patch &amp;&amp;
 ./configure --prefix=/usr &amp;&amp;
-make</command></userinput></screen>
+make</userinput></screen>
 
-<para>Now, as the root user:</para>
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen><userinput role='root'><command>make install &amp;&amp;
-chmod 755 /usr/lib/libcdda_*.so.0.9.8</command></userinput></screen>
+<screen role="root"><userinput>make install &amp;&amp;
+chmod -v 755 /usr/lib/libcdda_*.so.0.9.8</userinput></screen>
 
-</sect2>
+  </sect2>
 
-<sect2>
-<title>Configuring <application>CDParanoia</application></title>
+  <sect2 role="configuration">
+    <title>Configuring CDParanoia</title>
 
-<sect3><title>Configuration Information</title>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../../lib-config.xml"/> 
-</sect3>
+    <sect3>
+      <title>Configuration Information</title>
 
-</sect2>
+      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../../lib-config.xml"/> 
 
-<sect2>
-<title>Contents</title>
+    </sect3>
 
-<segmentedlist>
-<segtitle>Installed Program</segtitle>
-<segtitle>Installed Libraries</segtitle>
-<seglistitem>
-<seg>cdparanoia</seg>
-<seg>libcdda_interface.[so,a] and libcdda_paranoia.[so,a]</seg>
-</seglistitem>
-</segmentedlist>
+  </sect2>
 
-<variablelist>
-<bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
+  <sect2 role="content">
+    <title>Contents</title>
 
-<varlistentry id="cdparanoia-prog">
-<term><command>cdparanoia</command></term>
-<listitem><para>is used for 'ripping' an audio-cd. Ripping is the process of 
-digitally extracting music from an audio-cd.</para>
-<indexterm zone="cdparanoia cdparanoia-prog">
-<primary sortas="b-cdparanoia">cdparanoia</primary></indexterm>
-</listitem>
-</varlistentry>
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
-<varlistentry id="libcdda_interface">
-<term><filename class='libraryfile'>libcdda_interface.[so,a]</filename></term>
-<listitem><para>contains functions used by <command>cdparanoia</command>, as 
-well as other packages, which can automatically identify if a 
-<acronym>CD</acronym> device is <acronym>CDDA</acronym> compatible.</para>
-<indexterm zone="cdparanoia libcdda_interface">
-<primary sortas="c-libcdda_interface">libcdda_interface.[so,a]</primary>
-</indexterm></listitem>
-</varlistentry>
+      <seglistitem>
+        <seg>cdparanoia</seg>
+        <seg>libcdda_interface.[so,a] and libcdda_paranoia.[so,a]</seg>
+        <seg>None</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<varlistentry id="libcdda_paranoia">
-<term><filename class='libraryfile'>libcdda_paranoia.[so,a]</filename></term>
-<listitem><para>contains functions used by <command>cdparanoia</command>, as 
-well as other packages, which provide data verification, synchronization, 
-error handling and scratch reconstruction capability.</para>
-<indexterm zone="cdparanoia libcdda_paranoia">
-<primary sortas="c-libcdda_paranoia">libcdda_paranoia.[so,a]</primary>
-</indexterm></listitem>
-</varlistentry>
-</variablelist>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
 
-</sect2>
+      <varlistentry id="cdparanoia-prog">
+        <term><command>cdparanoia</command></term>
+        <listitem>
+          <para>is used for 'ripping' an audio-cd. Ripping is the process of 
+          digitally extracting music from an audio-cd.</para>
+          <indexterm zone="cdparanoia cdparanoia-prog">
+            <primary sortas="b-cdparanoia">cdparanoia</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libcdda_interface">
+        <term><filename class='libraryfile'>libcdda_interface.[so,a]</filename></term>
+        <listitem>
+          <para>contains functions used by <command>cdparanoia</command>, as 
+          well as other packages, which can automatically identify if a 
+          CD device is CDDA compatible.</para>
+          <indexterm zone="cdparanoia libcdda_interface">
+            <primary sortas="c-libcdda_interface">libcdda_interface.[so,a]</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libcdda_paranoia">
+        <term><filename class='libraryfile'>libcdda_paranoia.[so,a]</filename></term>
+        <listitem>
+          <para>contains functions used by <command>cdparanoia</command>, as 
+          well as other packages, which provide data verification, synchronization, 
+          error handling and scratch reconstruction capability.</para>
+          <indexterm zone="cdparanoia libcdda_paranoia">
+            <primary sortas="c-libcdda_paranoia">libcdda_paranoia.[so,a]</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
 
 </sect1>
