Index: kde/add/kdeedu.xml
===================================================================
--- kde/add/kdeedu.xml	(revision 16a096a128833300d240b51c206809d036afda8a)
+++ kde/add/kdeedu.xml	(revision c4d2a14b52dc0b5a9e08579858c670e5bb0222ce)
@@ -7,233 +7,246 @@
 <!ENTITY kdeedu-download-http "&kde-download-http;/kdeedu-&kde-version;.tar.bz2">
 <!ENTITY kdeedu-download-ftp  "&kde-download-ftp;/kdeedu-&kde-version;.tar.bz2">
-<!ENTITY kdeedu-md5sum        "2ea54bb7aee669582eb0877d3c6f0b3d">
+<!ENTITY kdeedu-md5sum        "c2aab0c4f6439abb6c0eb09413b6532c">
 <!ENTITY kdeedu-size          "22 MB">
-<!ENTITY kdeedu-buildsize     "171 MB">
-<!ENTITY kdeedu-time          "11.74 SBU">
+<!ENTITY kdeedu-buildsize     "196 MB">
+<!ENTITY kdeedu-time          "10.4 SBU">
 ]>
 
-<sect1 id="kdeedu">
-
-<sect1info>
-  <othername>$LastChangedBy$</othername>
-  <date>$Date$</date>
-</sect1info>
-
-<?dbhtml filename="kdeedu.html"?>
-<title><application>kdeedu</application>-&kde-version;</title>
-
-<indexterm zone="kdeedu">
-  <primary sortas="a-kdeedu">Kdeedu</primary>
-</indexterm>
-
-<sect2>
-<title>Introduction to <application>kdeedu</application></title>
-
-<sect3><title>Package information</title>
-  <itemizedlist spacing='compact'>
-    <listitem><para>Download (HTTP): <ulink url="&kdeedu-download-http;"/></para></listitem>
-    <listitem><para>Download (FTP): <ulink url="&kdeedu-download-ftp;"/></para></listitem>
-    <listitem><para>Download MD5 sum: &kdeedu-md5sum;</para></listitem>
-    <listitem><para>Download size: &kdeedu-size;</para></listitem>
-    <listitem><para>Estimated disk space required: &kdeedu-buildsize;</para></listitem>
-    <listitem><para>Estimated build time: &kdeedu-time;</para></listitem>
-  </itemizedlist>
-</sect3>
-
-<sect3>
-  <title><application>kdeedu</application> dependencies</title>
-
-<sect4><title>Required</title>
-  <para><xref linkend="kdebase"/></para>
-</sect4>
-
-<sect4><title>Recommended</title>
-  <para><xref linkend="libjpeg"/> and 
-        <xref linkend="libxml2"/>
-  </para>
-</sect4>
-
-<sect4>
-  <title>Optional</title>
-  <para><ulink url="http://www.boost.org/libs/python/doc/index.html">Boost.Python</ulink></para>
-</sect4>
-
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>kdeedu</application></title>
-
-<para>Install <application>kdeedu</application> with:</para>
-
-<screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
+<sect1 id="kdeedu" xreflabel="kdeedu-&kde-version;">
+  <?dbhtml filename="kdeedu.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>kdeedu-&kde-version;</title>
+
+  <indexterm zone="kdeedu">
+    <primary sortas="a-kdeedu">Kdeedu</primary>
+  </indexterm>
+
+  <sect2 role="package">
+  <title>Introduction to kdeedu</title>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Download (HTTP): <ulink url="&kdeedu-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&kdeedu-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &kdeedu-md5sum;</para></listitem>
+      <listitem>
+        <para>Download size: &kdeedu-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &kdeedu-buildsize;</para>
+        </listitem>
+      <listitem>
+        <para>Estimated build time: &kdeedu-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">kdeedu Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para><xref linkend="kdebase"/></para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para><xref linkend="libjpeg"/> and 
+          <xref linkend="libxml2"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para><ulink url="http://www.boost.org/libs/python/doc/index.html">Boost.Python</ulink></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of kdeedu</title>
+
+    <para>Install <application>kdeedu</application> with:</para>
+
+<screen><userinput>./configure --prefix=&kde-dir; --disable-debug \
     --disable-dependency-tracking &amp;&amp;
-make</command></userinput></screen>
-
-<para>Now, as the root user:</para>
- 
-<screen><userinput role='root'><command>make install</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<segmentedlist>
-  <segtitle>Installed Programs</segtitle>
- 
-  <seglistitem>
-    <seg>flashkard, kalzium, kbruch, keduca, khangman, kig, kiten, klettres, kmathtool,
-         kmessedwords, kmplot, kpercentage, kstars, ktouch, kverbos, kvoctrain</seg>
-  </seglistitem>
-</segmentedlist>
- 
-<variablelist>
-  <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-  <?dbfo list-presentation="list"?>
-
-<varlistentry id="kalzium">
-  <term><command>kalzium</command></term>
-  <listitem>
-    <para>is a program which shows you the Periodic System of Elements.</para>
-    <indexterm zone="kdeedu kalzium">
-      <primary sortas="b-kalzium">kalzium</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-<varlistentry id="kbruch">
-  <term><command>kbruch</command></term>
-  <listitem>
-    <para>is a small program to generate tasks with fractions.</para>
-    <indexterm zone="kdeedu kbruch">
-      <primary sortas="b-kbruch">kbruch</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-<varlistentry id="keduca">
-  <term><command>keduca</command></term>
-  <listitem>
-    <para>is flash card application, which allows you to make interactive form based tests..</para>
-    <indexterm zone="kdeedu keduca">
-      <primary sortas="b-keduca">keduca</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-<varlistentry id="khangman">
-  <term><command>khangman</command></term>
-  <listitem>
-    <para>is the classical hangman game for children, adapted for <acronym>KDE</acronym>.</para>
-    <indexterm zone="kdeedu khangman">
-      <primary sortas="b-khangman">khangman</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-<varlistentry id="kig">
-  <term><command>kig</command></term>
-  <listitem>
-    <para>is a <acronym>KDE</acronym> application for Interactive Geometry.</para>
-    <indexterm zone="kdeedu kig">
-      <primary sortas="b-kig">kig</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-<varlistentry id="kiten">
-  <term><command>kiten</command></term>
-  <listitem>
-    <para>is a Japanese reference/study tool for <acronym>KDE</acronym>.</para>
-    <indexterm zone="kdeedu kiten">
-      <primary sortas="b-kiten">kiten</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-<varlistentry id="klettres">
-  <term><command>klettres</command></term>
-  <listitem>
-    <para>is an alphabet tutor (French).</para>
-    <indexterm zone="kdeedu klettres">
-      <primary sortas="b-klettres">klettres</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-<varlistentry id="kmessedwords">
-  <term><command>kmessedwords</command></term>
-  <listitem>
-    <para>is a simple mind-training word game.</para>
-    <indexterm zone="kdeedu kmessedwords">
-      <primary sortas="b-kmessedwords">kmessedwords</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-<varlistentry id="kmplot">
-  <term><command>kmplot</command></term>
-  <listitem>
-    <para>is a mathematical function plotter for <acronym>KDE</acronym>.</para>
-    <indexterm zone="kdeedu kmplot">
-      <primary sortas="b-kmplot">kmplot</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-<varlistentry id="kpercentage">
-  <term><command>kpercentage</command></term>
-  <listitem>
-    <para>is a small math application that will help pupils to improve their 
-          skills in calculating percentages.</para>
-    <indexterm zone="kdeedu kpercentage">
-      <primary sortas="b-kpercentage">kpercentage</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-<varlistentry id="kstars">
-  <term><command>kstars</command></term>
-  <listitem>
-    <para>is a desktop planetarium.</para>
-    <indexterm zone="kdeedu kstars">
-      <primary sortas="b-kstars">kstars</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-<varlistentry id="ktouch">
-  <term><command>ktouch</command></term>
-  <listitem>
-    <para>is a touch typing tutor.</para>
-    <indexterm zone="kdeedu ktouch">
-      <primary sortas="b-ktouch">ktouch</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-<varlistentry id="kverbos">
-  <term><command>kverbos</command></term>
-  <listitem>
-    <para>is an application specially designed to study Spanish verb forms.</para>
-    <indexterm zone="kdeedu kverbos">
-      <primary sortas="b-kverbos">kverbos</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-<varlistentry id="kvoctrain">
-  <term><command>kvoctrain</command></term>
-  <listitem>
-    <para>is a vocabulary trainer.</para>
-    <indexterm zone="kdeedu kvoctrain">
-      <primary sortas="b-kvoctrain">kvoctrain</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-</variablelist>
-</sect2>
+make</userinput></screen>
+
+    <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 Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+     
+      <seglistitem>
+        <seg>flashkard, kalzium, kbruch, keduca, khangman, kig, kiten,
+        klettres, kmathtool, kmessedwords, kmplot, kpercentage, kstars, ktouch,
+        kverbos, and kvoctrain</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="kalzium">
+        <term><command>kalzium</command></term>
+        <listitem>
+          <para>is a program which shows you the Periodic System of Elements.</para>
+          <indexterm zone="kdeedu kalzium">
+            <primary sortas="b-kalzium">kalzium</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="kbruch">
+        <term><command>kbruch</command></term>
+        <listitem>
+          <para>is a small program to generate tasks with fractions.</para>
+          <indexterm zone="kdeedu kbruch">
+            <primary sortas="b-kbruch">kbruch</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="keduca">
+        <term><command>keduca</command></term>
+        <listitem>
+          <para>is flash card application, which allows you to make 
+          interactive form based tests..</para>
+          <indexterm zone="kdeedu keduca">
+            <primary sortas="b-keduca">keduca</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="khangman">
+        <term><command>khangman</command></term>
+        <listitem>
+          <para>is the classical hangman game for children, adapted for KDE.</para>
+          <indexterm zone="kdeedu khangman">
+            <primary sortas="b-khangman">khangman</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="kig">
+        <term><command>kig</command></term>
+        <listitem>
+          <para>is a KDE application for Interactive Geometry.</para>
+          <indexterm zone="kdeedu kig">
+            <primary sortas="b-kig">kig</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="kiten">
+        <term><command>kiten</command></term>
+        <listitem>
+          <para>is a Japanese reference/study tool for KDE.</para>
+          <indexterm zone="kdeedu kiten">
+            <primary sortas="b-kiten">kiten</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="klettres">
+        <term><command>klettres</command></term>
+        <listitem>
+          <para>is an alphabet tutor (French).</para>
+          <indexterm zone="kdeedu klettres">
+            <primary sortas="b-klettres">klettres</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="kmessedwords">
+        <term><command>kmessedwords</command></term>
+        <listitem>
+          <para>is a simple mind-training word game.</para>
+          <indexterm zone="kdeedu kmessedwords">
+            <primary sortas="b-kmessedwords">kmessedwords</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="kmplot">
+        <term><command>kmplot</command></term>
+        <listitem>
+          <para>is a mathematical function plotter for KDE.</para>
+          <indexterm zone="kdeedu kmplot">
+            <primary sortas="b-kmplot">kmplot</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="kpercentage">
+        <term><command>kpercentage</command></term>
+        <listitem>
+          <para>is a small math application that will help pupils to improve their 
+                skills in calculating percentages.</para>
+          <indexterm zone="kdeedu kpercentage">
+            <primary sortas="b-kpercentage">kpercentage</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="kstars">
+        <term><command>kstars</command></term>
+        <listitem>
+          <para>is a desktop planetarium.</para>
+          <indexterm zone="kdeedu kstars">
+            <primary sortas="b-kstars">kstars</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ktouch">
+        <term><command>ktouch</command></term>
+        <listitem>
+          <para>is a touch typing tutor.</para>
+          <indexterm zone="kdeedu ktouch">
+            <primary sortas="b-ktouch">ktouch</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="kverbos">
+        <term><command>kverbos</command></term>
+        <listitem>
+          <para>is an application specially designed to study Spanish 
+          verb forms.</para>
+          <indexterm zone="kdeedu kverbos">
+            <primary sortas="b-kverbos">kverbos</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="kvoctrain">
+        <term><command>kvoctrain</command></term>
+        <listitem>
+          <para>is a vocabulary trainer.</para>
+          <indexterm zone="kdeedu kvoctrain">
+            <primary sortas="b-kvoctrain">kvoctrain</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+    
+  </sect2>
+
 </sect1>
Index: kde/add/kdepim.xml
===================================================================
--- kde/add/kdepim.xml	(revision 16a096a128833300d240b51c206809d036afda8a)
+++ kde/add/kdepim.xml	(revision c4d2a14b52dc0b5a9e08579858c670e5bb0222ce)
@@ -7,84 +7,88 @@
 <!ENTITY kdepim-download-http "&kde-download-http;/kdepim-&kde-version;.tar.bz2">
 <!ENTITY kdepim-download-ftp  "&kde-download-ftp;/kdepim-&kde-version;.tar.bz2">
-<!ENTITY kdepim-md5sum        "73852792762c4f229e870314c51c081a">
-<!ENTITY kdepim-size          "9.9 MB">
-<!ENTITY kdepim-buildsize     "203 MB (additional 181 MB for API docs)">
-<!ENTITY kdepim-time          "23.64 SBU (additional 2.29 SBU for API docs)">
+<!ENTITY kdepim-md5sum        "7f8cc9a40c0190c5a6723f6325bcba06">
+<!ENTITY kdepim-size          "10.9 MB">
+<!ENTITY kdepim-buildsize     "254 MB (additional 181 MB for API docs)">
+<!ENTITY kdepim-time          "22 SBU (additional 2.3 SBU for API docs)">
+
+
+<!ENTITY gnu-org              "http://www.gnupg.org/download/index.html"> 
 ]>
 
 <sect1 id="kdepim" xreflabel="kdepim-&kde-version;">
-
-<sect1info>
-  <othername>$LastChangedBy$</othername>
-  <date>$Date$</date>
-</sect1info>
-<?dbhtml filename="kdepim.html"?>
-
-<title>kdepim-&kde-version;</title>
-
-<sect2>
-<title>Introduction to <application>kdepim</application></title>
-<indexterm zone="kdepim">
-  <primary sortas="a-kdepim">Kdepim</primary>
-</indexterm>
-
-
-<sect3>
-  <title>Package information</title>
+  <?dbhtml filename="kdepim.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>kdepim-&kde-version;</title>
+
+  <sect2>
+  <title>Introduction to kdepim</title>
+
+  <indexterm zone="kdepim">
+    <primary sortas="a-kdepim">Kdepim</primary>
+  </indexterm>
+
+  <bridgehead renderas="sect3">Package Information</bridgehead>
   <itemizedlist spacing='compact'>
-    <listitem><para>Download (HTTP): <ulink url="&kdepim-download-http;"/></para></listitem>
-    <listitem><para>Download (FTP): <ulink url="&kdepim-download-ftp;"/></para></listitem>
-    <listitem><para>Download MD5 sum: &kdepim-md5sum;</para></listitem>
-    <listitem><para>Download size: &kdepim-size;</para></listitem>
-    <listitem><para>Estimated disk space required: &kdepim-buildsize;</para></listitem>
-    <listitem><para>Estimated build time: &kdepim-time;</para></listitem>
+    <listitem>
+      <para>Download (HTTP): <ulink url="&kdepim-download-http;"/></para>
+    </listitem>
+    <listitem>
+      <para>Download (FTP): <ulink url="&kdepim-download-ftp;"/></para>
+    </listitem>
+    <listitem>
+      <para>Download MD5 sum: &kdepim-md5sum;</para>
+    </listitem>
+    <listitem>
+      <para>Download size: &kdepim-size;</para>
+    </listitem>
+    <listitem>
+      <para>Estimated disk space required: &kdepim-buildsize;</para>
+    </listitem>
+    <listitem>
+      <para>Estimated build time: &kdepim-time;</para>
+    </listitem>
   </itemizedlist>
-</sect3>
-
-<sect3>
-<title><application>kdepim</application> dependencies</title>
-
-<sect4>
-  <title>Required</title>
-  <para><xref linkend="kdebase"/></para>
-</sect4>
-
-<sect4>
-  <title>Recommended</title>
-  <para><xref linkend="libjpeg"/>, 
-        <xref linkend="libxml2"/>, 
-        <xref linkend="gnupg"/> and 
-        <xref linkend="openssl"/>
+
+    <bridgehead renderas="sect3">kdepim Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para><xref linkend="kdebase"/></para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para><xref linkend="libjpeg"/>, 
+          <xref linkend="libxml2"/>, 
+          <xref linkend="gnupg"/> and 
+          <xref linkend="openssl"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para><xref linkend="pilot-link"/>, 
+      <ulink url="&gnu-org;#gpgme">GPGME-0.9.x</ulink> 
+        (requires <ulink url="&gnu-org;#libgpg-error">Libgpg-error</ulink> 
+        then <ulink url="&gnu-org;#libgcrypt">Libgcrypt</ulink> 
+        then <ulink url="&gnu-org;#libassuan">Libassuan</ulink> 
+        then <ulink url="&gnu-org;#libksba">Libksba</ulink>, 
+      <ulink url="ftp://ftp.gnupg.org/gcrypt/pinentry/">pinentry</ulink>, 
+      <ulink url="http://www.gnu-org/software/pth/">Pth</ulink>, 
+      <ulink url="http://www.opensc.org/">OpenSC</ulink> and then 
+      <ulink url="&gnu-org;#gnupg2">GnuPG-1.9.x</ulink>), 
+      <ulink url="http://jasonday.home.att.net/code/libmal/libmal.html">libmal</ulink>, 
+      <ulink url="http://www.gnokii.org/">gnokii</ulink>, 
+      Bluetooth hardware and driver libraries, 
+      <ulink url="http://www.graphviz.org/">GraphViz</ulink>,
+      and <xref linkend="doxygen"/>
   </para>
-</sect4>
-
-<sect4><title>Optional</title>
-  <para><xref linkend="pilot-link"/>, 
-        <ulink url="http://www.gnupg.org/download/index.html#gpgme">GPGME-0.9.x</ulink> 
-
-         (requires <ulink url="http://www.gnupg.org/download/index.html#libgpg-error">Libgpg-error</ulink> 
-         then <ulink url="http://www.gnupg.org/download/index.html#libgcrypt">Libgcrypt</ulink> 
-         then <ulink url="http://www.gnupg.org/download/index.html#libassuan">Libassuan</ulink> 
-         then <ulink url="http://www.gnupg.org/download/index.html#libksba">Libksba</ulink>, 
-         <ulink url="ftp://ftp.gnupg.org/gcrypt/pinentry/">pinentry</ulink>, 
-         <ulink url="http://www.gnu.org/software/pth/">Pth</ulink>, 
-         <ulink url="http://www.opensc.org/">OpenSC</ulink> and then 
-         <ulink url="http://www.gnupg.org/download/index.html#gnupg2">GnuPG-1.9.x</ulink>), 
-
-         <ulink url="http://jasonday.home.att.net/code/libmal/libmal.html">libmal</ulink>, 
-         <ulink url="http://www.gnokii.org/">gnokii</ulink>, 
-         Bluetooth hardware and driver libraries, 
-         <ulink url="http://www.graphviz.org/">GraphViz</ulink> 
-         and <xref linkend="doxygen"/>
-  </para>
-</sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>kdepim</application></title>
-
-<para>Install <application>kdepim</application> with:</para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of kdepim</title>
+
+    <para>Install <application>kdepim</application> with:</para>
 
 <screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
@@ -92,167 +96,173 @@
 make</command></userinput></screen> 
 
-<note>
-  <para>If you wish to create the <acronym>API</acronym> documentation and 
+    <note>
+      <para>If you wish to create the <acronym>API</acronym> documentation and 
         you have <application>Doxygen</application> and 
-        <application>GraphViz</application> installed, <command>make apidox</command> 
-        must be done before <command>make install</command>.
-  </para>
-</note>
-
-<para>Now, as the root user:</para>
+        <application>GraphViz</application> installed, 
+        <command>make apidox</command> must be done before 
+        <command>make install</command>.
+      </para>
+    </note>
+
+    <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 Programs</segtitle>
+    <segtitle>Installed Libraries</segtitle>
+    <segtitle>Installed Directories</segtitle>
  
-<screen><userinput role='root'><command>make install</command></userinput></screen>
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<segmentedlist>
-  <segtitle>Installed Programs</segtitle>
- 
-  <seglistitem>
-    <seg>kaddressbook, kalarm, kandy, karm, kgpgcertmanager, kmail, knode, knotes, 
-         konsolekalendar, kontact, korganizer, korn, kpilot</seg>
-  </seglistitem>
-</segmentedlist>
-
-<variablelist>
-  <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-  <?dbfo list-presentation="list"?>
+    <seglistitem>
+      <seg>kaddressbook, kalarm, kandy, karm, kgpgcertmanager, kmail, knode, 
+        knotes, konsolekalendar, kontact, korganizer, korn, kpilot</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="kaddressbook">
-  <term><command>kaddressbook</command></term>
-  <listitem>
-    <para>is the <acronym>KDE</acronym> address book.</para>
-    <indexterm zone="kdepim kaddressbook">
-      <primary sortas="b-kaddressbook">kaddressbook</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-<varlistentry id="kalarm">
-  <term><command>kalarm</command></term>
-  <listitem>
-    <para>is a system to provide reminder messages.</para>
-    <indexterm zone="kdepim kalarm">
-      <primary sortas="b-kalarm">kalarm</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-<varlistentry id="kandy">
-  <term><command>kandy</command></term>
-  <listitem>
-    <para>is a program to synchronize mobile phone numbers.</para>
-    <indexterm zone="kdepim kandy">
-      <primary sortas="b-kandy">kandy</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-<varlistentry id="karm">
-  <term><command>karm</command></term>
-  <listitem>
-    <para> is a personal time tracker.</para>
-    <indexterm zone="kdepim karm">
-      <primary sortas="b-karm">karm</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-<varlistentry id="kgpgcertmanager">
-  <term><command>kgpgcertmanager</command></term>
-  <listitem>
-    <para>is a tool for managing X509 certificates.</para>
-    <indexterm zone="kdepim kgpgcertmanager">
-      <primary sortas="b-kgpgcertmanager">kgpgcertmanager</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-<varlistentry id="kmail">
-  <term><command>kmail</command></term>
-  <listitem>
-    <para>is <acronym>KDE</acronym>'s email client.</para>
-    <indexterm zone="kdepim kmail">
-      <primary sortas="b-kmail">kmail</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-<varlistentry id="knode">
-  <term><command>knode</command></term>
-  <listitem>
-    <para> is the <acronym>KDE</acronym> newsreader.</para>
-    <indexterm zone="kdepim knode">
-      <primary sortas="b-knode">knode</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-<varlistentry id="knotes">
-  <term><command>knotes</command></term>
-  <listitem>
-    <para> is a popup notes utility.</para>
-    <indexterm zone="kdepim knotes">
-      <primary sortas="b-knotes">knotes</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-<varlistentry id="konsolehelper">
-  <term><command>konsolehelper</command></term>
-  <listitem>
-    <para>is a command line interface to <acronym>KDE</acronym> calendars.</para>
-    <indexterm zone="kdepim konsolehelper">
-      <primary sortas="b-konsolehelper">konsolehelper</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-<varlistentry id="kontact">
-  <term><command>kontact</command></term>
-  <listitem>
-    <para>is the integrated solution to personal information management 
-          (<acronym>PIM</acronym>) needs.</para>
-    <indexterm zone="kdepim kontact">
-      <primary sortas="b-kontact">kontact</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-<varlistentry id="korganizer">
-  <term><command>korganizer</command></term>
-  <listitem>
-    <para>is a personal calendar/todo system.</para>
-    <indexterm zone="kdepim korganizer">
-      <primary sortas="b-korganizer">korganizer</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-<varlistentry id="korn">
-  <term><command>korn</command></term>
-  <listitem>
-    <para>is a <acronym>KDE</acronym> mail checker that has the capabilities to 
-          dock itself to <command>kicker</command>.</para>
-    <indexterm zone="kdepim korn">
-      <primary sortas="b-korn">korn</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-<varlistentry id="kpilot">
-  <term><command>kpilot</command></term>
-  <listitem>
-    <para>is a program to synchronize a Palm-Pilot.</para>
-    <indexterm zone="kdepim kpilot">
-      <primary sortas="b-kpilot">kpilot</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-</variablelist>   
-</sect2>
+    <varlistentry id="kaddressbook">
+      <term><command>kaddressbook</command></term>
+      <listitem>
+        <para>is the KDE address book.</para>
+        <indexterm zone="kdepim kaddressbook">
+          <primary sortas="b-kaddressbook">kaddressbook</primary>
+        </indexterm>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry id="kalarm">
+      <term><command>kalarm</command></term>
+      <listitem>
+        <para>is a system to provide reminder messages.</para>
+        <indexterm zone="kdepim kalarm">
+          <primary sortas="b-kalarm">kalarm</primary>
+        </indexterm>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry id="kandy">
+      <term><command>kandy</command></term>
+      <listitem>
+        <para>is a program to synchronize mobile phone numbers.</para>
+        <indexterm zone="kdepim kandy">
+          <primary sortas="b-kandy">kandy</primary>
+        </indexterm>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry id="karm">
+      <term><command>karm</command></term>
+      <listitem>
+        <para> is a personal time tracker.</para>
+        <indexterm zone="kdepim karm">
+          <primary sortas="b-karm">karm</primary>
+        </indexterm>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry id="kgpgcertmanager">
+      <term><command>kgpgcertmanager</command></term>
+      <listitem>
+        <para>is a tool for managing X509 certificates.</para>
+        <indexterm zone="kdepim kgpgcertmanager">
+          <primary sortas="b-kgpgcertmanager">kgpgcertmanager</primary>
+        </indexterm>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry id="kmail">
+      <term><command>kmail</command></term>
+      <listitem>
+        <para>is KDE's email client.</para>
+        <indexterm zone="kdepim kmail">
+          <primary sortas="b-kmail">kmail</primary>
+        </indexterm>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry id="knode">
+      <term><command>knode</command></term>
+      <listitem>
+        <para> is the KDE newsreader.</para>
+        <indexterm zone="kdepim knode">
+          <primary sortas="b-knode">knode</primary>
+        </indexterm>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry id="knotes">
+      <term><command>knotes</command></term>
+      <listitem>
+        <para> is a popup notes utility.</para>
+        <indexterm zone="kdepim knotes">
+          <primary sortas="b-knotes">knotes</primary>
+        </indexterm>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry id="konsolehelper">
+      <term><command>konsolehelper</command></term>
+      <listitem>
+        <para>is a command line interface to KDE calendars.</para>
+        <indexterm zone="kdepim konsolehelper">
+          <primary sortas="b-konsolehelper">konsolehelper</primary>
+        </indexterm>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry id="kontact">
+      <term><command>kontact</command></term>
+      <listitem>
+        <para>is the integrated solution to personal information management 
+              (PIM) needs.</para>
+        <indexterm zone="kdepim kontact">
+          <primary sortas="b-kontact">kontact</primary>
+        </indexterm>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry id="korganizer">
+      <term><command>korganizer</command></term>
+      <listitem>
+        <para>is a personal calendar/todo system.</para>
+        <indexterm zone="kdepim korganizer">
+          <primary sortas="b-korganizer">korganizer</primary>
+        </indexterm>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry id="korn">
+      <term><command>korn</command></term>
+      <listitem>
+        <para>is a <acronym>KDE</acronym> mail checker that has the capabilities to 
+              dock itself to <command>kicker</command>.</para>
+        <indexterm zone="kdepim korn">
+          <primary sortas="b-korn">korn</primary>
+        </indexterm>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry id="kpilot">
+      <term><command>kpilot</command></term>
+      <listitem>
+        <para>is a program to synchronize a Palm-Pilot.</para>
+        <indexterm zone="kdepim kpilot">
+          <primary sortas="b-kpilot">kpilot</primary>
+        </indexterm>
+      </listitem>
+    </varlistentry>
+
+    </variablelist>   
+  </sect2>
 
 </sect1>
Index: kde/add/kdesdk.xml
===================================================================
--- kde/add/kdesdk.xml	(revision 16a096a128833300d240b51c206809d036afda8a)
+++ kde/add/kdesdk.xml	(revision c4d2a14b52dc0b5a9e08579858c670e5bb0222ce)
@@ -7,153 +7,155 @@
 <!ENTITY kdesdk-download-http "&kde-download-http;/kdesdk-&kde-version;.tar.bz2">
 <!ENTITY kdesdk-download-ftp  "&kde-download-ftp;/kdesdk-&kde-version;.tar.bz2">
-<!ENTITY kdesdk-md5sum        "906bbcde1b3db2eaac8a257c8574e033">
-<!ENTITY kdesdk-size          "4.3 MB">
-<!ENTITY kdesdk-buildsize     "99 MB">
-<!ENTITY kdesdk-time          "9.79 SBU">
+<!ENTITY kdesdk-md5sum        "5b88692972e65c5e7d3aafc6400bea2c">
+<!ENTITY kdesdk-size          "4.4 MB">
+<!ENTITY kdesdk-buildsize     "108 MB">
+<!ENTITY kdesdk-time          "9.4 SBU">
 ]>
 
-<sect1 id="kdesdk">
+<sect1 id="kdesdk" xreflabel="kdesdk-&kde-version;">
+  <?dbhtml filename="kdesdk.html"?>
 
-<sect1info>
-  <othername>$LastChangedBy$</othername>
-  <date>$Date$</date>
-</sect1info>
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
 
-<?dbhtml filename="kdesdk.html"?>
-<title><application>kdesdk</application>-&kde-version;</title>
+  <title>kdesdk-&kde-version;</title>
 
-<indexterm zone="kdesdk">
-  <primary sortas="a-kdesdk">Kdesdk</primary>
-</indexterm>
+  <indexterm zone="kdesdk">
+    <primary sortas="a-kdesdk">Kdesdk</primary>
+  </indexterm>
 
-<sect2>
-<title>Introduction to <application>kdesdk</application></title>
+  <sect2 role="package">
+<title>Introduction to kdesdk</title>
 
-<sect3>
-  <title>Package information</title>
-  <itemizedlist spacing='compact'> 
-    <listitem><para>Download (HTTP): <ulink url="&kdesdk-download-http;"/></para></listitem>
-    <listitem><para>Download (FTP): <ulink url="&kdesdk-download-ftp;"/></para></listitem>
-    <listitem><para>Download MD5 sum: &kdesdk-md5sum;</para></listitem>
-    <listitem><para>Download size: &kdesdk-size;</para></listitem>
-    <listitem><para>Estimated disk space required: &kdesdk-buildsize;</para></listitem>
-    <listitem><para>Estimated build time: &kdesdk-time;</para></listitem>
-  </itemizedlist>
-</sect3>
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing='compact'> 
+      <listitem>
+        <para>Download (HTTP): <ulink url="&kdesdk-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&kdesdk-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &kdesdk-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &kdesdk-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &kdesdk-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &kdesdk-time;</para>
+      </listitem>
+    </itemizedlist>
 
-<sect3>
-  <title>Additional downloads</title>
-  <itemizedlist spacing="compact">
-    <listitem><para>Required patch for Berkeley DB: 
-              <ulink url="&patch-root;/kdesdk-&kde-version;-db43-1.patch"/></para>
-    </listitem>
-  </itemizedlist>
-</sect3>
 
-<sect3>
-<title><application>kdesdk</application> dependencies</title>
+    <bridgehead renderas="sect3">kdesdk Dependencies</bridgehead>
 
-<sect4>
-  <title>Required</title>
-  <para><xref linkend="kdebase"/></para>
-</sect4>
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para><xref linkend="kdebase"/></para>
 
-<sect4>
-  <title>Recommended</title>
-  <para><xref linkend="libjpeg"/>, 
-  <xref linkend="libxml2"/>, and 
-  <xref linkend="db"/></para>
-</sect4>
-</sect3>
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para><xref linkend="libjpeg"/>, 
+          <xref linkend="libxml2"/>, and 
+          <xref linkend="db"/>
+    </para>
 
-</sect2>
+  </sect2>
 
-<sect2>
-<title>Installation of <application>kdesdk</application></title>
+  <sect2 role="installation">
+    <title>Installation of kdesdk</title>
 
-<para>If you have Berkeley DB installed, apply the following patch:</para>
+    <para>Install <application>kdesdk</application> with:</para>
 
-<screen><userinput><command>patch -Np1 -i ../kdesdk-&kde-version;-db43-1.patch</command></userinput></screen>
+<screen><userinput>./configure --prefix=&kde-dir; --disable-debug \
+    --disable-dependency-tracking &amp;&amp;
+make</userinput></screen>
 
-<para>Install <application>kdesdk</application> with:</para>
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
-    --disable-dependency-tracking &amp;&amp;
-make</command></userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
 
-<para>Now, as the root user:</para>
- 
-<screen><userinput role='root'><command>make install</command></userinput></screen>
-</sect2>
+  </sect2>
 
-<sect2>
-  <title>Contents</title>
+  <sect2 role="content">
+    <title>Contents</title>
 
-<segmentedlist>
-  <segtitle>Installed Programs</segtitle>
- 
-  <seglistitem>
-    <seg>cervisia, kbabel, kcachegrind, kompare, umbrello</seg>
-  </seglistitem>
-</segmentedlist>
- 
-<variablelist>
-  <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-  <?dbfo list-presentation="list"?>
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+     
+      <seglistitem>
+        <seg>cervisia, kbabel, kcachegrind, kompare, umbrello</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="cervisia">
-  <term><command>cervisia</command></term>
-  <listitem>
-    <para>provides a graphical view of <acronym>CVS</acronym>.</para>
-    <indexterm zone="kdesdk cervisia">
-      <primary sortas="b-cervisia">cervisia</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
+      <varlistentry id="cervisia">
+        <term><command>cervisia</command></term>
+        <listitem>
+          <para>provides a graphical view of CVS.</para>
+          <indexterm zone="kdesdk cervisia">
+            <primary sortas="b-cervisia">cervisia</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-<varlistentry id="kbabel">
-  <term><command>kbabel</command></term>
-  <listitem>
-    <para>is a suite of an advanced <acronym>PO</acronym> file editor comprising 
-          <command>kbabel</command>, a multi functional <command>catalogmanager</command> 
-          and a dictionary for translators <command>kbabeldict</command>.</para>
-    <indexterm zone="kdesdk kbabel">
-      <primary sortas="b-kbabel">kbabel</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
+      <varlistentry id="kbabel">
+        <term><command>kbabel</command></term>
+        <listitem>
+          <para>is a suite of an advanced PO file editor comprising
+          <command>kbabel</command>, a multi functional
+          <command>catalogmanager</command> and a dictionary for translators
+          <command>kbabeldict</command>.</para>
+          <indexterm zone="kdesdk kbabel">
+            <primary sortas="b-kbabel">kbabel</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-<varlistentry id="kcachegrind">
-  <term><command>kcachegrind</command></term>
-  <listitem>
-    <para>is a <acronym>KDE</acronym> frontend for <command>cachegrind</command>, part of
-          <application>Valgrind</application>.</para>
-    <indexterm zone="kdesdk kcachegrind">
-      <primary sortas="b-kcachegrind">kcachegrind</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
+      <varlistentry id="kcachegrind">
+        <term><command>kcachegrind</command></term>
+        <listitem>
+          <para>is a KDE frontend for <command>cachegrind</command>, part of
+                <application>Valgrind</application>.</para>
+          <indexterm zone="kdesdk kcachegrind">
+            <primary sortas="b-kcachegrind">kcachegrind</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-<varlistentry id="kompare">
-  <term><command>kompare</command></term>
-  <listitem>
-    <para>is a program to view the differences between files.</para>
-    <indexterm zone="kdesdk kompare">
-      <primary sortas="b-kompare">kompare</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
+      <varlistentry id="kompare">
+        <term><command>kompare</command></term>
+        <listitem>
+          <para>is a program to view the differences between files.</para>
+          <indexterm zone="kdesdk kompare">
+            <primary sortas="b-kompare">kompare</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-<varlistentry id="umbrello">
-  <term><command>umbrello</command></term>
-  <listitem>
-    <para>is a <acronym>UML</acronym> modelling diagram tool.</para>
-    <indexterm zone="kdesdk umbrello">
-      <primary sortas="b-umbrello">umbrello</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
+      <varlistentry id="umbrello">
+        <term><command>umbrello</command></term>
+        <listitem>
+          <para>is a UML modelling diagram tool.</para>
+          <indexterm zone="kdesdk umbrello">
+            <primary sortas="b-umbrello">umbrello</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-</variablelist>
-</sect2>
+    </variablelist>
+      
+  </sect2>
+    
 </sect1>
