Index: kde/add/kdeedu.xml
===================================================================
--- kde/add/kdeedu.xml	(revision ff769b8c6178dd8b799a5e122a2e6a5d69a22a2c)
+++ 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>
