Index: kde/add/kdeartwork.xml
===================================================================
--- kde/add/kdeartwork.xml	(revision 4f43b3712603db26e12905669711782873844735)
+++ kde/add/kdeartwork.xml	(revision c26750e1a76446edde5f4765ad5619ac8f7d93d6)
@@ -7,92 +7,103 @@
 <!ENTITY kdeartwork-download-http "&kde-download-http;/kdeartwork-&kde-version;.tar.bz2">
 <!ENTITY kdeartwork-download-ftp  "&kde-download-ftp;/kdeartwork-&kde-version;.tar.bz2">
-<!ENTITY kdeartwork-md5sum        "9a712da253bacb87e0d4fd28cec183a1">
-<!ENTITY kdeartwork-size          "17.9 MB">
-<!ENTITY kdeartwork-buildsize     "105 MB">
-<!ENTITY kdeartwork-time          "1.96 SBU">
+<!ENTITY kdeartwork-md5sum        "89df94d9e6c63887e5a66312b6514d0d">
+<!ENTITY kdeartwork-size          "17.3 MB">
+<!ENTITY kdeartwork-buildsize     "104 MB">
+<!ENTITY kdeartwork-time          "1.5 SBU">
 ]>
 
-<sect1 id="kdeartwork">
-<sect1info>
-  <othername>$LastChangedBy$</othername>
-  <date>$Date$</date>
-</sect1info>
+<sect1 id="kdeartwork" xreflabel="kdeartwork-&kde-version;">
+  <?dbhtml filename="kdeartwork.html"?>
 
-<?dbhtml filename="kdeartwork.html"?>
-<title><application>kdeartwork</application>-&kde-version;</title>
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
 
-<indexterm zone="kdeartwork">
-  <primary sortas="a-kdeartwork">Kdeartwork</primary>
-</indexterm>
+  <title>kdeartwork-&kde-version;</title>
 
-<sect2>
-<title>Introduction to <application>kdeartwork</application></title>
+  <indexterm zone="kdeartwork">
+    <primary sortas="a-kdeartwork">Kdeartwork</primary>
+  </indexterm>
 
-<sect3><title>Package information</title>
-  <itemizedlist spacing='compact'>
-    <listitem><para>Download (HTTP): <ulink url="&kdeartwork-download-http;"/></para></listitem>
-    <listitem><para>Download (FTP): <ulink url="&kdeartwork-download-ftp;"/></para></listitem>
-    <listitem><para>Download MD5 sum: &kdeartwork-md5sum;</para></listitem>
-    <listitem><para>Download size: &kdeartwork-size;</para></listitem>
-    <listitem><para>Estimated disk space required: &kdeartwork-buildsize;</para></listitem>
-    <listitem><para>Estimated build time: &kdeartwork-time;</para></listitem>
-  </itemizedlist>
-</sect3>
+  <sect2>
+    <title>Introduction to kdeartwork</title>
 
-<sect3>
-  <title><application>kdeartwork</application> dependencies</title>
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Download (HTTP): <ulink url="&kdeartwork-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&kdeartwork-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &kdeartwork-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &kdeartwork-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &kdeartwork-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &kdeartwork-time;</para>
+      </listitem>
+    </itemizedlist>
 
-<sect4>
-  <title>Required</title>
-  <para><xref linkend="kdebase"/></para>
-</sect4>
+    <bridgehead renderas="sect3">kdeartwork Dependencies</bridgehead>
 
-<sect4>
-  <title>Recommended</title>
-  <para><xref linkend="libjpeg"/>, 
-        <xref linkend="libxml2"/>, and 
-        <xref linkend="libart_lgpl"/>
-  </para>
-</sect4>
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para><xref linkend="kdebase"/></para>
 
-<sect4>
-  <title>Optional</title>
-  <para><xref linkend="xscreensaver"/></para>
-</sect4>
-</sect3>
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para><xref linkend="libjpeg"/>, 
+          <xref linkend="libxml2"/>, and 
+          <xref linkend="libart_lgpl"/>
+    </para>
 
-</sect2>
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para><xref linkend="xscreensaver"/></para>
 
-<sect2>
-<title>Installation of <application>kdeartwork</application></title>
+  </sect2>
 
-<para>Install <application>kdeartwork</application> with:</para>
+  <sect2 role="installation">
+    <title>Installation of kdeartwork</title>
 
-<screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
+    <para>Install <application>kdeartwork</application> with:</para>
+
+<screen><userinput>./configure --prefix=&kde-dir; --disable-debug \
     --disable-dependency-tracking &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 role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Objects</segtitle>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
  
-<screen><userinput role='root'><command>make install</command></userinput></screen>
+      <seglistitem>
+        <seg>additional themes, screensavers, sounds, backgrounds, and 
+          widget styles for <acronym>KDE</acronym></seg>
+        <seg>None</seg>
+        <seg>None</seg>
+        <seg>None</seg>
+      </seglistitem>
+    </segmentedlist>
+ 
+    <indexterm zone="kdeartwork">
+      <primary sortas="g-kdeartwork">KDE Artwork</primary>
+    </indexterm>
 
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<segmentedlist>
-  <segtitle>Installed Objects</segtitle>
- 
-  <seglistitem>
-    <seg>  additional themes, screensavers, sounds, backgrounds, and widget styles for <acronym>KDE</acronym></seg>
-  </seglistitem>
-</segmentedlist>
- 
-<indexterm zone="kdeartwork">
-  <primary sortas="g-kdeartwork">KDE Artwork</primary>
-</indexterm>
-
-</sect2>
+  </sect2>
 
 </sect1>
Index: kde/add/kdemultimedia.xml
===================================================================
--- kde/add/kdemultimedia.xml	(revision 4f43b3712603db26e12905669711782873844735)
+++ kde/add/kdemultimedia.xml	(revision c26750e1a76446edde5f4765ad5619ac8f7d93d6)
@@ -7,57 +7,62 @@
 <!ENTITY kdemultimedia-download-http "&kde-download-http;/kdemultimedia-&kde-version;.tar.bz2">
 <!ENTITY kdemultimedia-download-ftp  "&kde-download-ftp;/kdemultimedia-&kde-version;.tar.bz2">
-<!ENTITY kdemultimedia-md5sum        "2f393da809542dab5bf75bf7a91d1ec0">
+<!ENTITY kdemultimedia-md5sum        "4e42790bbea7c4ac0c436da3c7c664ac">
 <!ENTITY kdemultimedia-size          "5.3 MB">
-<!ENTITY kdemultimedia-buildsize     "124 MB">
-<!ENTITY kdemultimedia-time          "13.17 SBU">
+<!ENTITY kdemultimedia-buildsize     "126 MB">
+<!ENTITY kdemultimedia-time          "11.5 SBU">
 ]>
 
 <sect1 id="kdemultimedia" xreflabel="kdemultimedia-&kde-version;">
-
-<sect1info>
-  <othername>$LastChangedBy$</othername>
-  <date>$Date$</date>
-</sect1info>
-
-<?dbhtml filename="kdemultimedia.html"?>
-<title><application>kdemultimedia</application>-&kde-version;</title>
-
-<indexterm zone="kdemultimedia">
-  <primary sortas="a-kdemultimedia">Kdemultimedia</primary>
-</indexterm>
-
-<sect2>
-<title>Introduction to <application>kdemultimedia</application></title>
-
-<sect3>
-  <title>Package information</title>
+  <?dbhtml filename="kdemultimedia.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>kdemultimedia-&kde-version;</title>
+
+  <indexterm zone="kdemultimedia">
+    <primary sortas="a-kdemultimedia">Kdemultimedia</primary>
+  </indexterm>
+
+  <sect2 role="package">
+  <title>Introduction to kdemultimedia</title>
+
+  <bridgehead renderas="sect3">Package Information</bridgehead>
   <itemizedlist spacing='compact'>
-    <listitem><para>Download (HTTP): <ulink url="&kdemultimedia-download-http;"/></para></listitem>
-    <listitem><para>Download (FTP): <ulink url="&kdemultimedia-download-ftp;"/></para></listitem>
-    <listitem><para>Download MD5 sum: &kdemultimedia-md5sum;</para></listitem>
-    <listitem><para>Download size: &kdemultimedia-size;</para></listitem>
-    <listitem><para>Estimated disk space required: &kdemultimedia-buildsize;</para></listitem>
-    <listitem><para>Estimated build time: &kdemultimedia-time;</para></listitem>
+    <listitem>
+      <para>Download (HTTP): <ulink url="&kdemultimedia-download-http;"/></para>
+    </listitem>
+    <listitem>
+      <para>Download (FTP): <ulink url="&kdemultimedia-download-ftp;"/></para>
+    </listitem>
+    <listitem>
+      <para>Download MD5 sum: &kdemultimedia-md5sum;</para>
+    </listitem>
+    <listitem>
+      <para>Download size: &kdemultimedia-size;</para>
+    </listitem>
+    <listitem>
+      <para>Estimated disk space required: &kdemultimedia-buildsize;</para>
+    </listitem>
+    <listitem>
+      <para>Estimated build time: &kdemultimedia-time;</para>
+    </listitem>
   </itemizedlist>
-</sect3>
-
-<sect3>
-<title><application>kdemultimedia</application> dependencies</title>
-
-<sect4><title>Required</title>
+
+  <bridgehead renderas="sect3">kdemultimedia Dependencies</bridgehead>
+
+  <bridgehead renderas="sect4">Required</bridgehead>
   <para><xref linkend="kdebase"/></para>
-</sect4>
-
-<sect4>
-  <title>Recommended</title>
+
+  <bridgehead renderas="sect4">Recommended</bridgehead>
   <para><xref linkend="libjpeg"/>, 
         <xref linkend="libxml2"/>, 
-        <xref linkend="alsa"/> and 
+        <xref linkend="alsa"/>, and 
         <xref linkend="libmad"/>
   </para>
-</sect4>
-
-<sect4>
-  <title>Optional</title>
+
+  <bridgehead renderas="sect4">Optional</bridgehead>
   <para><xref linkend="cdparanoia"/>, 
         <xref linkend="lame"/>,
@@ -76,14 +81,11 @@
         <ulink url="http://www.musicbrainz.org/products/tunepimp/download.html">TunePimp</ulink>
   </para>
-</sect4>
-
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>kdemultimedia</application></title>
-
-<para>Install <application>kdemultimedia</application> with:</para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of kdemultimedia</title>
+
+    <para>Install <application>kdemultimedia</application> with:</para>
 
 <screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
@@ -91,8 +93,9 @@
 make</command></userinput></screen>
 
-<para>Now, as the root user:</para>
+     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
  
-<screen><userinput role='root'><command>make install</command></userinput></screen>
-</sect2>
+  </sect2>
 
 <!-- 
@@ -100,10 +103,11 @@
   <title>Configuring kdemultimedia</title>
 
-  <para>There is no explicit configuration for the <application>kdemultimedia</application> 
-        package, however <command>kscd</command> needs to find the CD drive. The default 
-        device file is <filename>/dev/cdrom</filename> which may not exist on your system.  
-        The easiest way to do this is to create a symbolic link to this from your CD drive
-        (e.g., <filename>/dev/hdc</filename>, <filename>/dev/scd0</filename>, etc.):
-  </para>
+  <para>There is no explicit configuration for the
+  <application>kdemultimedia</application> package, however
+  <command>kscd</command> needs to find the CD drive. The default device file
+  is <filename>/dev/cdrom</filename> which may not exist on your system.  The
+  easiest way to do this is to create a symbolic link to this from your CD
+  drive (e.g., <filename>/dev/hdc</filename>, <filename>/dev/scd0</filename>,
+  etc.): </para>
 
 <screen><userinput><command>ln -s <replaceable>[CD Drive]</replaceable> /dev/cdrom</command></userinput></screen>
@@ -111,102 +115,108 @@
 -->
 
-<sect2>
-<title>Contents</title>
-
-<segmentedlist>
-  <segtitle>Installed Programs</segtitle>
- 
-  <seglistitem>
-    <seg>artsbuilder, juk, kaboodle, kmid, kmix, krec, kscd, noatun</seg>
-  </seglistitem>
-</segmentedlist>
- 
-<variablelist>
-  <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-  <?dbfo list-presentation="list"?>
-
-<varlistentry id="artsbuilder">
-  <term><command>artsbuilder</command></term>
-  <listitem>
-    <para>is a tool to create new structures of small connected aRts modules.</para>
-    <indexterm zone="kdemultimedia artsbuilder">
-      <primary sortas="b-artsbuilder">artsbuilder</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-<varlistentry id="juk">
-  <term><command>juk</command></term>
-  <listitem>
-    <para>is a jukebox, tagger, and music collection manager.</para>
-    <indexterm zone="kdemultimedia juk">
-      <primary sortas="b-juk">juk</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-<varlistentry id="kaboodle">
-  <term><command>kaboodle</command></term>
-  <listitem>
-    <para>is a multimedia player.</para>
-    <indexterm zone="kdemultimedia kaboodle">
-      <primary sortas="b-kaboodle">kaboodle</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-<varlistentry id="kmid">
-  <term><command>kmid</command></term>
-  <listitem>
-    <para>is a midi/karaoke player.</para>
-    <indexterm zone="kdemultimedia kmid">
-      <primary sortas="b-kmid">kmid</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-<varlistentry id="kmix">
-  <term><command>kmix</command></term>
-  <listitem>
-    <para>is a sound mixer.</para>
-    <indexterm zone="kdemultimedia kmix">
-      <primary sortas="b-kmix">kmix</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-<varlistentry id="krec">
-  <term><command>krec</command></term>
-  <listitem>
-    <para>is a recording frontend for <application>aRts</application>.</para>
-    <indexterm zone="kdemultimedia krec">
-      <primary sortas="b-krec">krec</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-<varlistentry id="kscd">
-  <term><command>kscd</command></term>
-  <listitem>
-    <para>is a CD player.</para>
-    <indexterm zone="kdemultimedia kscd">
-      <primary sortas="b-kscd">kscd</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-<varlistentry id="noatun">
-  <term><command>noatun</command></term>
-  <listitem>
-    <para>is another multimedia player.</para>
-    <indexterm zone="kdemultimedia noatun">
-      <primary sortas="b-noatun">noatun</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-</variablelist>
-
-</sect2>
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+     
+      <seglistitem>
+        <seg>artsbuilder, juk, kaboodle, kmid, kmix, krec, kscd, noatun</seg>
+        <seg>None</seg>
+        <seg>None</seg>
+      </seglistitem>
+    </segmentedlist>
+     
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="artsbuilder">
+        <term><command>artsbuilder</command></term>
+        <listitem>
+          <para>is a tool to create new structures of small connected aRts
+            modules.</para>
+          <indexterm zone="kdemultimedia artsbuilder">
+            <primary sortas="b-artsbuilder">artsbuilder</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="juk">
+        <term><command>juk</command></term>
+        <listitem>
+          <para>is a jukebox, tagger, and music collection manager.</para>
+          <indexterm zone="kdemultimedia juk">
+            <primary sortas="b-juk">juk</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="kaboodle">
+        <term><command>kaboodle</command></term>
+        <listitem>
+          <para>is a multimedia player.</para>
+          <indexterm zone="kdemultimedia kaboodle">
+            <primary sortas="b-kaboodle">kaboodle</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="kmid">
+        <term><command>kmid</command></term>
+        <listitem>
+          <para>is a midi/karaoke player.</para>
+          <indexterm zone="kdemultimedia kmid">
+            <primary sortas="b-kmid">kmid</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="kmix">
+        <term><command>kmix</command></term>
+        <listitem>
+          <para>is a sound mixer.</para>
+          <indexterm zone="kdemultimedia kmix">
+            <primary sortas="b-kmix">kmix</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="krec">
+        <term><command>krec</command></term>
+        <listitem>
+          <para>is a recording frontend for <application>aRts</application>.</para>
+          <indexterm zone="kdemultimedia krec">
+            <primary sortas="b-krec">krec</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="kscd">
+        <term><command>kscd</command></term>
+        <listitem>
+          <para>is a CD player.</para>
+          <indexterm zone="kdemultimedia kscd">
+            <primary sortas="b-kscd">kscd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="noatun">
+        <term><command>noatun</command></term>
+        <listitem>
+          <para>is another multimedia player.</para>
+          <indexterm zone="kdemultimedia noatun">
+            <primary sortas="b-noatun">noatun</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
 
 </sect1>
