Index: general/prog/doxygen.xml
===================================================================
--- general/prog/doxygen.xml	(revision 7ee98495b25ef22ac0fa5348ce04ca481b9d6390)
+++ general/prog/doxygen.xml	(revision 2ce558b14eb2bc22c3bf5ea097655669a1085b7a)
@@ -8,9 +8,9 @@
   <!ENTITY doxygen-download-ftp  "ftp://ftp.stack.nl/pub/users/dimitri/doxygen-&doxygen-version;.src.tar.gz">
   <!ENTITY doxygen-size          "2.7 MB">
-  <!ENTITY doxygen-buildsize     "48 MB">
-  <!ENTITY doxygen-time          "1.60 SBU">
+  <!ENTITY doxygen-buildsize     "48.2 MB">
+  <!ENTITY doxygen-time          "1.77 SBU (includes building documentation)">
 ]>
 
-<sect1 id="doxygen" xreflabel="Doxygen-&doxygen-version;">
+<sect1 id="doxygen-package" xreflabel="Doxygen-&doxygen-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
@@ -19,4 +19,6 @@
 <?dbhtml filename="doxygen.html"?>
 <title>Doxygen-&doxygen-version;</title>
+<indexterm zone="doxygen-package">
+<primary sortas="a-Doxygen">Doxygen</primary></indexterm>
 
 <sect2>
@@ -43,9 +45,13 @@
 <sect3><title>Package information</title>
 <itemizedlist spacing="compact">
-<listitem><para>Download (HTTP): <ulink url="&doxygen-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&doxygen-download-ftp;"/></para></listitem>
+<listitem><para>Download (HTTP): 
+<ulink url="&doxygen-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): 
+<ulink url="&doxygen-download-ftp;"/></para></listitem>
 <listitem><para>Download size: &doxygen-size;</para></listitem>
-<listitem><para>Estimated disk space required: &doxygen-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &doxygen-time;</para></listitem></itemizedlist>
+<listitem><para>Estimated disk space required: 
+&doxygen-buildsize;</para></listitem>
+<listitem><para>Estimated build time: 
+&doxygen-time;</para></listitem></itemizedlist>
 </sect3>
 
@@ -121,26 +127,46 @@
 <title>Contents</title>
 
-<para>The <application>Doxygen</application> package contains 
-<command>doxygen</command>, 
-<command>doxytag</command> and optionally, 
-<command>doxywizard</command>.</para>
+<segmentedlist>
+<segtitle>Installed Programs</segtitle>
+<segtitle>Installed Directory</segtitle>
+<seglistitem>
+<seg>doxygen, doxytag and doxywizard</seg>
+<seg>/usr/share/doc/doxygen</seg>
+</seglistitem>
+</segmentedlist>
 
-</sect2>
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
 
-<sect2><title>Description</title>
+<varlistentry id="doxygen">
+<term><command>doxygen</command></term>
+<listitem><para>is a command-line based utility used to generate template 
+configuration files and then generate documentation from these templates. Use 
+<command>doxygen --help</command> for an explanation of the command-line 
+parameters.</para>
+<indexterm zone="doxygen-package doxygen">
+<primary sortas="b-doxygen">doxygen</primary></indexterm>
+</listitem>
+</varlistentry>
 
-<sect3><title>doxygen</title>
-<para><command>doxygen</command> is a command-line based utility used to 
-generate template configuration files and then generate documentation from 
-these templates. Use <command>doxygen --help</command> for an explanation of 
-the command-line parameters.</para></sect3>
+<varlistentry id="doxytag">
+<term><command>doxytag</command></term>
+<listitem><para>is used to generate a tag file and/or a search index for a set 
+of <acronym>HTML</acronym> files.</para>
+<indexterm zone="doxygen-package doxytag">
+<primary sortas="b-doxytag">doxytag</primary></indexterm>
+</listitem>
+</varlistentry>
 
-<sect3><title>doxytag</title>
-<para><command>doxytag</command> is used to generate a tag file and/or a 
-search index for a set of <acronym>HTML</acronym> files.</para></sect3>
-
-<sect3><title>doxywizard</title>
-<para><command>doxywizard</command> is a <acronym>GUI</acronym> front-end for 
-configuring and running <command>doxygen</command>.</para></sect3>
+<varlistentry id="doxywizard">
+<term><command>doxywizard</command></term>
+<listitem><para>is a <acronym>GUI</acronym> front-end for configuring and 
+running <command>doxygen</command>.</para>
+<indexterm zone="doxygen-package doxywizard">
+<primary sortas="b-doxywizard">doxywizard</primary></indexterm>
+</listitem>
+</varlistentry>
+</variablelist>
 
 </sect2>
