Index: kde/add/kdeadmin.xml
===================================================================
--- kde/add/kdeadmin.xml	(revision 0b5a693ea2007924acc46c5ae9dacf07b0119d49)
+++ kde/add/kdeadmin.xml	(revision 898b7bbbc90eb61e4d49134124c3924faaf5abd3)
@@ -14,10 +14,16 @@
 
 <sect1 id="kdeadmin">
+
 <sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
+  <othername>$LastChangedBy$</othername>
+  <date>$Date$</date>
 </sect1info>
 <?dbhtml filename="kdeadmin.html"?>
+
 <title><application>kdeadmin</application>-&kde-version;</title>
+
+<indexterm zone="kdeadmin">
+  <primary sortas="a-kdeadmin">TEMPLATE</primary>
+</indexterm>
 
 <sect2>
@@ -26,28 +32,24 @@
 <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 MD5 sum: &kdeadmin-md5sum;</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>
+  <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 MD5 sum: &kdeadmin-md5sum;</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>
+  <para><xref linkend="kdebase"/></para>
 </sect4>
 
 <sect4><title>Recommended</title>
-<para><xref linkend="libjpeg"/> and <xref linkend="libxml2"/></para>
+  <para><xref linkend="libjpeg"/> and <xref linkend="libxml2"/></para>
 </sect4>
 
 <sect4><title>Optional</title>
-<para><xref linkend="Linux_PAM"/> and 
-<ulink url="http://lilo.go.dyndns.org/">LILO</ulink></para>
+  <para><xref linkend="Linux_PAM"/> and <ulink url="http://lilo.go.dyndns.org/">LILO</ulink></para>
 </sect4>
 </sect3>
@@ -62,6 +64,9 @@
 <screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
     --disable-dependency-tracking &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
+make</command></userinput></screen> 
+
+<para>Now, as the root user:</para>
+ 
+<screen><userinput role='root'><command>make install</command></userinput></screen>
 
 </sect2>
@@ -70,32 +75,67 @@
 <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>
+<segmentedlist>
+  <segtitle>Installed Programs</segtitle>
+ 
+  <seglistitem>
+    <seg>kcron, kdat, kpackage, ksysv, kuser</seg>
+  </seglistitem>
+</segmentedlist>
 
-</sect2>
+<variablelist>
+  <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+  <?dbfo list-presentation="list"?>
+ 
+<varlistentry id="kcron">
+  <term><command>kcron</command></term>
+  <listitem>
+    <para>is a  task scheduler.</para>
+    <indexterm zone="kdeadmin kcron">
+      <primary sortas="b-kcron">Kcron</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
 
-<sect2><title>Description</title>
+<varlistentry id="kdat">
+  <term><command>kdat</command></term>
+  <listitem>
+    <para>is a tar-based tape archiver.</para>
+    <indexterm zone="kdeadmin kdat">
+      <primary sortas="b-kdat">Kdat</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
 
-<sect3><title>kcron</title>
-<para><command>kcron</command> is a task scheduler.</para></sect3>
+<varlistentry id="kpackage">
+  <term><command>kpackage</command></term>
+  <listitem>
+    <para>is a package manager.</para>
+    <indexterm zone="kdeadmin kpackage">
+      <primary sortas="b-kpackage">Kpackage</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
 
-<sect3><title>kdat</title>
-<para><command>kdat</command> is a tar-based tape
-archiver.</para></sect3>
+<varlistentry id="ksysv">
+  <term><command>ksysv</command></term>
+  <listitem>
+    <para>is a Sys V-Init editor.</para>
+    <indexterm zone="kdeadmin ksysv">
+      <primary sortas="b-ksysv">Ksysv</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
 
-<sect3><title>kpackage</title>
-<para><command>kpackage</command> is a package manager.</para></sect3>
+<varlistentry id="kuser">
+  <term><command>kuser</command></term>
+  <listitem>
+    <para>is a  graphical user manager.</para>
+    <indexterm zone="kdeadmin kuser">
+      <primary sortas="b-kuser">Kuser</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
 
-<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>
+</variablelist>
 
 </sect2>
Index: kde/add/kdeedu.xml
===================================================================
--- kde/add/kdeedu.xml	(revision 0b5a693ea2007924acc46c5ae9dacf07b0119d49)
+++ kde/add/kdeedu.xml	(revision 898b7bbbc90eb61e4d49134124c3924faaf5abd3)
@@ -14,41 +14,49 @@
 
 <sect1 id="kdeedu">
+
 <sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
+  <othername>$LastChangedBy$</othername>
+  <date>$Date$</date>
 </sect1info>
+
 <?dbhtml filename="kdeedu.html"?>
 <title><application>kdeedu</application>-&kde-version;</title>
 
+<indexterm zone="kdeedu">
+  <primary sortas="a-kdeedu">kdeedu</primary>
+</indexterm>
+
 <sect2>
 <title>Introduction to <application>kdeedu</application></title>
 
 <sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&kdeedu-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&kdeedu-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &kdeedu-md5sum;</para></listitem>
-<listitem><para>Download size: &kdeedu-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&kdeedu-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&kdeedu-time;</para></listitem></itemizedlist>
+  <itemizedlist spacing='compact'>
+    <listitem><para>Download (HTTP): <ulink url="&kdeedu-download-http;"/></para></listitem>
+    <listitem><para>Download (FTP): <ulink url="&kdeedu-download-ftp;"/></para></listitem>
+    <listitem><para>Download MD5 sum: &kdeedu-md5sum;</para></listitem>
+    <listitem><para>Download size: &kdeedu-size;</para></listitem>
+    <listitem><para>Estimated disk space required: &kdeedu-buildsize;</para></listitem>
+    <listitem><para>Estimated build time: &kdeedu-time;</para></listitem>
+  </itemizedlist>
 </sect3>
 
-<sect3><title><application>kdeedu</application> dependencies</title>
+<sect3>
+  <title><application>kdeedu</application> dependencies</title>
+
 <sect4><title>Required</title>
-<para><xref linkend="kdebase"/></para>
+  <para><xref linkend="kdebase"/></para>
 </sect4>
 
 <sect4><title>Recommended</title>
-<para><xref linkend="libjpeg"/> and <xref linkend="libxml2"/></para>
+  <para><xref linkend="libjpeg"/> and 
+        <xref linkend="libxml2"/>
+  </para>
 </sect4>
 
-<sect4><title>Optional</title>
-<para><ulink 
-url="http://www.boost.org/libs/python/doc/index.html">Boost.Python</ulink>
-</para></sect4>
+<sect4>
+  <title>Optional</title>
+  <para><ulink url="http://www.boost.org/libs/python/doc/index.html">Boost.Python</ulink></para>
+</sect4>
+
 </sect3>
 
@@ -62,6 +70,9 @@
 <screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
     --disable-dependency-tracking &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
+make</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+ 
+<screen><userinput role='root'><command>make install</command></userinput></screen>
 
 </sect2>
@@ -70,82 +81,159 @@
 <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>
-
+<segmentedlist>
+  <segtitle>Installed Program(s)</segtitle>
+ 
+  <seglistitem>
+    <seg>flashkard, kalzium, kbruch, keduca, khangman, kig, kiten, klettres, kmathtool,
+         kmessedwords, kmplot, kpercentage, kstars, ktouch, kverbos, kvoctrain</seg>
+  </seglistitem>
+</segmentedlist>
+ 
+<variablelist>
+  <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+  <?dbfo list-presentation="list"?>
+
+<varlistentry id="kalzium">
+  <term><command>kalzium</command></term>
+  <listitem>
+    <para>is a program which shows you the Periodic System of Elements.</para>
+    <indexterm zone="kdeedu kalzium">
+      <primary sortas="b-kalzium">Kalzium</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kbruch">
+  <term><command>kbruch</command></term>
+  <listitem>
+    <para>is a small program to generate tasks with fractions.</para>
+    <indexterm zone="kdeedu kbruch">
+      <primary sortas="b-kbruch">Kbruch</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="keduca">
+  <term><command>keduca</command></term>
+  <listitem>
+    <para>is flash card application, which allows you to make interactive form based tests..</para>
+    <indexterm zone="kdeedu keduca">
+      <primary sortas="b-keduca">Keduca</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="khangman">
+  <term><command>khangman</command></term>
+  <listitem>
+    <para>is the classical hangman game for children, adapted for <acronym>KDE</acronym>.</para>
+    <indexterm zone="kdeedu khangman">
+      <primary sortas="b-khangman">Khangman</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kig">
+  <term><command>kig</command></term>
+  <listitem>
+    <para>is a <acronym>KDE</acronym> application for Interactive Geometry.</para>
+    <indexterm zone="kdeedu kig">
+      <primary sortas="b-kig">Kig</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kiten">
+  <term><command>kiten</command></term>
+  <listitem>
+    <para>is a Japanese reference/study tool for <acronym>KDE</acronym>.</para>
+    <indexterm zone="kdeedu kiten">
+      <primary sortas="b-kiten">Kiten</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="klettres">
+  <term><command>klettres</command></term>
+  <listitem>
+    <para>is an alphabet tutor (French).</para>
+    <indexterm zone="kdeedu klettres">
+      <primary sortas="b-klettres">Klettres</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kmessedwords">
+  <term><command>kmessedwords</command></term>
+  <listitem>
+    <para>is a simple mind-training word game.</para>
+    <indexterm zone="kdeedu kmessedwords">
+      <primary sortas="b-kmessedwords">Kmessedwords</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kmplot">
+  <term><command>kmplot</command></term>
+  <listitem>
+    <para>is a mathematical function plotter for <acronym>KDE</acronym>.</para>
+    <indexterm zone="kdeedu kmplot">
+      <primary sortas="b-kmplot">Kmplot</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kpercentage">
+  <term><command>kpercentage</command></term>
+  <listitem>
+    <para>is a small math application that will help pupils to improve their 
+          skills in calculating percentages.</para>
+    <indexterm zone="kdeedu kpercentage">
+      <primary sortas="b-kpercentage">Kpercentage</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kstars">
+  <term><command>kstars</command></term>
+  <listitem>
+    <para>is a desktop planetarium.</para>
+    <indexterm zone="kdeedu kstars">
+      <primary sortas="b-kstars">Kstars</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="ktouch">
+  <term><command>ktouch</command></term>
+  <listitem>
+    <para>is a touch typing tutor.</para>
+    <indexterm zone="kdeedu ktouch">
+      <primary sortas="b-ktouch">Ktouch</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kverbos">
+  <term><command>kverbos</command></term>
+  <listitem>
+    <para>is an application specially designed to study Spanish verb forms.</para>
+    <indexterm zone="kdeedu kverbos">
+      <primary sortas="b-kverbos">Kverbos</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kvoctrain">
+  <term><command>kvoctrain</command></term>
+  <listitem>
+    <para>is a vocabulary trainer.</para>
+    <indexterm zone="kdeedu kvoctrain">
+      <primary sortas="b-kvoctrain">Kvoctrain</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+</variablelist>
 </sect2>
-
-<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> &ndash; 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 verb forms.</para></sect3>
-
-<sect3><title>kvoctrain</title>
-<para><command>kvoctrain</command> is a vocabulary
-trainer.</para></sect3>
-
-</sect2>
-
 </sect1>
Index: kde/add/kdegraphics.xml
===================================================================
--- kde/add/kdegraphics.xml	(revision 0b5a693ea2007924acc46c5ae9dacf07b0119d49)
+++ kde/add/kdegraphics.xml	(revision 898b7bbbc90eb61e4d49134124c3924faaf5abd3)
@@ -15,60 +15,73 @@
 <sect1 id="kdegraphics" xreflabel="kdegraphics-&kde-version;">
 <sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
+  <othername>$LastChangedBy$</othername>
+  <date>$Date$</date>
 </sect1info>
+
 <?dbhtml filename="kdegraphics.html"?>
 <title><application>kdegraphics</application>-&kde-version;</title>
 
+<indexterm zone="kdegraphics">
+  <primary sortas="a-kdegraphics">kdegraphics</primary>
+</indexterm>
+
+
 <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 MD5 sum: &kdegraphics-md5sum;</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>
+  <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 MD5 sum: &kdegraphics-md5sum;</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>Additional download</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Required patch: <ulink 
-url="ftp://ftp.kde.org/pub/kde/security_patches/post-3.3.2-kdegraphics.diff"/></para>
-</listitem></itemizedlist>
+  <itemizedlist spacing='compact'>
+    <listitem>
+      <para>Required patch: 
+        <ulink url="ftp://ftp.kde.org/pub/kde/security_patches/post-3.3.2-kdegraphics.diff"/>
+      </para>
+    </listitem>
+  </itemizedlist>
 </sect3>
 
-<sect3><title><application>kdegraphics</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="kdebase"/></para>
+<sect3>
+<title><application>kdegraphics</application> dependencies</title>
+
+<sect4>
+  <title>Required</title>
+  <para><xref linkend="kdebase"/></para>
 </sect4>
 
-<sect4><title>Recommended</title>
-<para><xref linkend="libjpeg"/>, 
-<xref linkend="libxml2"/> and 
-<xref linkend="libart_lgpl"/></para>
+<sect4>
+  <title>Recommended</title>
+  <para><xref linkend="libjpeg"/>, 
+        <xref linkend="libxml2"/> and 
+        <xref linkend="libart_lgpl"/>
+  </para>
 </sect4>
 
-<sect4><title>Optional</title>
-<para><xref linkend="libtiff"/>, 
-<xref linkend="imlib"/>,
-<xref linkend="lcms"/>,
-<xref linkend="sane"/>,
-<xref linkend="xpdf"/>,
-<xref linkend="tex"/>,
-<ulink url="http://freedesktop.org/Software/FriBidi">FriBidi</ulink>, 
-<ulink url="http://www.gphoto.org/">gPhoto2</ulink>, 
-<ulink 
-url="http://gd.tuwien.ac.at/visual/ibiblio/libs/graphics/t1lib-5.0.2.tar.gz">t1lib</ulink>, 
-<ulink url="http://www.openexr.com/">OpenEXR</ulink> and 
-<ulink 
-url="http://packages.debian.org/unstable/source/libpaper">libpaper</ulink>
-</para></sect4>
+<sect4>
+  <title>Optional</title>
+  <para>
+    <xref linkend="libtiff"/>, 
+    <xref linkend="imlib"/>,
+    <xref linkend="lcms"/>,
+    <xref linkend="sane"/>,
+    <xref linkend="xpdf"/>,
+    <xref linkend="tex"/>,
+    <ulink url="http://freedesktop.org/Software/FriBidi">FriBidi</ulink>, 
+    <ulink url="http://www.gphoto.org/">gPhoto2</ulink>, 
+    <ulink url="http://gd.tuwien.ac.at/visual/ibiblio/libs/graphics/t1lib-5.0.2.tar.gz">t1lib</ulink>, 
+    <ulink url="http://www.openexr.com/">OpenEXR</ulink>, and 
+    <ulink url="http://packages.debian.org/unstable/source/libpaper">libpaper</ulink>
+  </para>
+</sect4>
 </sect3>
 
@@ -83,6 +96,9 @@
 ./configure --prefix=&kde-dir; --disable-debug \
     --disable-dependency-tracking &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
+make</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+ 
+<screen><userinput role='root'><command>make install</command></userinput></screen>
 
 </sect2>
@@ -91,80 +107,164 @@
 <title>Contents</title>
 
-<para>Major programs in <application>kdegraphics</application> include
-<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>, 
-<command>kview</command> and the 
-<filename class='libraryfile'>kio_kamera</filename> io slave.</para>
-
+<segmentedlist>
+  <segtitle>Installed Programs</segtitle>
+  <segtitle>Installed Library</segtitle> 
+
+  <seglistitem>
+    <seg>kcoloredit, kdvi, kfax, kgamma, kghostview, kiconedit, kooka, kpaint, 
+         kpdf, kpovmodeler, kruler, ksnapshot, kuickshow, kview</seg>
+    <seg>kio_kamera</seg>
+  </seglistitem>
+</segmentedlist>
+ 
+<variablelist>
+  <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+  <?dbfo list-presentation="list"?>
+
+
+<varlistentry id="kcoloredit">
+  <term><command>kcoloredit</command></term>
+  <listitem>
+    <para>is a color pallette editor.</para>
+    <indexterm zone="kdegraphics kcoloredit">
+      <primary sortas="b-kcoloredit">Kcoloredit</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kdvi">
+  <term><command>kdvi</command></term>
+  <listitem>
+    <para>is a <acronym>DVI</acronym> viewer.</para>
+    <indexterm zone="kdegraphics kdvi">
+      <primary sortas="b-kdvi">Kdvi</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kfax">
+  <term><command>kfax</command></term>
+  <listitem>
+    <para>is a <acronym>FAX</acronym> viewer.</para>
+    <indexterm zone="kdegraphics kfax">
+      <primary sortas="b-kfax">Kfax</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kgamma">
+  <term><command>kgamma</command></term>
+  <listitem>
+    <para>is a simple tool for monitor gamma correction.</para>
+    <indexterm zone="kdegraphics kgamma">
+      <primary sortas="b-kgamma">Kgamma</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kghostview">
+  <term><command>kghostview</command></term>
+  <listitem>
+    <para>is a <acronym>PS</acronym>/<acronym>PDF</acronym> viewer.</para>
+    <indexterm zone="kdegraphics kghostview">
+      <primary sortas="b-kghostview">Kghostview</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kiconedit">
+  <term><command>kiconedit</command></term>
+  <listitem>
+    <para>is an icon editor.</para>
+    <indexterm zone="kdegraphics kiconedit">
+      <primary sortas="b-kiconedit">Kiconedit</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kooka">
+  <term><command>kooka</command></term>
+  <listitem>
+    <para>is a raster image scan program.</para>
+    <indexterm zone="kdegraphics kooka">
+      <primary sortas="b-kooka">Kooka</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kpaint">
+  <term><command>kpaint</command></term>
+  <listitem>
+    <para>is a paint program.</para>
+    <indexterm zone="kdegraphics kpaint">
+      <primary sortas="b-kpaint">Kpaint</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kpovmodeler">
+  <term><command>kpovmodeler</command></term>
+  <listitem>
+    <para>is a graphical 3D modeler, which can generate scenes for 
+          <ulink url="http://www.povray.org/">POV-Ray</ulink>.</para>
+    <indexterm zone="kdegraphics kpovmodeler">
+      <primary sortas="b-kpovmodeler">Kpovmodeler</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kruler">
+  <term><command>kruler</command></term>
+  <listitem>
+    <para>is a screen ruler.</para>
+    <indexterm zone="kdegraphics kruler">
+      <primary sortas="b-kruler">Kruler</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="ksnapshot">
+  <term><command>ksnapshot</command></term>
+  <listitem>
+    <para> is a screen capture program.</para>
+    <indexterm zone="kdegraphics ksnapshot">
+      <primary sortas="b-ksnapshot">Ksnapshot</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kuickshow">
+  <term><command>kuickshow</command></term>
+  <listitem>
+    <para>is an image viewer.</para>
+    <indexterm zone="kdegraphics kuickshow">
+      <primary sortas="b-kuickshow">Kuickshow</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kview">
+  <term><command>kview</command></term>
+  <listitem>
+    <para>is another image viewer.</para>
+    <indexterm zone="kdegraphics kview">
+      <primary sortas="b-kview">Kview</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kio_kamera">
+  <term><command>kio_kamera</command></term>
+  <listitem>
+    <para>is an io slave that allows you to view and download 
+          images from a digital camera using the <userinput>kamera:/</userinput> 
+          <acronym>URL</acronym> in <application>konqueror</application>.</para>
+    <indexterm zone="kdegraphics kio_kamera">
+      <primary sortas="c-kio_kamera">Kio_kamera</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+</variablelist>   
 </sect2>
-
-<sect2><title>Description</title>
-
-<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>
-
-<sect3><title>kio_kamera io slave</title>
-<para>The <filename class='libraryfile'>kio_kamera</filename> io slave allows 
-you to view and download images from a digital camera using the 
-<userinput>kamera:/</userinput> <acronym>URL</acronym> in 
-<application>konqueror</application>.</para></sect3>
-
-</sect2>
-
 </sect1>
Index: kde/add/kdemultimedia.xml
===================================================================
--- kde/add/kdemultimedia.xml	(revision 0b5a693ea2007924acc46c5ae9dacf07b0119d49)
+++ kde/add/kdemultimedia.xml	(revision 898b7bbbc90eb61e4d49134124c3924faaf5abd3)
@@ -14,59 +14,68 @@
 
 <sect1 id="kdemultimedia" xreflabel="kdemultimedia-&kde-version;">
+
 <sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
+  <othername>$LastChangedBy$</othername>
+  <date>$Date$</date>
 </sect1info>
+
 <?dbhtml filename="kdemultimedia.html"?>
 <title><application>kdemultimedia</application>-&kde-version;</title>
 
+<indexterm zone="kdemultimedia">
+  <primary sortas="a-kdemultimedia">kdemultimedia</primary>
+</indexterm>
+
 <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 MD5 sum: &kdemultimedia-md5sum;</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>
+  <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 MD5 sum: &kdemultimedia-md5sum;</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>
+<sect3>
+<title><application>kdemultimedia</application> dependencies</title>
+
 <sect4><title>Required</title>
-<para><xref linkend="kdebase"/></para>
+  <para><xref linkend="kdebase"/></para>
 </sect4>
 
-<sect4><title>Recommended</title>
-<para><xref linkend="libjpeg"/>, 
-<xref linkend="libxml2"/>, 
-<xref linkend="alsa"/> and 
-<xref linkend="libmad"/></para>
+<sect4>
+  <title>Recommended</title>
+  <para><xref linkend="libjpeg"/>, 
+        <xref linkend="libxml2"/>, 
+        <xref linkend="alsa"/> and 
+        <xref linkend="libmad"/>
+  </para>
 </sect4>
 
-<sect4><title>Optional</title>
-<para><xref linkend="cdparanoia"/>, 
-<xref linkend="lame"/>,
-<xref linkend="audiofile"/>,
-<xref linkend="libogg"/>,
-<xref linkend="libvorbis"/>,
-<xref linkend="xine-lib"/>,
-<xref linkend="flac"/>,
-<xref linkend="speex"/>, 
-<xref linkend="sdl"/>, 
-<xref linkend="gstreamer"/> 
-(with <ulink url="http://developer.kde.org/~wheeler/juk.html">KGst</ulink>), 
-<ulink url="http://developer.kde.org/~wheeler/taglib/">TagLib</ulink>, 
-<ulink url="http://www.musicbrainz.org/">libmusicbrainz</ulink>, 
-<ulink url="http://www.musicbrainz.org/products/trmgen/download.html">TRM 
-Generator</ulink> and 
-<ulink 
-url="http://www.musicbrainz.org/products/tunepimp/download.html">TunePimp</ulink>
-</para></sect4>
+<sect4>
+  <title>Optional</title>
+  <para><xref linkend="cdparanoia"/>, 
+        <xref linkend="lame"/>,
+        <xref linkend="audiofile"/>,
+        <xref linkend="libogg"/>,
+        <xref linkend="libvorbis"/>,
+        <xref linkend="xine-lib"/>,
+        <xref linkend="flac"/>,
+        <xref linkend="speex"/>, 
+        <xref linkend="sdl"/>, 
+        <xref linkend="gstreamer"/> 
+          (with <ulink url="http://developer.kde.org/~wheeler/juk.html">KGst</ulink>), 
+        <ulink url="http://developer.kde.org/~wheeler/taglib/">TagLib</ulink>, 
+        <ulink url="http://www.musicbrainz.org/">libmusicbrainz</ulink>, 
+        <ulink url="http://www.musicbrainz.org/products/trmgen/download.html">TRM Generator</ulink>, and 
+        <ulink url="http://www.musicbrainz.org/products/tunepimp/download.html">TunePimp</ulink>
+  </para>
+</sect4>
+
 </sect3>
 
@@ -80,23 +89,22 @@
 <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 kdemultimedia</title>
-
-<para>There is no explicit configuration for the 
-<application>kdemultimedia</application> package, however
-<command>kscd</command> needs to find the CD drive. The default device file 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.):
+make</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+ 
+<screen><userinput role='root'><command>make install</command></userinput></screen>
+</sect2>
+
+<sect2>
+  <title>Configuring kdemultimedia</title>
+
+  <para>There is no explicit configuration for the <application>kdemultimedia</application> 
+        package, however <command>kscd</command> needs to find the CD drive. The default 
+        device file 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.):
+  </para>
 
 <screen><userinput><command>ln -s <replaceable>[CD Drive]</replaceable> /dev/cdrom</command></userinput></screen>
-
-</para>
-
 </sect2>
 
@@ -104,42 +112,97 @@
 <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>
+<segmentedlist>
+  <segtitle>Installed Programs</segtitle>
+ 
+  <seglistitem>
+    <seg>artsbuilder, juk, kaboodle, kmid, kmix, krec, kscd, noatun</seg>
+  </seglistitem>
+</segmentedlist>
+ 
+<variablelist>
+  <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+  <?dbfo list-presentation="list"?>
+
+<varlistentry id="artsbuilder">
+  <term><command>artsbuilder</command></term>
+  <listitem>
+    <para>is a tool to create new structures of small connected aRts modules.</para>
+    <indexterm zone="kdemultimedia artsbuilder">
+      <primary sortas="b-artsbuilder">Artsbuilder</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="juk">
+  <term><command>juk</command></term>
+  <listitem>
+    <para>is a jukebox, tagger, and music collection manager.</para>
+    <indexterm zone="kdemultimedia juk">
+      <primary sortas="b-juk">Juk</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kaboodle">
+  <term><command>kaboodle</command></term>
+  <listitem>
+    <para>is a multimedia player.</para>
+    <indexterm zone="kdemultimedia kaboodle">
+      <primary sortas="b-kaboodle">Kaboodle</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kmid">
+  <term><command>kmid</command></term>
+  <listitem>
+    <para>is a midi/karaoke player.</para>
+    <indexterm zone="kdemultimedia kmid">
+      <primary sortas="b-kmid">Kmid</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kmix">
+  <term><command>kmix</command></term>
+  <listitem>
+    <para>is a sound mixer.</para>
+    <indexterm zone="kdemultimedia kmix">
+      <primary sortas="b-kmix">Kmix</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="krec">
+  <term><command>krec</command></term>
+  <listitem>
+    <para>is a recording frontend for <application>aRts</application>.</para>
+    <indexterm zone="kdemultimedia krec">
+      <primary sortas="b-krec">Krec</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kscd">
+  <term><command>kscd</command></term>
+  <listitem>
+    <para>is a CD player.</para>
+    <indexterm zone="kdemultimedia kscd">
+      <primary sortas="b-kscd">kscd</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="noatun">
+  <term><command>noatun</command></term>
+  <listitem>
+    <para>is another multimedia player.</para>
+    <indexterm zone="kdemultimedia noatun">
+      <primary sortas="b-noatun">Noatun</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+</variablelist>
 
 </sect2>
Index: kde/add/kdenetwork.xml
===================================================================
--- kde/add/kdenetwork.xml	(revision 0b5a693ea2007924acc46c5ae9dacf07b0119d49)
+++ kde/add/kdenetwork.xml	(revision 898b7bbbc90eb61e4d49134124c3924faaf5abd3)
@@ -14,11 +14,17 @@
 
 <sect1 id="kdenetwork" xreflabel="kdenetwork-&kde-version;">
+
 <sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
+  <othername>$LastChangedBy$</othername>
+  <date>$Date$</date>
 </sect1info>
+
 <?dbhtml filename="kdenetwork.html"?>
 <title>kdenetwork-&kde-version;</title>
 
+<indexterm zone="kdenetwork">
+  <primary sortas="a-kdenetwork">Kdenetwork</primary>
+</indexterm>
+
 <sect2>
 <title>Introduction to <application>kdenetwork</application></title>
@@ -26,39 +32,39 @@
 <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 MD5 sum: &kdenetwork-md5sum;</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>
+  <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 MD5 sum: &kdenetwork-md5sum;</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>Recommended</title>
-<para><xref linkend="libjpeg"/>, 
-<xref linkend="libxml2"/>, 
-<xref linkend="libxslt"/> and 
-<xref linkend="openssl"/></para>
+  <para><xref linkend="libjpeg"/>, 
+        <xref linkend="libxml2"/>, 
+        <xref linkend="libxslt"/>, and 
+        <xref linkend="openssl"/>
+  </para>
 </sect4>
 
 <sect4><title>Optional</title>
-<para><xref linkend="ppp"/>, 
-<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>, 
-<ulink url="http://www.graphviz.org/">GraphViz</ulink>, 
-<xref linkend="doxygen"/> and 
-<ulink url="http://valgrind.kde.org/">Valgrind</ulink></para>
+  <para><xref linkend="ppp"/>, 
+        <xref linkend="xmms"/>, 
+        <xref linkend="doxygen"/>,
+        <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>, 
+        <ulink url="http://www.graphviz.org/">GraphViz</ulink>, and
+        <ulink url="http://valgrind.kde.org/">Valgrind</ulink>
+  </para>
 </sect4>
 </sect3>
@@ -73,6 +79,9 @@
 <screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
     --disable-dependency-tracking &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
+make</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+ 
+<screen><userinput role='root'><command>make install</command></userinput></screen>
 
 </sect2>
@@ -81,26 +90,40 @@
 <title>Configuring kdenetwork</title>
 
-<sect3><title>Config Files</title>
-<para><filename>/etc/lisarc</filename> and <filename>~/.lisarc</filename></para>
-</sect3>
-
-<sect3><title>Configuration Information</title>
-<para>To utilize the <acronym>LAN</acronym> Browser of 
-<command>konqueror</command> you'll need to create the 
-<filename>/etc/lisarc</filename> file and start the <command>lisa</command> 
-daemon. Create <filename>/etc/lisarc</filename> by filling out the 
-information in the <quote>Guided LISa Setup</quote> section of the 
-<quote>LISa Daemon</quote> tab on the <quote>Control Center</quote> &mdash; 
-<quote>Internet &amp; Network</quote> &mdash; <quote>Local Network 
-Browsing</quote> dialog box.</para>
-
-<para>Install the <filename>/etc/rc.d/init.d/lisa</filename> init script 
-included in the <xref linkend="intro-important-bootscripts"/> package.</para>
+<sect3 id='kdenetwork-config'>
+  <title>Config Files</title>
+  <para><filename>/etc/lisarc</filename> and <filename>~/.lisarc</filename></para>
+  <indexterm zone="kdenetwork kdenetwork-config">
+    <primary sortas="e-AA.lisarc">~/.lisarc</primary>
+  </indexterm>
+ 
+  <indexterm zone="kdenetwork kdenetwork-config">
+    <primary sortas="e-etc-lisarc">/etc/lisarc</primary>
+  </indexterm>
+</sect3>
+
+<sect3 id='kdenetwork-init'>
+  <title>Configuration Information</title>
+
+  <para>To utilize the <acronym>LAN</acronym> Browser of <command>konqueror</command> 
+  you'll need to create the <filename>/etc/lisarc</filename> file and start the 
+  <command>lisa</command> daemon. Create <filename>/etc/lisarc</filename> by filling out the 
+  information in the <quote>Guided LISa Setup</quote> section of the 
+  <quote>LISa Daemon</quote> tab on the <quote>Control Center</quote> &mdash; 
+  <quote>Internet &amp; Network</quote> &mdash; <quote>Local Network 
+  Browsing</quote> dialog box.</para>
+
+  <para>Install the <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 
-<application>kdenetwork</application> package, however some individual 
-programs need to be set up with user information.</para>
+  <indexterm zone="kdenetwork kdenetwork-init">
+    <primary sortas="f-kdenetwork">kdenetwork</primary>
+  </indexterm>
+
+  <para>There is no explicit configuration for the rest of the 
+  <application>kdenetwork</application> package, however some individual 
+  programs need to be set up with user information.</para>
+
 </sect3>
 
@@ -110,76 +133,145 @@
 <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&mdash;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>
+<segmentedlist>
+  <segtitle>Installed Programs</segtitle>
+ 
+  <seglistitem>
+    <seg>kdict, kget, knewsticker, kopete, kpf, kppp, krdc, krfb, ksirc, ktalkd, kwifimanager, lisa</seg>
+  </seglistitem>
+</segmentedlist>
+
+<variablelist>
+  <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+  <?dbfo list-presentation="list"?>
+ 
+<varlistentry id="kdict">
+  <term><command>kdict</command></term>
+  <listitem>
+    <para> is a graphical client for the Dictionary Server Protocol (DICT).</para>
+    <indexterm zone="kdenetwork kdict">
+      <primary sortas="b-kdict">Kdict</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kget">
+  <term><command>kget</command></term>
+  <listitem>
+    <para>allows you to group downloads.</para>
+    <indexterm zone="kdenetwork kget">
+      <primary sortas="b-kget">Kget</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="knewsticker">
+  <term><command>knewsticker</command></term>
+  <listitem>
+    <para>is a news applet for the <acronym>KDE</acronym> Application Launcher Panel.</para>
+    <indexterm zone="kdenetwork knewsticker">
+      <primary sortas="b-knewsticker">Knewsticker</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kopete">
+  <term><command>kopete</command></term>
+  <listitem>
+    <para> is <acronym>KDE</acronym>'s multi-protocol instant messenger client.</para>
+    <indexterm zone="kdenetwork kopete">
+      <primary sortas="b-kopete">Kopete</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kpf">
+  <term><command>kpf</command></term>
+  <listitem>
+    <para>allows you to share files over a network.</para>
+    <indexterm zone="kdenetwork kpf">
+      <primary sortas="b-kpf">Kpf</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kppp">
+  <term><command>kppp</command></term>
+  <listitem>
+    <para>is a dial-up utility.</para>
+    <indexterm zone="kdenetwork kppp">
+      <primary sortas="b-kppp">Kppp</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="krdc">
+  <term><command>krdc</command></term>
+  <listitem>
+    <para>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>
+    <indexterm zone="kdenetwork krdc">
+      <primary sortas="b-krdc">Krdc</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+
+<varlistentry id="krfb">
+  <term><command>krfb</command></term>
+  <listitem>
+    <para> 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>
+    <indexterm zone="kdenetwork krfb">
+      <primary sortas="b-krfb">Krfb</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="ksirc">
+  <term><command>ksirc</command></term>
+  <listitem>
+    <para>is a chat client.</para>
+    <indexterm zone="kdenetwork ksirc">
+      <primary sortas="b-ksirc">Ksirc</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="ktalkd">
+  <term><command>ktalkd</command></term>
+  <listitem>
+    <para>is an enhanced <command>talk</command> daemon&mdash;a program to handle 
+          incoming <command>talk</command> requests, announce them and allow you to 
+          respond to them using a talk client.</para>
+    <indexterm zone="kdenetwork ktalkd">
+      <primary sortas="b-ktalkd">Ktalkd</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kwifimanager">
+  <term><command>kwifimanager</command></term>
+  <listitem>
+    <para>is used to configure and monitor wireless <acronym>LAN</acronym> cards.</para>
+    <indexterm zone="kdenetwork kwifimanager">
+      <primary sortas="b-kwifimanager">Kwifimanager</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="lisa">
+  <term><command>lisa</command></term>
+  <listitem>
+    <para>is intended to provide a kind of network neighborhood, but only relying on 
+          the <acronym>TCP</acronym>/<acronym>IP</acronym> protocol stack.</para>
+    <indexterm zone="kdenetwork lisa">
+      <primary sortas="b-lisa">Lisa</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+</variablelist>
 
 </sect2>
Index: kde/add/kdepim.xml
===================================================================
--- kde/add/kdepim.xml	(revision 0b5a693ea2007924acc46c5ae9dacf07b0119d49)
+++ kde/add/kdepim.xml	(revision 898b7bbbc90eb61e4d49134124c3924faaf5abd3)
@@ -14,63 +14,68 @@
 
 <sect1 id="kdepim" xreflabel="kdepim-&kde-version;">
+
 <sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
+  <othername>$LastChangedBy$</othername>
+  <date>$Date$</date>
 </sect1info>
 <?dbhtml filename="kdepim.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="&kdepim-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&kdepim-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &kdepim-md5sum;</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>
+<indexterm zone="kdepim">
+  <primary sortas="a-kdepim">kdepim</primary>
+</indexterm>
+
+
+<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 MD5 sum: &kdepim-md5sum;</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>
+<sect3>
+<title><application>kdepim</application> dependencies</title>
+
+<sect4>
+  <title>Required</title>
+  <para><xref linkend="kdebase"/></para>
 </sect4>
 
-<sect4><title>Recommended</title>
-<para><xref linkend="libjpeg"/>, 
-<xref linkend="libxml2"/>, 
-<xref linkend="gnupg"/> and 
-<xref linkend="openssl"/></para>
+<sect4>
+  <title>Recommended</title>
+  <para><xref linkend="libjpeg"/>, 
+        <xref linkend="libxml2"/>, 
+        <xref linkend="gnupg"/> and 
+        <xref linkend="openssl"/>
+  </para>
 </sect4>
 
 <sect4><title>Optional</title>
-<para><xref linkend="pilot-link"/>, 
-<ulink 
-url="http://www.gnupg.org/download/index.html#gpgme">GPGME-0.9.x</ulink> 
-(requires <ulink 
-url="http://www.gnupg.org/download/index.html#libgpg-error">Libgpg-error</ulink> 
-then <ulink 
-url="http://www.gnupg.org/download/index.html#libgcrypt">Libgcrypt</ulink> 
-then <ulink 
-url="http://www.gnupg.org/download/index.html#libassuan">Libassuan</ulink> 
-then <ulink 
-url="http://www.gnupg.org/download/index.html#libksba">Libksba</ulink>, 
-<ulink url="ftp://ftp.gnupg.org/gcrypt/pinentry/">pinentry</ulink>, 
-<ulink url="http://www.gnu.org/software/pth/">Pth</ulink>, 
-<ulink url="http://www.opensc.org/">OpenSC</ulink> and then 
-<ulink 
-url="http://www.gnupg.org/download/index.html#gnupg2">GnuPG-1.9.x</ulink>), 
-<ulink 
-url="http://jasonday.home.att.net/code/libmal/libmal.html">libmal</ulink>, 
-<ulink url="http://www.gnokii.org/">gnokii</ulink>, 
-Bluetooth hardware and driver libraries, 
-<ulink url="http://www.graphviz.org/">GraphViz</ulink> 
-and <xref linkend="doxygen"/></para>
+  <para><xref linkend="pilot-link"/>, 
+        <ulink url="http://www.gnupg.org/download/index.html#gpgme">GPGME-0.9.x</ulink> 
+
+         (requires <ulink url="http://www.gnupg.org/download/index.html#libgpg-error">Libgpg-error</ulink> 
+         then <ulink url="http://www.gnupg.org/download/index.html#libgcrypt">Libgcrypt</ulink> 
+         then <ulink url="http://www.gnupg.org/download/index.html#libassuan">Libassuan</ulink> 
+         then <ulink url="http://www.gnupg.org/download/index.html#libksba">Libksba</ulink>, 
+         <ulink url="ftp://ftp.gnupg.org/gcrypt/pinentry/">pinentry</ulink>, 
+         <ulink url="http://www.gnu.org/software/pth/">Pth</ulink>, 
+         <ulink url="http://www.opensc.org/">OpenSC</ulink> and then 
+         <ulink url="http://www.gnupg.org/download/index.html#gnupg2">GnuPG-1.9.x</ulink>), 
+
+         <ulink url="http://jasonday.home.att.net/code/libmal/libmal.html">libmal</ulink>, 
+         <ulink url="http://www.gnokii.org/">gnokii</ulink>, 
+         Bluetooth hardware and driver libraries, 
+         <ulink url="http://www.graphviz.org/">GraphViz</ulink> 
+         and <xref linkend="doxygen"/>
+  </para>
 </sect4>
 </sect3>
@@ -85,12 +90,17 @@
 <screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
     --disable-dependency-tracking &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 <application>Doxygen</application> and 
-<application>GraphViz</application> installed, <command>make apidox</command> 
-must be done before <command>make install</command>.</para></note>
-
+make</command></userinput></screen> 
+
+<note>
+  <para>If you wish to create the <acronym>API</acronym> documentation and 
+        you have <application>Doxygen</application> and 
+        <application>GraphViz</application> installed, <command>make apidox</command> 
+        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>
 
@@ -98,76 +108,151 @@
 <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>
-
+<segmentedlist>
+  <segtitle>Installed Programs</segtitle>
+ 
+  <seglistitem>
+    <seg>kaddressbook, kalarm, kandy, karm, kgpgcertmanager, kmail, knode, knotes, 
+         konsolekalendar, kontact, korganizer, korn, kpilot</seg>
+  </seglistitem>
+</segmentedlist>
+
+<variablelist>
+  <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+  <?dbfo list-presentation="list"?>
+    
+<varlistentry id="kaddressbook">
+  <term><command>kaddressbook</command></term>
+  <listitem>
+    <para>is the <acronym>KDE</acronym> address book.</para>
+    <indexterm zone="kdepim kaddressbook">
+      <primary sortas="b-kaddressbook">Kaddressbook</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kalarm">
+  <term><command>kalarm</command></term>
+  <listitem>
+    <para>is a system to provide reminder messages.</para>
+    <indexterm zone="kdepim kalarm">
+      <primary sortas="b-kalarm">Kalarm</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kandy">
+  <term><command>kandy</command></term>
+  <listitem>
+    <para>is a program to synchronize mobile phone numbers.</para>
+    <indexterm zone="kdepim kandy">
+      <primary sortas="b-kandy">Kandy</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="karm">
+  <term><command>karm</command></term>
+  <listitem>
+    <para> is a personal time tracker.</para>
+    <indexterm zone="kdepim karm">
+      <primary sortas="b-karm">Karm</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kgpgcertmanager">
+  <term><command>kgpgcertmanager</command></term>
+  <listitem>
+    <para>is a tool for managing X509 certificates.</para>
+    <indexterm zone="kdepim kgpgcertmanager">
+      <primary sortas="b-kgpgcertmanager">Kgpgcertmanager</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kmail">
+  <term><command>kmail</command></term>
+  <listitem>
+    <para>is <acronym>KDE</acronym>'s email client.</para>
+    <indexterm zone="kdepim kmail">
+      <primary sortas="b-kmail">Kmail</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="knode">
+  <term><command>knode</command></term>
+  <listitem>
+    <para> is the <acronym>KDE</acronym> newsreader.</para>
+    <indexterm zone="kdepim knode">
+      <primary sortas="b-knode">Knode</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="knotes">
+  <term><command>knotes</command></term>
+  <listitem>
+    <para> is a popup notes utility.</para>
+    <indexterm zone="kdepim knotes">
+      <primary sortas="b-knotes">Knotes</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="konsolehelper">
+  <term><command>konsolehelper</command></term>
+  <listitem>
+    <para>is a command line interface to <acronym>KDE</acronym> calendars.</para>
+    <indexterm zone="kdepim konsolehelper">
+      <primary sortas="b-konsolehelper">Konsolehelper</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kontact">
+  <term><command>kontact</command></term>
+  <listitem>
+    <para>is the integrated solution to personal information management 
+          (<acronym>PIM</acronym>) needs.</para>
+    <indexterm zone="kdepim kontact">
+      <primary sortas="b-kontact">Kontact</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="korganizer">
+  <term><command>korganizer</command></term>
+  <listitem>
+    <para>is a personal calendar/todo system.</para>
+    <indexterm zone="kdepim korganizer">
+      <primary sortas="b-korganizer">Korganizer</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="korn">
+  <term><command>korn</command></term>
+  <listitem>
+    <para>is a <acronym>KDE</acronym> mail checker that has the capabilities to 
+          dock itself to <command>kicker</command>.</para>
+    <indexterm zone="kdepim korn">
+      <primary sortas="b-korn">Korn</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kpilot">
+  <term><command>kpilot</command></term>
+  <listitem>
+    <para>is a program to synchronize a Palm-Pilot.</para>
+    <indexterm zone="kdepim kpilot">
+      <primary sortas="b-kpilot">Kpilot</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+</variablelist>   
 </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 (<acronym>PIM</acronym>) 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: kde/add/kdesdk.xml
===================================================================
--- kde/add/kdesdk.xml	(revision 0b5a693ea2007924acc46c5ae9dacf07b0119d49)
+++ kde/add/kdesdk.xml	(revision 898b7bbbc90eb61e4d49134124c3924faaf5abd3)
@@ -14,44 +14,54 @@
 
 <sect1 id="kdesdk">
+
 <sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
+  <othername>$LastChangedBy$</othername>
+  <date>$Date$</date>
 </sect1info>
+
 <?dbhtml filename="kdesdk.html"?>
 <title><application>kdesdk</application>-&kde-version;</title>
+
+<indexterm zone="kdesdk">
+  <primary sortas="a-kdesdk">kdesdk</primary>
+</indexterm>
 
 <sect2>
 <title>Introduction to <application>kdesdk</application></title>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&kdesdk-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&kdesdk-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &kdesdk-md5sum;</para></listitem>
-<listitem><para>Download size: &kdesdk-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&kdesdk-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&kdesdk-time;</para></listitem></itemizedlist>
+<sect3>
+  <title>Package information</title>
+  <itemizedlist spacing='compact'> 
+    <listitem><para>Download (HTTP): <ulink url="&kdesdk-download-http;"/></para></listitem>
+    <listitem><para>Download (FTP): <ulink url="&kdesdk-download-ftp;"/></para></listitem>
+    <listitem><para>Download MD5 sum: &kdesdk-md5sum;</para></listitem>
+    <listitem><para>Download size: &kdesdk-size;</para></listitem>
+    <listitem><para>Estimated disk space required: &kdesdk-buildsize;</para></listitem>
+    <listitem><para>Estimated build time: &kdesdk-time;</para></listitem>
+  </itemizedlist>
 </sect3>
 
-<sect3><title>Additional downloads</title>
-<itemizedlist spacing="compact">
-<listitem><para>Required patch for Berkeley DB: <ulink 
-url="&patch-root;/kdesdk-&kde-version;-db43-1.patch"/></para>
-</listitem></itemizedlist>
+<sect3>
+  <title>Additional downloads</title>
+  <itemizedlist spacing="compact">
+    <listitem><para>Required patch for Berkeley DB: 
+              <ulink url="&patch-root;/kdesdk-&kde-version;-db43-1.patch"/></para>
+    </listitem>
+  </itemizedlist>
 </sect3>
 
-<sect3><title><application>kdesdk</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="kdebase"/></para>
+<sect3>
+<title><application>kdesdk</application> dependencies</title>
+
+<sect4>
+  <title>Required</title>
+  <para><xref linkend="kdebase"/></para>
 </sect4>
 
-<sect4><title>Recommended</title>
-<para><xref linkend="libjpeg"/>, 
-<xref linkend="libxml2"/> and 
-<xref linkend="db"/></para>
+<sect4>
+  <title>Recommended</title>
+  <para><xref linkend="libjpeg"/>, 
+  <xref linkend="libxml2"/>, and 
+  <xref linkend="db"/></para>
 </sect4>
 </sect3>
@@ -62,6 +72,5 @@
 <title>Installation of <application>kdesdk</application></title>
 
-<para>If you have Berkeley DB installed, apply
-the following patch:</para>
+<para>If you have Berkeley DB installed, apply the following patch:</para>
 
 <screen><userinput><command>patch -Np1 -i ../kdesdk-&kde-version;-db43-1.patch</command></userinput></screen>
@@ -71,47 +80,80 @@
 <screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
     --disable-dependency-tracking &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
+make</command></userinput></screen>
 
+<para>Now, as the root user:</para>
+ 
+<screen><userinput role='root'><command>make install</command></userinput></screen>
 </sect2>
 
 <sect2>
-<title>Contents</title>
+  <title>Contents</title>
 
-<para>Major programs in <application>kdesdk</application> include
-<command>cervisia</command>,
-<command>kbabel</command>,
-<command>kcachegrind</command>,
-<command>kompare</command> and
-<command>umbrello</command>.</para>
+<segmentedlist>
+  <segtitle>Installed Programs</segtitle>
+ 
+  <seglistitem>
+    <seg>cervisia, kbabel, kcachegrind, kompare, umbrello</seg>
+  </seglistitem>
+</segmentedlist>
+ 
+<variablelist>
+  <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+  <?dbfo list-presentation="list"?>
 
+<varlistentry id="cervisia">
+  <term><command>cervisia</command></term>
+  <listitem>
+    <para>provides a graphical view of <acronym>CVS</acronym>.</para>
+    <indexterm zone="kdesdk cervisia">
+      <primary sortas="b-cervisia">Cervisia</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kbabel">
+  <term><command>kbabel</command></term>
+  <listitem>
+    <para>is a suite of an advanced <acronym>PO</acronym> file editor comprising 
+          <command>kbabel</command>, a multi functional <command>catalogmanager</command> 
+          and a dictionary for translators <command>kbabeldict</command>.</para>
+    <indexterm zone="kdesdk kbabel">
+      <primary sortas="b-kbabel">Kbabel</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kcachegrind">
+  <term><command>kcachegrind</command></term>
+  <listitem>
+    <para>is a <acronym>KDE</acronym> frontend for <command>cachegrind</command>, part of
+          <application>Valgrind</application>.</para>
+    <indexterm zone="kdesdk kcachegrind">
+      <primary sortas="b-kcachegrind">Kcachegrind</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kompare">
+  <term><command>kompare</command></term>
+  <listitem>
+    <para>is a program to view the differences between files.</para>
+    <indexterm zone="kdesdk kompare">
+      <primary sortas="b-kompare">Kompare</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="umbrello">
+  <term><command>umbrello</command></term>
+  <listitem>
+    <para>is a <acronym>UML</acronym> modelling diagram tool.</para>
+    <indexterm zone="kdesdk umbrello">
+      <primary sortas="b-umbrello">Umbrello</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+</variablelist>
 </sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>cervisia</title>
-<para><command>cervisia</command> provides a graphical view of
-<acronym>CVS</acronym>.</para></sect3>
-
-<sect3><title>kbabel</title>
-<para><command>kbabel</command> is a suite of an advanced
-<acronym>PO</acronym> file editor comprising <command>kbabel</command>,
-a multi functional <command>catalogmanager</command> and a dictionary
-for translators <command>kbabeldict</command>.</para></sect3>
-
-<sect3><title>kcachegrind</title>
-<para><command>kcachegrind</command> is a <acronym>KDE</acronym>
-frontend for <command>cachegrind</command>, part of
-<application>Valgrind</application>.</para></sect3>
-
-<sect3><title>kompare</title>
-<para><command>kompare</command> is a program to view the differences
-between files.</para></sect3>
-
-<sect3><title>umbrello</title>
-<para><command>umbrello</command> is a <acronym>UML</acronym> modelling
-diagram tool.</para></sect3>
-
-</sect2>
-
 </sect1>
Index: kde/add/kdeutils.xml
===================================================================
--- kde/add/kdeutils.xml	(revision 0b5a693ea2007924acc46c5ae9dacf07b0119d49)
+++ kde/add/kdeutils.xml	(revision 898b7bbbc90eb61e4d49134124c3924faaf5abd3)
@@ -15,39 +15,51 @@
 <sect1 id="kdeutils">
 <sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
+  <othername>$LastChangedBy$</othername>
+  <date>$Date$</date>
 </sect1info>
+
 <?dbhtml filename="kdeutils.html"?>
 <title><application>kdeutils</application>-&kde-version;</title>
 
+<indexterm zone="kdeutils">
+  <primary sortas="a-kdeutils">kdeutils</primary>
+</indexterm>
+
 <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 MD5 sum: &kdeutils-md5sum;</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>
+  <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 MD5 sum: &kdeutils-md5sum;</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>
+<sect3>
+  <title><application>kdeutils</application> dependencies</title>
+
+<sect4>
+  <title>Required</title>
+  <para><xref linkend="kdebase"/></para>
 </sect4>
 
-<sect4><title>Recommended</title>
-<para><xref linkend="libjpeg"/> and <xref linkend="libxml2"/></para>
+<sect4>
+  <title>Recommended</title>
+  <para><xref linkend="libjpeg"/> and 
+        <xref linkend="libxml2"/>
+  </para>
 </sect4>
 
-<sect4><title>Optional</title>
-<para><ulink url="http://www.net-snmp.org/">Net-SNMP</ulink> and 
-<ulink url="http://tpctl.sourceforge.net/">tpctl</ulink></para>
+<sect4>
+  <title>Optional</title>
+  <para>
+    <ulink url="http://www.net-snmp.org/">Net-SNMP</ulink> and 
+    <ulink url="http://tpctl.sourceforge.net/">tpctl</ulink>
+  </para>
 </sect4>
 </sect3>
@@ -61,6 +73,9 @@
 <screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
     --disable-dependency-tracking &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
+make</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+ 
+<screen><userinput role='root'><command>make install</command></userinput></screen>
 
 </sect2>
@@ -69,75 +84,151 @@
 <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>
-
+<segmentedlist>
+  <segtitle>Installed Program(s)</segtitle>
+ 
+  <seglistitem>
+    <seg>ark, irkick, kcalc, kcharselect, kcmlirc, kdepasswd, kdf, kedit, kfloppy, 
+         kgpg, khexedit, kjots, ksim, kregexpeditor, ktimer, kwallet</seg>
+  </seglistitem>
+</segmentedlist>
+
+<variablelist>
+  <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+  <?dbfo list-presentation="list"?>
+
+<varlistentry id="ark">
+  <term><command>ark</command></term>
+  <listitem>
+    <para>is an archiving tool..</para>
+    <indexterm zone="kdeutils ark">
+      <primary sortas="b-ark">Ark</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="irkick">
+  <term><command>irkick</command></term>
+  <listitem>
+    <para> is the infrastructure for <acronym>KDE</acronym>'s Infrared Remote Control 
+           functionality; <command>irkick</command> is the server component of that
+           infrastructure.</para>
+    <indexterm zone="kdeutils irkick">
+      <primary sortas="b-irkick">Irkick</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kcalc">
+  <term><command>kcalc</command></term>
+  <listitem>
+    <para>is a scientific calculator.</para>
+    <indexterm zone="kdeutils kcalc">
+      <primary sortas="b-kcalc">Kcalc</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kcharselect">
+  <term><command>kcharselect</command></term>
+  <listitem>
+    <para>is a character selector applet.</para>
+    <indexterm zone="kdeutils kcharselect">
+      <primary sortas="b-kcharselect">Kcharselect</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kdepasswd">
+  <term><command>kdepasswd</command></term>
+  <listitem>
+    <para> is a password managing utility.</para>
+    <indexterm zone="kdeutils kdepasswd">
+      <primary sortas="b-kdepasswd">Kdepasswd</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kdf">
+  <term><command>kdf</command></term>
+  <listitem>
+    <para>is a disk usage viewer.</para>
+    <indexterm zone="kdeutils kdf">
+      <primary sortas="b-kdf">Kdf</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kedit">
+  <term><command>kedit</command></term>
+  <listitem>
+    <para>is a text editor.</para>
+    <indexterm zone="kdeutils kedit">
+      <primary sortas="b-kedit">Kedit</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kfloppy">
+  <term><command>kfloppy</command></term>
+  <listitem>
+    <para>is a floppy formatter.</para>
+    <indexterm zone="kdeutils kfloppy">
+      <primary sortas="b-kfloppy">Kfloppy</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kgpg">
+  <term><command>kgpg</command></term>
+  <listitem>
+    <para>a simple graphical interface for <xref linkend="gnupg"/>.</para>
+    <indexterm zone="kdeutils kgpg">
+      <primary sortas="b-kgpg">Kgpg</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="khexedit">
+  <term><command>khexedit</command></term>
+  <listitem>
+    <para>is a binary editor.</para>
+    <indexterm zone="kdeutils khexedit">
+      <primary sortas="b-khexedit">Khexedit</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kjots">
+  <term><command>kjots</command></term>
+  <listitem>
+    <para>is a note taker.</para>
+    <indexterm zone="kdeutils kjots">
+      <primary sortas="b-kjots">Kjots</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="kregexpeditor">
+  <term><command>kregexpeditor</command></term>
+  <listitem>
+    <para>is an editor for editing regular expressions in a graphical style (in 
+          contrast to the <acronym>ASCII</acronym> syntax).</para>
+    <indexterm zone="kdeutils kregexpeditor">
+      <primary sortas="b-kregexpeditor">Kregexpeditor</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="ktimer">
+  <term><command>ktimer</command></term>
+  <listitem>
+    <para>is a task scheduler.</para>
+    <indexterm zone="kdeutils ktimer">
+      <primary sortas="b-ktimer">Ktimer</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+</variablelist> 
 </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 
-<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>
