Index: basicnet/mailnews/other.xml
===================================================================
--- basicnet/mailnews/other.xml	(revision 8ba058e76b0ce3eb4eafe901a3a98903624e6ddf)
+++ basicnet/mailnews/other.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -7,7 +7,7 @@
 
 <para>KNode is a Qt based newsreader program from 
-<xref linkend="kde-network"/>.</para>
+<xref linkend="kdepim"/>.</para>
 
-<para>KMail is a Qt based mail client from <xref linkend="kde-network"/>.</para>
+<para>KMail is a Qt based mail client from <xref linkend="kdepim"/>.</para>
 
 <para><xref linkend="balsa"/> is an <acronym>GTK</acronym>2 based mail client.
Index: kde/add/add.xml
===================================================================
--- kde/add/add.xml	(revision 8ba058e76b0ce3eb4eafe901a3a98903624e6ddf)
+++ kde/add/add.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -3,15 +3,15 @@
 <title>KDE Additional Packages</title>
 
-&kde-multimedia;
-&kde-network;
-&kde-graphics;
-&kde-pim;
-&kde-admin;
-&kde-games;
-&kde-utils;
-&kde-edu;
-&kde-artwork;
-&kde-toys;
-&kde-addons;
+&kdemultimedia;
+&kdenetwork;
+&kdegraphics;
+&kdepim;
+&kdeadmin;
+&kdegames;
+&kdeutils;
+&kdeedu;
+&kdeartwork;
+&kdetoys;
+&kdeaddons;
 
 </chapter>
Index: kde/add/kdeaddons.xml
===================================================================
--- kde/add/kdeaddons.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdeaddons.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,9 @@
+<sect1 id="kdeaddons">
+<?dbhtml filename="kdeaddons.html"?>
+<title>kdeaddons-&kde-version;</title>
+
+&kdeaddons-intro;
+&kdeaddons-inst;
+&kdeaddons-desc;
+
+</sect1>
Index: kde/add/kdeaddons/kdeaddons-desc.xml
===================================================================
--- kde/add/kdeaddons/kdeaddons-desc.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdeaddons/kdeaddons-desc.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,7 @@
+<sect2>
+<title>Contents</title>
+
+<para>The <acronym>KDE</acronym> Addons package provides konqueror and
+noatun plugins, kicker applets and newskicker scripts.</para>
+
+</sect2>
Index: kde/add/kdeaddons/kdeaddons-inst.xml
===================================================================
--- kde/add/kdeaddons/kdeaddons-inst.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdeaddons/kdeaddons-inst.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,10 @@
+<sect2>
+<title>Installation of <application>kdeaddons</application></title>
+
+<para>Install <application>kdeaddons</application> with:</para>
+<screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
+    --disable-dependency-tracking &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
Index: kde/add/kdeaddons/kdeaddons-intro.xml
===================================================================
--- kde/add/kdeaddons/kdeaddons-intro.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdeaddons/kdeaddons-intro.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,34 @@
+<sect2>
+<title>Introduction to <application>kdeaddons</application></title>
+
+<para><application>kdeaddons</application> contains additional plugins
+and scripts for some <acronym>KDE</acronym> applications. This package
+should be compiled last.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&kdeaddons-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&kdeaddons-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &kdeaddons-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&kdeaddons-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&kdeaddons-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>kdeaddons</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="kdebase"/>
+</para></sect4>
+<sect4><title>Optional</title>
+<para>
+<xref linkend="libxml2"/>,
+<xref linkend="db"/>,
+<xref linkend="xmms"/> and
+<xref linkend="SDL"/>
+</para></sect4>
+</sect3>
+
+</sect2>
Index: kde/add/kdeaddons/kdeaddons.ent
===================================================================
--- kde/add/kdeaddons/kdeaddons.ent	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdeaddons/kdeaddons.ent	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,9 @@
+<!ENTITY kdeaddons SYSTEM "../kdeaddons.xml">
+<!ENTITY kdeaddons-intro SYSTEM "kdeaddons-intro.xml">
+<!ENTITY kdeaddons-inst SYSTEM "kdeaddons-inst.xml">
+<!ENTITY kdeaddons-desc SYSTEM "kdeaddons-desc.xml">
+<!ENTITY kdeaddons-download-http "&kde-download-http;/kdeaddons-&kde-version;.tar.bz2">
+<!ENTITY kdeaddons-download-ftp "&kde-download-ftp;/kdeaddons-&kde-version;.tar.bz2">
+<!ENTITY kdeaddons-size "1.4 MB">
+<!ENTITY kdeaddons-buildsize "32 MB">
+<!ENTITY kdeaddons-time "4.62 SBU">
Index: kde/add/kdeadmin.xml
===================================================================
--- kde/add/kdeadmin.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdeadmin.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,9 @@
+<sect1 id="kdeadmin">
+<?dbhtml filename="kdeadmin.html"?>
+<title>kdeadmin-&kde-version;</title>
+
+&kdeadmin-intro;
+&kdeadmin-inst;
+&kdeadmin-desc;
+
+</sect1>
Index: kde/add/kdeadmin/kdeadmin-desc.xml
===================================================================
--- kde/add/kdeadmin/kdeadmin-desc.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdeadmin/kdeadmin-desc.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,33 @@
+<sect2>
+<title>Contents</title>
+
+<para>Major programs in <application>kdeadmin</application> include
+<command>kcron</command>,
+<command>kdat</command>,
+<command>kpackage</command>,
+<command>ksysv</command> and
+<command>kuser</command>.
+</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>kcron</title>
+<para><command>kcron</command> is a task scheduler.</para></sect3>
+
+<sect3><title>kdat</title>
+<para><command>kdat</command> is a tar-based tape
+archiver.</para></sect3>
+
+<sect3><title>kpackage</title>
+<para><command>kpackage</command> is a package manager.</para></sect3>
+
+<sect3><title>ksysv</title>
+<para><command>ksysv</command> is a Sys V-Init editor.</para></sect3>
+
+<sect3><title>kuser</title>
+<para><command>kuser</command> is a graphical user
+manager.</para></sect3>
+
+</sect2>
Index: kde/add/kdeadmin/kdeadmin-inst.xml
===================================================================
--- kde/add/kdeadmin/kdeadmin-inst.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdeadmin/kdeadmin-inst.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,10 @@
+<sect2>
+<title>Installation of <application>kdeadmin</application></title>
+
+<para>Install <application>kdeadmin</application> with:</para>
+<screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
+    --disable-dependency-tracking &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
Index: kde/add/kdeadmin/kdeadmin-intro.xml
===================================================================
--- kde/add/kdeadmin/kdeadmin-intro.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdeadmin/kdeadmin-intro.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,28 @@
+<sect2>
+<title>Introduction to <application>kdeadmin</application></title>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&kdeadmin-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&kdeadmin-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &kdeadmin-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&kdeadmin-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&kdeadmin-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>kdeadmin</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="kdebase"/>
+</para></sect4>
+<sect4><title>Optional</title>
+<para>
+<xref linkend="libxml2"/> and
+<xref linkend="Linux_PAM"/>
+</para></sect4>
+</sect3>
+
+</sect2>
Index: kde/add/kdeadmin/kdeadmin.ent
===================================================================
--- kde/add/kdeadmin/kdeadmin.ent	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdeadmin/kdeadmin.ent	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,9 @@
+<!ENTITY kdeadmin SYSTEM "../kdeadmin.xml">
+<!ENTITY kdeadmin-intro SYSTEM "kdeadmin-intro.xml">
+<!ENTITY kdeadmin-inst SYSTEM "kdeadmin-inst.xml">
+<!ENTITY kdeadmin-desc SYSTEM "kdeadmin-desc.xml">
+<!ENTITY kdeadmin-download-http "&kde-download-http;/kdeadmin-&kde-version;.tar.bz2">
+<!ENTITY kdeadmin-download-ftp "&kde-download-ftp;/kdeadmin-&kde-version;.tar.bz2">
+<!ENTITY kdeadmin-size "1.6 MB">
+<!ENTITY kdeadmin-buildsize "16 MB">
+<!ENTITY kdeadmin-time "1.09 SBU">
Index: kde/add/kdeartwork.xml
===================================================================
--- kde/add/kdeartwork.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdeartwork.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,9 @@
+<sect1 id="kdeartwork">
+<?dbhtml filename="kdeartwork.html"?>
+<title>kdeartwork-&kde-version;</title>
+
+&kdeartwork-intro;
+&kdeartwork-inst;
+&kdeartwork-desc;
+
+</sect1>
Index: kde/add/kdeartwork/kdeartwork-desc.xml
===================================================================
--- kde/add/kdeartwork/kdeartwork-desc.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdeartwork/kdeartwork-desc.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Contents</title>
+
+<para>Major programs in <application>kdeartwork</application> include
+<command>kscreensaver</command>.
+</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>kscreensaver</title>
+<para><command>kscreensaver</command> is the
+<acronym>KDE</acronym> screensaver.</para></sect3>
+
+</sect2>
Index: kde/add/kdeartwork/kdeartwork-inst.xml
===================================================================
--- kde/add/kdeartwork/kdeartwork-inst.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdeartwork/kdeartwork-inst.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,10 @@
+<sect2>
+<title>Installation of <application>kdeartwork</application></title>
+
+<para>Install <application>kdeartwork</application> with:</para>
+<screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
+    --disable-dependency-tracking &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
Index: kde/add/kdeartwork/kdeartwork-intro.xml
===================================================================
--- kde/add/kdeartwork/kdeartwork-intro.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdeartwork/kdeartwork-intro.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,33 @@
+<sect2>
+<title>Introduction to <application>kdeartwork</application></title>
+
+<para><application>kdeartwork</application> contains additional
+themes, screensaver, sounds, wallpapers and widget styles for
+<acronym>KDE</acronym>.</para>
+
+<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 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>
+
+<sect3><title><application>kdeartwork</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="kdebase"/>
+</para></sect4>
+<sect4><title>Optional</title>
+<para>
+<xref linkend="libxml2"/>,
+<xref linkend="libart_lgpl"/> and
+<ulink url="http://www.jwz.org/xscreensaver/">xscreensaver</ulink>
+</para></sect4>
+</sect3>
+
+</sect2>
Index: kde/add/kdeartwork/kdeartwork.ent
===================================================================
--- kde/add/kdeartwork/kdeartwork.ent	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdeartwork/kdeartwork.ent	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,9 @@
+<!ENTITY kdeartwork SYSTEM "../kdeartwork.xml">
+<!ENTITY kdeartwork-intro SYSTEM "kdeartwork-intro.xml">
+<!ENTITY kdeartwork-inst SYSTEM "kdeartwork-inst.xml">
+<!ENTITY kdeartwork-desc SYSTEM "kdeartwork-desc.xml">
+<!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-size "17 MB">
+<!ENTITY kdeartwork-buildsize "57 MB">
+<!ENTITY kdeartwork-time "1.94 SBU">
Index: kde/add/kdeedu.xml
===================================================================
--- kde/add/kdeedu.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdeedu.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,9 @@
+<sect1 id="kdeedu">
+<?dbhtml filename="kdeedu.html"?>
+<title>kdeedu-&kde-version;</title>
+
+&kdeedu-intro;
+&kdeedu-inst;
+&kdeedu-desc;
+
+</sect1>
Index: kde/add/kdeedu/kdeedu-desc.xml
===================================================================
--- kde/add/kdeedu/kdeedu-desc.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdeedu/kdeedu-desc.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,82 @@
+<sect2>
+<title>Contents</title>
+
+<para>Major programs in <application>kdeedu</application> include
+<command>flashkard</command>,
+<command>kalzium</command>,
+<command>kbruch</command>,
+<command>keduca</command>,
+<command>khangman</command>,
+<command>kig</command>,
+<command>kiten</command>,
+<command>klettres</command>,
+<command>kmathtool</command>,
+<command>kmessedwords</command>,
+<command>kmplot</command>,
+<command>kpercentage</command>,
+<command>kstars</command>,
+<command>ktouch</command>,
+<command>kverbos</command> and
+<command>kvoctrain</command>.
+</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>kalzium</title>
+<para><command>kalzium</command> is a program which shows you
+the Periodic System of Elements.</para></sect3>
+
+<sect3><title>kbruch</title>
+<para><command>kbruch</command> is a small program to generate tasks
+with fractions.</para></sect3>
+
+<sect3><title>keduca</title>
+<para><command>keduca</command> - tests and exams.</para></sect3>
+
+<sect3><title>khangman</title>
+<para><command>khangman</command> is the classical hangman game for
+children, adapted for <acronym>KDE</acronym>.</para></sect3>
+
+<sect3><title>kig</title>
+<para><command>kig</command> is a <acronym>KDE</acronym> application for
+Interactive
+Geometry.</para></sect3>
+
+<sect3><title>kiten</title>
+<para><command>kiten</command> is a Japanese reference/study tool
+for <acronym>KDE</acronym>.</para></sect3>
+
+<sect3><title>klettres</title>
+<para><command>klettres</command> is an alphabet tutor
+(French).</para></sect3>
+
+<sect3><title>kmessedwords</title>
+<para><command>kmessedwords</command> is a simple mind-training
+word game.</para></sect3>
+
+<sect3><title>kmplot</title>
+<para><command>kmplot</command> is a mathematical function plotter
+for <acronym>KDE</acronym>.</para></sect3>
+
+<sect3><title>kpercentage</title>
+<para><command>kpercentage</command> is a small math application
+that will help pupils to improve their skills in calculating
+percentages.</para></sect3>
+
+<sect3><title>kstars</title>
+<para><command>kstars</command> is a desktop planetarium.</para></sect3>
+
+<sect3><title>ktouch</title>
+<para><command>ktouch</command> is a touch typing tutor.</para></sect3>
+
+<sect3><title>kverbos</title>
+<para><command>kverbos</command> is an application specially
+designed to study Spanish verbforms.</para></sect3>
+
+<sect3><title>kvoctrain</title>
+<para><command>kvoctrain</command> is a vocabulary
+trainer.</para></sect3>
+
+</sect2>
Index: kde/add/kdeedu/kdeedu-inst.xml
===================================================================
--- kde/add/kdeedu/kdeedu-inst.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdeedu/kdeedu-inst.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,10 @@
+<sect2>
+<title>Installation of <application>kdeedu</application></title>
+
+<para>Install <application>kdeedu</application> with:</para>
+<screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
+    --disable-dependency-tracking &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
Index: kde/add/kdeedu/kdeedu-intro.xml
===================================================================
--- kde/add/kdeedu/kdeedu-intro.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdeedu/kdeedu-intro.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,29 @@
+<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 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>Optional</title>
+<para>
+<xref linkend="libxml2"/> and
+<ulink
+url="http://www.boost.org/libs/python/doc/index.html">Boost.Python</ulink>
+</para></sect4>
+</sect3>
+
+</sect2>
Index: kde/add/kdeedu/kdeedu.ent
===================================================================
--- kde/add/kdeedu/kdeedu.ent	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdeedu/kdeedu.ent	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,9 @@
+<!ENTITY kdeedu SYSTEM "../kdeedu.xml">
+<!ENTITY kdeedu-intro SYSTEM "kdeedu-intro.xml">
+<!ENTITY kdeedu-inst SYSTEM "kdeedu-inst.xml">
+<!ENTITY kdeedu-desc SYSTEM "kdeedu-desc.xml">
+<!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-size "22 MB">
+<!ENTITY kdeedu-buildsize "91 MB">
+<!ENTITY kdeedu-time "4.19 SBU">
Index: kde/add/kdegames.xml
===================================================================
--- kde/add/kdegames.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdegames.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,9 @@
+<sect1 id="kdegames">
+<?dbhtml filename="kdegames.html"?>
+<title>kdegames-&kde-version;</title>
+
+&kdegames-intro;
+&kdegames-inst;
+&kdegames-desc;
+
+</sect1>
Index: kde/add/kdegames/kdegames-desc.xml
===================================================================
--- kde/add/kdegames/kdegames-desc.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdegames/kdegames-desc.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,36 @@
+<sect2>
+<title>Contents</title>
+
+<para>Major programs in <application>kdegames</application> include
+<command>atlantik</command>,
+<command>kasteroids</command>,
+<command>katomic</command>,
+<command>kbackgammon</command>,
+<command>kbattleship</command>,
+<command>kblackbox</command>,
+<command>kbounce</command>,
+<command>kenolaba</command>,
+<command>kfouleggs</command>,
+<command>kgoldrunner</command>,
+<command>kjumpingcube</command>,
+<command>klickety</command>,
+<command>klines</command>,
+<command>kmines</command>,
+<command>kolf</command>,
+<command>konquest</command>,
+<command>kpat</command>,
+<command>kpoker</command>,
+<command>kreversi</command>,
+<command>ksame</command>,
+<command>kshisen</command>,
+<command>ksirtet</command>,
+<command>ksnake</command>,
+<command>ksokoban</command>,
+<command>kspaceduel</command>,
+<command>ktron</command>,
+<command>ktuberling</command>,
+<command>kwin4</command> and
+<command>lskat</command>.
+</para>
+
+</sect2>
Index: kde/add/kdegames/kdegames-inst.xml
===================================================================
--- kde/add/kdegames/kdegames-inst.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdegames/kdegames-inst.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,10 @@
+<sect2>
+<title>Installation of <application>kdegames</application></title>
+
+<para>Install <application>kdegames</application> with:</para>
+<screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
+    --disable-dependency-tracking &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
Index: kde/add/kdegames/kdegames-intro.xml
===================================================================
--- kde/add/kdegames/kdegames-intro.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdegames/kdegames-intro.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,34 @@
+<sect2>
+<title>Introduction to <application>kdegames</application></title>
+
+<para><application>kdegames</application> is a compilation of various
+games.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&kdegames-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&kdegames-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &kdegames-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&kdegames-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&kdegames-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>kdegames</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="kdebase"/>
+</para></sect4>
+<sect4><title>Optional</title>
+<para>
+<xref linkend="libxml2"/>,
+<ulink
+url="http://www.research.att.com/sw/tools/graphviz/">graphviz</ulink>
+and
+<ulink url="http://www.stack.nl/~dimitri/doxygen/">doxygen</ulink>
+</para></sect4>
+</sect3>
+
+</sect2>
Index: kde/add/kdegames/kdegames.ent
===================================================================
--- kde/add/kdegames/kdegames.ent	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdegames/kdegames.ent	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,9 @@
+<!ENTITY kdegames SYSTEM "../kdegames.xml">
+<!ENTITY kdegames-intro SYSTEM "kdegames-intro.xml">
+<!ENTITY kdegames-inst SYSTEM "kdegames-inst.xml">
+<!ENTITY kdegames-desc SYSTEM "kdegames-desc.xml">
+<!ENTITY kdegames-download-http "&kde-download-http;/kdegames-&kde-version;.tar.bz2">
+<!ENTITY kdegames-download-ftp "&kde-download-ftp;/kdegames-&kde-version;.tar.bz2">
+<!ENTITY kdegames-size "8.7 MB">
+<!ENTITY kdegames-buildsize "68 MB">
+<!ENTITY kdegames-time "4.47 SBU">
Index: kde/add/kdegraphics.xml
===================================================================
--- kde/add/kdegraphics.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdegraphics.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,9 @@
+<sect1 id="kdegraphics" xreflabel="kdegraphics-&kde-version;">
+<?dbhtml filename="kdegraphics.html"?>
+<title>kdegraphics-&kde-version;</title>
+
+&kdegraphics-intro;
+&kdegraphics-inst;
+&kdegraphics-desc;
+
+</sect1>
Index: kde/add/kdegraphics/kdegraphics-desc.xml
===================================================================
--- kde/add/kdegraphics/kdegraphics-desc.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdegraphics/kdegraphics-desc.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,78 @@
+<sect2>
+<title>Contents</title>
+
+<para>Major programs in <application>kdegraphics</application> include
+<command>kamera</command>,
+<command>kcoloredit</command>,
+<command>kdvi</command>,
+<command>kfax</command>,
+<command>kgamma</command>,
+<command>kghostview</command>,
+<command>kiconedit</command>,
+<command>kooka</command>,
+<command>kpaint</command>,
+<command>kpdf</command>,
+<command>kpovmodeler</command>,
+<command>kruler</command>,
+<command>ksnapshot</command>,
+<command>kuickshow</command> and
+<command>kview</command>.
+</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>kamera</title>
+<para><command>kamera</command> allows you to view and download
+images on a digital camera.</para></sect3>
+
+<sect3><title>kcoloredit</title>
+<para><command>kcoloredit</command> is a color pallette
+editor.</para></sect3>
+
+<sect3><title>kdvi</title>
+<para><command>kdvi</command> is a <acronym>DVI</acronym>
+viewer.</para></sect3>
+
+<sect3><title>kfax</title>
+<para><command>kfax</command> is a <acronym>FAX</acronym>
+viewer.</para></sect3>
+
+<sect3><title>kgamma</title>
+<para><command>kgamma</command> is a simple tool for monitor gamma
+correction.</para></sect3>
+
+<sect3><title>kghostview</title>
+<para><command>kghostview</command> is a
+<acronym>PS</acronym>/<acronym>PDF</acronym> viewer.</para></sect3>
+
+<sect3><title>kiconedit</title>
+<para><command>kiconedit</command> is an icon editor.</para></sect3>
+
+<sect3><title>kooka</title>
+<para><command>kooka</command> is a raster image scan
+program.</para></sect3>
+
+<sect3><title>kpaint</title>
+<para><command>kpaint</command> is a paint program.</para></sect3>
+
+<sect3><title>kpovmodeler</title>
+<para><command>kpovmodeler</command> is a graphical 3D modeler,
+which can generate scenes for
+<ulink url="http://www.povray.org/">POV-Ray</ulink>.</para></sect3>
+
+<sect3><title>kruler</title>
+<para><command>kruler</command> is a screen ruler.</para></sect3>
+
+<sect3><title>ksnapshot</title>
+<para><command>ksnapshot</command> is a screen capture
+program.</para></sect3>
+
+<sect3><title>kuickshow</title>
+<para><command>kuickshow</command> is an image viewer.</para></sect3>
+
+<sect3><title>kview</title>
+<para><command>kview</command> is another image viewer.</para></sect3>
+
+</sect2>
Index: kde/add/kdegraphics/kdegraphics-inst.xml
===================================================================
--- kde/add/kdegraphics/kdegraphics-inst.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdegraphics/kdegraphics-inst.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,10 @@
+<sect2>
+<title>Installation of <application>kdegraphics</application></title>
+
+<para>Install <application>kdegraphics</application> with:</para>
+<screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
+    --disable-dependency-tracking &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
Index: kde/add/kdegraphics/kdegraphics-intro.xml
===================================================================
--- kde/add/kdegraphics/kdegraphics-intro.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdegraphics/kdegraphics-intro.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,37 @@
+<sect2>
+<title>Introduction to <application>kdegraphics</application></title>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&kdegraphics-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&kdegraphics-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &kdegraphics-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&kdegraphics-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&kdegraphics-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>kdegraphics</application>
+dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="kdebase"/>
+</para></sect4>
+<sect4><title>Optional</title>
+<para>
+<xref linkend="libxml2"/>,
+<xref linkend="sane"/>,
+<xref linkend="libtiff"/>,
+<xref linkend="xpdf"/>,
+<xref linkend="imlib"/>,
+<xref linkend="libart_lgpl"/>,
+<xref linkend="pkgconfig"/>,
+<ulink url="http://www.ece.uvic.ca/~mdadams/jasper/">JasPer</ulink>,
+<ulink url="http://fribidi.sourceforge.net/">FriBidi</ulink> and
+<ulink url="http://www.gphoto.org/">gPhoto2</ulink>
+</para></sect4>
+</sect3>
+
+</sect2>
Index: kde/add/kdegraphics/kdegraphics.ent
===================================================================
--- kde/add/kdegraphics/kdegraphics.ent	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdegraphics/kdegraphics.ent	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,9 @@
+<!ENTITY kdegraphics SYSTEM "../kdegraphics.xml">
+<!ENTITY kdegraphics-intro SYSTEM "kdegraphics-intro.xml">
+<!ENTITY kdegraphics-inst SYSTEM "kdegraphics-inst.xml">
+<!ENTITY kdegraphics-desc SYSTEM "kdegraphics-desc.xml">
+<!ENTITY kdegraphics-download-http "&kde-download-http;/kdegraphics-&kde-version;.tar.bz2">
+<!ENTITY kdegraphics-download-ftp "&kde-download-ftp;/kdegraphics-&kde-version;.tar.bz2">
+<!ENTITY kdegraphics-size "5.5 MB">
+<!ENTITY kdegraphics-buildsize "71 MB">
+<!ENTITY kdegraphics-time "8.12 SBU">
Index: kde/add/kdemultimedia.xml
===================================================================
--- kde/add/kdemultimedia.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdemultimedia.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,11 @@
+<sect1 id="kdemultimedia" xreflabel="kdemultimedia-&kde-version;">
+<?dbhtml filename="kdemultimedia.html"?>
+<title>kdemultimedia-&kde-version;</title>
+
+&kdemultimedia-intro;
+&kdemultimedia-inst;
+&kdemultimedia-exp;
+&kdemultimedia-config;
+&kdemultimedia-desc;
+
+</sect1>
Index: kde/add/kdemultimedia/kdemultimedia-config.xml
===================================================================
--- kde/add/kdemultimedia/kdemultimedia-config.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdemultimedia/kdemultimedia-config.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,17 @@
+<sect2>
+<title>Configuring kdemultimedia</title>
+
+<para>There is no explicit configuration for the kdemultimedia package,
+however <command>kscd</command> needs to find the CD drive. The default
+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):
+<screen><userinput><command>cd /dev &amp;&amp;
+ln -s <replaceable>[CD Drive]</replaceable>
+/dev/cdrom</command></userinput></screen>
+</para>
+
+</sect2>
Index: kde/add/kdemultimedia/kdemultimedia-desc.xml
===================================================================
--- kde/add/kdemultimedia/kdemultimedia-desc.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdemultimedia/kdemultimedia-desc.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,43 @@
+<sect2>
+<title>Contents</title>
+
+<para>Major programs in <application>kdemultimedia</application> include
+<command>artsbuilder</command>,
+<command>juk</command>,
+<command>kaboodle</command>,
+<command>kmid</command>,
+<command>kmix</command>,
+<command>krec</command>,
+<command>kscd</command> and
+<command>noatun</command>.
+</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>juk</title>
+<para><command>juk</command> is a jukebox, tagger and music
+collection manager.</para></sect3>
+
+<sect3><title>kaboodle</title>
+<para><command>kaboodle</command> is a multimedia player.</para></sect3>
+
+<sect3><title>kmid</title>
+<para><command>kmid</command> is a midi/karaoke player.</para></sect3>
+
+<sect3><title>kmix</title>
+<para><command>kmix</command> is a sound mixer.</para></sect3>
+
+<sect3><title>krec</title>
+<para><command>krec</command> is a recording frontend for
+<application>aRts</application>.</para></sect3>
+
+<sect3><title>kscd</title>
+<para><command>kscd</command> is a CD player.</para></sect3>
+
+<sect3><title>noatun</title>
+<para><command>noatun</command> is another multimedia
+player.</para></sect3>
+
+</sect2>
Index: kde/add/kdemultimedia/kdemultimedia-exp.xml
===================================================================
--- kde/add/kdemultimedia/kdemultimedia-exp.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdemultimedia/kdemultimedia-exp.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,26 @@
+<sect2>
+<title>Command explanations</title>
+
+<!--
+<para><command>sed -i -e 's/strings -ansi/strings/'
+kaudiocreator/Makefile</command> : 
+Remove <parameter>-ansi</parameter> from <application>gcc</application>
+parameters to work around
+a broken header in the kernel.  The broken file is
+<filename>asm/byteorder.h</filename>, where
+a parameter is used, but not defined, when <parameter>-ansi</parameter>
+is specified.</para>
+
+<para><command>sed -i -e 's/strings -ansi/strings/'
+kioslave/audiocd/Makefile</command> : 
+Remove <parameter>-ansi</parameter> from <application>gcc</application>
+parameters to work around
+a broken header in the kernel.</para>
+-->
+
+<para><command>sed -i -e 's/-ansi//' kscd/libwm/Makefile</command> :
+Remove <parameter>-ansi</parameter> from <application>gcc</application>
+parameters to work around
+a broken header in the kernel.</para>
+
+</sect2>
Index: kde/add/kdemultimedia/kdemultimedia-inst.xml
===================================================================
--- kde/add/kdemultimedia/kdemultimedia-inst.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdemultimedia/kdemultimedia-inst.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of <application>kdemultimedia</application></title>
+
+<para>Install <application>kdemultimedia</application> with:</para>
+<screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
+    --disable-dependency-tracking &amp;&amp;
+sed -i -e 's/-ansi//' kscd/libwm/Makefile &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
Index: kde/add/kdemultimedia/kdemultimedia-intro.xml
===================================================================
--- kde/add/kdemultimedia/kdemultimedia-intro.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdemultimedia/kdemultimedia-intro.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,41 @@
+<sect2>
+<title>Introduction to <application>kdemultimedia</application></title>
+
+<sect3><title>Package information</title>
+<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 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>
+<para><xref linkend="kdebase"/>
+</para></sect4>
+<sect4><title>Optional</title>
+<para>
+<xref linkend="alsa"/>,
+<xref linkend="CDParanoia"/>,
+<xref linkend="lame"/>,
+<xref linkend="audiofile"/>,
+<xref linkend="libogg"/>,
+<xref linkend="libvorbis"/>,
+<xref linkend="xine-lib"/>,
+<xref linkend="libtiff"/>,
+<xref linkend="libxml2"/>,
+<xref linkend="flac"/>,
+<ulink url="http://www.ece.uvic.ca/~mdadams/jasper/">JasPer</ulink>,
+<ulink url="http://developer.kde.org/~wheeler/taglib/">TagLib</ulink>
+and
+<ulink url="http://www.musicbrainz.org/">libmusicbrainz</ulink>
+</para></sect4>
+</sect3>
+
+</sect2>
Index: kde/add/kdemultimedia/kdemultimedia.ent
===================================================================
--- kde/add/kdemultimedia/kdemultimedia.ent	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdemultimedia/kdemultimedia.ent	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,11 @@
+<!ENTITY kdemultimedia SYSTEM "../kdemultimedia.xml">
+<!ENTITY kdemultimedia-intro SYSTEM "kdemultimedia-intro.xml">
+<!ENTITY kdemultimedia-inst SYSTEM "kdemultimedia-inst.xml">
+<!ENTITY kdemultimedia-exp SYSTEM "kdemultimedia-exp.xml">
+<!ENTITY kdemultimedia-config SYSTEM "kdemultimedia-config.xml">
+<!ENTITY kdemultimedia-desc SYSTEM "kdemultimedia-desc.xml">
+<!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-size "4.7 MB">
+<!ENTITY kdemultimedia-buildsize "78 MB">
+<!ENTITY kdemultimedia-time "8.18 SBU">
Index: kde/add/kdenetwork.xml
===================================================================
--- kde/add/kdenetwork.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdenetwork.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,10 @@
+<sect1 id="kdenetwork" xreflabel="kdenetwork-&kde-version;">
+<?dbhtml filename="kdenetwork.html"?>
+<title>kdenetwork-&kde-version;</title>
+
+&kdenetwork-intro;
+&kdenetwork-inst;
+&kdenetwork-config;
+&kdenetwork-desc;
+
+</sect1>
Index: kde/add/kdenetwork/kdenetwork-config.xml
===================================================================
--- kde/add/kdenetwork/kdenetwork-config.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdenetwork/kdenetwork-config.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,15 @@
+<sect2>
+<title>Configuring kdenetwork</title>
+
+<para>Install <filename>/etc/rc.d/init.d/lisa</filename> init script
+included in the <xref linkend="intro-important-bootscripts"/>
+package.</para>
+
+<screen><userinput><command>make
+install-lisa</command></userinput></screen>
+
+<para>There is no explicit configuration for the rest of the kdenetwork
+package, however individual packages need to be set up with user
+information.</para>
+
+</sect2>
Index: kde/add/kdenetwork/kdenetwork-desc.xml
===================================================================
--- kde/add/kdenetwork/kdenetwork-desc.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdenetwork/kdenetwork-desc.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,77 @@
+<sect2>
+<title>Contents</title>
+
+<para>Major programs in <application>kdenetwork</application> include
+<command>kdict</command>,
+<command>kget</command>,
+<command>knewsticker</command>,
+<command>kopete</command>,
+<command>kpf</command>,
+<command>kppp</command>,
+<command>krdc</command>,
+<command>krfb</command>,
+<command>ksirc</command>,
+<command>ktalkd</command>,
+<command>kwifimanager</command> and
+<command>lisa</command>.
+</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>kdict</title>
+<para><command>kdict</command> is a graphical client for the
+Dictionary Server Protocol (DICT).</para></sect3>
+
+<sect3><title>kget</title>
+<para><command>kget</command> allows you to group
+downloads.</para></sect3>
+
+<sect3><title>knewsticker</title>
+<para><command>knewsticker</command> is a news applet for the
+<acronym>KDE</acronym> Application Launcher Panel.</para></sect3>
+
+<sect3><title>kopete</title>
+<para><command>kopete</command> is <acronym>KDE</acronym>'s
+multi-protocol instant messenger client.</para></sect3>
+
+<sect3><title>kpf</title>
+<para><command>kpf</command> allows you to share files over a
+network.</para></sect3>
+
+<sect3><title>kppp</title>
+<para><command>kppp</command> is a dial-up utility.</para></sect3>
+
+<sect3><title>krdc</title>
+<para><command>krdc</command> is a client application that allows you to
+view or even control the desktop session on another machine that is
+running a compatible (<acronym>VNC</acronym>) server.</para></sect3>
+
+<sect3><title>krfb</title>
+<para><command>krfb</command> is a server application that allows you to
+share your current session with a user on another machine, who can use a
+<acronym>VNC</acronym> client to view or even control the
+desktop.</para></sect3>
+
+<sect3><title>ksirc</title>
+<para><command>ksirc</command> is a chat client.</para></sect3>
+
+<sect3><title>ktalkd</title>
+<para><command>ktalkd</command> is an enhanced <command>talk</command>
+daemon - a program to handle incoming <command>talk</command> requests,
+announce them and allow you to respond to them using a talk
+client.</para></sect3>
+
+<sect3><title>kwifimanager</title>
+<para>The <command>kwifimanager</command> suite can be used to
+configure and monitor wireless <acronym>LAN</acronym>
+cards.</para></sect3>
+
+<sect3><title>lisa</title>
+<para><command>lisa</command> is intended to provide a kind of network
+neighborhood, but only relying on the
+<acronym>TCP</acronym>/<acronym>IP</acronym> protocol stack, no
+<acronym>SMB</acronym> or anything else required.</para></sect3>
+
+</sect2>
Index: kde/add/kdenetwork/kdenetwork-inst.xml
===================================================================
--- kde/add/kdenetwork/kdenetwork-inst.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdenetwork/kdenetwork-inst.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,10 @@
+<sect2>
+<title>Installation of <application>kdenetwork</application></title>
+
+<para>Install <application>kdenetwork</application> with:</para>
+<screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
+    --disable-dependency-tracking &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
Index: kde/add/kdenetwork/kdenetwork-intro.xml
===================================================================
--- kde/add/kdenetwork/kdenetwork-intro.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdenetwork/kdenetwork-intro.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,38 @@
+<sect2>
+<title>Introduction to <application>kdenetwork</application></title>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&kdenetwork-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&kdenetwork-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &kdenetwork-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&kdenetwork-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&kdenetwork-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>kdenetwork</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="kdebase"/>
+</para></sect4>
+<sect4><title>Optional</title>
+<para>
+<xref linkend="libxml2"/>,
+<xref linkend="libxslt"/>,
+<xref linkend="ppp"/>,
+<xref linkend="openssl"/>,
+<xref linkend="libtiff"/>,
+<xref linkend="xmms"/>,
+<ulink url="http://www.openslp.org/">OpenSLP</ulink>,
+<ulink
+url="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html">Wireless
+Tools</ulink>,
+<ulink url="http://dev.null.pl/ekg/">libgadu</ulink> and
+<ulink url="http://www.ece.uvic.ca/~mdadams/jasper/">JasPer</ulink>
+</para></sect4>
+</sect3>
+
+</sect2>
Index: kde/add/kdenetwork/kdenetwork.ent
===================================================================
--- kde/add/kdenetwork/kdenetwork.ent	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdenetwork/kdenetwork.ent	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,10 @@
+<!ENTITY kdenetwork SYSTEM "../kdenetwork.xml">
+<!ENTITY kdenetwork-intro SYSTEM "kdenetwork-intro.xml">
+<!ENTITY kdenetwork-inst SYSTEM "kdenetwork-inst.xml">
+<!ENTITY kdenetwork-config SYSTEM "kdenetwork-config.xml">
+<!ENTITY kdenetwork-desc SYSTEM "kdenetwork-desc.xml">
+<!ENTITY kdenetwork-download-http "&kde-download-http;/kdenetwork-&kde-version;.tar.bz2">
+<!ENTITY kdenetwork-download-ftp "&kde-download-ftp;/kdenetwork-&kde-version;.tar.bz2">
+<!ENTITY kdenetwork-size "6.0 MB">
+<!ENTITY kdenetwork-buildsize "67 MB">
+<!ENTITY kdenetwork-time "3.21 SBU">
Index: kde/add/kdepim.xml
===================================================================
--- kde/add/kdepim.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdepim.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,9 @@
+<sect1 id="kdepim">
+<?dbhtml filename="kdepim.html"?>
+<title>kdepim-&kde-version;</title>
+
+&kdepim-intro;
+&kdepim-inst;
+&kdepim-desc;
+
+</sect1>
Index: kde/add/kdepim/kdepim-desc.xml
===================================================================
--- kde/add/kdepim/kdepim-desc.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdepim/kdepim-desc.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,76 @@
+<sect2>
+<title>Contents</title>
+
+<para>Major programs in <application>kdepim</application> include
+<command>kaddressbook</command>,
+<command>kalarm</command>,
+<command>kandy</command>,
+<command>karm</command>,
+<command>kgpgcertmanager</command>,
+<command>kmail</command>,
+<command>knode</command>,
+<command>knotes</command>,
+<command>konsolekalendar</command>,
+<command>kontact</command>
+<command>korganizer</command>,
+<command>korn</command> and
+<command>kpilot</command>.
+</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>kaddressbook</title>
+<para><command>kaddressbook</command> is the <acronym>KDE</acronym>
+address
+book.</para></sect3>
+
+<sect3><title>kalarm</title>
+<para><command>kalarm</command> is a system to provide reminder
+messages.</para></sect3>
+
+<sect3><title>kandy</title>
+<para><command>kandy</command>is a program to synchronize mobile phone
+numbers.</para></sect3>
+
+<sect3><title>karm</title>
+<para><command>karm</command> is a personal time tracker.</para></sect3>
+
+<sect3><title>kgpgcertmanager</title>
+<para><command>kgpgcertmanager</command> is a tool for managing X509
+certificates.</para></sect3>
+
+<sect3><title>kmail</title>
+<para><command>kmail</command> is <acronym>KDE</acronym>'s email
+client.</para></sect3>
+
+<sect3><title>knode</title>
+<para><command>knode</command> is the <acronym>KDE</acronym>
+newsreader.</para></sect3>
+
+<sect3><title>knotes</title>
+<para><command>knotes</command> is a popup notes utility.</para></sect3>
+
+<sect3><title>konsolekalendar</title>
+<para><command>konsolekalendar</command> is a command line interface
+to <acronym>KDE</acronym> calendars.</para></sect3>
+
+<sect3><title>kontact</title>
+<para><command>kontact</command> is the integrated solution to
+personal information management (PIM) needs.</para></sect3>
+
+<sect3><title>korganizer</title>
+<para><command>korganizer</command> is a personal calendar/todo
+system.</para></sect3>
+
+<sect3><title>korn</title>
+<para><command>korn</command> is a <acronym>KDE</acronym> mail checker
+that has the
+capabilities to dock itself to <command>kicker</command>.</para></sect3>
+
+<sect3><title>kpilot</title>
+<para><command>kpilot</command> is a program to synchronize a
+Palm-Pilot.</para></sect3>
+
+</sect2>
Index: kde/add/kdepim/kdepim-inst.xml
===================================================================
--- kde/add/kdepim/kdepim-inst.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdepim/kdepim-inst.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,10 @@
+<sect2>
+<title>Installation of <application>kdepim</application></title>
+
+<para>Install <application>kdepim</application> with:</para>
+<screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
+    --disable-dependency-tracking &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
Index: kde/add/kdepim/kdepim-intro.xml
===================================================================
--- kde/add/kdepim/kdepim-intro.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdepim/kdepim-intro.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,35 @@
+<sect2>
+<title>Introduction to <application>kdepim</application></title>
+
+<sect3><title>Package information</title>
+<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 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>Optional</title>
+<para>
+<xref linkend="libxml2"/>,
+<ulink
+url="http://jasonday.home.att.net/code/libmal/libmal.html">libmal</ulink>,
+<ulink url="http://www.gnokii.org/">gnokii</ulink>,
+<ulink url="http://www.pilot-link.org/">pilot-link</ulink>,
+<ulink
+url="http://www.research.att.com/sw/tools/graphviz/">graphviz</ulink>
+and
+<ulink url="http://www.stack.nl/~dimitri/doxygen/">doxygen</ulink>
+</para></sect4>
+</sect3>
+
+</sect2>
Index: kde/add/kdepim/kdepim.ent
===================================================================
--- kde/add/kdepim/kdepim.ent	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdepim/kdepim.ent	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,9 @@
+<!ENTITY kdepim SYSTEM "../kdepim.xml">
+<!ENTITY kdepim-intro SYSTEM "kdepim-intro.xml">
+<!ENTITY kdepim-inst SYSTEM "kdepim-inst.xml">
+<!ENTITY kdepim-desc SYSTEM "kdepim-desc.xml">
+<!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-size "7.4 MB">
+<!ENTITY kdepim-buildsize "110 MB">
+<!ENTITY kdepim-time "12.2 SBU">
Index: kde/add/kdetoys.xml
===================================================================
--- kde/add/kdetoys.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdetoys.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,9 @@
+<sect1 id="kdetoys">
+<?dbhtml filename="kdetoys.html"?>
+<title>kdetoys-&kde-version;</title>
+
+&kdetoys-intro;
+&kdetoys-inst;
+&kdetoys-desc;
+
+</sect1>
Index: kde/add/kdetoys/kdetoys-desc.xml
===================================================================
--- kde/add/kdetoys/kdetoys-desc.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdetoys/kdetoys-desc.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,35 @@
+<sect2>
+<title>Contents</title>
+
+<para>Major programs in <application>kdetoys</application> include
+<command>amor</command>,
+<command>kmoon</command>,
+<command>kodo</command>,
+<command>kteatime</command>,
+<command>ktux</command>,
+<command>kweather</command> and
+<command>kworldclock</command>.
+</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>amor</title>
+<para><command>amor</command> - Amusing Misuse of
+Resources.</para></sect3>
+
+<sect3><title>kmoon</title>
+<para><command>kmoon</command> is a Moon phase indicator.</para></sect3>
+
+<sect3><title>kodo</title>
+<para><command>kodo</command> measures your desktop
+mileage.</para></sect3>
+
+<sect3><title>kteatime</title>
+<para><command>kteatime</command> times your tea brewing.</para></sect3>
+
+<sect3><title>ktux</title>
+<para><command>ktux</command> - small Tux crossing stars.</para></sect3>
+
+</sect2>
Index: kde/add/kdetoys/kdetoys-inst.xml
===================================================================
--- kde/add/kdetoys/kdetoys-inst.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdetoys/kdetoys-inst.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,10 @@
+<sect2>
+<title>Installation of <application>kdetoys</application></title>
+
+<para>Install <application>kdetoys</application> with:</para>
+<screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
+    --disable-dependency-tracking &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
Index: kde/add/kdetoys/kdetoys-intro.xml
===================================================================
--- kde/add/kdetoys/kdetoys-intro.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdetoys/kdetoys-intro.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,29 @@
+<sect2>
+<title>Introduction to <application>kdetoys</application></title>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&kdetoys-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&kdetoys-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &kdetoys-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&kdetoys-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&kdetoys-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>kdetoys</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="kdebase"/>
+</para></sect4>
+<sect4><title>Optional</title>
+<para>
+<xref linkend="libxml2"/>,
+<xref linkend="libtiff"/> and
+<ulink url="http://www.ece.uvic.ca/~mdadams/jasper/">JasPer</ulink>,
+</para></sect4>
+</sect3>
+
+</sect2>
Index: kde/add/kdetoys/kdetoys.ent
===================================================================
--- kde/add/kdetoys/kdetoys.ent	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdetoys/kdetoys.ent	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,9 @@
+<!ENTITY kdetoys SYSTEM "../kdetoys.xml">
+<!ENTITY kdetoys-intro SYSTEM "kdetoys-intro.xml">
+<!ENTITY kdetoys-inst SYSTEM "kdetoys-inst.xml">
+<!ENTITY kdetoys-desc SYSTEM "kdetoys-desc.xml">
+<!ENTITY kdetoys-download-http "&kde-download-http;/kdetoys-&kde-version;.tar.bz2">
+<!ENTITY kdetoys-download-ftp "&kde-download-ftp;/kdetoys-&kde-version;.tar.bz2">
+<!ENTITY kdetoys-size "2.4 MB">
+<!ENTITY kdetoys-buildsize "14 MB">
+<!ENTITY kdetoys-time "0.96 SBU">
Index: kde/add/kdeutils.xml
===================================================================
--- kde/add/kdeutils.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdeutils.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,9 @@
+<sect1 id="kdeutils">
+<?dbhtml filename="kdeutils.html"?>
+<title>kdeutils-&kde-version;</title>
+
+&kdeutils-intro;
+&kdeutils-inst;
+&kdeutils-desc;
+
+</sect1>
Index: kde/add/kdeutils/kdeutils-desc.xml
===================================================================
--- kde/add/kdeutils/kdeutils-desc.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdeutils/kdeutils-desc.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,75 @@
+<sect2>
+<title>Contents</title>
+
+<para>Major programs in <application>kdeutils</application> include
+<command>ark</command>,
+<command>irkick</command>,
+<command>kcalc</command>,
+<command>kcharselect</command>,
+<command>kcmlirc</command>,
+<command>kdepasswd</command>,
+<command>kdf</command>,
+<command>kedit</command>,
+<command>kfloppy</command>,
+<command>kgpg</command>,
+<command>khexedit</command>,
+<command>kjots</command>,
+<command>ksim</command>,
+<command>kregexpeditor</command>,
+<command>ktimer</command> and
+<command>kwallet</command>.
+</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>ark</title>
+<para><command>ark</command> is an archiving tool.</para></sect3>
+
+<sect3><title>irkick</title>
+<para><command>irkick</command> is the infrastructure for the
+<acronym>KDE</acronym>'s Infrared Remote Control functionality;
+<command>irkick</command> is the server component of that
+infrastructure.</para></sect3>
+
+<sect3><title>kcalc</title>
+<para><command>kcalc</command> is a scientific
+calculator.</para></sect3>
+
+<sect3><title>kcharselect</title>
+<para><command>kcharselect</command> is a character selector
+applet.</para></sect3>
+
+<sect3><title>kdepasswd</title>
+<para><command>kdepasswd</command> is a password managing
+utility.</para></sect3>
+
+<sect3><title>kdf</title>
+<para><command>kdf</command> is a disk usage viewer.</para></sect3>
+
+<sect3><title>kedit</title>
+<para><command>kedit</command> is a text editor.</para></sect3>
+
+<sect3><title>kfloppy</title>
+<para><command>kfloppy</command> is a floppy formatter.</para></sect3>
+
+<sect3><title>kgpg</title>
+<para><command>kgpg</command> is a simple graphical interface for
+<xref linkend="gnupg"/>.</para></sect3>
+
+<sect3><title>khexedit</title>
+<para><command>khexedit</command> is a binary editor.</para></sect3>
+
+<sect3><title>kjots</title>
+<para><command>kjots</command> is a note taker.</para></sect3>
+
+<sect3><title>kregexpeditor</title>
+<para><command>kregexpeditor</command> is an editor for editing regular
+expressions in a graphical style (in contrast to the
+<acronym>ASCII</acronym> syntax).</para></sect3>
+
+<sect3><title>ktimer</title>
+<para><command>ktimer</command> is a task scheduler.</para></sect3>
+
+</sect2>
Index: kde/add/kdeutils/kdeutils-inst.xml
===================================================================
--- kde/add/kdeutils/kdeutils-inst.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdeutils/kdeutils-inst.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,10 @@
+<sect2>
+<title>Installation of <application>kdeutils</application></title>
+
+<para>Install <application>kdeutils</application> with:</para>
+<screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
+    --disable-dependency-tracking &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
Index: kde/add/kdeutils/kdeutils-intro.xml
===================================================================
--- kde/add/kdeutils/kdeutils-intro.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdeutils/kdeutils-intro.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,28 @@
+<sect2>
+<title>Introduction to <application>kdeutils</application></title>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&kdeutils-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&kdeutils-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &kdeutils-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&kdeutils-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&kdeutils-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>kdeutils</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="kdebase"/>
+</para></sect4>
+<sect4><title>Optional</title>
+<para>
+<xref linkend="libxml2"/> and
+<ulink url="http://tpctl.sourceforge.net/">tpctl</ulink>
+</para></sect4>
+</sect3>
+
+</sect2>
Index: kde/add/kdeutils/kdeutils.ent
===================================================================
--- kde/add/kdeutils/kdeutils.ent	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/add/kdeutils/kdeutils.ent	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,9 @@
+<!ENTITY kdeutils SYSTEM "../kdeutils.xml">
+<!ENTITY kdeutils-intro SYSTEM "kdeutils-intro.xml">
+<!ENTITY kdeutils-inst SYSTEM "kdeutils-inst.xml">
+<!ENTITY kdeutils-desc SYSTEM "kdeutils-desc.xml">
+<!ENTITY kdeutils-download-http "&kde-download-http;/kdeutils-&kde-version;.tar.bz2">
+<!ENTITY kdeutils-download-ftp "&kde-download-ftp;/kdeutils-&kde-version;.tar.bz2">
+<!ENTITY kdeutils-size "2.5 MB">
+<!ENTITY kdeutils-buildsize "41 MB">
+<!ENTITY kdeutils-time "3.97 SBU">
Index: kde/core/arts.xml
===================================================================
--- kde/core/arts.xml	(revision 8ba058e76b0ce3eb4eafe901a3a98903624e6ddf)
+++ kde/core/arts.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -3,101 +3,8 @@
 <title>aRts-&arts-version;</title>
 
-<sect2><title>Introduction to <application><acronym>aRts</acronym></application></title>
+&arts-intro;
+&arts-inst;
+&arts-exp;
+&arts-config;
 
-<para>The Analog Real-time Synthesizer (<acronym>aRts</acronym>)
-provides sound support for <acronym>KDE</acronym>. It provides necessary 
-libraries for kdelibs.</para> 
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink url="&arts-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&arts-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &arts-size;</para></listitem>
-<listitem><para>Estimated Disk space required: &arts-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &arts-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application>aRts</application> dependencies</title>
-<sect4><title>Required</title>
-<para>
-<xref linkend="qt"/> and
-<xref linkend="GLib2"/>
-</para></sect4>
-<sect4><title>Optional</title>
-<para>
-<xref linkend="libogg"/>,
-<xref linkend="libvorbis"/>,
-<xref linkend="alsa"/>,
-<xref linkend="audiofile"/>,
-<xref linkend="pkgconfig"/>,
-<xref linkend="libmad"/>,
-<xref linkend="esound"/> and
-<ulink url="http://www.mediaapplicationserver.net/">MAS</ulink>
-</para></sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>aRts</application></title>
-
-<para>Install <application>aRts</application> by running the
-following commands:</para>
-
-<screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
-    --disable-dependency-tracking &amp;&amp;
-make &amp;&amp;
-make install &amp;&amp;
-ln -sfn kde-&kde-version; /opt/kde</command></userinput></screen>
-
-<note><para>Another configure option is <parameter>--enable-final</parameter>. 
-This option can speed up the build process, but requires a lot of memory.  If
-you have less than 256MB of RAM, this option may cause swapping and 
-significantly slow compilation.</para></note>
-
-</sect2>
-
-<sect2><title>Command explanations</title>
-<para><parameter>--prefix=&kde-dir;</parameter> : This option tells the
-process to install the package in <filename
-class="directory">&kde-dir;</filename>. We put aRts here because this
-package is required before installing <acronym>KDE</acronym>.</para>
-
-<para><parameter>--disable-debug</parameter> : This option causes the
-system to be compiled without debugging code.
-</para>
-
-<para><parameter>--disable-dependency-tracking</parameter> : This option speeds
-up one time builds.</para>
-
-<para><command>ln -sfn kde-&kde-version; /opt/kde</command> : This parameter creates
-a link for access to <acronym>KDE</acronym>. If a newer version of
-<acronym>KDE</acronym> is released, the new
-system can be built by changing the <parameter>--prefix</parameter> location
-and then set up by changing the link as this parameter does.
-</para>
-
-</sect2>
-
-<sect2><title>Configuring aRts</title>
-
-<sect3><title>Configuration Information</title>
-
-<para>The library directory <filename class="directory">/opt/kde/lib</filename> 
-should appear in <filename>/etc/ld.so.conf</filename> 
-so that ldd can find the shared libraries. The following command will add it 
-if it is missing:</para>
-
-<screen><userinput><command>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; "EOF"
-# Begin kde addition to /etc/ld.so.conf
-
-/opt/kde/lib
-
-# End kde addition
-EOF
-ldconfig</command></userinput></screen>
-
-</sect3>
-
-</sect2>
 </sect1>
Index: kde/core/arts/arts-config.xml
===================================================================
--- kde/core/arts/arts-config.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/core/arts/arts-config.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,23 @@
+<sect2><title>Configuring aRts</title>
+
+<sect3><title>Configuration Information</title>
+
+<para>The library directory <filename
+class="directory">/opt/kde/lib</filename>
+should appear in <filename>/etc/ld.so.conf</filename>
+so that ldd can find the shared libraries. The following command will
+add it
+if it is missing:</para>
+
+<screen><userinput><command>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; "EOF"
+# Begin kde addition to /etc/ld.so.conf
+
+/opt/kde/lib
+
+# End kde addition
+EOF
+ldconfig</command></userinput></screen>
+
+</sect3>
+
+</sect2>
Index: kde/core/arts/arts-exp.xml
===================================================================
--- kde/core/arts/arts-exp.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/core/arts/arts-exp.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,24 @@
+<sect2><title>Command explanations</title>
+<para><parameter>--prefix=&kde-dir;</parameter> : This option tells the
+process to install the package in <filename
+class="directory">&kde-dir;</filename>. We put aRts here because this
+package is required before installing <acronym>KDE</acronym>.</para>
+
+<para><parameter>--disable-debug</parameter> : This option causes the
+system to be compiled without debugging code.
+</para>
+
+<para><parameter>--disable-dependency-tracking</parameter> : This option
+speeds
+up one time builds.</para>
+
+<para><command>ln -sfn kde-&kde-version; /opt/kde</command> : This
+parameter creates
+a link for access to <acronym>KDE</acronym>. If a newer version of
+<acronym>KDE</acronym> is released, the new
+system can be built by changing the <parameter>--prefix</parameter>
+location
+and then set up by changing the link as this parameter does.
+</para>
+
+</sect2>
Index: kde/core/arts/arts-inst.xml
===================================================================
--- kde/core/arts/arts-inst.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/core/arts/arts-inst.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,20 @@
+<sect2>
+<title>Installation of <application>aRts</application></title>
+
+<para>Install <application>aRts</application> by running the
+following commands:</para>
+
+<screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
+    --disable-dependency-tracking &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+ln -sfn kde-&kde-version; /opt/kde</command></userinput></screen>
+
+<note><para>Another configure option is
+<parameter>--enable-final</parameter>.
+This option can speed up the build process, but requires a lot of
+memory.  If
+you have less than 256MB of RAM, this option may cause swapping and
+significantly slow compilation.</para></note>
+
+</sect2>
Index: kde/core/arts/arts-intro.xml
===================================================================
--- kde/core/arts/arts-intro.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/core/arts/arts-intro.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,40 @@
+<sect2><title>Introduction to
+<application><acronym>aRts</acronym></application></title>
+
+<para>The Analog Real-time Synthesizer (<acronym>aRts</acronym>)
+provides sound support for <acronym>KDE</acronym>. It provides necessary
+libraries for kdelibs.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&arts-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&arts-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &arts-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&arts-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&arts-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>aRts</application> dependencies</title>
+<sect4><title>Required</title>
+<para>
+<xref linkend="qt"/> and
+<xref linkend="GLib2"/>
+</para></sect4>
+<sect4><title>Optional</title>
+<para>
+<xref linkend="libogg"/>,
+<xref linkend="libvorbis"/>,
+<xref linkend="alsa"/>,
+<xref linkend="audiofile"/>,
+<xref linkend="pkgconfig"/>,
+<xref linkend="libmad"/>,
+<xref linkend="esound"/> and
+<ulink url="http://www.mediaapplicationserver.net/">MAS</ulink>
+</para></sect4>
+</sect3>
+
+</sect2>
Index: kde/core/arts/arts.ent
===================================================================
--- kde/core/arts/arts.ent	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/core/arts/arts.ent	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,11 @@
+<!ENTITY kde-core-arts SYSTEM "../arts.xml">
+<!ENTITY arts-intro SYSTEM "arts-intro.xml">
+<!ENTITY arts-inst SYSTEM "arts-inst.xml">
+<!ENTITY arts-exp SYSTEM "arts-exp.xml">
+<!ENTITY arts-config SYSTEM "arts-config.xml">
+<!ENTITY arts-version "1.2.1">
+<!ENTITY arts-download-http "&kde-download-http;/arts-&arts-version;.tar.bz2">
+<!ENTITY arts-download-ftp "&kde-download-ftp;/arts-&arts-version;.tar.bz2">
+<!ENTITY arts-size "1016 KB">
+<!ENTITY arts-buildsize "24 MB">
+<!ENTITY arts-time "1.60 SBU">
Index: kde/core/core.xml
===================================================================
--- kde/core/core.xml	(revision 8ba058e76b0ce3eb4eafe901a3a98903624e6ddf)
+++ kde/core/core.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -4,6 +4,6 @@
 
 &kde-core-arts;
-&kde-libs;
-&kde-base;
+&kdelibs;
+&kdebase;
 &kde-core-config;
 
Index: e/core/kde-old.xml
===================================================================
--- kde/core/kde-old.xml	(revision 8ba058e76b0ce3eb4eafe901a3a98903624e6ddf)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<sect2 id="kde" xreflabel="kde">
-<title>KDE-&kde-version;</title>
-
-&kde-intro;
-&kde-inst;
-
-&kde-multimedia;
-&kde-network;
-&kde-graphics;
-&kde-pim;
-&kde-admin;
-&kde-games;
-&kde-utils;
-&kde-edu;
-&kde-artwork;
-&kde-toys;
-&kde-addons;
-&kde-office;
-<!-- &kde-exp;
-&kde-desc; -->
-
-</sect2>
-
Index: kde/core/kdebase.xml
===================================================================
--- kde/core/kdebase.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/core/kdebase.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,9 @@
+<sect1 id="kdebase" xreflabel="kdebase-&kde-version;">
+<?dbhtml filename="kdebase.html"?>
+<title>kdebase-&kde-version;</title>
+
+&kdebase-intro;
+&kdebase-inst;
+&kdebase-desc;
+
+</sect1>
Index: kde/core/kdebase/kdebase-desc.xml
===================================================================
--- kde/core/kdebase/kdebase-desc.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/core/kdebase/kdebase-desc.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,109 @@
+<sect2>
+<title>Contents</title>
+
+<para>Major programs in <application>kdebase</application> include
+<command>kate</command>,
+<command>kcontrol</command>,
+<command>kdebugdialog</command>,
+<command>kdeprint</command>,
+<command>kdesu</command>,
+<command>kdm</command>,
+<command>kfind</command>,
+<command>khelpcenter</command>,
+<command>kicker</command>,
+<command>kinfocenter</command>,
+<command>kioslave</command>,
+<command>klipper</command>,
+<command>kmenuedit</command>,
+<command>konqueror</command>,
+<command>konsole</command>,
+<command>kpager</command>,
+<command>ksplashml</command>,
+<command>ksysguard</command>,
+<command>kwrite</command> and
+<command>kxkb</command>.
+</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>kate</title>
+<para><command>kate</command> is a programmer's text editor for
+<acronym>KDE</acronym>.</para></sect3>
+
+<sect3><title>kcontrol</title>
+<para><command>kcontrol</command> is <acronym>KDE</acronym> Control
+Center.</para></sect3>
+
+<sect3><title>kdebugdialog</title>
+<para><command>kdebugdialog</command> is a dialog box for managing
+diagnostic messages at runtime.</para></sect3>
+
+<sect3><title>kdeprint</title>
+<para><command>kdeprint</command> provides Print job
+administration.</para></sect3>
+
+<sect3><title>kdesu</title>
+<para><command>kdesu</command> is a graphical front end for the
+Unix <command>su</command> command.</para></sect3>
+
+<sect3><title>kdm</title>
+<para><command>kdm</command> is the <acronym>KDE</acronym> display
+manager (a
+replacement for <command>xdm</command>).</para></sect3>
+
+<sect3><title>kfind</title>
+<para><command>kfind</command> is an utility to find
+files.</para></sect3>
+
+<sect3><title>khelpcenter</title>
+<para><command>khelpcenter</command> is the <acronym>KDE</acronym> help
+tool.</para></sect3>
+
+<sect3><title>kicker</title>
+<para><command>kicker</command> is the <acronym>KDE</acronym> control
+panel.</para></sect3>
+
+<sect3><title>kinfocenter</title>
+<para><command>kinfocenter</command> provides a centralized
+and convenient overview of your <acronym>KDE</acronym> and system
+settings.</para></sect3>
+
+<sect3><title>klipper</title>
+<para><command>klipper</command> is a clipboard utility.</para></sect3>
+
+<sect3><title>kmenuedit</title>
+<para><command>kmenuedit</command> is an utility to rearrange or add
+items to the K-menu.</para></sect3>
+
+<sect3><title>konqueror</title>
+<para><command>konqueror</command> is a filesystem and Web
+browser.</para></sect3>
+
+<sect3><title>konsole</title>
+<para><command>konsole</command> is a highly configurable X terminal
+emulator.</para></sect3>
+
+<sect3><title>kpager</title>
+<para><command>kpager</command> provides a thumbnail view of all
+virtual desktops.</para></sect3>
+
+<sect3><title>ksplashml</title>
+<para><command>ksplashml</command> is a splash screen that
+shows the progress of an application that is loading.</para></sect3>
+
+<sect3><title>ksysguard</title>
+<para><command>ksysguard</command> is a network enabled task manager
+and system monitor application, with the additional functionality of
+<command>top</command>.</para></sect3>
+
+<sect3><title>kwrite</title>
+<para><command>kwrite</command> is a text editor for
+<acronym>KDE</acronym>.</para></sect3>
+
+<sect3><title>kxkb</title>
+<para><command>kxkb</command> is a keyboard layout switching
+utility based on X11 xkb extension.</para></sect3>
+
+</sect2>
Index: kde/core/kdebase/kdebase-inst.xml
===================================================================
--- kde/core/kdebase/kdebase-inst.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/core/kdebase/kdebase-inst.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,10 @@
+<sect2>
+<title>Installation of <application>kdebase</application></title>
+
+<para>Install kdebase with:</para>
+<screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
+    --disable-dependency-tracking &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
Index: kde/core/kdebase/kdebase-intro.xml
===================================================================
--- kde/core/kdebase/kdebase-intro.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/core/kdebase/kdebase-intro.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,48 @@
+<sect2>
+<title>Introduction to <application>kdebase</application></title>
+
+<para><application>kdebase</application> is the second mandatory package
+(besides kdelibs) for
+the K Desktop Environment. It provides various applications and
+infrastructure files
+and libraries.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&kdebase-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&kdebase-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &kdebase-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&kdebase-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&kdebase-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>kdebase</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="kdelibs"/></para></sect4>
+<sect4><title>Optional</title>
+<para>
+<xref linkend="libxml2"/>,
+<xref linkend="j2sdk"/>,
+<xref linkend="lesstif"/>,
+<xref linkend="openssl"/>,
+<xref linkend="Linux_PAM"/>,
+<xref linkend="libtiff"/>,
+<xref linkend="openldap"/>,
+<xref linkend="pkgconfig"/>,
+<xref linkend="libart_lgpl"/>,
+<xref linkend="samba3"/>,
+<ulink url="http://mtools.linux.lu/">Mtools</ulink>,
+<ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>,
+<ulink url="http://www.ece.uvic.ca/~mdadams/jasper/">JasPer</ulink>,
+<ulink
+url="http://www.research.att.com/sw/tools/graphviz/">graphviz</ulink>
+and
+<ulink url="http://www.stack.nl/~dimitri/doxygen/">doxygen</ulink>
+</para></sect4>
+</sect3>
+
+</sect2>
Index: kde/core/kdebase/kdebase.ent
===================================================================
--- kde/core/kdebase/kdebase.ent	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/core/kdebase/kdebase.ent	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,9 @@
+<!ENTITY kdebase SYSTEM "../kdebase.xml">
+<!ENTITY kdebase-intro SYSTEM "kdebase-intro.xml">
+<!ENTITY kdebase-inst SYSTEM "kdebase-inst.xml">
+<!ENTITY kdebase-desc SYSTEM "kdebase-desc.xml">
+<!ENTITY kdebase-download-http "&kde-download-http;/kdebase-&kde-version;.tar.bz2">
+<!ENTITY kdebase-download-ftp "&kde-download-ftp;/kdebase-&kde-version;.tar.bz2">
+<!ENTITY kdebase-size "17 MB">
+<!ENTITY kdebase-buildsize "172 MB">
+<!ENTITY kdebase-time "15.9 SBU">
Index: kde/core/kdelibs.xml
===================================================================
--- kde/core/kdelibs.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/core/kdelibs.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,11 @@
+<sect1 id="kdelibs" xreflabel="kdelibs-&kde-version;">
+<?dbhtml filename="kdelibs.html"?>
+<title>kdelibs-&kde-version;</title>
+ 
+&kdelibs-intro;
+&kdelibs-inst;
+&kdelibs-exp;
+&kdelibs-config;
+&kdelibs-desc;
+
+</sect1>
Index: kde/core/kdelibs/kdelibs-config.xml
===================================================================
--- kde/core/kdelibs/kdelibs-config.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/core/kdelibs/kdelibs-config.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,13 @@
+<sect2>
+<title>Configuring <application>kdelibs</application></title>
+
+<sect3><title>Configuration Information</title>
+
+<para>Add <filename class="directory">/opt/kde/bin</filename> to
+your <envar>PATH</envar> environment variable:</para>
+
+<screen><userinput><command>export
+PATH=$PATH:/opt/kde/bin</command></userinput></screen>
+
+</sect3>
+</sect2>
Index: kde/core/kdelibs/kdelibs-desc.xml
===================================================================
--- kde/core/kdelibs/kdelibs-desc.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/core/kdelibs/kdelibs-desc.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,5 @@
+<sect2><title>Contents</title>
+<para>kdelibs provides numerous libraries needed by
+<acronym>KDE</acronym> programs.</para>
+
+</sect2>
Index: kde/core/kdelibs/kdelibs-exp.xml
===================================================================
--- kde/core/kdelibs/kdelibs-exp.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/core/kdelibs/kdelibs-exp.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,23 @@
+<sect2><title>Command explanations</title>
+<para><parameter>--prefix=&kde-dir;</parameter> : This option tells
+the process to install the package in <filename
+class="directory">&kde-dir;</filename>.</para>
+
+<para><parameter>--disable-debug</parameter> : This option causes the
+system to be compiled without debugging code.</para>
+
+<para><parameter>--disable-dependency-tracking</parameter> : This option
+speeds up one time builds.</para>
+
+<para><parameter>--enable-fast-malloc=full</parameter> : This option
+tells
+<acronym>KDE</acronym> programs to use an internal memory allocation
+scheme
+optimized for <acronym>KDE</acronym>.</para>
+
+<para><parameter>--disable-pcre</parameter> : Omit this switch if you
+have <acronym>PCRE</acronym> installed and you want improved regular
+expression support
+in the <acronym>KDE</acronym> JavaScript engine.</para>
+
+</sect2>
Index: kde/core/kdelibs/kdelibs-inst.xml
===================================================================
--- kde/core/kdelibs/kdelibs-inst.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/core/kdelibs/kdelibs-inst.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,17 @@
+<sect2>
+<title>Installation of <application>kdelibs</application></title>
+
+<para>Install <application>kdelibs</application> with:</para>
+<screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
+    --disable-dependency-tracking --enable-fast-malloc=full --disable-pcre &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+<note><para>If you wish to create the <acronym>API</acronym>
+documentation and you have
+doxygen and graphviz installed, <command>make apidox</command> must be
+done
+before <command>make install</command>. This applies to all packages
+which can utilize doxygen.</para></note>
+
+</sect2>
Index: kde/core/kdelibs/kdelibs-intro.xml
===================================================================
--- kde/core/kdelibs/kdelibs-intro.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/core/kdelibs/kdelibs-intro.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,47 @@
+<sect2>
+<title>Introduction to <application>kdelibs</application></title>
+
+<para>This package includes libraries that are central to the
+development and execution of a <acronym>KDE</acronym> program, as well
+as internationalization files for these libraries, misc
+<acronym>HTML</acronym> documentation, theme modules and regression
+tests.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&kdelibs-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&kdelibs-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &kdelibs-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&kdelibs-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&kdelibs-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>kdelibs</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="kde-core-arts"/></para></sect4>
+<sect4><title>Optional</title>
+<para>
+<xref linkend="libxml2"/>,
+<xref linkend="libxslt"/>,
+<xref linkend="cups"/>,
+<xref linkend="openldap"/>,
+<xref linkend="fam"/>,
+<xref linkend="pcre"/>,
+<xref linkend="openssl"/>,
+<xref linkend="libart_lgpl"/>,
+<xref linkend="alsa"/>,
+<xref linkend="libtiff"/>,
+<ulink url="http://www.gnu.org/software/libidn/">Libidn</ulink>,
+<ulink url="http://www.ece.uvic.ca/~mdadams/jasper/">JasPer</ulink>,
+<ulink
+url="http://www.research.att.com/sw/tools/graphviz/">graphviz</ulink>
+and
+<ulink url="http://www.stack.nl/~dimitri/doxygen/">doxygen</ulink>
+</para></sect4>
+</sect3>
+
+</sect2>
Index: kde/core/kdelibs/kdelibs.ent
===================================================================
--- kde/core/kdelibs/kdelibs.ent	(revision ee2025f4cd233b04703e7c613f946250313906b1)
+++ kde/core/kdelibs/kdelibs.ent	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -0,0 +1,11 @@
+<!ENTITY kdelibs SYSTEM "../kdelibs.xml">
+<!ENTITY kdelibs-intro SYSTEM "kdelibs-intro.xml">
+<!ENTITY kdelibs-inst SYSTEM "kdelibs-inst.xml">
+<!ENTITY kdelibs-exp SYSTEM "kdelibs-exp.xml">
+<!ENTITY kdelibs-config SYSTEM "kdelibs-config.xml">
+<!ENTITY kdelibs-desc SYSTEM "kdelibs-desc.xml">
+<!ENTITY kdelibs-download-http "&kde-download-http;/kdelibs-&kde-version;.tar.bz2">
+<!ENTITY kdelibs-download-ftp "&kde-download-ftp;/kdelibs-&kde-version;.tar.bz2">
+<!ENTITY kdelibs-size "13 MB">
+<!ENTITY kdelibs-buildsize "160 MB">
+<!ENTITY kdelibs-time "12.3 SBU">
Index: e/inst/kde-addons.xml
===================================================================
--- kde/inst/kde-addons.xml	(revision 8ba058e76b0ce3eb4eafe901a3a98903624e6ddf)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<sect1 id="kde-addons">
-<?dbhtml filename="kde-addons.html"?>
-<title>kdeaddons-&kde-version;</title>
-
-<sect2>
-<title>Introduction to <application>kdeaddons</application></title>
-
-<para><application>kdeaddons</application> contains additional plugins 
-and scripts for some <acronym>KDE</acronym> applications. This package
-should be compiled last.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink url="&kde-addons-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&kde-addons-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &kde-addons-size;</para></listitem>
-<listitem><para>Estimated Disk space required: &kde-addons-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &kde-addons-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application>kdeaddons</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="kde-base"/>
-</para></sect4>
-<sect4><title>Optional</title>
-<para>
-<xref linkend="libxml2"/>,
-<xref linkend="db"/>,
-<xref linkend="xmms"/> and
-<xref linkend="SDL"/>
-</para></sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>kdeaddons</application></title>
-
-<para>Install <application>kdeaddons</application> with:</para>
-<screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
-    --disable-dependency-tracking &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<para>The <acronym>KDE</acronym> Addons package provides konqueror and
-noatun plugins, kicker applets and newskicker scripts.</para>
-
-</sect2>
-</sect1>
Index: e/inst/kde-admin.xml
===================================================================
--- kde/inst/kde-admin.xml	(revision 8ba058e76b0ce3eb4eafe901a3a98903624e6ddf)
+++ 	(revision )
@@ -1,73 +1,0 @@
-<sect1 id="kde-admin">
-<?dbhtml filename="kde-admin.html"?>
-<title>kdeadmin-&kde-version;</title>
-
-<sect2>
-<title>Introduction to <application>kdeadmin</application></title>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink url="&kde-admin-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&kde-admin-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &kde-admin-size;</para></listitem>
-<listitem><para>Estimated Disk space required: &kde-admin-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &kde-admin-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application>kdeadmin</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="kde-base"/>
-</para></sect4>
-<sect4><title>Optional</title>
-<para>
-<xref linkend="libxml2"/> and
-<xref linkend="Linux_PAM"/>
-</para></sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>kdeadmin</application></title>
-
-<para>Install <application>kdeadmin</application> with:</para>
-<screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
-    --disable-dependency-tracking &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<para>Major programs in <application>kdeadmin</application> include
-<command>kcron</command>,
-<command>kdat</command>,
-<command>kpackage</command>,
-<command>ksysv</command> and
-<command>kuser</command>.
-</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>kcron</title>
-<para><command>kcron</command> is a task scheduler.</para></sect3>
-
-<sect3><title>kdat</title>
-<para><command>kdat</command> is a tar-based tape
-archiver.</para></sect3>
-
-<sect3><title>kpackage</title>
-<para><command>kpackage</command> is a package manager.</para></sect3>
-
-<sect3><title>ksysv</title>
-<para><command>ksysv</command> is a Sys V-Init editor.</para></sect3>
-
-<sect3><title>kuser</title>
-<para><command>kuser</command> is a graphical user manager.</para></sect3>
-
-</sect2>
-</sect1>
Index: e/inst/kde-artwork.xml
===================================================================
--- kde/inst/kde-artwork.xml	(revision 8ba058e76b0ce3eb4eafe901a3a98903624e6ddf)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<sect1 id="kde-artwork">
-<?dbhtml filename="kde-artwork.html"?>
-<title>kdeartwork-&kde-version;</title>
-
-<sect2>
-<title>Introduction to <application>kdeartwork</application></title>
-
-<para><application>kdeartwork</application> contains additional
-themes, screensaver, sounds, wallpapers and widget styles for
-<acronym>KDE</acronym>.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink url="&kde-artwork-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&kde-artwork-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &kde-artwork-size;</para></listitem>
-<listitem><para>Estimated Disk space required: &kde-artwork-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &kde-artwork-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application>kdeartwork</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="kde-base"/>
-</para></sect4>
-<sect4><title>Optional</title>
-<para>
-<xref linkend="libxml2"/>,
-<xref linkend="libart_lgpl"/> and
-<ulink url="http://www.jwz.org/xscreensaver/">xscreensaver</ulink>
-</para></sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>kdeartwork</application></title>
-
-<para>Install <application>kdeartwork</application> with:</para>
-<screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
-    --disable-dependency-tracking &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<para>Major programs in <application>kdeartwork</application> include
-<command>kscreensaver</command>.
-</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>kscreensaver</title>
-<para><command>kscreensaver</command> is the
-<acronym>KDE</acronym> screensaver.</para></sect3>
-
-</sect2>
-</sect1>
Index: e/inst/kde-base.xml
===================================================================
--- kde/inst/kde-base.xml	(revision 8ba058e76b0ce3eb4eafe901a3a98903624e6ddf)
+++ 	(revision )
@@ -1,170 +1,0 @@
-<sect1 id="kde-base" xreflabel="kdebase-&kde-version;">
-<?dbhtml filename="kdebase.html"?>
-<title>kdebase-&kde-version;</title>
-
-<sect2>
-<title>Introduction to <application>kdebase</application></title>
-
-<para><application>kdebase</application> is the second mandatory package (besides kdelibs) for 
-the K Desktop Environment. It provides various applications and infrastructure files
-and libraries.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink url="&kde-base-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&kde-base-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &kde-base-size;</para></listitem>
-<listitem><para>Estimated Disk space required: &kde-base-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &kde-base-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application>kdebase</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="kde-libs"/></para></sect4>
-<sect4><title>Optional</title>
-<para>
-<xref linkend="libxml2"/>,
-<xref linkend="j2sdk"/>,
-<xref linkend="lesstif"/>,
-<xref linkend="openssl"/>,
-<xref linkend="Linux_PAM"/>,
-<xref linkend="libtiff"/>,
-<xref linkend="openldap"/>,
-<xref linkend="pkgconfig"/>,
-<xref linkend="libart_lgpl"/>,
-<xref linkend="samba3"/>,
-<ulink url="http://mtools.linux.lu/">Mtools</ulink>,
-<ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>,
-<ulink url="http://www.ece.uvic.ca/~mdadams/jasper/">JasPer</ulink>,
-<ulink url="http://www.research.att.com/sw/tools/graphviz/">graphviz</ulink> and
-<ulink url="http://www.stack.nl/~dimitri/doxygen/">doxygen</ulink>
-</para></sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>kdebase</application></title>
-
-<!--
-<para>Check to see if <filename class="libraryfile">/lib/libmisc.la</filename> 
-exists. If not, run:</para>
-<screen><userinput><command>ln -sf /usr/lib/libmisc.la /lib/libmisc.la</command>
-</userinput></screen>
--->
-
-<para>Install kdebase with:</para>
-<screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
-    --disable-dependency-tracking &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<para>Major programs in <application>kdebase</application> include 
-<command>kate</command>,
-<command>kcontrol</command>,
-<command>kdebugdialog</command>,
-<command>kdeprint</command>,
-<command>kdesu</command>,
-<command>kdm</command>,
-<command>kfind</command>,
-<command>khelpcenter</command>,
-<command>kicker</command>,
-<command>kinfocenter</command>,
-<command>kioslave</command>,
-<command>klipper</command>,
-<command>kmenuedit</command>,
-<command>konqueror</command>,
-<command>konsole</command>,
-<command>kpager</command>,
-<command>ksplashml</command>,
-<command>ksysguard</command>,
-<command>kwrite</command> and
-<command>kxkb</command>.
-</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>kate</title>
-<para><command>kate</command> is a programmer's text editor for
-<acronym>KDE</acronym>.</para></sect3>
-
-<sect3><title>kcontrol</title>
-<para><command>kcontrol</command> is <acronym>KDE</acronym> Control
-Center.</para></sect3>
-
-<sect3><title>kdebugdialog</title>
-<para><command>kdebugdialog</command> is a dialog box for managing
-diagnostic messages at runtime.</para></sect3>
- 
-<sect3><title>kdeprint</title>
-<para><command>kdeprint</command> provides Print job administration.</para></sect3>
-
-<sect3><title>kdesu</title>
-<para><command>kdesu</command> is a graphical front end for the
-Unix <command>su</command> command.</para></sect3>
-
-<sect3><title>kdm</title>
-<para><command>kdm</command> is the <acronym>KDE</acronym> display manager (a 
-replacement for <command>xdm</command>).</para></sect3>
- 
-<sect3><title>kfind</title>
-<para><command>kfind</command> is an utility to find files.</para></sect3> 
-
-<sect3><title>khelpcenter</title>
-<para><command>khelpcenter</command> is the <acronym>KDE</acronym> help
-tool.</para></sect3>
-
-<sect3><title>kicker</title>
-<para><command>kicker</command> is the <acronym>KDE</acronym> control
-panel.</para></sect3> 
-
-<sect3><title>kinfocenter</title>
-<para><command>kinfocenter</command> provides a centralized
-and convenient overview of your <acronym>KDE</acronym> and system
-settings.</para></sect3>
-
-<sect3><title>klipper</title>
-<para><command>klipper</command> is a clipboard utility.</para></sect3>
- 
-<sect3><title>kmenuedit</title>
-<para><command>kmenuedit</command> is an utility to rearrange or add
-items to the K-menu.</para></sect3>
-
-<sect3><title>konqueror</title>
-<para><command>konqueror</command> is a filesystem and Web browser.</para></sect3>
-
-<sect3><title>konsole</title>
-<para><command>konsole</command> is a highly configurable X terminal
-emulator.</para></sect3>
-
-<sect3><title>kpager</title>
-<para><command>kpager</command> provides a thumbnail view of all
-virtual desktops.</para></sect3>
-
-<sect3><title>ksplashml</title>
-<para><command>ksplashml</command> is a splash screen that
-shows the progress of an application that is loading.</para></sect3>
-
-<sect3><title>ksysguard</title>
-<para><command>ksysguard</command> is a network enabled task manager
-and system monitor application, with the additional functionality of
-<command>top</command>.</para></sect3>
-
-<sect3><title>kwrite</title>
-<para><command>kwrite</command> is a text editor for
-<acronym>KDE</acronym>.</para></sect3>
-
-<sect3><title>kxkb</title>
-<para><command>kxkb</command> is a keyboard layout switching 
-utility based on X11 xkb extension.</para></sect3>
-
-</sect2>
-   
-</sect1>
Index: e/inst/kde-bindings.xml
===================================================================
--- kde/inst/kde-bindings.xml	(revision 8ba058e76b0ce3eb4eafe901a3a98903624e6ddf)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<sect1 id="kde-bindings" xreflabel="kde-bindings-&kde-version;">
-<title>Installing kde-bindings</title>
-<screen>Estimated build disk space: ??? MB
-Estimated installed space:   ?? MB
-Package size:                &kde-bindings-size;
-Estimated build time:        ?? min</screen>
-
-<para>NOT YET DONE</para>
- 
-</sect1>
Index: e/inst/kde-edu.xml
===================================================================
--- kde/inst/kde-edu.xml	(revision 8ba058e76b0ce3eb4eafe901a3a98903624e6ddf)
+++ 	(revision )
@@ -1,120 +1,0 @@
-<sect1 id="kde-edu">
-<?dbhtml filename="kde-edu.html"?>
-<title>kdeedu-&kde-version;</title>
-
-<sect2>
-<title>Introduction to <application>kdeedu</application></title>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink url="&kde-edu-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&kde-edu-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &kde-edu-size;</para></listitem>
-<listitem><para>Estimated Disk space required: &kde-edu-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &kde-edu-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application>kdeedu</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="kde-base"/>
-</para></sect4>
-<sect4><title>Optional</title>
-<para>
-<xref linkend="libxml2"/> and
-<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 \
-    --disable-dependency-tracking &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<para>Major programs in <application>kdeedu</application> include
-<command>flashkard</command>,
-<command>kalzium</command>,
-<command>kbruch</command>,
-<command>keduca</command>,
-<command>khangman</command>,
-<command>kig</command>,
-<command>kiten</command>,
-<command>klettres</command>,
-<command>kmathtool</command>,
-<command>kmessedwords</command>,
-<command>kmplot</command>,
-<command>kpercentage</command>,
-<command>kstars</command>,
-<command>ktouch</command>,
-<command>kverbos</command> and
-<command>kvoctrain</command>.
-</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>kalzium</title>
-<para><command>kalzium</command> is a program which shows you
-the Periodic System of Elements.</para></sect3>
-
-<sect3><title>kbruch</title>
-<para><command>kbruch</command> is a small program to generate tasks
-with fractions.</para></sect3>
-
-<sect3><title>keduca</title>
-<para><command>keduca</command> - tests and exams.</para></sect3>
-
-<sect3><title>khangman</title>
-<para><command>khangman</command> is the classical hangman game for
-children, adapted for <acronym>KDE</acronym>.</para></sect3>
-
-<sect3><title>kig</title>
-<para><command>kig</command> is a <acronym>KDE</acronym> application for Interactive
-Geometry.</para></sect3>
-
-<sect3><title>kiten</title>
-<para><command>kiten</command> is a Japanese reference/study tool
-for <acronym>KDE</acronym>.</para></sect3>
-
-<sect3><title>klettres</title>
-<para><command>klettres</command> is an alphabet tutor (French).</para></sect3>
-
-<sect3><title>kmessedwords</title>
-<para><command>kmessedwords</command> is a simple mind-training
-word game.</para></sect3>
-
-<sect3><title>kmplot</title>
-<para><command>kmplot</command> is a mathematical function plotter
-for <acronym>KDE</acronym>.</para></sect3>
-
-<sect3><title>kpercentage</title>
-<para><command>kpercentage</command> is a small math application
-that will help pupils to improve their skills in calculating
-percentages.</para></sect3>
-
-<sect3><title>kstars</title>
-<para><command>kstars</command> is a desktop planetarium.</para></sect3>
-
-<sect3><title>ktouch</title>
-<para><command>ktouch</command> is a touch typing tutor.</para></sect3>
-
-<sect3><title>kverbos</title>
-<para><command>kverbos</command> is an application specially
-designed to study Spanish verbforms.</para></sect3>
-
-<sect3><title>kvoctrain</title>
-<para><command>kvoctrain</command> is a vocabulary trainer.</para></sect3>
-
-</sect2>
-</sect1>
Index: e/inst/kde-games.xml
===================================================================
--- kde/inst/kde-games.xml	(revision 8ba058e76b0ce3eb4eafe901a3a98903624e6ddf)
+++ 	(revision )
@@ -1,80 +1,0 @@
-<sect1 id="kde-games">
-<?dbhtml filename="kde-games.html"?>
-<title>kdegames-&kde-version;</title>
-
-<sect2>
-<title>Introduction to <application>kdegames</application></title>
-
-<para><application>kdegames</application> is a compilation of various games.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink url="&kde-games-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&kde-games-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &kde-games-size;</para></listitem>
-<listitem><para>Estimated Disk space required: &kde-games-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &kde-games-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application>kdegames</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="kde-base"/>
-</para></sect4>
-<sect4><title>Optional</title>
-<para>
-<xref linkend="libxml2"/>,
-<ulink url="http://www.research.att.com/sw/tools/graphviz/">graphviz</ulink> and
-<ulink url="http://www.stack.nl/~dimitri/doxygen/">doxygen</ulink>
-</para></sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>kdegames</application></title>
-
-<para>Install <application>kdegames</application> with:</para>
-<screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
-    --disable-dependency-tracking &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<para>Major programs in <application>kdegames</application> include
-<command>atlantik</command>,
-<command>kasteroids</command>,
-<command>katomic</command>,
-<command>kbackgammon</command>,
-<command>kbattleship</command>,
-<command>kblackbox</command>,
-<command>kbounce</command>,
-<command>kenolaba</command>,
-<command>kfouleggs</command>,
-<command>kgoldrunner</command>,
-<command>kjumpingcube</command>,
-<command>klickety</command>,
-<command>klines</command>,
-<command>kmines</command>,
-<command>kolf</command>,
-<command>konquest</command>,
-<command>kpat</command>,
-<command>kpoker</command>,
-<command>kreversi</command>,
-<command>ksame</command>,
-<command>kshisen</command>,
-<command>ksirtet</command>,
-<command>ksnake</command>,
-<command>ksokoban</command>,
-<command>kspaceduel</command>,
-<command>ktron</command>,
-<command>ktuberling</command>,
-<command>kwin4</command> and
-<command>lskat</command>.
-</para>
-
-</sect2>
-</sect1>
Index: e/inst/kde-graphics.xml
===================================================================
--- kde/inst/kde-graphics.xml	(revision 8ba058e76b0ce3eb4eafe901a3a98903624e6ddf)
+++ 	(revision )
@@ -1,123 +1,0 @@
-<sect1 id="kde-graphics" xreflabel="kdegraphics-&kde-version;">
-<?dbhtml filename="kde-graphics.html"?>
-<title>kdegraphics-&kde-version;</title>
-
-<sect2>
-<title>Introduction to <application>kdegraphics</application></title>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink url="&kde-graphics-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&kde-graphics-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &kde-graphics-size;</para></listitem>
-<listitem><para>Estimated Disk space required: &kde-graphics-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &kde-graphics-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application>kdegraphics</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="kde-base"/>
-</para></sect4>
-<sect4><title>Optional</title>
-<para>
-<xref linkend="libxml2"/>,
-<xref linkend="sane"/>,
-<xref linkend="libtiff"/>,
-<xref linkend="xpdf"/>,
-<xref linkend="imlib"/>,
-<xref linkend="libart_lgpl"/>,
-<xref linkend="pkgconfig"/>,
-<ulink url="http://www.ece.uvic.ca/~mdadams/jasper/">JasPer</ulink>,
-<ulink url="http://fribidi.sourceforge.net/">FriBidi</ulink> and
-<ulink url="http://www.gphoto.org/">gPhoto2</ulink>
-</para></sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>kdegraphics</application></title>
-
-<para>Install <application>kdegraphics</application> with:</para>
-<screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
-    --disable-dependency-tracking &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<para>Major programs in <application>kdegraphics</application> include
-<command>kamera</command>,
-<command>kcoloredit</command>,
-<command>kdvi</command>,
-<command>kfax</command>,
-<command>kgamma</command>,
-<command>kghostview</command>,
-<command>kiconedit</command>,
-<command>kooka</command>,
-<command>kpaint</command>,
-<command>kpdf</command>,
-<command>kpovmodeler</command>,
-<command>kruler</command>,
-<command>ksnapshot</command>,
-<command>kuickshow</command> and
-<command>kview</command>.
-</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>kamera</title>
-<para><command>kamera</command> allows you to view and download
-images on a digital camera.</para></sect3>
-
-<sect3><title>kcoloredit</title>
-<para><command>kcoloredit</command> is a color pallette editor.</para></sect3>
-
-<sect3><title>kdvi</title>
-<para><command>kdvi</command> is a <acronym>DVI</acronym> viewer.</para></sect3>
-
-<sect3><title>kfax</title>
-<para><command>kfax</command> is a <acronym>FAX</acronym>
-viewer.</para></sect3>
-
-<sect3><title>kgamma</title>
-<para><command>kgamma</command> is a simple tool for monitor gamma
-correction.</para></sect3>
-
-<sect3><title>kghostview</title>
-<para><command>kghostview</command> is a
-<acronym>PS</acronym>/<acronym>PDF</acronym> viewer.</para></sect3>
-
-<sect3><title>kiconedit</title>
-<para><command>kiconedit</command> is an icon editor.</para></sect3>
-
-<sect3><title>kooka</title>
-<para><command>kooka</command> is a raster image scan program.</para></sect3>
-
-<sect3><title>kpaint</title>
-<para><command>kpaint</command> is a paint program.</para></sect3>
-
-<sect3><title>kpovmodeler</title>
-<para><command>kpovmodeler</command> is a graphical 3D modeler,
-which can generate scenes for
-<ulink url="http://www.povray.org/">POV-Ray</ulink>.</para></sect3>
-
-<sect3><title>kruler</title>
-<para><command>kruler</command> is a screen ruler.</para></sect3>
-
-<sect3><title>ksnapshot</title>
-<para><command>ksnapshot</command> is a screen capture program.</para></sect3>
-
-<sect3><title>kuickshow</title>
-<para><command>kuickshow</command> is an image viewer.</para></sect3>
-
-<sect3><title>kview</title>
-<para><command>kview</command> is another image viewer.</para></sect3>
-
-</sect2>
-</sect1>
Index: e/inst/kde-libs.xml
===================================================================
--- kde/inst/kde-libs.xml	(revision 8ba058e76b0ce3eb4eafe901a3a98903624e6ddf)
+++ 	(revision )
@@ -1,102 +1,0 @@
-<sect1 id="kde-libs" xreflabel="kdelibs-&kde-version;">
-<?dbhtml filename="kdelibs.html"?>
-<title>kdelibs-&kde-version;</title>
- 
-<sect2>
-<title>Introduction to <application>kdelibs</application></title>
-
-<para>This package includes libraries that are central to the
-development and execution of a <acronym>KDE</acronym> program, as well 
-as internationalization files for these libraries, misc 
-<acronym>HTML</acronym> documentation, theme modules and regression 
-tests.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink url="&kde-libs-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&kde-libs-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &kde-libs-size;</para></listitem>
-<listitem><para>Estimated Disk space required: &kde-libs-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &kde-libs-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application>kdelibs</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="kde-core-arts"/></para></sect4>
-<sect4><title>Optional</title>
-<para>
-<xref linkend="libxml2"/>,
-<xref linkend="libxslt"/>,
-<xref linkend="cups"/>,
-<xref linkend="openldap"/>,
-<xref linkend="fam"/>,
-<xref linkend="pcre"/>,
-<xref linkend="openssl"/>,
-<xref linkend="libart_lgpl"/>,
-<xref linkend="alsa"/>,
-<xref linkend="libtiff"/>,
-<ulink url="http://www.gnu.org/software/libidn/">Libidn</ulink>,
-<ulink url="http://www.ece.uvic.ca/~mdadams/jasper/">JasPer</ulink>,
-<ulink url="http://www.research.att.com/sw/tools/graphviz/">graphviz</ulink> and
-<ulink url="http://www.stack.nl/~dimitri/doxygen/">doxygen</ulink>
-</para></sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>kdelibs</application></title>
-
-<para>Install <application>kdelibs</application> with:</para>
-<screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
-    --disable-dependency-tracking --enable-fast-malloc=full --disable-pcre &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
-
-<note><para>If you wish to create the <acronym>API</acronym> documentation and you have
-doxygen and graphviz installed, <command>make apidox</command> must be done
-before <command>make install</command>. This applies to all packages
-which can utilize doxygen.</para></note>
-
-</sect2>
-
-<sect2><title>Command explanations</title>
-<para><parameter>--prefix=&kde-dir;</parameter> : This option tells
-the process to install the package in <filename
-class="directory">&kde-dir;</filename>.</para>
-
-<para><parameter>--disable-debug</parameter> : This option causes the
-system to be compiled without debugging code.</para>
-
-<para><parameter>--disable-dependency-tracking</parameter> : This option
-speeds up one time builds.</para>
-
-<para><parameter>--enable-fast-malloc=full</parameter> : This option tells
-<acronym>KDE</acronym> programs to use an internal memory allocation scheme 
-optimized for <acronym>KDE</acronym>.</para>
-
-<para><parameter>--disable-pcre</parameter> : Omit this switch if you
-have <acronym>PCRE</acronym> installed and you want improved regular expression support
-in the <acronym>KDE</acronym> JavaScript engine.</para>
-
-</sect2>
-
-<sect2>
-<title>Configuring <application>kdelibs</application></title>
-
-<sect3><title>Configuration Information</title>
-
-<para>Add <filename class="directory">/opt/kde/bin</filename> to
-your <envar>PATH</envar> environment variable:</para>
-
-<screen><userinput><command>export PATH=$PATH:/opt/kde/bin</command></userinput></screen>
-
-</sect3>
-</sect2>
-
-<sect2><title>Contents</title>
-<para>kdelibs provides numerous libraries needed by
-<acronym>KDE</acronym> programs.</para>
-
-</sect2>
-</sect1>
Index: e/inst/kde-multimedia.xml
===================================================================
--- kde/inst/kde-multimedia.xml	(revision 8ba058e76b0ce3eb4eafe901a3a98903624e6ddf)
+++ 	(revision )
@@ -1,130 +1,0 @@
-<sect1 id="kde-multimedia" xreflabel="kdemultimedia-&kde-version;">
-<?dbhtml filename="kde-multimedia.html"?>
-<title>kdemultimedia-&kde-version;</title>
-
-<sect2>
-<title>Introduction to <application>kdemultimedia</application></title>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink url="&kde-multimedia-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&kde-multimedia-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &kde-multimedia-size;</para></listitem>
-<listitem><para>Estimated Disk space required: &kde-multimedia-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &kde-multimedia-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application>kdemultimedia</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="kde-base"/>
-</para></sect4>
-<sect4><title>Optional</title>
-<para>
-<xref linkend="alsa"/>,
-<xref linkend="CDParanoia"/>,
-<xref linkend="lame"/>,
-<xref linkend="audiofile"/>,
-<xref linkend="libogg"/>,
-<xref linkend="libvorbis"/>,
-<xref linkend="xine-lib"/>,
-<xref linkend="libtiff"/>,
-<xref linkend="libxml2"/>,
-<xref linkend="flac"/>,
-<ulink url="http://www.ece.uvic.ca/~mdadams/jasper/">JasPer</ulink>,
-<ulink url="http://developer.kde.org/~wheeler/taglib/">TagLib</ulink> and
-<ulink url="http://www.musicbrainz.org/">libmusicbrainz</ulink>
-</para></sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>kdemultimedia</application></title>
-
-<para>Install <application>kdemultimedia</application> with:</para>
-<screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
-    --disable-dependency-tracking &amp;&amp;
-sed -i -e 's/-ansi//' kscd/libwm/Makefile &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Command explanations</title>
-
-<!--
-<para><command>sed -i -e 's/strings -ansi/strings/' kaudiocreator/Makefile</command> : 
-Remove <parameter>-ansi</parameter> from <application>gcc</application> parameters to work around
-a broken header in the kernel.  The broken file is <filename>asm/byteorder.h</filename>, where
-a parameter is used, but not defined, when <parameter>-ansi</parameter> is specified.</para>
-
-<para><command>sed -i -e 's/strings -ansi/strings/' kioslave/audiocd/Makefile</command> : 
-Remove <parameter>-ansi</parameter> from <application>gcc</application> parameters to work around
-a broken header in the kernel.</para>
--->
-
-<para><command>sed -i -e 's/-ansi//' kscd/libwm/Makefile</command> : 
-Remove <parameter>-ansi</parameter> from <application>gcc</application> parameters to work around
-a broken header in the kernel.</para>
-
-</sect2>
-
-<sect2>
-<title>Configuring kdemultimedia</title>
-
-<para>There is no explicit configuration for the kdemultimedia package, 
-however <command>kscd</command> needs to find the CD drive. The default 
-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):
-<screen><userinput><command>cd /dev &amp;&amp;
-ln -s <replaceable>[CD Drive]</replaceable> /dev/cdrom</command></userinput></screen>
-</para>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<para>Major programs in <application>kdemultimedia</application> include
-<command>artsbuilder</command>,
-<command>juk</command>,
-<command>kaboodle</command>,
-<command>kmid</command>,
-<command>kmix</command>,
-<command>krec</command>,
-<command>kscd</command> and
-<command>noatun</command>.
-</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>juk</title>
-<para><command>juk</command> is a jukebox, tagger and music
-collection manager.</para></sect3>
-
-<sect3><title>kaboodle</title>
-<para><command>kaboodle</command> is a multimedia player.</para></sect3>
-
-<sect3><title>kmid</title>
-<para><command>kmid</command> is a midi/karaoke player.</para></sect3>
-
-<sect3><title>kmix</title>
-<para><command>kmix</command> is a sound mixer.</para></sect3>
-
-<sect3><title>krec</title>
-<para><command>krec</command> is a recording frontend for
-<application>aRts</application>.</para></sect3>
-
-<sect3><title>kscd</title>
-<para><command>kscd</command> is a CD player.</para></sect3>
-
-<sect3><title>noatun</title>
-<para><command>noatun</command> is another multimedia player.</para></sect3>
-
-</sect2>
-</sect1>
Index: e/inst/kde-network.xml
===================================================================
--- kde/inst/kde-network.xml	(revision 8ba058e76b0ce3eb4eafe901a3a98903624e6ddf)
+++ 	(revision )
@@ -1,141 +1,0 @@
-<sect1 id="kde-network" xreflabel="kdenetwork-&kde-version;">
-<?dbhtml filename="kde-network.html"?>
-<title>kdenetwork-&kde-version;</title>
-
-<sect2>
-<title>Introduction to <application>kdenetwork</application></title>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink url="&kde-network-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&kde-network-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &kde-network-size;</para></listitem>
-<listitem><para>Estimated Disk space required: &kde-network-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &kde-network-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application>kdenetwork</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="kde-base"/>
-</para></sect4>
-<sect4><title>Optional</title>
-<para>
-<xref linkend="libxml2"/>,
-<xref linkend="libxslt"/>,
-<xref linkend="ppp"/>,
-<xref linkend="openssl"/>,
-<xref linkend="libtiff"/>,
-<xref linkend="xmms"/>,
-<ulink url="http://www.openslp.org/">OpenSLP</ulink>,
-<ulink url="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html">Wireless Tools</ulink>,
-<ulink url="http://dev.null.pl/ekg/">libgadu</ulink> and
-<ulink url="http://www.ece.uvic.ca/~mdadams/jasper/">JasPer</ulink>
-</para></sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>kdenetwork</application></title>
-
-<para>Install <application>kdenetwork</application> with:</para>
-<screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
-    --disable-dependency-tracking &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Configuring kdenetwork</title>
-
-<para>Install <filename>/etc/rc.d/init.d/lisa</filename> init script
-included in the <xref linkend="intro-important-bootscripts"/>
-package.</para>
-
-<screen><userinput><command>make install-lisa</command></userinput></screen>
-
-<para>There is no explicit configuration for the rest of the kdenetwork
-package, however individual packages need to be set up with user
-information.</para>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<para>Major programs in <application>kdenetwork</application> include
-<command>kdict</command>,
-<command>kget</command>,
-<command>knewsticker</command>,
-<command>kopete</command>,
-<command>kpf</command>,
-<command>kppp</command>,
-<command>krdc</command>,
-<command>krfb</command>,
-<command>ksirc</command>,
-<command>ktalkd</command>,
-<command>kwifimanager</command> and
-<command>lisa</command>.
-</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>kdict</title>
-<para><command>kdict</command> is a graphical client for the
-Dictionary Server Protocol (DICT).</para></sect3>
-
-<sect3><title>kget</title>
-<para><command>kget</command> allows you to group
-downloads.</para></sect3>
-
-<sect3><title>knewsticker</title>
-<para><command>knewsticker</command> is a news applet for the
-<acronym>KDE</acronym> Application Launcher Panel.</para></sect3>
-
-<sect3><title>kopete</title>
-<para><command>kopete</command> is <acronym>KDE</acronym>'s
-multi-protocol instant messenger client.</para></sect3>
-
-<sect3><title>kpf</title>
-<para><command>kpf</command> allows you to share files over a
-network.</para></sect3>
-
-<sect3><title>kppp</title>
-<para><command>kppp</command> is a dial-up utility.</para></sect3>
-
-<sect3><title>krdc</title>
-<para><command>krdc</command> is a client application that allows you to
-view or even control the desktop session on another machine that is
-running a compatible (<acronym>VNC</acronym>) server.</para></sect3>
-
-<sect3><title>krfb</title>
-<para><command>krfb</command> is a server application that allows you to
-share your current session with a user on another machine, who can use a
-<acronym>VNC</acronym> client to view or even control the
-desktop.</para></sect3>
-
-<sect3><title>ksirc</title>
-<para><command>ksirc</command> is a chat client.</para></sect3>
-
-<sect3><title>ktalkd</title>
-<para><command>ktalkd</command> is an enhanced <command>talk</command>
-daemon - a program to handle incoming <command>talk</command> requests,
-announce them and allow you to respond to them using a talk
-client.</para></sect3>
-
-<sect3><title>kwifimanager</title>
-<para>The <command>kwifimanager</command> suite can be used to
-configure and monitor wireless <acronym>LAN</acronym>
-cards.</para></sect3>
-
-<sect3><title>lisa</title>
-<para><command>lisa</command> is intended to provide a kind of network
-neighborhood, but only relying on the
-<acronym>TCP</acronym>/<acronym>IP</acronym> protocol stack, no
-<acronym>SMB</acronym> or anything else required.</para></sect3>
-
-</sect2>
-</sect1>
Index: e/inst/kde-pim.xml
===================================================================
--- kde/inst/kde-pim.xml	(revision 8ba058e76b0ce3eb4eafe901a3a98903624e6ddf)
+++ 	(revision )
@@ -1,116 +1,0 @@
-<sect1 id="kde-pim">
-<?dbhtml filename="kde-pim.html"?>
-<title>kdepim-&kde-version;</title>
-
-<sect2>
-<title>Introduction to <application>kdepim</application></title>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink url="&kde-pim-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&kde-pim-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &kde-pim-size;</para></listitem>
-<listitem><para>Estimated Disk space required: &kde-pim-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &kde-pim-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application>kdepim</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="kde-base"/>
-</para></sect4>
-<sect4><title>Optional</title>
-<para>
-<xref linkend="libxml2"/>,
-<ulink url="http://jasonday.home.att.net/code/libmal/libmal.html">libmal</ulink>,
-<ulink url="http://www.gnokii.org/">gnokii</ulink>,
-<ulink url="http://www.pilot-link.org/">pilot-link</ulink>,
-<ulink url="http://www.research.att.com/sw/tools/graphviz/">graphviz</ulink> and
-<ulink url="http://www.stack.nl/~dimitri/doxygen/">doxygen</ulink>
-</para></sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>kdepim</application></title>
-
-<para>Install <application>kdepim</application> with:</para>
-<screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
-    --disable-dependency-tracking &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<para>Major programs in <application>kdepim</application> include
-<command>kaddressbook</command>,
-<command>kalarm</command>,
-<command>kandy</command>,
-<command>karm</command>,
-<command>kgpgcertmanager</command>,
-<command>kmail</command>,
-<command>knode</command>,
-<command>knotes</command>,
-<command>konsolekalendar</command>,
-<command>kontact</command>
-<command>korganizer</command>,
-<command>korn</command> and
-<command>kpilot</command>.
-</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>kaddressbook</title>
-<para><command>kaddressbook</command> is the <acronym>KDE</acronym> address
-book.</para></sect3>
-
-<sect3><title>kalarm</title>
-<para><command>kalarm</command> is a system to provide reminder messages.</para></sect3>
-
-<sect3><title>kandy</title>
-<para><command>kandy</command>is a program to synchronize mobile phone
-numbers.</para></sect3>
-
-<sect3><title>karm</title>
-<para><command>karm</command> is a personal time tracker.</para></sect3>
-
-<sect3><title>kgpgcertmanager</title>
-<para><command>kgpgcertmanager</command> is a tool for managing X509
-certificates.</para></sect3>
-
-<sect3><title>kmail</title>
-<para><command>kmail</command> is <acronym>KDE</acronym>'s email client.</para></sect3>
-
-<sect3><title>knode</title>
-<para><command>knode</command> is the <acronym>KDE</acronym>
-newsreader.</para></sect3>
-
-<sect3><title>knotes</title>
-<para><command>knotes</command> is a popup notes utility.</para></sect3>
-
-<sect3><title>konsolekalendar</title>
-<para><command>konsolekalendar</command> is a command line interface
-to <acronym>KDE</acronym> calendars.</para></sect3>
-
-<sect3><title>kontact</title>
-<para><command>kontact</command> is the integrated solution to
-personal information management (PIM) needs.</para></sect3>
-
-<sect3><title>korganizer</title>
-<para><command>korganizer</command> is a personal calendar/todo system.</para></sect3>
-
-<sect3><title>korn</title>
-<para><command>korn</command> is a <acronym>KDE</acronym> mail checker that has the
-capabilities to dock itself to <command>kicker</command>.</para></sect3>
-
-<sect3><title>kpilot</title>
-<para><command>kpilot</command> is a program to synchronize a
-Palm-Pilot.</para></sect3>
-
-</sect2>
-</sect1>
Index: e/inst/kde-sdk.xml
===================================================================
--- kde/inst/kde-sdk.xml	(revision 8ba058e76b0ce3eb4eafe901a3a98903624e6ddf)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<sect1 id="kde-sdk" xreflabel="kde-sdk-&kde-version;">
-<title>Installing kde-sdk</title>
-<screen>Estimated build disk space: ??? MB
-Estimated installed space:   ?? MB
-Package size:                &kde-sdk-size;
-Estimated build time:        ?? min</screen>
-
-<para>NOT YET DONE</para>
- 
-</sect1>
Index: e/inst/kde-toys.xml
===================================================================
--- kde/inst/kde-toys.xml	(revision 8ba058e76b0ce3eb4eafe901a3a98903624e6ddf)
+++ 	(revision )
@@ -1,75 +1,0 @@
-<sect1 id="kde-toys">
-<?dbhtml filename="kde-toys.html"?>
-<title>kdetoys-&kde-version;</title>
-
-<sect2>
-<title>Introduction to <application>kdetoys</application></title>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink url="&kde-toys-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&kde-toys-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &kde-toys-size;</para></listitem>
-<listitem><para>Estimated Disk space required: &kde-toys-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &kde-toys-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application>kdetoys</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="kde-base"/>
-</para></sect4>
-<sect4><title>Optional</title>
-<para>
-<xref linkend="libxml2"/>,
-<xref linkend="libtiff"/> and
-<ulink url="http://www.ece.uvic.ca/~mdadams/jasper/">JasPer</ulink>,
-</para></sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>kdetoys</application></title>
-
-<para>Install <application>kdetoys</application> with:</para>
-<screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
-    --disable-dependency-tracking &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<para>Major programs in <application>kdetoys</application> include
-<command>amor</command>,
-<command>kmoon</command>,
-<command>kodo</command>,
-<command>kteatime</command>,
-<command>ktux</command>,
-<command>kweather</command> and
-<command>kworldclock</command>.
-</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>amor</title>
-<para><command>amor</command> - Amusing Misuse of Resources.</para></sect3>
-
-<sect3><title>kmoon</title>
-<para><command>kmoon</command> is a Moon phase indicator.</para></sect3>
-
-<sect3><title>kodo</title>
-<para><command>kodo</command> measures your desktop mileage.</para></sect3>
-
-<sect3><title>kteatime</title>
-<para><command>kteatime</command> times your tea brewing.</para></sect3>
-
-<sect3><title>ktux</title>
-<para><command>ktux</command> - small Tux crossing stars.</para></sect3>
-
-</sect2>
-</sect1>
Index: e/inst/kde-utils.xml
===================================================================
--- kde/inst/kde-utils.xml	(revision 8ba058e76b0ce3eb4eafe901a3a98903624e6ddf)
+++ 	(revision )
@@ -1,114 +1,0 @@
-<sect1 id="kde-utils">
-<?dbhtml filename="kde-utils.html"?>
-<title>kdeutils-&kde-version;</title>
-
-<sect2>
-<title>Introduction to <application>kdeutils</application></title>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink url="&kde-utils-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&kde-utils-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &kde-utils-size;</para></listitem>
-<listitem><para>Estimated Disk space required: &kde-utils-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &kde-utils-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application>kdeutils</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="kde-base"/>
-</para></sect4>
-<sect4><title>Optional</title>
-<para>
-<xref linkend="libxml2"/> and
-<ulink url="http://tpctl.sourceforge.net/">tpctl</ulink>
-</para></sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>kdeutils</application></title>
-
-<para>Install <application>kdeutils</application> with:</para>
-<screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
-    --disable-dependency-tracking &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<para>Major programs in <application>kdeutils</application> include
-<command>ark</command>,
-<command>irkick</command>,
-<command>kcalc</command>,
-<command>kcharselect</command>,
-<command>kcmlirc</command>,
-<command>kdepasswd</command>,
-<command>kdf</command>,
-<command>kedit</command>,
-<command>kfloppy</command>,
-<command>kgpg</command>,
-<command>khexedit</command>,
-<command>kjots</command>,
-<command>ksim</command>,
-<command>kregexpeditor</command>,
-<command>ktimer</command> and
-<command>kwallet</command>.
-</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>ark</title>
-<para><command>ark</command> is an archiving tool.</para></sect3>
-
-<sect3><title>irkick</title>
-<para><command>irkick</command> is the infrastructure for the
-<acronym>KDE</acronym>'s Infrared Remote Control functionality;
-<command>irkick</command> is the server component of that
-infrastructure.</para></sect3>
-
-<sect3><title>kcalc</title>
-<para><command>kcalc</command> is a scientific calculator.</para></sect3>
-
-<sect3><title>kcharselect</title>
-<para><command>kcharselect</command> is a character selector
-applet.</para></sect3>
-
-<sect3><title>kdepasswd</title>
-<para><command>kdepasswd</command> is a password managing utility.</para></sect3>
-
-<sect3><title>kdf</title>
-<para><command>kdf</command> is a disk usage viewer.</para></sect3>
-
-<sect3><title>kedit</title>
-<para><command>kedit</command> is a text editor.</para></sect3>
-
-<sect3><title>kfloppy</title>
-<para><command>kfloppy</command> is a floppy formatter.</para></sect3>
-
-<sect3><title>kgpg</title>
-<para><command>kgpg</command> is a simple graphical interface for
-<xref linkend="gnupg"/>.</para></sect3>
-
-<sect3><title>khexedit</title>
-<para><command>khexedit</command> is a binary editor.</para></sect3>
-
-<sect3><title>kjots</title>
-<para><command>kjots</command> is a note taker.</para></sect3>
-
-<sect3><title>kregexpeditor</title>
-<para><command>kregexpeditor</command> is an editor for editing regular
-expressions in a graphical style (in contrast to the
-<acronym>ASCII</acronym> syntax).</para></sect3>
-
-<sect3><title>ktimer</title>
-<para><command>ktimer</command> is a task scheduler.</para></sect3>
-
-</sect2>
-</sect1>
Index: e/inst/kdevelop.xml
===================================================================
--- kde/inst/kdevelop.xml	(revision 8ba058e76b0ce3eb4eafe901a3a98903624e6ddf)
+++ 	(revision )
@@ -1,27 +1,0 @@
-<sect1 id="kdevelop" xreflabel="kdevelop-&kde-version;">
-<title>Installing kdevelop</title>
-<para><screen>Download location (FTP):     <ulink url="&kdevelop-ftp;"/>
-Estimated build disk space:  27   MB
-Estimated installed space:    7.2 MB
-Package size:                 &kdevelop-size;
-Estimated build time:        21 min (1.2 GHz)</screen></para>
-
-<para>kdevelop depends on:
-<screen><xref linkend="kde-base"/>.</screen></para>
-
-<para>Install kdevelop with:
-<screen><userinput>./configure --prefix=&kde-dir; --disable-debug \
-    --disable-dependency-tracking &amp;&amp;
-make &amp;&amp;
-make install</userinput></screen></para>
- 
-<sect2>
-<title>Contents</title>
-<para>The kdevelop package provides:</para>
-<itemizedlist>
-<listitem><para>kdevelop - an integrated development environment</para></listitem>
-</itemizedlist>
-</sect2>
-
- 
-</sect1>
Index: e/inst/kdm.xml
===================================================================
--- kde/inst/kdm.xml	(revision 8ba058e76b0ce3eb4eafe901a3a98903624e6ddf)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<sect1 id="kdm" xreflabel="kdm-&kde-version;">
-<title>Installing kdm</title>
-<para><screen>Estimated build disk space: ??? MB
-Estimated installed space:   ?? MB
-Package size:                &kdm-size;
-Estimated build time:        ?? min</screen></para>
-
-<para>NOT YET DONE</para>
- 
-</sect1>
Index: e/inst/kdoc.xml
===================================================================
--- kde/inst/kdoc.xml	(revision 8ba058e76b0ce3eb4eafe901a3a98903624e6ddf)
+++ 	(revision )
@@ -1,32 +1,0 @@
-<sect1 id="kdoc" xreflabel="kdoc-&kde-version;">
-<title>kdoc</title>
-<para><screen>Download location (FTP):     <ulink url="&kdoc-ftp;"/>
-Estimated build disk space:  512 KB
-Estimated installed space:   304 KB
-Package size:                &kdoc-size;</screen></para>
-
-<para>
-KDOC is a C++ and IDL interface documentation tool, initially written for the 
-specific purpose of generating documentation for the KDE libraries.
-</para>
-
-<note><para>KDOC is still under development.  This prcedure installs the latest 
-snapshot.</para></note>
-
-
-<para>Install kdoc with:
-<screen><userinput>./configure --prefix=&kde-dir; &amp;&amp;
-make &amp;&amp;
-make install</userinput></screen></para>
-     
-<sect2>
-<title>Contents</title>
-<para>The kdoc package provides:</para>
-<itemizedlist>
-<listitem><para>kdoc - C++ Documentation tool</para></listitem>
-<listitem><para>makekdedoc - Generates HTML documentation of the KDE libraries</para></listitem>
-<listitem><para>qt2kdoc - Generates KDoc reference index for the QT GUI toolkit</para></listitem>
-</itemizedlist>
-</sect2>
-
-</sect1>
Index: e/inst/objprelink.xml
===================================================================
--- kde/inst/objprelink.xml	(revision 8ba058e76b0ce3eb4eafe901a3a98903624e6ddf)
+++ 	(revision )
@@ -1,68 +1,0 @@
-<sect1 id="objprelink" xreflabel="objprelink">
-<?dbhtml filename="objprelink.html"?>
-<title>objprelink</title>
-
-<sect2>
-<title>Introduction to objprelink</title>
-
-<screen>Download location:              <ulink url="&objprelink-download;"/>
-Version used:                   &objprelink-version;
-Package size:                   &objprelink-size;
-Estimated Disk space required:  &objprelink-buildsize;</screen>
-
-<para>The objprelink package contains the C code (only) for objprelink.
-This is useful for prelinking c++ files to produce more efficient dynamic 
-links.  This program is only applicable to Intel architecture computers.
-</para>
-
-<screen>objprelink depends on: binutils (libbfd.a and libiberty.a)
-</screen>
-
-</sect2>
-
-<sect2>
-<title>Installation of objprelink</title>
- 
-<para><screen><userinput>
-gcc -O2 -o objprelink objprelink-1.c /usr/lib/libbfd.a /usr/lib/libiberty.a &amp;&amp;
-cp objprelink /usr/bin</userinput></screen></para>
-</sect2>
-
-<sect2>
-<title>Command explanations</title>
-
-<para><userinput>cp objprelink /usr</userinput> Since there is
-no makefile, we need to copy the executable manually.</para>
-</sect2>
-
-<sect2>
-<title>Configuring objprelink</title>
-
-<sect3><title>Configuration Information</title>
-
-<para>There is no configuration to do.</para>
-
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<para>The objprelink package contains <userinput>objprelink.c</userinput></para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>objprelink</title>
-<para>The objprelink package contains a program for prelinking c++ files 
-to produce more efficient dynamic links.  This program is only applicable 
-to Intel architecture computers.
-</para>
-</sect3>
-
-</sect2>
-
-</sect1>
-
Index: kde/kde.ent
===================================================================
--- kde/kde.ent	(revision 8ba058e76b0ce3eb4eafe901a3a98903624e6ddf)
+++ kde/kde.ent	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -1,5 +1,4 @@
 <!ENTITY kde SYSTEM "kde.xml">
 <!ENTITY kde-intro SYSTEM "kde-intro.xml">
-
 <!ENTITY kde-version "3.2.1">
 <!ENTITY kde-dldir "&kde-version;">
@@ -8,127 +7,36 @@
 <!ENTITY kde-dir "/opt/kde-&kde-version;">
 
-<!-- KDE Core -->
+<!-- KDE Core Packages -->
 <!ENTITY kde-core SYSTEM "core/core.xml">
+<!ENTITY % kde-core-arts SYSTEM "core/arts/arts.ent">
+%kde-core-arts;
+<!ENTITY % kdelibs SYSTEM "core/kdelibs/kdelibs.ent">
+%kdelibs;
+<!ENTITY % kdebase SYSTEM "core/kdebase/kdebase.ent">
+%kdebase;
 <!ENTITY kde-core-config SYSTEM "core/config.xml">
 
-<!ENTITY kde-core-arts SYSTEM "core/arts.xml">
-<!ENTITY arts-version "1.2.1">
-<!ENTITY arts-download-http "&kde-download-http;/arts-&arts-version;.tar.bz2">
-<!ENTITY arts-download-ftp "&kde-download-ftp;/arts-&arts-version;.tar.bz2">
-<!ENTITY arts-size "1016 KB">
-<!ENTITY arts-buildsize "24 MB">
-<!ENTITY arts-time "1.60 SBU">
-
-<!-- KDE Additional -->
+<!-- KDE Additional Packages -->
 <!ENTITY kde-add SYSTEM "add/add.xml">
-
-<!-- KDE Other -->
-<!-- <!ENTITY kde-other SYSTEM "other/other.xml"> -->
-
-<!-- Package entities -->
-<!ENTITY kde-office SYSTEM "inst/kde-office.xml">
-<!-- <!ENTITY kdoc SYSTEM "inst/kdoc.xml">  
-<!ENTITY kde-bindings SYSTEM "inst/kde-bindings.xml">
-<!ENTITY kde-sdk SYSTEM "inst/kde-sdk.xml">
-<!ENTITY kdevelop SYSTEM "inst/kdevelop.xml">
-<!ENTITY kdm SYSTEM "inst/kdm.xml"> -->
-
-<!ENTITY kde-libs SYSTEM "inst/kde-libs.xml">
-<!ENTITY kde-libs-download-http "&kde-download-http;/kdelibs-&kde-version;.tar.bz2">
-<!ENTITY kde-libs-download-ftp "&kde-download-ftp;/kdelibs-&kde-version;.tar.bz2">
-<!ENTITY kde-libs-size "13 MB">
-<!ENTITY kde-libs-buildsize "160 MB">
-<!ENTITY kde-libs-time "12.3 SBU">
-
-<!ENTITY kde-base SYSTEM "inst/kde-base.xml">
-<!ENTITY kde-base-download-http "&kde-download-http;/kdebase-&kde-version;.tar.bz2">
-<!ENTITY kde-base-download-ftp "&kde-download-ftp;/kdebase-&kde-version;.tar.bz2">
-<!ENTITY kde-base-size "17 MB">
-<!ENTITY kde-base-buildsize "172 MB">
-<!ENTITY kde-base-time "15.9 SBU">
-
-<!ENTITY kde-multimedia SYSTEM "inst/kde-multimedia.xml">
-<!ENTITY kde-multimedia-download-http "&kde-download-http;/kdemultimedia-&kde-version;.tar.bz2">
-<!ENTITY kde-multimedia-download-ftp "&kde-download-ftp;/kdemultimedia-&kde-version;.tar.bz2">
-<!ENTITY kde-multimedia-size "4.7 MB">
-<!ENTITY kde-multimedia-buildsize "78 MB">
-<!ENTITY kde-multimedia-time "8.18 SBU">
-
-<!ENTITY kde-network SYSTEM "inst/kde-network.xml">
-<!ENTITY kde-network-download-http "&kde-download-http;/kdenetwork-&kde-version;.tar.bz2">
-<!ENTITY kde-network-download-ftp "&kde-download-ftp;/kdenetwork-&kde-version;.tar.bz2">
-<!ENTITY kde-network-size "6.0 MB">
-<!ENTITY kde-network-buildsize "67 MB">
-<!ENTITY kde-network-time "3.21 SBU">
-
-<!ENTITY kde-graphics SYSTEM "inst/kde-graphics.xml">
-<!ENTITY kde-graphics-download-http "&kde-download-http;/kdegraphics-&kde-version;.tar.bz2">
-<!ENTITY kde-graphics-download-ftp "&kde-download-ftp;/kdegraphics-&kde-version;.tar.bz2">
-<!ENTITY kde-graphics-size "5.5 MB">
-<!ENTITY kde-graphics-buildsize "71 MB">
-<!ENTITY kde-graphics-time "8.12 SBU">
-
-<!ENTITY kde-pim SYSTEM "inst/kde-pim.xml">
-<!ENTITY kde-pim-download-http "&kde-download-http;/kdepim-&kde-version;.tar.bz2">
-<!ENTITY kde-pim-download-ftp "&kde-download-ftp;/kdepim-&kde-version;.tar.bz2">
-<!ENTITY kde-pim-size "7.4 MB">
-<!ENTITY kde-pim-buildsize "110 MB">
-<!ENTITY kde-pim-time "12.2 SBU">
-
-<!ENTITY kde-admin SYSTEM "inst/kde-admin.xml">
-<!ENTITY kde-admin-download-http "&kde-download-http;/kdeadmin-&kde-version;.tar.bz2">
-<!ENTITY kde-admin-download-ftp "&kde-download-ftp;/kdeadmin-&kde-version;.tar.bz2">
-<!ENTITY kde-admin-size "1.6 MB">
-<!ENTITY kde-admin-buildsize "16 MB">
-<!ENTITY kde-admin-time "1.09 SBU">
-
-<!ENTITY kde-games SYSTEM "inst/kde-games.xml">
-<!ENTITY kde-games-download-http "&kde-download-http;/kdegames-&kde-version;.tar.bz2">
-<!ENTITY kde-games-download-ftp "&kde-download-ftp;/kdegames-&kde-version;.tar.bz2">
-<!ENTITY kde-games-size "8.7 MB">
-<!ENTITY kde-games-buildsize "68 MB">
-<!ENTITY kde-games-time "4.47 SBU">
-
-<!ENTITY kde-utils SYSTEM "inst/kde-utils.xml">
-<!ENTITY kde-utils-download-http "&kde-download-http;/kdeutils-&kde-version;.tar.bz2">
-<!ENTITY kde-utils-download-ftp "&kde-download-ftp;/kdeutils-&kde-version;.tar.bz2">
-<!ENTITY kde-utils-size "2.5 MB">
-<!ENTITY kde-utils-buildsize "41 MB">
-<!ENTITY kde-utils-time "3.97 SBU">
-
-<!ENTITY kde-edu SYSTEM "inst/kde-edu.xml">
-<!ENTITY kde-edu-download-http "&kde-download-http;/kdeedu-&kde-version;.tar.bz2">
-<!ENTITY kde-edu-download-ftp "&kde-download-ftp;/kdeedu-&kde-version;.tar.bz2">
-<!ENTITY kde-edu-size "22 MB">
-<!ENTITY kde-edu-buildsize "91 MB">
-<!ENTITY kde-edu-time "4.19 SBU">
-
-<!ENTITY kde-artwork SYSTEM "inst/kde-artwork.xml">
-<!ENTITY kde-artwork-download-http "&kde-download-http;/kdeartwork-&kde-version;.tar.bz2">
-<!ENTITY kde-artwork-download-ftp "&kde-download-ftp;/kdeartwork-&kde-version;.tar.bz2">
-<!ENTITY kde-artwork-size "17 MB">
-<!ENTITY kde-artwork-buildsize "57 MB">
-<!ENTITY kde-artwork-time "1.94 SBU">
-
-<!ENTITY kde-toys SYSTEM "inst/kde-toys.xml">
-<!ENTITY kde-toys-download-http "&kde-download-http;/kdetoys-&kde-version;.tar.bz2">
-<!ENTITY kde-toys-download-ftp "&kde-download-ftp;/kdetoys-&kde-version;.tar.bz2">
-<!ENTITY kde-toys-size "2.4 MB">
-<!ENTITY kde-toys-buildsize "14 MB">
-<!ENTITY kde-toys-time "0.96 SBU">
-
-<!ENTITY kde-addons SYSTEM "inst/kde-addons.xml">
-<!ENTITY kde-addons-download-http "&kde-download-http;/kdeaddons-&kde-version;.tar.bz2">
-<!ENTITY kde-addons-download-ftp "&kde-download-ftp;/kdeaddons-&kde-version;.tar.bz2">
-<!ENTITY kde-addons-size "1.4 MB">
-<!ENTITY kde-addons-buildsize "32 MB">
-<!ENTITY kde-addons-time "4.62 SBU">
-
-<!--
-<!ENTITY kdoc-ftp "http://www.ph.unimelb.edu.au/~ssk/kde/kdoc/kdoc-snapshot.tar.gz">
-<!ENTITY kdoc-size "86 KB">
-<!ENTITY kde-bindings-size "??? MB">
-<!ENTITY kde-sdk-size "??? MB">
-<!ENTITY kdevelop-ftp "ftp://download.uk.kde.org/pub/kde/stable/3.0.5/src/kdevelop-2.1.4_for_KDE_3.0.tar.bz2">
-<!ENTITY kdevelop-size "3.2 MB">
-<!ENTITY kdm-size "??? MB">  -->
+<!ENTITY % kdemultimedia SYSTEM "add/kdemultimedia/kdemultimedia.ent">
+%kdemultimedia;
+<!ENTITY % kdenetwork SYSTEM "add/kdenetwork/kdenetwork.ent">
+%kdenetwork;
+<!ENTITY % kdegraphics SYSTEM "add/kdegraphics/kdegraphics.ent">
+%kdegraphics;
+<!ENTITY % kdepim SYSTEM "add/kdepim/kdepim.ent">
+%kdepim;
+<!ENTITY % kdeadmin SYSTEM "add/kdeadmin/kdeadmin.ent">
+%kdeadmin;
+<!ENTITY % kdegames SYSTEM "add/kdegames/kdegames.ent">
+%kdegames;
+<!ENTITY % kdeutils SYSTEM "add/kdeutils/kdeutils.ent">
+%kdeutils;
+<!ENTITY % kdeedu SYSTEM "add/kdeedu/kdeedu.ent">
+%kdeedu;
+<!ENTITY % kdeartwork SYSTEM "add/kdeartwork/kdeartwork.ent">
+%kdeartwork;
+<!ENTITY % kdetoys SYSTEM "add/kdetoys/kdetoys.ent">
+%kdetoys;
+<!ENTITY % kdeaddons SYSTEM "add/kdeaddons/kdeaddons.ent">
+%kdeaddons;
Index: e/other/other.xml
===================================================================
--- kde/other/other.xml	(revision 8ba058e76b0ce3eb4eafe901a3a98903624e6ddf)
+++ 	(revision )
@@ -1,8 +1,0 @@
-<chapter id="kde-other">
-<?dbhtml filename="other.html"?>
-<title>Other KDE Packages</title>
-
-&kdoc;
-<!--&kdevelop;-->
-
-</chapter>
Index: pst/ps/other.xml
===================================================================
--- pst/ps/other.xml	(revision 8ba058e76b0ce3eb4eafe901a3a98903624e6ddf)
+++ pst/ps/other.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -3,8 +3,6 @@
 <title>Other PostScript programs</title>
 
-
 <para>KGhostview is a Qt based newsreader program from 
-<xref linkend="kde-graphics"/>.</para>
-
+<xref linkend="kdegraphics"/>.</para>
 
 </sect1>
Index: xsoft/graphweb/konq.xml
===================================================================
--- xsoft/graphweb/konq.xml	(revision 8ba058e76b0ce3eb4eafe901a3a98903624e6ddf)
+++ xsoft/graphweb/konq.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -4,6 +4,5 @@
 
 <para>Konqueror is the default graphical web browser for the KDE desktop
-environment.  It is packaged and installed with <xref linkend="kde-base"/>.</para>
+environment.  It is packaged and installed with <xref linkend="kdebase"/>.</para>
 
 </sect1>
-
Index: xsoft/suites/koffice/koffice-intro.xml
===================================================================
--- xsoft/suites/koffice/koffice-intro.xml	(revision 8ba058e76b0ce3eb4eafe901a3a98903624e6ddf)
+++ xsoft/suites/koffice/koffice-intro.xml	(revision ee2025f4cd233b04703e7c613f946250313906b1)
@@ -20,5 +20,5 @@
 <sect3><title><application>KOffice</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="kde-base"/></para></sect4>
+<para><xref linkend="kdebase"/></para></sect4>
 <sect4><title>Optional</title>
 <para>
