Index: kde/core/base/kde-base-desc.xml
===================================================================
--- kde/core/base/kde-base-desc.xml	(revision 64d855fecd4554803f70f60d336f6be9c7473e4f)
+++ kde/core/base/kde-base-desc.xml	(revision 64d855fecd4554803f70f60d336f6be9c7473e4f)
@@ -0,0 +1,92 @@
+<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: kde/core/base/kde-base-exp.xml
===================================================================
--- kde/core/base/kde-base-exp.xml	(revision 64d855fecd4554803f70f60d336f6be9c7473e4f)
+++ kde/core/base/kde-base-exp.xml	(revision 64d855fecd4554803f70f60d336f6be9c7473e4f)
@@ -0,0 +1,11 @@
+<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: kde/core/base/kde-base-inst.xml
===================================================================
--- kde/core/base/kde-base-inst.xml	(revision 64d855fecd4554803f70f60d336f6be9c7473e4f)
+++ kde/core/base/kde-base-inst.xml	(revision 64d855fecd4554803f70f60d336f6be9c7473e4f)
@@ -0,0 +1,17 @@
+<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: kde/core/base/kde-base-intro.xml
===================================================================
--- kde/core/base/kde-base-intro.xml	(revision 64d855fecd4554803f70f60d336f6be9c7473e4f)
+++ kde/core/base/kde-base-intro.xml	(revision 64d855fecd4554803f70f60d336f6be9c7473e4f)
@@ -0,0 +1,33 @@
+<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: kde/core/base/kde-base.ent
===================================================================
--- kde/core/base/kde-base.ent	(revision 64d855fecd4554803f70f60d336f6be9c7473e4f)
+++ kde/core/base/kde-base.ent	(revision 64d855fecd4554803f70f60d336f6be9c7473e4f)
@@ -0,0 +1,10 @@
+<!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: kde/core/kde-base.xml
===================================================================
--- kde/core/kde-base.xml	(revision 64d855fecd4554803f70f60d336f6be9c7473e4f)
+++ kde/core/kde-base.xml	(revision 64d855fecd4554803f70f60d336f6be9c7473e4f)
@@ -0,0 +1,9 @@
+<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: kde/core/libs/kde-libs-inst.xml
===================================================================
--- kde/core/libs/kde-libs-inst.xml	(revision f41b8969d0f2527c60aa7f4803fe9274a89b438a)
+++ kde/core/libs/kde-libs-inst.xml	(revision 64d855fecd4554803f70f60d336f6be9c7473e4f)
@@ -11,6 +11,5 @@
 <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;
+     --disable-dependency-tracking --with-alsa --enable-fast-malloc=full &amp;&amp;
 make &amp;&amp;
 make install</command></userinput></screen>
Index: e/inst/kde-base.xml
===================================================================
--- kde/inst/kde-base.xml	(revision f41b8969d0f2527c60aa7f4803fe9274a89b438a)
+++ 	(revision )
@@ -1,146 +1,0 @@
-<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/kde.ent
===================================================================
--- kde/kde.ent	(revision f41b8969d0f2527c60aa7f4803fe9274a89b438a)
+++ kde/kde.ent	(revision 64d855fecd4554803f70f60d336f6be9c7473e4f)
@@ -11,6 +11,8 @@
 <!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;
 
 <!-- KDE Additional -->
@@ -27,11 +29,4 @@
 <!ENTITY kdevelop SYSTEM "inst/kdevelop.xml">
 <!ENTITY kdm SYSTEM "inst/kdm.xml"> -->
-
-<!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">
