Index: basicnet/netutils/ethereal.xml
===================================================================
--- basicnet/netutils/ethereal.xml	(revision 7da83f179df574d1b1267fee9b50ab4089c4c2ae)
+++ basicnet/netutils/ethereal.xml	(revision 2ce558b14eb2bc22c3bf5ea097655669a1085b7a)
@@ -65,5 +65,5 @@
 <xref linkend="python"/>, 
 <xref linkend="pcre"/>, 
-<xref linkend="doxygen"/>, 
+<xref linkend="doxygen-package"/>, 
 <ulink url="http://www.net-snmp.org/">Net-SNMP</ulink> and 
 <ulink url="http://www.gnu.org/software/adns/adns.html">adns</ulink></para>
Index: content/databases/mysql.xml
===================================================================
--- content/databases/mysql.xml	(revision 7da83f179df574d1b1267fee9b50ab4089c4c2ae)
+++ content/databases/mysql.xml	(revision 2ce558b14eb2bc22c3bf5ea097655669a1085b7a)
@@ -54,5 +54,5 @@
 <xref linkend="ORBit"/> (detected only if <xref linkend="which"/> is 
 installed), 
-<xref linkend="doxygen"/> and
+<xref linkend="doxygen-package"/> and
 <xref linkend="tex"/>
 </para></sect4>
Index: content/web/apache.xml
===================================================================
--- content/web/apache.xml	(revision 7da83f179df574d1b1267fee9b50ab4089c4c2ae)
+++ content/web/apache.xml	(revision 2ce558b14eb2bc22c3bf5ea097655669a1085b7a)
@@ -54,5 +54,5 @@
 <xref linkend="openldap"/>, 
 <xref linkend="expat"/> and 
-<xref linkend="doxygen"/></para>
+<xref linkend="doxygen-package"/></para>
 </sect4>
 </sect3>
Index: general.ent
===================================================================
--- general.ent	(revision 7da83f179df574d1b1267fee9b50ab4089c4c2ae)
+++ general.ent	(revision 2ce558b14eb2bc22c3bf5ea097655669a1085b7a)
@@ -182,5 +182,5 @@
 <!ENTITY NASM-version                 "0.98.38">
 <!ENTITY gcc3-version                 "3.3.4">                                     
-<!ENTITY doxygen-version              "1.3.9.1">                                     
+<!ENTITY doxygen-version              "1.4.1">                                     
 <!-- Part IV -->                     
                                      
Index: general/prog/doxygen.xml
===================================================================
--- general/prog/doxygen.xml	(revision 7da83f179df574d1b1267fee9b50ab4089c4c2ae)
+++ 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>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 7da83f179df574d1b1267fee9b50ab4089c4c2ae)
+++ introduction/welcome/changelog.xml	(revision 2ce558b14eb2bc22c3bf5ea097655669a1085b7a)
@@ -22,4 +22,7 @@
 
 <itemizedlist>
+
+<listitem><para>January 15th, 2005 [randy]: Updated to 
+Doxygen-1.4.1.</para></listitem>
 
 <listitem><para>January 13th, 2005 [bdubbs]: Fixed sed command
Index: kde/add/kdegames.xml
===================================================================
--- kde/add/kdegames.xml	(revision 7da83f179df574d1b1267fee9b50ab4089c4c2ae)
+++ kde/add/kdegames.xml	(revision 2ce558b14eb2bc22c3bf5ea097655669a1085b7a)
@@ -49,5 +49,5 @@
 <sect4><title>Optional</title>
 <para><ulink url="http://www.graphviz.org/">GraphViz</ulink> and 
-<xref linkend="doxygen"/></para>
+<xref linkend="doxygen-package"/></para>
 </sect4>
 </sect3>
Index: kde/add/kdenetwork.xml
===================================================================
--- kde/add/kdenetwork.xml	(revision 7da83f179df574d1b1267fee9b50ab4089c4c2ae)
+++ kde/add/kdenetwork.xml	(revision 2ce558b14eb2bc22c3bf5ea097655669a1085b7a)
@@ -59,5 +59,5 @@
 <ulink url="http://dev.null.pl/ekg/">libgadu</ulink>, 
 <ulink url="http://www.graphviz.org/">GraphViz</ulink>, 
-<xref linkend="doxygen"/> and 
+<xref linkend="doxygen-package"/> and 
 <ulink url="http://valgrind.kde.org/">Valgrind</ulink></para>
 </sect4>
Index: kde/add/kdepim.xml
===================================================================
--- kde/add/kdepim.xml	(revision 7da83f179df574d1b1267fee9b50ab4089c4c2ae)
+++ kde/add/kdepim.xml	(revision 2ce558b14eb2bc22c3bf5ea097655669a1085b7a)
@@ -72,5 +72,5 @@
 Bluetooth hardware and driver libraries, 
 <ulink url="http://www.graphviz.org/">GraphViz</ulink> 
-and <xref linkend="doxygen"/></para>
+and <xref linkend="doxygen-package"/></para>
 </sect4>
 </sect3>
Index: kde/add/kdevelop.xml
===================================================================
--- kde/add/kdevelop.xml	(revision 7da83f179df574d1b1267fee9b50ab4089c4c2ae)
+++ kde/add/kdevelop.xml	(revision 2ce558b14eb2bc22c3bf5ea097655669a1085b7a)
@@ -51,5 +51,5 @@
 <ulink url="http://sourceforge.net/projects/docbase/">DocBase</ulink>, 
 <ulink url="http://www.graphviz.org/">GraphViz</ulink> 
-and <xref linkend="doxygen"/></para>
+and <xref linkend="doxygen-package"/></para>
 </sect4>
 </sect3>
Index: kde/core/kdebase.xml
===================================================================
--- kde/core/kdebase.xml	(revision 7da83f179df574d1b1267fee9b50ab4089c4c2ae)
+++ kde/core/kdebase.xml	(revision 2ce558b14eb2bc22c3bf5ea097655669a1085b7a)
@@ -77,5 +77,5 @@
 <ulink url="http://www.ece.uvic.ca/~mdadams/jasper/">JasPer</ulink>, 
 <ulink url="http://www.graphviz.org/">GraphViz</ulink> 
-and <xref linkend="doxygen"/></para>
+and <xref linkend="doxygen-package"/></para>
 </sect4>
 
Index: kde/core/kdelibs.xml
===================================================================
--- kde/core/kdelibs.xml	(revision 7da83f179df574d1b1267fee9b50ab4089c4c2ae)
+++ kde/core/kdelibs.xml	(revision 2ce558b14eb2bc22c3bf5ea097655669a1085b7a)
@@ -85,5 +85,5 @@
 <ulink url="http://www.ece.uvic.ca/~mdadams/jasper/">JasPer</ulink>, 
 <ulink url="http://www.graphviz.org/">GraphViz</ulink> 
-and <xref linkend="doxygen"/></para>
+and <xref linkend="doxygen-package"/></para>
 </sect4>
 
Index: multimedia/libdriv/alsa-lib.xml
===================================================================
--- multimedia/libdriv/alsa-lib.xml	(revision 7da83f179df574d1b1267fee9b50ab4089c4c2ae)
+++ multimedia/libdriv/alsa-lib.xml	(revision 2ce558b14eb2bc22c3bf5ea097655669a1085b7a)
@@ -41,5 +41,5 @@
 <sect4><title>Optional</title>
 <para><ulink url="http://jackit.sourceforge.net/">JACK</ulink> and 
-<xref linkend="doxygen"/></para>
+<xref linkend="doxygen-package"/></para>
 </sect4>
 </sect3>
Index: multimedia/libdriv/flac.xml
===================================================================
--- multimedia/libdriv/flac.xml	(revision 7da83f179df574d1b1267fee9b50ab4089c4c2ae)
+++ multimedia/libdriv/flac.xml	(revision 2ce558b14eb2bc22c3bf5ea097655669a1085b7a)
@@ -44,5 +44,5 @@
 <xref linkend="NASM"/>, 
 <xref linkend="docbook-utils"/>, 
-<xref linkend="doxygen"/> and 
+<xref linkend="doxygen-package"/> and 
 <ulink url="http://valgrind.kde.org/">Valgrind</ulink></para>
 </sect4>
Index: x/lib/libxklavier.xml
===================================================================
--- x/lib/libxklavier.xml	(revision 7da83f179df574d1b1267fee9b50ab4089c4c2ae)
+++ x/lib/libxklavier.xml	(revision 2ce558b14eb2bc22c3bf5ea097655669a1085b7a)
@@ -43,5 +43,5 @@
 
 <sect4><title>Optional</title>
-<para><xref linkend="doxygen"/></para>
+<para><xref linkend="doxygen-package"/></para>
 </sect4>
 </sect3>
Index: xsoft/graphweb/firefox.xml
===================================================================
--- xsoft/graphweb/firefox.xml	(revision 7da83f179df574d1b1267fee9b50ab4089c4c2ae)
+++ xsoft/graphweb/firefox.xml	(revision 2ce558b14eb2bc22c3bf5ea097655669a1085b7a)
@@ -55,5 +55,5 @@
 <xref linkend="mitkrb"/> or <xref linkend="heimdal"/> 
 (for the GSSAPI libraries), 
-<xref linkend="doxygen"/>, 
+<xref linkend="doxygen-package"/>, 
 <ulink url="http://xprint.mozdev.org/">Xprint</ulink>, 
 <ulink url="http://perens.com/FreeSoftware/">Electric Fence</ulink> and 
Index: xsoft/graphweb/mozilla.xml
===================================================================
--- xsoft/graphweb/mozilla.xml	(revision 7da83f179df574d1b1267fee9b50ab4089c4c2ae)
+++ xsoft/graphweb/mozilla.xml	(revision 2ce558b14eb2bc22c3bf5ea097655669a1085b7a)
@@ -99,5 +99,5 @@
 <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>
 (for the GSSAPI libraries),
-<xref linkend="doxygen"/>,
+<xref linkend="doxygen-package"/>,
 <ulink url="http://xprint.mozdev.org/">Xprint</ulink>,
 <ulink url="http://perens.com/FreeSoftware/">Electric Fence</ulink> and
Index: xsoft/office/gnucash.xml
===================================================================
--- xsoft/office/gnucash.xml	(revision 7da83f179df574d1b1267fee9b50ab4089c4c2ae)
+++ xsoft/office/gnucash.xml	(revision 2ce558b14eb2bc22c3bf5ea097655669a1085b7a)
@@ -64,5 +64,5 @@
 (LWP, HTML-Parser, DateManip and Finance-Quote), 
 <ulink url="http://www.graphviz.org/">GraphViz</ulink>, 
-<xref linkend="doxygen"/>, 
+<xref linkend="doxygen-package"/>, 
 <ulink url="http://perens.com/FreeSoftware/">Electric Fence</ulink></para>
 </sect4>
Index: xsoft/other/thunderbird.xml
===================================================================
--- xsoft/other/thunderbird.xml	(revision 7da83f179df574d1b1267fee9b50ab4089c4c2ae)
+++ xsoft/other/thunderbird.xml	(revision 2ce558b14eb2bc22c3bf5ea097655669a1085b7a)
@@ -80,5 +80,5 @@
 <xref linkend="mitkrb"/> or <xref linkend="heimdal"/> 
 (for the GSSAPI libraries), 
-<xref linkend="doxygen"/>, 
+<xref linkend="doxygen-package"/>, 
 <ulink url="http://xprint.mozdev.org/">Xprint</ulink>, 
 <ulink url="http://perens.com/FreeSoftware/">Electric Fence</ulink> 
Index: xsoft/suites/koffice.xml
===================================================================
--- xsoft/suites/koffice.xml	(revision 7da83f179df574d1b1267fee9b50ab4089c4c2ae)
+++ xsoft/suites/koffice.xml	(revision 2ce558b14eb2bc22c3bf5ea097655669a1085b7a)
@@ -87,5 +87,5 @@
 url="http://packages.debian.org/unstable/source/libpaper">libpaper</ulink>, 
 <ulink url="http://www.graphviz.org/">GraphViz</ulink> 
-and <xref linkend="doxygen"/></para>
+and <xref linkend="doxygen-package"/></para>
 </sect4>
 
