Index: kde/core/config.xml
===================================================================
--- kde/core/config.xml	(revision 7c27bc802436a46fbf4df366eb7fa67264b76433)
+++ kde/core/config.xml	(revision fb31251d18396270562c2283406e9eda6b7c3ffb)
@@ -18,4 +18,7 @@
 
 <screen><userinput><command>echo "exec startkde" &gt; ~/.xinitrc</command></userinput></screen>
+<indexterm zone="kde-core-config">
+  <primary sortas="e-AA.xinitrc">~/.xinitrc</primary>
+</indexterm>
 
 <para>If you installed the <xref linkend="desktop-file-utils"/> package, 
Index: kde/core/kdebase.xml
===================================================================
--- kde/core/kdebase.xml	(revision 7c27bc802436a46fbf4df366eb7fa67264b76433)
+++ kde/core/kdebase.xml	(revision fb31251d18396270562c2283406e9eda6b7c3ffb)
@@ -20,4 +20,7 @@
 <?dbhtml filename="kdebase.html"?>
 <title>kdebase-&kde-version;</title>
+<indexterm zone="kdebase">
+  <primary sortas="a-kdebase">KDEbase</primary>
+</indexterm>
 
 <sect2>
@@ -98,6 +101,5 @@
 ./configure --prefix=&kde-dir; --disable-debug \
     --disable-dependency-tracking &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
+make</command></userinput></screen> 
 
 <note><para>If you wish to create the <acronym>API</acronym> documentation and 
@@ -106,4 +108,8 @@
 must be done before <command>make install</command>.</para></note>
 
+<para>Now, as the root user:</para>
+ 
+<screen><userinput role='root'><command>make install</command></userinput></screen>
+
 </sect2>
 
@@ -111,110 +117,226 @@
 <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>
+<segmentedlist>
+  <segtitle>Installed Programs</segtitle>
+
+  <seglistitem>
+    <seg>kate, kcontrol, kdebugdialog, kdeprint, kdesu, kdm, kfind,
+         khelpcenter, kicker, kinfocenter, kioslave, klipper, kmenuedit
+         konqueror, konsole, kpager, ksplashml, ksysguard, kwrite, kxkb</seg>
+  </seglistitem>
+</segmentedlist>
+
+<variablelist>
+  <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+  <?dbfo list-presentation="list"?>
+ 
+<varlistentry id="kate">
+  <term><command>kate</command></term>
+  <listitem>
+    <para> is a programmer's text editor for <acronym>KDE</acronym>.</para>
+    <indexterm zone="kdebase kate">
+      <primary sortas="b-kate">kate</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kcontrol">
+  <term><command>kcontrol</command></term>
+  <listitem>
+    <para> is the <acronym>KDE</acronym> Control Center.</para>
+    <indexterm zone="kdebase kcontrol">
+      <primary sortas="b-kcontrol">kcontrol</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kdebugdialog">
+  <term><command>kdebugdialog</command></term>
+  <listitem>
+    <para>is a dialog box for managing diagnostic messages at runtime.</para>
+    <indexterm zone="kdebase kdebugdialog">
+      <primary sortas="b-kdebugdialog">kdebugdialog</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kdeprint">
+  <term><command>kdeprint</command></term>
+  <listitem>
+    <para>is a dialog box for managing diagnostic messages at runtime.</para>
+    <indexterm zone="kdebase kdeprint">
+      <primary sortas="b-kdeprint">kdeprint</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kdesu">
+  <term><command>kdesu</command></term>
+  <listitem>
+    <para>is a graphical front end for the Unix <command>su</command> command.</para>
+    <indexterm zone="kdebase kdesu">
+      <primary sortas="b-kdesu">kdesu</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kdm">
+  <term><command>kdm</command></term>
+  <listitem>
+    <para>is the <acronym>KDE</acronym> display manager (a replacement for <command>xdm</command>).</para>
+    <indexterm zone="kdebase kdm">
+      <primary sortas="b-kdm">kdm</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kfind">
+  <term><command>kfind</command></term>
+  <listitem>
+    <para>is an utility to find files.</para>
+    <indexterm zone="kdebase kfind">
+      <primary sortas="b-kfind">kfind</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="khelpcenter">
+  <term><command>khelpcenter</command></term>
+  <listitem>
+    <para>is the <acronym>KDE</acronym> help tool.</para>
+    <indexterm zone="kdebase khelpcenter">
+       <primary sortas="b-khelpcenter">khelpcenter</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kicker">
+  <term><command>kicker</command></term>
+  <listitem>
+    <para>is the <acronym>KDE</acronym> control panel.</para>
+    <indexterm zone="kdebase kicker">
+      <primary sortas="b-kicker">kicker</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kinfocenter">
+  <term><command>kinfocenter</command></term>
+  <listitem>
+    <para>provides a centralized and convenient 
+          overview of your <acronym>KDE</acronym> and system settings.</para>
+    <indexterm zone="kdebase kinfocenter">
+      <primary sortas="b-kinfocenter">kinfocenter</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kioslaves">
+  <term>kioslaves</term>
+  <listitem>
+    <para>are support programs designed to be intimately familiar with a certian
+          protocol, so that a standard interface can be used to get at data from
+          any number of places. Examples are the http and ftp kioslaves,
+          which will retrieve data from an http or ftp server respectively.</para>
+    <indexterm zone="kdebase kioslaves">
+      <primary sortas="b-kioslaves">kioslaves</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="klipper">
+  <term><command>klipper</command></term>
+  <listitem>
+    <para> is a clipboard utility.</para>
+    <indexterm zone="kdebase klipper">
+      <primary sortas="b-klipper">klipper</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kmenuedit">
+  <term><command>kmenuedit</command></term>
+  <listitem>
+    <para>is a utility to rearrange or add items to the K-menu.</para>
+    <indexterm zone="kdebase kmenuedit">
+      <primary sortas="b-kmenuedit">kmenuedit</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kongueror">
+  <term><command>kongueror</command></term>
+  <listitem>
+    <para>is a filesystem and web browser.</para>
+    <indexterm zone="kdebase kongueror">
+      <primary sortas="b-kongueror">kongueror</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="konsole">
+  <term><command>konsole</command></term>
+  <listitem>
+    <para>is a highly configurable X terminal emulator.</para>
+    <indexterm zone="kdebase konsole">
+      <primary sortas="b-konsole">konsole</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kpager">
+  <term><command>kpager</command></term>
+  <listitem>
+    <para> provides a thumbnail view of all virtual desktops.</para>
+    <indexterm zone="kdebase kpager">
+      <primary sortas="b-kpager">kpager</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="ksplashml">
+  <term><command>ksplashml</command></term>
+  <listitem>
+    <para>is a splash screen that shows the progress of an application that is loading.</para>
+    <indexterm zone="kdebase ksplashml">
+      <primary sortas="b-ksplashml">ksplashml</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="ksysguard">
+  <term><command>ksysguard</command></term>
+  <listitem>
+    <para>is a network enabled task manager and system monitor application, 
+          with the additional functionality of <command>top</command>.</para>
+    <indexterm zone="kdebase ksysguard">
+      <primary sortas="b-ksysguard">ksysguard</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kwrite">
+  <term><command>kwrite</command></term>
+  <listitem>
+    <para>is a text editor for <acronym>KDE</acronym>.</para>
+    <indexterm zone="kdebase kwrite">
+      <primary sortas="b-kwrite">kwrite</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kxkb">
+  <term><command>kxkb</command></term>
+  <listitem>
+    <para>is a keyboard layout switching utility based on the X11 xkb extension.</para>
+    <indexterm zone="kdebase kxkb">
+      <primary sortas="b-kxkb">kxkb</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+</variablelist>
 
 </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 the <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: kde/core/kdelibs.xml
===================================================================
--- kde/core/kdelibs.xml	(revision 7c27bc802436a46fbf4df366eb7fa67264b76433)
+++ kde/core/kdelibs.xml	(revision fb31251d18396270562c2283406e9eda6b7c3ffb)
@@ -21,5 +21,5 @@
 <title><application>kdelibs</application>-&kde-version;</title>
 <indexterm zone="kdelibs">
-  <primary sortas="a-kdelibs">Kdelibs</primary>
+  <primary sortas="a-kdelibs">KDElibs</primary>
 </indexterm>
 
@@ -148,6 +148,6 @@
  
   <seglistitem>
-    <seg>kspell</seg>
-    <seg>Numerous KDE liraries</seg>
+    <seg>Numerous KDE support programs</seg>
+    <seg>Numerous KDE libraries</seg>
   </seglistitem>
 </segmentedlist>
@@ -157,11 +157,10 @@
   <?dbfo list-presentation="list"?>
  
-<varlistentry id="kspell">
-  <term><command>kspell</command></term>
+<varlistentry id="kdelib-programs">
+  <term>KDE Support Programs</term>
   <listitem>
-    <para>is the spelling checker used by KDE applications such as Kate, KMail, and KWord. 
-          It is a GUI frontend to International ISpell and ASpell.</para>
-    <indexterm zone="kdelibs kspell">
-      <primary sortas="b-kspell">kspell</primary>
+    <para>contain essential support programs needed by other KDE applications.</para>
+    <indexterm zone="kdelibs kdelib-programs">
+      <primary sortas="b-kdelib-programs">KDE Support Programs</primary>
     </indexterm>
   </listitem>
@@ -169,7 +168,7 @@
 
 <varlistentry id="kde-libraries">
-  <term><filename class='libraryfile'>KDE Libraries</filename></term>
+  <term>KDE Libraries</term>
   <listitem>
-    <para>contains essential functions that are needed by KDS applications.</para>
+    <para>contain essential functions that are needed by KDE applications.</para>
     <indexterm zone="kdelibs kde-libraries">
       <primary sortas="c-kde-libraries">kde-libraries</primary>
@@ -180,8 +179,7 @@
 </variablelist>
 
-<para>The number of programs and libraries installed by
-<application>kdelibs</application> prohibits an explanation of each one in this
-section. Instead, see the <ulink url="http://docs.kde.org/">KDE
-Documentation</ulink>.</para>
+<para>The number of programs and libraries installed by <application>kdelibs</application>
+prohibits an explanation of each one in this section. Instead, see the <ulink
+url="http://docs.kde.org/">KDE Documentation</ulink>.</para>
 
 </sect2>
Index: kde/core/pre-install-config.xml
===================================================================
--- kde/core/pre-install-config.xml	(revision 7c27bc802436a46fbf4df366eb7fa67264b76433)
+++ kde/core/pre-install-config.xml	(revision fb31251d18396270562c2283406e9eda6b7c3ffb)
@@ -12,5 +12,5 @@
 </sect1info>
 <?dbhtml filename="pre-install-config.html"?>
-<title>Pre-installation configuration</title>
+<title>KDE Pre-installation configuration</title>
 
 <para>Based on your preference, set <envar>KDE_PREFIX</envar>.</para>
@@ -55,4 +55,8 @@
 <command>EOF</command></userinput></screen>
 
+<indexterm zone="kde-pre-install-config">
+  <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
+</indexterm>
+
 <para>Add to your <filename>/etc/man.conf</filename>:</para>
 
@@ -64,14 +68,17 @@
 # End kde addition to man.conf
 <command>EOF</command></userinput></screen>
+ 
+<indexterm zone="kde-pre-install-config">
+  <primary sortas="e-etc-man.conf">/etc/man.conf</primary>
+</indexterm>
 
 <tip>
-<para>If you prefer installing <acronym>KDE</acronym> in
-<filename class="directory">/opt</filename>, one trick to avoid the
-above configuration changes every time you
-install a new version is to replace
-<filename class="directory">/opt/kde-&kde-version;</filename>
-with <filename class="directory">/opt/kde</filename> and to create a symlink from
-<filename class="directory">/opt/kde-&kde-version;</filename>
-to <filename class="directory">/opt/kde</filename>.</para>
+<para>If you prefer installing <acronym>KDE</acronym> in <filename
+class="directory">/opt</filename>, one trick to avoid the above configuration
+changes every time you install a new version is to replace <filename
+class="directory">/opt/kde-&kde-version;</filename> with <filename
+class="directory">/opt/kde</filename> and to create a symlink from <filename
+class="directory">/opt/kde-&kde-version;</filename> to <filename
+class="directory">/opt/kde</filename>.</para>
 
 <screen><userinput><command>ln -sf kde-&kde-version; /opt/kde</command></userinput></screen>
