Index: basicnet/netutils/ethereal.xml
===================================================================
--- basicnet/netutils/ethereal.xml	(revision 1a07ee040f3cb36cad94e161c7d24d8453b76d23)
+++ basicnet/netutils/ethereal.xml	(revision faa80ab0abae0a69df56a2578b31f330c454ebbf)
@@ -62,7 +62,7 @@
 <xref linkend="Python"/>, 
 <xref linkend="pcre"/>, 
-<ulink url="http://www.net-snmp.org/">Net-SNMP</ulink>, 
-<ulink url="http://www.gnu.org/software/adns/adns.html">adns</ulink> and 
-<ulink url="http://www.stack.nl/~dimitri/doxygen/">doxygen</ulink></para>
+<xref linkend="doxygen"/>, 
+<ulink url="http://www.net-snmp.org/">Net-SNMP</ulink> and 
+<ulink url="http://www.gnu.org/software/adns/adns.html">adns</ulink></para>
 </sect4>
 
Index: content/web/apache.xml
===================================================================
--- content/web/apache.xml	(revision 1a07ee040f3cb36cad94e161c7d24d8453b76d23)
+++ content/web/apache.xml	(revision faa80ab0abae0a69df56a2578b31f330c454ebbf)
@@ -55,5 +55,5 @@
 <xref linkend="openldap"/>, 
 <xref linkend="expat"/> and 
-<ulink url="http://www.stack.nl/~dimitri/doxygen/">doxygen</ulink></para>
+<xref linkend="doxygen"/></para>
 </sect4>
 </sect3>
Index: general.ent
===================================================================
--- general.ent	(revision 1a07ee040f3cb36cad94e161c7d24d8453b76d23)
+++ general.ent	(revision faa80ab0abae0a69df56a2578b31f330c454ebbf)
@@ -140,4 +140,5 @@
 <!ENTITY NASM-version                 "0.98.38">
 <!ENTITY gcc3-version                 "3.3.3">                                     
+<!ENTITY doxygen-version              "1.3.9.1">                                     
 <!-- Part IV -->                     
                                      
Index: general/genutils/imagemagick.xml
===================================================================
--- general/genutils/imagemagick.xml	(revision 1a07ee040f3cb36cad94e161c7d24d8453b76d23)
+++ general/genutils/imagemagick.xml	(revision faa80ab0abae0a69df56a2578b31f330c454ebbf)
@@ -61,5 +61,5 @@
 <ulink url="http://www.cl.cam.ac.uk/~mgk25/jbigkit/">JBIG-KIT</ulink>,
 <ulink url="http://www.ece.uvic.ca/~mdadams/jasper/">Jasper</ulink>, 
-<ulink url="http://www.research.att.com/sw/tools/graphviz/">Graphviz</ulink>, 
+<ulink url="http://www.graphviz.org/">GraphViz</ulink>, 
 <ulink url="http://corefonts.sourceforge.net/">corefonts</ulink>, 
 <ulink url="http://perens.com/FreeSoftware/">Electric Fence</ulink> and 
Index: general/prog/doxygen.xml
===================================================================
--- general/prog/doxygen.xml	(revision faa80ab0abae0a69df56a2578b31f330c454ebbf)
+++ general/prog/doxygen.xml	(revision faa80ab0abae0a69df56a2578b31f330c454ebbf)
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY doxygen-download-http " ">
+  <!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">
+]>
+
+<sect1 id="doxygen" xreflabel="Doxygen-&doxygen-version;">
+<sect1info>
+<othername>$LastChangedBy$</othername>
+<date>$Date$</date>
+</sect1info>
+<?dbhtml filename="doxygen.html"?>
+<title>Doxygen-&doxygen-version;</title>
+
+<sect2>
+<title>Introduction to <application>Doxygen</application></title>
+
+<para>The <application>Doxygen</application> package contains a documentation 
+system for C++, C, Java, Objective-C, Corba IDL and to some extent PHP, C# 
+and D. This is useful for generating <acronym>HTML</acronym> documentation 
+and/or an off-line reference manual from a set of documented source files. 
+There is also support for generating output in <acronym>RTF</acronym>, 
+PostScript, hyperlinked <acronym>PDF</acronym>, compressed 
+<acronym>HTML</acronym>, and Unix man pages. The documentation is extracted 
+directly from the sources, which makes it much easier to keep the 
+documentation consistent with the source code.</para>
+
+<para>You can also configure <application>Doxygen</application> to extract the 
+code structure from undocumented source files. This is very useful to quickly 
+find your way in large source distributions. Used along with 
+<application>GraphViz</application>, you can also visualize the relations 
+between the various elements by means of include dependency graphs, 
+inheritance diagrams, and collaboration diagrams, which are all generated 
+automatically.</para>
+
+<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 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>
+</sect3>
+
+<sect3><title><application>Doxygen</application> dependencies</title>
+<sect4><title>Optional</title>
+<para><xref linkend="qt"/>, 
+<xref linkend="Python"/>, 
+<xref linkend="pst-typesetting-tex"/>, 
+<xref linkend="gs"/> or <xref linkend="espgs"/>, and 
+<ulink url="http://www.graphviz.org/">GraphViz</ulink></para>
+</sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>Doxygen</application></title>
+
+<para>Install <application>Doxygen</application> by running the following 
+commands:</para>
+
+<screen><userinput><command>rm src/unistd.h &amp;&amp;
+./configure --prefix /usr --docdir /usr/share/doc &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+<para>If you wish to generate and install the package documentation, ensure 
+the Python, TeX and Graphviz packages are installed, then substitute the 
+following commands for the <command>make install</command> command above:</para>
+
+<screen><userinput><command>make docs &amp;&amp;
+make pdf &amp;&amp;
+install -d -m755 /usr/share/doc/doxygen/src &amp;&amp;
+install -m644 src/translator{,_adapter,_en}.h \
+    /usr/share/doc/doxygen/src &amp;&amp;
+install -m644 VERSION /usr/share/doc/doxygen &amp;&amp;
+make install_docs</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><command>rm src/unistd.h</command>: There is a bug in 
+<application>Flex</application>-2.5.31 which causes <command>make</command> to 
+use this file instead of the system installed version. Removing this file 
+allows the <acronym>GUI</acronym> front-end to build successfully.</para>
+
+<para><option>--with-doxywizard</option>: Use this parameter if 
+<application>Qt</application> is installed and you wish to build the 
+<acronym>GUI</acronym> front-end.</para>
+
+<para><command>make docs</command>: This command builds the 
+<acronym>HTML</acronym> documentation.</para>
+
+<para><command>make pdf</command>: This command builds a 
+<acronym>PDF</acronym> version of the <application>Doxygen</application> 
+Manual.</para>
+
+<para><command>install ...</command>: These commands install some files 
+required by the documentation installation.</para>
+
+<para><emphasis>Note: For documentation in a language other than English, 
+replace the <quote>_en</quote> with the country code of your 
+locale.</emphasis></para>
+
+<para><command>make install_docs</command>: This command installs the binaries 
+and documentation.</para>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>Doxygen</application> package contains 
+<command>doxygen</command>, 
+<command>doxytag</command> and optionally, 
+<command>doxywizard</command>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<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>
+
+<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>
+
+</sect2>
+
+</sect1>
+
Index: general/prog/prog.xml
===================================================================
--- general/prog/prog.xml	(revision 1a07ee040f3cb36cad94e161c7d24d8453b76d23)
+++ general/prog/prog.xml	(revision faa80ab0abae0a69df56a2578b31f330c454ebbf)
@@ -30,4 +30,5 @@
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gcc3.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="nasm.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="doxygen.xml"/>
 
 </chapter>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 1a07ee040f3cb36cad94e161c7d24d8453b76d23)
+++ introduction/welcome/changelog.xml	(revision faa80ab0abae0a69df56a2578b31f330c454ebbf)
@@ -22,4 +22,7 @@
 
 <itemizedlist>
+
+<listitem><para>October 30th, 2004 [randy]: Added new package 
+Doxygen-1.3.9.1.</para></listitem>
 
 <listitem><para>October 30th, 2004 [igor]: Updated to
Index: kde/add/kdegames.xml
===================================================================
--- kde/add/kdegames.xml	(revision 1a07ee040f3cb36cad94e161c7d24d8453b76d23)
+++ kde/add/kdegames.xml	(revision faa80ab0abae0a69df56a2578b31f330c454ebbf)
@@ -50,6 +50,6 @@
 <sect4><title>Optional</title>
 <para><ulink 
-url="http://www.research.att.com/sw/tools/graphviz/">Graphviz</ulink> and 
-<ulink url="http://www.stack.nl/~dimitri/doxygen/">doxygen</ulink></para>
+url="http://www.graphviz.org/">GraphViz</ulink> and 
+<xref linkend="doxygen"/></para>
 </sect4>
 </sect3>
@@ -67,6 +67,6 @@
 
 <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>
+you have <application>Doxygen</application> and
+<application>GraphViz</application> installed, <command>make apidox</command>
 must be done before <command>make install</command>.</para></note>
 
Index: kde/add/kdenetwork.xml
===================================================================
--- kde/add/kdenetwork.xml	(revision 1a07ee040f3cb36cad94e161c7d24d8453b76d23)
+++ kde/add/kdenetwork.xml	(revision faa80ab0abae0a69df56a2578b31f330c454ebbf)
@@ -60,6 +60,6 @@
 <ulink url="http://dev.null.pl/ekg/">libgadu</ulink>, 
 <ulink url="http://www.ece.uvic.ca/~mdadams/jasper/">JasPer</ulink>, 
-<ulink url="http://www.research.att.com/sw/tools/graphviz/">Graphviz</ulink>, 
-<ulink url="http://www.stack.nl/~dimitri/doxygen/">doxygen</ulink> and 
+<ulink url="http://www.graphviz.org/">GraphViz</ulink>, 
+<xref linkend="doxygen"/> and 
 <ulink url="http://valgrind.kde.org/">Valgrind</ulink>
 </para></sect4>
Index: kde/add/kdepim.xml
===================================================================
--- kde/add/kdepim.xml	(revision 1a07ee040f3cb36cad94e161c7d24d8453b76d23)
+++ kde/add/kdepim.xml	(revision faa80ab0abae0a69df56a2578b31f330c454ebbf)
@@ -64,6 +64,6 @@
 <ulink url="http://jasonday.home.att.net/code/libmal/libmal.html">libmal</ulink>, 
 <ulink url="http://www.gnokii.org/">gnokii</ulink>, 
-<ulink url="http://www.research.att.com/sw/tools/graphviz/">Graphviz</ulink> 
-and <ulink url="http://www.stack.nl/~dimitri/doxygen/">doxygen</ulink></para>
+<ulink url="http://www.graphviz.org/">GraphViz</ulink> 
+and <xref linkend="doxygen"/></para>
 </sect4>
 </sect3>
@@ -81,6 +81,6 @@
 
 <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>
+you have <application>Doxygen</application> and
+<application>GraphViz</application> installed, <command>make apidox</command>
 must be done before <command>make install</command>.</para></note>
 
Index: kde/add/kdevelop.xml
===================================================================
--- kde/add/kdevelop.xml	(revision 1a07ee040f3cb36cad94e161c7d24d8453b76d23)
+++ kde/add/kdevelop.xml	(revision faa80ab0abae0a69df56a2578b31f330c454ebbf)
@@ -50,7 +50,7 @@
 <sect4><title>Optional</title>
 <para><xref linkend="Python"/>, 
-<ulink url="http://www.stack.nl/~dimitri/doxygen/">doxygen</ulink> and 
-<ulink url="http://www.research.att.com/sw/tools/graphviz/">graphviz</ulink>
-</para></sect4>
+<ulink url="http://www.graphviz.org/">GraphViz</ulink> 
+and <xref linkend="doxygen"/></para>
+</sect4>
 </sect3>
 
@@ -68,6 +68,6 @@
 
 <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>
+you have <application>Doxygen</application> and
+<application>GraphViz</application> installed, <command>make apidox</command>
 must be done before <command>make install</command>. You'll also need to run
 <command>make install-apidox</command> to install the API documentation.</para>
Index: kde/core/kdebase.xml
===================================================================
--- kde/core/kdebase.xml	(revision 1a07ee040f3cb36cad94e161c7d24d8453b76d23)
+++ kde/core/kdebase.xml	(revision faa80ab0abae0a69df56a2578b31f330c454ebbf)
@@ -66,6 +66,6 @@
 <ulink url="http://mtools.linux.lu/?power-to-the-parliament">Mtools</ulink>,
 <ulink url="http://www.ece.uvic.ca/~mdadams/jasper/">JasPer</ulink>,
-<ulink url="http://www.research.att.com/sw/tools/graphviz/">Graphviz</ulink>
-and <ulink url="http://www.stack.nl/~dimitri/doxygen/">doxygen</ulink></para>
+<ulink url="http://www.graphviz.org/">GraphViz</ulink> 
+and <xref linkend="doxygen"/></para>
 </sect4>
 
@@ -89,6 +89,6 @@
 
 <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>
+you have <application>Doxygen</application> and
+<application>GraphViz</application> installed, <command>make apidox</command>
 must be done before <command>make install</command>.</para></note>
 
Index: kde/core/kdelibs.xml
===================================================================
--- kde/core/kdelibs.xml	(revision 1a07ee040f3cb36cad94e161c7d24d8453b76d23)
+++ kde/core/kdelibs.xml	(revision faa80ab0abae0a69df56a2578b31f330c454ebbf)
@@ -78,6 +78,6 @@
 <ulink url="http://www.openexr.com/">OpenEXR</ulink>, 
 <ulink url="http://www.ece.uvic.ca/~mdadams/jasper/">JasPer</ulink>, 
-<ulink url="http://www.research.att.com/sw/tools/graphviz/">Graphviz</ulink> 
-and <ulink url="http://www.stack.nl/~dimitri/doxygen/">doxygen</ulink></para>
+<ulink url="http://www.graphviz.org/">GraphViz</ulink> 
+and <xref linkend="doxygen"/></para>
 </sect4>
 
@@ -96,8 +96,8 @@
 
 <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> 
+you have <application>Doxygen</application> and 
+<application>GraphViz</application> installed, <command>make apidox</command> 
 must be done before <command>make install</command>. This applies to all 
-packages which can utilize <application>doxygen</application>.</para></note>
+packages which can utilize <application>Doxygen</application>.</para></note>
 
 </sect2>
Index: multimedia/libdriv/flac.xml
===================================================================
--- multimedia/libdriv/flac.xml	(revision 1a07ee040f3cb36cad94e161c7d24d8453b76d23)
+++ multimedia/libdriv/flac.xml	(revision faa80ab0abae0a69df56a2578b31f330c454ebbf)
@@ -39,9 +39,11 @@
 dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="libogg"/>, <xref linkend="xmms"/>, 
-<xref linkend="id3lib"/>, <xref linkend="NASM"/>, 
-<ulink url="http://valgrind.kde.org/">Valgrind</ulink> and 
-<ulink url="http://www.stack.nl/~dimitri/doxygen/">doxygen</ulink>
-</para></sect4>
+<para><xref linkend="libogg"/>, 
+<xref linkend="xmms"/>, 
+<xref linkend="id3lib"/>, 
+<xref linkend="NASM"/>, 
+<xref linkend="doxygen"/> and 
+<ulink url="http://valgrind.kde.org/">Valgrind</ulink></para>
+</sect4>
 </sect3>
 
Index: x/lib/libxklavier.xml
===================================================================
--- x/lib/libxklavier.xml	(revision 1a07ee040f3cb36cad94e161c7d24d8453b76d23)
+++ x/lib/libxklavier.xml	(revision faa80ab0abae0a69df56a2578b31f330c454ebbf)
@@ -43,5 +43,5 @@
 
 <sect4><title>Optional</title>
-<para><ulink url="http://www.stack.nl/~dimitri/doxygen/">doxygen</ulink></para>
+<para><xref linkend="doxygen"/></para>
 </sect4>
 </sect3>
Index: xsoft/graphweb/firefox.xml
===================================================================
--- xsoft/graphweb/firefox.xml	(revision 1a07ee040f3cb36cad94e161c7d24d8453b76d23)
+++ xsoft/graphweb/firefox.xml	(revision faa80ab0abae0a69df56a2578b31f330c454ebbf)
@@ -51,9 +51,9 @@
 <xref linkend="unzip"/>,
 <xref linkend="gnome-vfs"/>,
-<xref linkend="mitkrb"/> or <xref linkend="heimdal"/>,
+<xref linkend="mitkrb"/> or <xref linkend="heimdal"/>, 
+<xref linkend="doxygen"/>, 
 <ulink url="http://xprint.mozdev.org/">Xprint</ulink>,
-<ulink url="http://perens.com/FreeSoftware/">Electric Fence</ulink>, 
-<ulink url="http://cairographics.org/">Cairo</ulink> and
-<ulink url="http://www.stack.nl/~dimitri/doxygen/">doxygen</ulink>
+<ulink url="http://perens.com/FreeSoftware/">Electric Fence</ulink> and 
+<ulink url="http://cairographics.org/">Cairo</ulink>
 </para></sect4>
 </sect3>
Index: xsoft/graphweb/mozilla.xml
===================================================================
--- xsoft/graphweb/mozilla.xml	(revision 1a07ee040f3cb36cad94e161c7d24d8453b76d23)
+++ xsoft/graphweb/mozilla.xml	(revision faa80ab0abae0a69df56a2578b31f330c454ebbf)
@@ -93,15 +93,23 @@
 <sect3><title><application>Mozilla</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="zip"/>, <xref linkend="GTK2"/>, <xref linkend="libIDL"/>, 
-<xref linkend="libmng"/> and <xref linkend="which"/></para></sect4>
+<para><xref linkend="zip"/>, 
+<xref linkend="GTK2"/>, 
+<xref linkend="libIDL"/>, 
+<xref linkend="libmng"/> and 
+<xref linkend="which"/></para>
+</sect4>
+
 <sect4><title>Recommended</title>
-<para><xref linkend="gnupg"/> (for Enigmail extension)</para></sect4>
+<para><xref linkend="gnupg"/> (for Enigmail extension)</para>
+</sect4>
+
 <sect4><title>Optional</title>
-<para><xref linkend="gnome-vfs"/>, <xref linkend="libart_lgpl"/>, 
+<para><xref linkend="gnome-vfs"/>, 
+<xref linkend="libart_lgpl"/>, 
 <xref linkend="heimdal"/> or <xref linkend="mitkrb"/> 
 (for the GSSAPI libraries), 
-<ulink url="http://www.hpl.hp.com/personal/Hans_Boehm/gc/">GC</ulink> and 
-<ulink url="http://www.stack.nl/~dimitri/doxygen/">doxygen</ulink>
-</para></sect4>
+<xref linkend="doxygen"/> and 
+<ulink url="http://www.hpl.hp.com/personal/Hans_Boehm/gc/">GC</ulink></para>
+</sect4>
 </sect3>
 
Index: xsoft/office/gnucash.xml
===================================================================
--- xsoft/office/gnucash.xml	(revision 1a07ee040f3cb36cad94e161c7d24d8453b76d23)
+++ xsoft/office/gnucash.xml	(revision faa80ab0abae0a69df56a2578b31f330c454ebbf)
@@ -50,6 +50,6 @@
 
 <sect4><title>Optional</title>
-<para><ulink url="http://www.stack.nl/~dimitri/doxygen/">doxygen</ulink>, 
-<ulink url="http://www.research.att.com/sw/tools/graphviz/">Graphviz</ulink>, 
+<para><ulink url="http://www.graphviz.org/">GraphViz</ulink>, 
+<xref linkend="doxygen"/>, 
 <ulink url="http://perens.com/FreeSoftware/">Electric Fence</ulink>, 
 <ulink url="http://openhbci.sourceforge.net/">OpenHBCI</ulink> and 
Index: xsoft/other/thunderbird.xml
===================================================================
--- xsoft/other/thunderbird.xml	(revision 1a07ee040f3cb36cad94e161c7d24d8453b76d23)
+++ xsoft/other/thunderbird.xml	(revision faa80ab0abae0a69df56a2578b31f330c454ebbf)
@@ -80,8 +80,8 @@
 <xref linkend="gnome-vfs"/>, 
 <xref linkend="mitkrb"/> or <xref linkend="heimdal"/>, 
+<xref linkend="doxygen"/>, 
 <ulink url="http://xprint.mozdev.org/">Xprint</ulink>, 
-<ulink url="http://perens.com/FreeSoftware/">Electric Fence</ulink>, 
-<ulink url="http://cairographics.org/">Cairo</ulink> and 
-<ulink url="http://www.stack.nl/~dimitri/doxygen/">doxygen</ulink></para>
+<ulink url="http://perens.com/FreeSoftware/">Electric Fence</ulink> 
+and <ulink url="http://cairographics.org/">Cairo</ulink></para>
 </sect4>
 </sect3>
Index: xsoft/suites/koffice.xml
===================================================================
--- xsoft/suites/koffice.xml	(revision 1a07ee040f3cb36cad94e161c7d24d8453b76d23)
+++ xsoft/suites/koffice.xml	(revision faa80ab0abae0a69df56a2578b31f330c454ebbf)
@@ -78,6 +78,6 @@
 <ulink 
 url="http://packages.debian.org/unstable/source/libpaper">libpaper</ulink>, 
-<ulink url="http://www.research.att.com/sw/tools/graphviz/">Graphviz</ulink> 
-and <ulink url="http://www.stack.nl/~dimitri/doxygen/">doxygen</ulink></para>
+<ulink url="http://www.graphviz.org/">GraphViz</ulink> 
+and <xref linkend="doxygen"/></para>
 </sect4>
 
@@ -98,6 +98,6 @@
 
 <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>
+you have <application>Doxygen</application> and
+<application>GraphViz</application> installed, <command>make apidox</command>
 must be done before <command>make install</command>.</para></note>
 
