Index: kde/core/arts.xml
===================================================================
--- kde/core/arts.xml	(revision aad8e0bc07fb2560af949ef6701db2c282bc9602)
+++ kde/core/arts.xml	(revision cf93e2c556c3eaeb54d3928cf26c8a72b6ec2fee)
@@ -3,8 +3,97 @@
 <title>aRts-&arts-version;</title>
 
-&arts-intro;
-&arts-inst;
-&arts-exp;
-&arts-config;
+<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"/></para></sect4>
+<sect4><title>Recommended</title>
+<para><xref linkend="alsa"/>, <xref linkend="audiofile"/> and <xref
+linkend="libvorbis"/></para></sect4> 
+<sect4><title>Optional</title>
+<para><xref linkend="pkgconfig"/>, <xref
+linkend="GLib2"/> and <xref linkend="libmad"/></para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>aRts</application></title>
+
+<para>Before starting the build, ensure you have the 
+<envar>QTDIR</envar> environment variable set:</para>
+<screen><userinput><command>export QTDIR=/opt/qt</command></userinput></screen>
+
+<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-dir; /opt/kde</command></userinput></screen>
+
+<note><para>Another configure option is <command>--enable-final</command>. 
+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><command>--prefix=&kde-dir;</command> : 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><command>--disable-debug</command> : This option causes the
+system to be compiled without debugging code.
+</para>
+
+<para><command>--disable-dependency-tracking</command> : This option speeds
+up one time builds.</para>
+
+<para><command>ln -sfn &kde-dir; /opt/kde</command> : This command 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 <command>--prefix</command> location
+and then set up by changing the link as this command 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: e/core/arts/arts-config.xml
===================================================================
--- kde/core/arts/arts-config.xml	(revision aad8e0bc07fb2560af949ef6701db2c282bc9602)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<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: e/core/arts/arts-exp.xml
===================================================================
--- kde/core/arts/arts-exp.xml	(revision aad8e0bc07fb2560af949ef6701db2c282bc9602)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<sect2><title>Command explanations</title>
-<para><command>--prefix=&kde-dir;</command> : 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><command>--disable-debug</command> : This option causes the
-system to be compiled without debugging code.
-</para>
-
-<para><command>--disable-dependency-tracking</command> : This option
-speeds
-up one time builds.</para>
-
-<para><command>ln -sfn &kde-dir; /opt/kde</command> : This command
-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 <command>--prefix</command> location
-and then set up by changing the link as this command does.
-</para>
-
-</sect2>
Index: e/core/arts/arts-inst.xml
===================================================================
--- kde/core/arts/arts-inst.xml	(revision aad8e0bc07fb2560af949ef6701db2c282bc9602)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<sect2>
-<title>Installation of <application>aRts</application></title>
-
-<para>Before starting the build, ensure you have the
-<envar>QTDIR</envar> environment variable set:</para>
-<screen><userinput><command>export
-QTDIR=/opt/qt</command></userinput></screen>
-
-<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-dir; /opt/kde</command></userinput></screen>
-
-<note><para>Another configure option is
-<command>--enable-final</command>. 
-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: e/core/arts/arts-intro.xml
===================================================================
--- kde/core/arts/arts-intro.xml	(revision aad8e0bc07fb2560af949ef6701db2c282bc9602)
+++ 	(revision )
@@ -1,32 +1,0 @@
-<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"/></para></sect4>
-<sect4><title>Recommended</title>
-<para><xref linkend="alsa"/>, <xref linkend="audiofile"/> and <xref
-linkend="libvorbis"/></para></sect4> 
-<sect4><title>Optional</title>
-<para><xref linkend="pkgconfig"/>, <xref
-linkend="GLib2"/> and <xref linkend="libmad"/></para></sect4>
-</sect3>
-
-</sect2>
Index: e/core/arts/arts.ent
===================================================================
--- kde/core/arts/arts.ent	(revision aad8e0bc07fb2560af949ef6701db2c282bc9602)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<!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.1.4">
-<!ENTITY arts-download-http "">
-<!ENTITY arts-download-ftp "&kde-download;/arts-&arts-version;.tar.bz2">
-<!ENTITY arts-size "963 KB">
-<!ENTITY arts-buildsize "42.5 MB">
-<!ENTITY arts-time "2.52 SBU">
Index: e/core/base/kde-base-desc.xml
===================================================================
--- kde/core/base/kde-base-desc.xml	(revision aad8e0bc07fb2560af949ef6701db2c282bc9602)
+++ 	(revision )
@@ -1,92 +1,0 @@
-<sect2>
-<title>Contents</title>
-
-<para>Major programs in kdebase include
-<command>kdesktop</command>,
-<command>kaddressbook</command>,
-<command>kappfinder</command>,
-<command>kcontrol</command>,
-<command>kdeprint</command>,
-<command>kdm</command>,
-<command>kfind</command>,
-<command>khelpcenter</command>,
-<command>khotkeys</command>,
-<command>kicker</command>,
-<command>klipper</command>,
-<command>kmenuedit</command>,
-<command>konqueror</command>,
-<command>konsole</command>,
-<command>kscreensaver</command> and 
-<command>ktip</command>
-</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>kdesktop</title>
-<para><command>kdesktop</command> is the program that handles desktop
-icons, popup menus, and the
-screensaver system.</para></sect3>
-
-<sect3><title>kaddressbook</title>
-<para><command>kaddressbook</command> is a simple
-addressbook.</para></sect3>
-
-<sect3><title>kappfinder</title>
-<para><command>kappfinder</command>is an utility to add
-non-<acronym>KDE</acronym> applications to K-menu.</para></sect3>
-
-<sect3><title>kcontrol</title>
-<para><command>kcontrol</command>is <acronym>KDE</acronym> Control
-Center.</para></sect3>
- 
-<sect3><title>kdeprint</title>
-<para><command>kdeprint</command> provides Print job
-administration.</para></sect3>
-
-<sect3><title>kdm</title>
-<para><command>kdm</command> is the <acronym>KDE</acronym> Display
-manager (a 
-replacement for xdm.</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>khotkeys</title>
-<para><command>khotkeys</command> handles hot keys for
-<acronym>KDE</acronym>.</para></sect3>
-
-<sect3><title>kicker</title>
-<para><command>kicker</command> is the <acronym>KDE</acronym> control
-panel.</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>kscreensaver</title>
-<para><command>kscreensaver</command> is a program to set up
-screensavers.</para></sect3>
-
-<sect3><title>ktip</title>
-<para><command>ktip</command> is a wizard to provide hints and
-<acronym>KDE</acronym> information.</para></sect3> 
-
-</sect2>
Index: e/core/base/kde-base-exp.xml
===================================================================
--- kde/core/base/kde-base-exp.xml	(revision aad8e0bc07fb2560af949ef6701db2c282bc9602)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para><command>--disable-lametest</command> : Do not search for and use
-lame support. This package provides <filename>MP3</filename> encoding.
-Omit this option if
-you installed <filename>lame</filename>.</para>
-
-<para><command>--with-shadow</command> : Use shadow password
-support.</para>
-</sect2>
Index: e/core/base/kde-base-inst.xml
===================================================================
--- kde/core/base/kde-base-inst.xml	(revision aad8e0bc07fb2560af949ef6701db2c282bc9602)
+++ 	(revision )
@@ -1,17 +1,0 @@
-<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 --disable-lametest --with-shadow &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
-
-</sect2>
Index: e/core/base/kde-base-intro.xml
===================================================================
--- kde/core/base/kde-base-intro.xml	(revision aad8e0bc07fb2560af949ef6701db2c282bc9602)
+++ 	(revision )
@@ -1,33 +1,0 @@
-<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>Recommended</title>
-<para><xref linkend="openssl"/>, <xref linkend="lesstif"/>, <xref
-linkend="CDParanoia"/>, <xref linkend="libvorbis"/> and <xref
-linkend="cups"/></para></sect4>
-<sect4><title>Optional</title>
-<para><xref linkend="lame"/> and <xref
-linkend="Linux_PAM"/></para></sect4>
-</sect3>
-
-</sect2>
Index: e/core/base/kde-base.ent
===================================================================
--- kde/core/base/kde-base.ent	(revision aad8e0bc07fb2560af949ef6701db2c282bc9602)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<!ENTITY kde-base SYSTEM "../kde-base.xml">
-<!ENTITY kde-base-intro SYSTEM "kde-base-intro.xml">
-<!ENTITY kde-base-inst SYSTEM "kde-base-inst.xml">
-<!ENTITY kde-base-exp SYSTEM "kde-base-exp.xml">
-<!ENTITY kde-base-desc SYSTEM "kde-base-desc.xml">
-<!ENTITY kde-base-download-http "">
-<!ENTITY kde-base-download-ftp "&kde-download;/kdebase-&kde-version;.tar.bz2">
-<!ENTITY kde-base-size "14 MB">
-<!ENTITY kde-base-buildsize "196 MB">
-<!ENTITY kde-base-time "28.22 SBU">
Index: e/core/kde-base.xml
===================================================================
--- kde/core/kde-base.xml	(revision aad8e0bc07fb2560af949ef6701db2c282bc9602)
+++ 	(revision )
@@ -1,9 +1,0 @@
-<sect1 id="kde-base" xreflabel="kdebase-&kde-version;">
-<title>kdebase-&kde-version;</title>
-
-&kde-base-intro;
-&kde-base-inst;
-&kde-base-exp;
-&kde-base-desc;
-
-</sect1>
Index: e/core/kde-libs.xml
===================================================================
--- kde/core/kde-libs.xml	(revision aad8e0bc07fb2560af949ef6701db2c282bc9602)
+++ 	(revision )
@@ -1,9 +1,0 @@
-<sect1 id="kde-libs" xreflabel="kdelibs-&kde-version;">
-<title>kdelibs-&kde-version;</title>
-
-&kde-libs-intro;
-&kde-libs-inst;
-&kde-libs-exp;
-&kde-libs-desc;
- 
-</sect1>
Index: e/core/libs/kde-libs-desc.xml
===================================================================
--- kde/core/libs/kde-libs-desc.xml	(revision aad8e0bc07fb2560af949ef6701db2c282bc9602)
+++ 	(revision )
@@ -1,5 +1,0 @@
-<sect2><title>Contents</title>
-<para>kdelibs provides numerous libraries needed by
-<acronym>KDE</acronym> programs.</para>
-
-</sect2>
Index: e/core/libs/kde-libs-exp.xml
===================================================================
--- kde/core/libs/kde-libs-exp.xml	(revision aad8e0bc07fb2560af949ef6701db2c282bc9602)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<sect2><title>Command explanations</title>
-<para><command>--prefix=&kde-dir;</command> : This option tells
-the process to install the package in <filename
-class="directory">&kde-dir;</filename>.</para>
-
-<para><command>--disable-debug</command> : This option causes the
-system to be compiled without debugging code.</para>
-
-<para><command>--disable-dependency-tracking</command> : This option
-speeds up one time builds.</para>
-
-<para><command>--with-alsa</command> : This option tells the build
-process to
-search for and use Alsa for sound support.</para>
-
-<para><command>--enable-fast-malloc=full</command> : This option tells
-<acronym>KDE</acronym> programs to use an internal memory allocation
-scheme
-optimized for <acronym>KDE</acronym>.</para>
-</sect2>
Index: e/core/libs/kde-libs-inst.xml
===================================================================
--- kde/core/libs/kde-libs-inst.xml	(revision aad8e0bc07fb2560af949ef6701db2c282bc9602)
+++ 	(revision )
@@ -1,17 +1,0 @@
-<sect2>
-<title>Installation of <application>kdelibs</application></title>
-
-<!--
-<warning><para>The <acronym>KDE</acronym> instructions are being
-revised. The instructions should
-work as described in the following sections, but not all KDE packages
-have been validated.</para></warning>
--->
-
-<para>Install <application>kdelibs</application> with:</para>
-<screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
-     --disable-dependency-tracking --with-alsa --enable-fast-malloc=full &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
-
-</sect2>
Index: e/core/libs/kde-libs-intro.xml
===================================================================
--- kde/core/libs/kde-libs-intro.xml	(revision aad8e0bc07fb2560af949ef6701db2c282bc9602)
+++ 	(revision )
@@ -1,36 +1,0 @@
-<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>Recommended</title>
-<para><xref linkend="openssl"/>, <xref linkend="pcre"/>, <xref
-linkend="libxml2"/>, <xref linkend="libxslt"/>, <xref
-linkend="libfam"/> and <xref linkend="libart_lgpl"/></para></sect4>
-<sect4><title>Optional</title>
-<para><xref linkend="cups"/>, <xref linkend="sane"/> and <xref
-linkend="openldap"/>
-</para></sect4>
-</sect3>
-
-</sect2>
Index: e/core/libs/kde-libs.ent
===================================================================
--- kde/core/libs/kde-libs.ent	(revision aad8e0bc07fb2560af949ef6701db2c282bc9602)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<!ENTITY kde-libs SYSTEM "../kde-libs.xml">
-<!ENTITY kde-libs-intro SYSTEM "kde-libs-intro.xml">
-<!ENTITY kde-libs-inst SYSTEM "kde-libs-inst.xml">
-<!ENTITY kde-libs-exp SYSTEM "kde-libs-exp.xml">
-<!ENTITY kde-libs-desc SYSTEM "kde-libs-desc.xml">
-<!ENTITY kde-libs-download-http "">
-<!ENTITY kde-libs-download-ftp "&kde-download;/kdelibs-&kde-version;.tar.bz2">
-<!ENTITY kde-libs-size "10 MB">
-<!ENTITY kde-libs-buildsize "193 MB">
-<!ENTITY kde-libs-time "35.34 SBU">
Index: kde/inst/kde-base.xml
===================================================================
--- kde/inst/kde-base.xml	(revision cf93e2c556c3eaeb54d3928cf26c8a72b6ec2fee)
+++ kde/inst/kde-base.xml	(revision cf93e2c556c3eaeb54d3928cf26c8a72b6ec2fee)
@@ -0,0 +1,146 @@
+<sect1 id="kde-base" xreflabel="kdebase-&kde-version;">
+<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>Recommended</title>
+<para><xref linkend="openssl"/>, <xref linkend="lesstif"/>, <xref
+linkend="CDParanoia"/>, <xref linkend="libvorbis"/> and <xref
+linkend="cups"/></para></sect4>
+<sect4><title>Optional</title>
+<para><xref linkend="lame"/> and <xref
+linkend="Linux_PAM"/></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 --disable-lametest --with-shadow &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+ 
+<para><command>--disable-lametest</command> : Do not search for and use 
+lame support. This package provides <filename>MP3</filename> encoding. Omit this option if
+you installed <filename>lame</filename>.</para>
+  
+<para><command>--with-shadow</command> : Use shadow password 
+support.</para>
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>Major programs in kdebase include 
+<command>kdesktop</command>,
+<command>kaddressbook</command>,
+<command>kappfinder</command>,
+<command>kcontrol</command>,
+<command>kdeprint</command>,
+<command>kdm</command>,
+<command>kfind</command>,
+<command>khelpcenter</command>,
+<command>khotkeys</command>,
+<command>kicker</command>,
+<command>klipper</command>,
+<command>kmenuedit</command>,
+<command>konqueror</command>,
+<command>konsole</command>,
+<command>kscreensaver</command> and 
+<command>ktip</command>
+</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>kdesktop</title>
+<para><command>kdesktop</command> is the program that handles desktop icons, popup menus, and the
+screensaver system.</para></sect3>
+
+<sect3><title>kaddressbook</title>
+<para><command>kaddressbook</command> is a simple addressbook.</para></sect3>
+
+<sect3><title>kappfinder</title>
+<para><command>kappfinder</command>is an utility to add
+non-<acronym>KDE</acronym> applications to K-menu.</para></sect3>
+
+<sect3><title>kcontrol</title>
+<para><command>kcontrol</command>is <acronym>KDE</acronym> Control
+Center.</para></sect3>
+ 
+<sect3><title>kdeprint</title>
+<para><command>kdeprint</command> provides Print job administration.</para></sect3>
+
+<sect3><title>kdm</title>
+<para><command>kdm</command> is the <acronym>KDE</acronym> Display manager (a 
+replacement for xdm.</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>khotkeys</title>
+<para><command>khotkeys</command> handles hot keys for
+<acronym>KDE</acronym>.</para></sect3>
+
+<sect3><title>kicker</title>
+<para><command>kicker</command> is the <acronym>KDE</acronym> control
+panel.</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>kscreensaver</title>
+<para><command>kscreensaver</command> is a program to set up
+screensavers.</para></sect3>
+
+<sect3><title>ktip</title>
+<para><command>ktip</command> is a wizard to provide hints and
+<acronym>KDE</acronym> information.</para></sect3> 
+
+</sect2>
+   
+</sect1>
Index: kde/inst/kde-libs.xml
===================================================================
--- kde/inst/kde-libs.xml	(revision cf93e2c556c3eaeb54d3928cf26c8a72b6ec2fee)
+++ kde/inst/kde-libs.xml	(revision cf93e2c556c3eaeb54d3928cf26c8a72b6ec2fee)
@@ -0,0 +1,77 @@
+<sect1 id="kde-libs" xreflabel="kdelibs-&kde-version;">
+<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>Recommended</title>
+<para><xref linkend="openssl"/>, <xref linkend="pcre"/>, <xref
+linkend="libxml2"/>, <xref linkend="libxslt"/>, <xref
+linkend="libfam"/> and <xref linkend="libart_lgpl"/></para></sect4>
+<sect4><title>Optional</title>
+<para><xref linkend="cups"/>, <xref linkend="sane"/> and <xref linkend="openldap"/>
+</para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>kdelibs</application></title>
+
+<!-- 
+<warning><para>The <acronym>KDE</acronym> instructions are being revised. The instructions should
+work as described in the following sections, but not all KDE packages
+have been validated.</para></warning>
+-->
+
+<para>Install <application>kdelibs</application> with:</para>
+<screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
+     --disable-dependency-tracking --with-alsa --enable-fast-malloc=full &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
+<sect2><title>Command explanations</title>
+<para><command>--prefix=&kde-dir;</command> : This option tells
+the process to install the package in <filename
+class="directory">&kde-dir;</filename>.</para>
+
+<para><command>--disable-debug</command> : This option causes the
+system to be compiled without debugging code.</para>
+
+<para><command>--disable-dependency-tracking</command> : This option
+speeds up one time builds.</para>
+
+<para><command>--with-alsa</command> : This option tells the build process to
+search for and use Alsa for sound support.</para>
+
+<para><command>--enable-fast-malloc=full</command> : This option tells
+<acronym>KDE</acronym> programs to use an internal memory allocation scheme 
+optimized for <acronym>KDE</acronym>.</para>
+</sect2>
+
+<sect2><title>Contents</title>
+<para>kdelibs provides numerous libraries needed by
+<acronym>KDE</acronym> programs.</para>
+
+</sect2>
+</sect1>
Index: kde/kde.ent
===================================================================
--- kde/kde.ent	(revision aad8e0bc07fb2560af949ef6701db2c282bc9602)
+++ kde/kde.ent	(revision cf93e2c556c3eaeb54d3928cf26c8a72b6ec2fee)
@@ -9,10 +9,12 @@
 <!ENTITY kde-core SYSTEM "core/core.xml">
 <!ENTITY kde-core-config SYSTEM "core/config.xml">
-<!ENTITY % kde-core-arts SYSTEM "core/arts/arts.ent">
-<!ENTITY % kde-libs SYSTEM "core/libs/kde-libs.ent">
-<!ENTITY % kde-base SYSTEM "core/base/kde-base.ent">
-%kde-core-arts;
-%kde-libs;
-%kde-base;
+
+<!ENTITY kde-core-arts SYSTEM "core/arts.xml">
+<!ENTITY arts-buildsize "42.5 MB">
+<!ENTITY arts-version "1.1.4">
+<!ENTITY arts-download-http "">
+<!ENTITY arts-download-ftp "&kde-download;/arts-&arts-version;.tar.bz2">
+<!ENTITY arts-size "963 KB">
+<!ENTITY arts-time "2.52 SBU">
 
 <!-- KDE Additional -->
@@ -29,4 +31,18 @@
 <!ENTITY kdevelop SYSTEM "inst/kdevelop.xml">
 <!ENTITY kdm SYSTEM "inst/kdm.xml"> -->
+
+<!ENTITY kde-libs SYSTEM "inst/kde-libs.xml">
+<!ENTITY kde-libs-buildsize "193 MB">
+<!ENTITY kde-libs-download-http "">
+<!ENTITY kde-libs-download-ftp "&kde-download;/kdelibs-&kde-version;.tar.bz2">
+<!ENTITY kde-libs-size "10 MB">
+<!ENTITY kde-libs-time "35.34 SBU">
+
+<!ENTITY kde-base SYSTEM "inst/kde-base.xml">
+<!ENTITY kde-base-buildsize "196 MB">
+<!ENTITY kde-base-download-http "">
+<!ENTITY kde-base-download-ftp "&kde-download;/kdebase-&kde-version;.tar.bz2">
+<!ENTITY kde-base-size "14 MB">
+<!ENTITY kde-base-time "28.22 SBU">
 
 <!ENTITY kde-multimedia SYSTEM "inst/kde-multimedia.xml">
