Index: xsoft/suites/koffice.xml
===================================================================
--- xsoft/suites/koffice.xml	(revision 1c5e6173c7f844643cb8705b03fd295427d6ef6f)
+++ xsoft/suites/koffice.xml	(revision a35ea5d6383f0b4a16928e02565178cf537660e4)
@@ -13,154 +13,211 @@
 ]>
 
-<sect1 id="koffice">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="koffice.html" ?>
-<title><application>KOffice</application>-&koffice-version;</title>
-
-<sect2><title>Introduction to <application>KOffice</application></title>
-
-<para><application>KOffice</application> is the integrated office suite
-for <acronym>KDE</acronym>.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&koffice-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&koffice-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &koffice-md5sum;</para></listitem>
-<listitem><para>Download size: &koffice-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&koffice-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&koffice-time;</para></listitem>
-</itemizedlist>
-</sect3>
-
-<sect3><title>Additional downloads</title>
-
-<para><application>KOffice</application> has many internationalization 
-packages in the form of: 
-
-<filename>koffice-i18n-<replaceable>[xx]</replaceable>-&koffice-version;.tar.bz2</filename>. 
-
-The <replaceable>[xx]</replaceable> is a two to five letter code for the 
-country covered. The sizes of these files range from about 0.3 MB to 4.2 
-MB. You can also download a complete i18n version which includes translations 
-for all country codes.</para>
-
-<itemizedlist spacing='compact'>
-<listitem><para>Download mirrors: <ulink 
-url="http://download.kde.org/download.php?url=stable/koffice-&koffice-version;/src/"/>
-</para></listitem>
-<listitem><para><application>KOffice</application> i18n package listing: <ulink 
-url="http://mirrors.isc.org/pub/kde/stable/koffice-1.3.5/src/"/></para>
-</listitem>
-<listitem><para>Download MD5 sums: <ulink 
-url="http://mirrors.isc.org/pub/kde/stable/koffice-1.3.5/src/MD5SUMS"/></para>
-</listitem></itemizedlist>
-
-</sect3>
-
-<sect3><title><application>KOffice</application> dependencies</title>
-
-<sect4><title>Required</title>
-<para><xref linkend="kdebase"/></para>
-</sect4>
-
-<sect4><title>Recommended</title>
-<para><xref linkend="libjpeg"/>, 
-<xref linkend="libart_lgpl"/>, 
-<xref linkend="libxml2"/>, 
-<xref linkend="libxslt"/></para>
-</sect4>
-
-<sect4><title>Optional</title>
-<para><xref linkend="aspell"/>, 
-<xref linkend="python"/>, 
-<xref linkend="imagemagick"/>, 
-<ulink url="http://sourceforge.net/projects/wvware/">libwv2</ulink>, 
-<ulink 
-url="http://packages.debian.org/unstable/source/libpaper">libpaper</ulink>, 
-<ulink url="http://www.graphviz.org/">GraphViz</ulink> 
-and <xref linkend="doxygen"/></para>
-</sect4>
-
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>KOffice</application></title>
-
-<para>Install <application>KOffice</application> with the following
-commands:</para>
-
-<screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug \
+<sect1 id="koffice" xreflabel="KOffice-&koffice-version;">
+  <?dbhtml filename="koffice.html" ?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>KOffice-&koffice-version;</title>
+
+  <indexterm zone="koffice">
+    <primary sortas="a-KOffice">KOffice</primary>
+  </indexterm>
+
+  <sect2>
+    <title>Introduction to KOffice</title>
+
+    <para><application>KOffice</application> is the integrated office suite
+    for <application>KDE</application>.</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&koffice-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&koffice-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &koffice-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &koffice-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &koffice-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &koffice-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+
+    <para><application>KOffice</application> has many internationalization
+    packages in the form of:
+    <filename>koffice-i18n-<replaceable>[xx]</replaceable>-&koffice-version;.tar.bz2</filename>.
+    The <replaceable>[xx]</replaceable> is a two to five letter code for the
+    country covered. The sizes of these files range from about 0.3 MB to 4.2
+    MB. You can also download a complete i18n version which includes translations
+    for all country codes.</para>
+
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Download mirrors: <ulink
+        url="http://download.kde.org/download.php?url=stable/koffice-&koffice-version;/src/"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para><application>KOffice</application> i18n package listing: <ulink
+        url="http://mirrors.isc.org/pub/kde/stable/koffice-1.3.5/src/"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sums: <ulink
+        url="http://mirrors.isc.org/pub/kde/stable/koffice-1.3.5/src/MD5SUMS"/></para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">KOffice Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para><xref linkend="kdebase"/></para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para><xref linkend="libjpeg"/>,
+    <xref linkend="libart_lgpl"/>,
+    <xref linkend="libxml2"/>,
+    <xref linkend="libxslt"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para><xref linkend="aspell"/>,
+    <xref linkend="python"/>,
+    <xref linkend="imagemagick"/>,
+    <ulink url="http://sourceforge.net/projects/wvware/">libwv2</ulink>,
+    <ulink
+    url="http://packages.debian.org/unstable/source/libpaper">libpaper</ulink>,
+    <ulink url="http://www.graphviz.org/">GraphViz</ulink>
+    and <xref linkend="doxygen"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of KOffice</title>
+
+    <para>Install <application>KOffice</application> with the following
+    commands:</para>
+
+<screen><userinput>./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>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<para>The <application>KOffice</application> package provides
-<command>karbon</command>,
-<command>kchart</command>,
-<command>kformula</command>,
-<command>kivio</command>,
-<command>koconverter</command>,
-<command>koscript</command>,
-<command>koshell</command>,
-<command>kprconverter.pl</command>,
-<command>kpresenter</command>,
-<command>kspread</command>,
-<command>kthesaurus</command>,
-<command>kudesigner</command>,
-<command>kugar</command> and
-<command>kword</command>.</para>
-
-</sect2>
-
-<sect2>
-<title>Description</title>
-
-<sect3><title>kchart</title>
-<para><command>kchart</command> is a chart drawing
-application.</para></sect3>
-
-<sect3><title>kformula</title>
-<para><command>kformula</command> is a formula editor.</para></sect3>
-
-<sect3><title>kivio</title>
-<para><command>kivio</command> is a flowchart program.</para></sect3>
-
-<sect3><title>kpresenter</title>
-<para><command>kpresenter</command> is a presentation builder/display
-program.</para></sect3>
-
-<sect3><title>kspread</title>
-<para><command>kspread</command> is a scriptable spreadsheet
-program.</para></sect3>
-
-<sect3><title>kugar</title>
-<para><command>kugar</command> is a tool for creating
-reports.</para></sect3>
-
-<sect3><title>kword</title>
-<para><command>kword</command> is a framemaker-like word processing and
-desktop publishing program.</para></sect3>
-
-</sect2>
+make install</userinput></screen>
+
+    <note>
+      <para>If you wish to create the API 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>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>karbon, kchart, kformula, kivio, koconverter,
+        koscript, koshell, kprconverter.pl, kpresenter, kspread,
+        kthesaurus, kudesigner, kugar, and kword</seg>
+        <seg>None</seg>
+        <seg>Not determined at this time</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="kchart">
+        <term><command>kchart</command></term>
+        <listitem>
+          <para>is a chart drawing application.</para>
+          <indexterm zone="koffice kchart">
+            <primary sortas="b-kchart">kchart</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="kformula">
+        <term><command>kformula</command></term>
+        <listitem>
+          <para>is a formula editor.</para>
+          <indexterm zone="koffice kformula">
+            <primary sortas="b-kformula">kformula</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="kivio">
+        <term><command>kivio</command></term>
+        <listitem>
+          <para>is a flowchart program.</para>
+          <indexterm zone="koffice kivio">
+            <primary sortas="b-kivio">kivio</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="kpresenter">
+        <term><command>kpresenter</command></term>
+        <listitem>
+          <para>is a presentation builder/display program.</para>
+          <indexterm zone="koffice kpresenter">
+            <primary sortas="b-kpresenter">kpresenter</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="kspread">
+        <term><command>kspread</command></term>
+        <listitem>
+          <para>is a scriptable spreadsheet program.</para>
+          <indexterm zone="koffice kspread">
+            <primary sortas="b-kspread"></primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="kugar">
+        <term><command>kugar</command></term>
+        <listitem>
+          <para>is a tool for creating reports.</para>
+          <indexterm zone="koffice kugar">
+            <primary sortas="b-kugar">kugar</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="kword">
+        <term><command>kword</command></term>
+        <listitem>
+          <para>is a framemaker-like word processing and desktop
+          publishing program.</para>
+          <indexterm zone="koffice kword">
+            <primary sortas="b-kword">kword</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
 
 </sect1>
