Index: basicnet/mailnews/fetchmail.xml
===================================================================
--- basicnet/mailnews/fetchmail.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ basicnet/mailnews/fetchmail.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -45,5 +45,5 @@
 <sect4><title>Required</title>
 
-<para><xref linkend="openssl-package"/> and a local MDA (<xref linkend="procmail"/>)
+<para><xref linkend="openssl"/> and a local MDA (<xref linkend="procmail"/>)
 </para>
 </sect4>
Index: basicnet/mailnews/mutt.xml
===================================================================
--- basicnet/mailnews/mutt.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ basicnet/mailnews/mutt.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -57,5 +57,5 @@
 
 <para>If you did not install a <acronym>MTA</acronym>, such as 
-<xref linkend="postfix"/> or <xref linkend="sendmail-package"/>, you need to 
+<xref linkend="postfix"/> or <xref linkend="sendmail"/>, you need to 
 modify the ownership of <filename>/var/mail</filename> with this command:</para>
 
Index: basicnet/mailnews/nail.xml
===================================================================
--- basicnet/mailnews/nail.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ basicnet/mailnews/nail.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -50,5 +50,5 @@
 <sect3><title><application>Nail</application> dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="openssl-package"/> or 
+<para><xref linkend="openssl"/> or 
 Mozilla <acronym>NSS</acronym> (from 
 <xref linkend="mozilla"/> or 
Index: basicnet/mailnews/pine.xml
===================================================================
--- basicnet/mailnews/pine.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ basicnet/mailnews/pine.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -50,5 +50,5 @@
 <sect3><title><application>Pine</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="openssl-package"/></para></sect4>
+<para><xref linkend="openssl"/></para></sect4>
 <sect4><title>Optional</title>
 <para>
Index: basicnet/mailnews/slrn.xml
===================================================================
--- basicnet/mailnews/slrn.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ basicnet/mailnews/slrn.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -43,5 +43,5 @@
 <sect4><title>Optional</title>
 <para>
-<xref linkend="openssl-package"/>,
+<xref linkend="openssl"/>,
 <ulink url="http://www.gnu.org/software/gnutls/">GnuTLS</ulink>,
 <ulink url="http://www.fpx.de/fp/Software/UUDeview/">UUDeview</ulink>,
Index: basicnet/netlibs/curl.xml
===================================================================
--- basicnet/netlibs/curl.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ basicnet/netlibs/curl.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -44,5 +44,5 @@
 <sect4><title>Optional</title>
 <para><xref linkend="pkgconfig"/>, 
-<xref linkend="openssl-package"/>, 
+<xref linkend="openssl"/>, 
 <xref linkend="openldap"/>, 
 <xref linkend="mitkrb"/> or <xref linkend="heimdal"/>, 
@@ -96,5 +96,5 @@
 <para><command>curl</command> is a client that can get documents from or send 
 documents to any of the following protocols: <acronym>HTTP</acronym>, 
-<acronym>HTTPS</acronym> (needs <xref linkend="openssl-package"/>), 
+<acronym>HTTPS</acronym> (needs <xref linkend="openssl"/>), 
 <acronym>FTP</acronym>, GOPHER, DICT, TELNET, <acronym>LDAP</acronym> (needs 
 <xref linkend="openldap"/>) or FILE.</para></sect3>
Index: basicnet/netlibs/wvstreams.xml
===================================================================
--- basicnet/netlibs/wvstreams.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ basicnet/netlibs/wvstreams.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -44,5 +44,5 @@
 <sect4><title>Required</title>
 <para>
-<xref linkend="openssl-package"/>
+<xref linkend="openssl"/>
 </para></sect4>
 <sect4><title>Optional</title>
Index: basicnet/netprogs/ntp.xml
===================================================================
--- basicnet/netprogs/ntp.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ basicnet/netprogs/ntp.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -38,5 +38,5 @@
 <sect3><title><application><acronym>NTP</acronym></application> dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="openssl-package"/></para></sect4>
+<para><xref linkend="openssl"/></para></sect4>
 </sect3>
 
Index: basicnet/netprogs/subversion.xml
===================================================================
--- basicnet/netprogs/subversion.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ basicnet/netprogs/subversion.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -67,5 +67,5 @@
 <xref linkend="apache"/>, 
 <xref linkend="j2sdk"/>, 
-<xref linkend="openssl-package"/>, 
+<xref linkend="openssl"/>, 
 <xref linkend="openssh"/>, 
 <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>, 
Index: basicnet/netprogs/wget.xml
===================================================================
--- basicnet/netprogs/wget.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ basicnet/netprogs/wget.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -41,5 +41,5 @@
 <sect3><title><application>Wget</application> dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="openssl-package"/> and 
+<para><xref linkend="openssl"/> and 
 <ulink url="http://www.inet.no/dante/">Dante</ulink></para>
 </sect4>
Index: basicnet/netutils/bind-utils.xml
===================================================================
--- basicnet/netutils/bind-utils.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ basicnet/netutils/bind-utils.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -51,5 +51,5 @@
 dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="openssl-package"/></para>
+<para><xref linkend="openssl"/></para>
 </sect4>
 </sect3>
Index: basicnet/netutils/ethereal.xml
===================================================================
--- basicnet/netutils/ethereal.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ basicnet/netutils/ethereal.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -61,9 +61,9 @@
 <xref linkend="GTK"/> or <xref linkend="gtk2"/> (to build the 
 <acronym>GUI</acronym> front-end), 
-<xref linkend="openssl-package"/>, 
+<xref linkend="openssl"/>, 
 <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>, 
 <xref linkend="python"/>, 
 <xref linkend="pcre"/>, 
-<xref linkend="doxygen-package"/>, 
+<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>
Index: basicnet/netutils/nmap.xml
===================================================================
--- basicnet/netutils/nmap.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ basicnet/netutils/nmap.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -42,5 +42,5 @@
 <sect3><title><application>Nmap</application> dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="openssl-package"/>, 
+<para><xref linkend="openssl"/>, 
 <xref linkend="pcre"/>, 
 <xref linkend="GTK"/> (for building the graphical front-end) and 
Index: basicnet/textweb/links.xml
===================================================================
--- basicnet/textweb/links.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ basicnet/textweb/links.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -39,5 +39,5 @@
 <sect4><title>Optional</title>
 <para><xref linkend="gpm-package"/>, 
-<xref linkend="openssl-package"/>, 
+<xref linkend="openssl"/>, 
 <xref linkend="libpng"/>, 
 <xref linkend="libjpeg"/>, 
Index: basicnet/textweb/lynx.xml
===================================================================
--- basicnet/textweb/lynx.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ basicnet/textweb/lynx.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -40,5 +40,5 @@
 <sect3><title><application>Lynx</application> dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="openssl-package"/> or
+<para><xref linkend="openssl"/> or
 <ulink url="http://www.gnu.org/software/gnutls/">GnuTLS</ulink> (which
 needs <ulink
Index: basicnet/textweb/w3m.xml
===================================================================
--- basicnet/textweb/w3m.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ basicnet/textweb/w3m.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -43,5 +43,5 @@
 <para><xref linkend="pkgconfig"/>, 
 <xref linkend="gpm-package"/>, 
-<xref linkend="openssl-package"/>, 
+<xref linkend="openssl"/>, 
 <xref linkend="imlib"/>, 
 <xref linkend="imlib2"/>, 
Index: content/databases/mysql.xml
===================================================================
--- content/databases/mysql.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ content/databases/mysql.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -48,5 +48,5 @@
 <sect4><title>Optional</title>
 <para>
-<xref linkend="openssl-package"/>,
+<xref linkend="openssl"/>,
 <xref linkend="tcpwrappers"/>,
 <ulink url="http://sourceforge.net/projects/libedit/">libedit</ulink> 
@@ -54,5 +54,5 @@
 <xref linkend="ORBit"/> (detected only if <xref linkend="which"/> is 
 installed), 
-<xref linkend="doxygen-package"/> and
+<xref linkend="doxygen"/> and
 <xref linkend="tex"/>
 </para></sect4>
Index: content/databases/postgresql.xml
===================================================================
--- content/databases/postgresql.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ content/databases/postgresql.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -53,5 +53,5 @@
 <xref linkend="tcl"/>,
 <xref linkend="tk"/>,
-<xref linkend="openssl-package"/>,
+<xref linkend="openssl"/>,
 <xref linkend="Linux_PAM"/>,
 <xref linkend="sgml-dtd-3"/>, 
Index: content/web/apache.xml
===================================================================
--- content/web/apache.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ content/web/apache.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -53,8 +53,8 @@
 <sect4><title>Optional</title>
 <para><xref linkend="db"/> or <xref linkend="gdbm"/>, 
-<xref linkend="openssl-package"/>, 
+<xref linkend="openssl"/>, 
 <xref linkend="openldap"/>, 
 <xref linkend="expat"/> and 
-<xref linkend="doxygen-package"/></para>
+<xref linkend="doxygen"/></para>
 </sect4>
 </sect3>
Index: content/web/php.xml
===================================================================
--- content/web/php.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ content/web/php.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -53,5 +53,5 @@
 <xref linkend="libxml2"/>,
 <xref linkend="libxslt"/>,
-<xref linkend="openssl-package"/>,
+<xref linkend="openssl"/>,
 <ulink url="http://www.fastio.com/">ClibPDF</ulink>,
 <xref linkend="libjpeg"/>,
Index: content/web/vsftpd.xml
===================================================================
--- content/web/vsftpd.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ content/web/vsftpd.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -44,5 +44,5 @@
 <sect4><title>Optional</title>
 <para><xref linkend="Linux_PAM"/>,
-<xref linkend="openssl-package"/>, and
+<xref linkend="openssl"/>, and
 <xref linkend="tcpwrappers"/></para>
 </sect4>
Index: general/genlib/libesmtp.xml
===================================================================
--- general/genlib/libesmtp.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ general/genlib/libesmtp.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -44,5 +44,5 @@
 
 <sect4><title>Optional</title>
-<para><xref linkend="openssl-package"/></para>
+<para><xref linkend="openssl"/></para>
 </sect4>
 
Index: general/prog/doxygen.xml
===================================================================
--- general/prog/doxygen.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ general/prog/doxygen.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -12,5 +12,5 @@
 ]>
 
-<sect1 id="doxygen-package" xreflabel="Doxygen-&doxygen-version;">
+<sect1 id="doxygen" xreflabel="Doxygen-&doxygen-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
@@ -19,5 +19,5 @@
 <?dbhtml filename="doxygen.html"?>
 <title>Doxygen-&doxygen-version;</title>
-<indexterm zone="doxygen-package">
+<indexterm zone="doxygen">
 <primary sortas="a-Doxygen">Doxygen</primary></indexterm>
 
@@ -140,5 +140,5 @@
 <?dbfo list-presentation="list"?>
 
-<varlistentry id="doxygen">
+<varlistentry id="doxygen-prog">
 <term><command>doxygen</command></term>
 <listitem><para>is a command-line based utility used to generate template 
@@ -146,5 +146,5 @@
 <command>doxygen --help</command> for an explanation of the command-line 
 parameters.</para>
-<indexterm zone="doxygen-package doxygen">
+<indexterm zone="doxygen doxygen-prog">
 <primary sortas="b-doxygen">doxygen</primary></indexterm>
 </listitem>
@@ -155,5 +155,5 @@
 <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">
+<indexterm zone="doxygen doxytag">
 <primary sortas="b-doxytag">doxytag</primary></indexterm>
 </listitem>
@@ -164,5 +164,5 @@
 <listitem><para>is a <acronym>GUI</acronym> front-end for configuring and 
 running <command>doxygen</command>.</para>
-<indexterm zone="doxygen-package doxywizard">
+<indexterm zone="doxygen doxywizard">
 <primary sortas="b-doxywizard">doxywizard</primary></indexterm>
 </listitem>
Index: general/prog/python.xml
===================================================================
--- general/prog/python.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ general/prog/python.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -48,5 +48,5 @@
 <sect3><title><application>Python</application> dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="openssl-package"/>,
+<para><xref linkend="openssl"/>,
 <xref linkend="tk"/>, 
 <xref linkend="gdbm"/> and
Index: general/prog/ruby.xml
===================================================================
--- general/prog/ruby.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ general/prog/ruby.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -46,5 +46,5 @@
 <sect3><title><application>Ruby</application> dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="openssl-package"/>, 
+<para><xref linkend="openssl"/>, 
 <xref linkend="tk"/>, 
 <xref linkend="db"/>, 
Index: gnome/core/gnome-vfs.xml
===================================================================
--- gnome/core/gnome-vfs.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ gnome/core/gnome-vfs.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -60,5 +60,5 @@
 <xref linkend="gtk-doc"/>,
 <xref linkend="openssh"/>,
-<xref linkend="openssl-package"/> or
+<xref linkend="openssl"/> or
 <ulink url="http://www.gnu.org/software/gnutls/">GnuTLS</ulink>, 
 <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>, 
Index: gnome/core/orbit2.xml
===================================================================
--- gnome/core/orbit2.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ gnome/core/orbit2.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -51,5 +51,5 @@
 
 <sect4><title>Optional</title>
-<para><xref linkend="gtk-doc"/> and <xref linkend="openssl-package"/></para>
+<para><xref linkend="gtk-doc"/> and <xref linkend="openssl"/></para>
 </sect4>
 </sect3>
Index: gnome/otherlibs/gnome-vfs1.xml
===================================================================
--- gnome/otherlibs/gnome-vfs1.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ gnome/otherlibs/gnome-vfs1.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -63,5 +63,5 @@
 <xref linkend="GConf1"/>, 
 <xref linkend="bonobo14"/>, 
-<xref linkend="openssl-package"/>, 
+<xref linkend="openssl"/>, 
 <xref linkend="cdparanoia-package"/>, 
 <xref linkend="gtk-doc"/> and 
Index: gnome/otherlibs/soup.xml
===================================================================
--- gnome/otherlibs/soup.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ gnome/otherlibs/soup.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -59,5 +59,5 @@
 <sect4><title>Optional</title>
 <para><xref linkend="apache"/>, 
-<xref linkend="openssl-package"/> or 
+<xref linkend="openssl"/> or 
 <xref linkend="mozilla"/> (for the <acronym>NSS</acronym> libraries), 
 <xref linkend="gtk-doc"/> and 
Index: kde/add/kdegames.xml
===================================================================
--- kde/add/kdegames.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ kde/add/kdegames.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -49,5 +49,5 @@
 <sect4><title>Optional</title>
 <para><ulink url="http://www.graphviz.org/">GraphViz</ulink> and 
-<xref linkend="doxygen-package"/></para>
+<xref linkend="doxygen"/></para>
 </sect4>
 </sect3>
Index: kde/add/kdenetwork.xml
===================================================================
--- kde/add/kdenetwork.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ kde/add/kdenetwork.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -47,5 +47,5 @@
 <xref linkend="libxml2"/>, 
 <xref linkend="libxslt"/> and 
-<xref linkend="openssl-package"/></para>
+<xref linkend="openssl"/></para>
 </sect4>
 
@@ -59,5 +59,5 @@
 <ulink url="http://dev.null.pl/ekg/">libgadu</ulink>, 
 <ulink url="http://www.graphviz.org/">GraphViz</ulink>, 
-<xref linkend="doxygen-package"/> and 
+<xref linkend="doxygen"/> and 
 <ulink url="http://valgrind.kde.org/">Valgrind</ulink></para>
 </sect4>
Index: kde/add/kdepim.xml
===================================================================
--- kde/add/kdepim.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ kde/add/kdepim.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -47,5 +47,5 @@
 <xref linkend="libxml2"/>, 
 <xref linkend="gnupg"/> and 
-<xref linkend="openssl-package"/></para>
+<xref linkend="openssl"/></para>
 </sect4>
 
@@ -72,5 +72,5 @@
 Bluetooth hardware and driver libraries, 
 <ulink url="http://www.graphviz.org/">GraphViz</ulink> 
-and <xref linkend="doxygen-package"/></para>
+and <xref linkend="doxygen"/></para>
 </sect4>
 </sect3>
Index: kde/add/kdevelop.xml
===================================================================
--- kde/add/kdevelop.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ kde/add/kdevelop.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -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-package"/></para>
+and <xref linkend="doxygen"/></para>
 </sect4>
 </sect3>
Index: kde/core/kdebase.xml
===================================================================
--- kde/core/kdebase.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ kde/core/kdebase.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -59,5 +59,5 @@
 <xref linkend="libart_lgpl"/>, 
 <xref linkend="libxml2"/>, 
-<xref linkend="openssl-package"/> and 
+<xref linkend="openssl"/> and 
 <xref linkend="j2sdk"/></para>
 </sect4>
@@ -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-package"/></para>
+and <xref linkend="doxygen"/></para>
 </sect4>
 
Index: kde/core/kdelibs.xml
===================================================================
--- kde/core/kdelibs.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ kde/core/kdelibs.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -71,5 +71,5 @@
 <xref linkend="pcre"/>, 
 <xref linkend="fam"/>, 
-<xref linkend="openssl-package"/> and 
+<xref linkend="openssl"/> and 
 <ulink url="http://www.gnu.org/software/libidn/">Libidn</ulink></para>
 </sect4>
@@ -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-package"/></para>
+and <xref linkend="doxygen"/></para>
 </sect4>
 
Index: multimedia/libdriv/alsa-lib.xml
===================================================================
--- multimedia/libdriv/alsa-lib.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ multimedia/libdriv/alsa-lib.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -41,5 +41,5 @@
 <sect4><title>Optional</title>
 <para><ulink url="http://jackit.sourceforge.net/">JACK</ulink> and 
-<xref linkend="doxygen-package"/></para>
+<xref linkend="doxygen"/></para>
 </sect4>
 </sect3>
Index: multimedia/libdriv/flac.xml
===================================================================
--- multimedia/libdriv/flac.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ multimedia/libdriv/flac.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -44,5 +44,5 @@
 <xref linkend="NASM"/>, 
 <xref linkend="docbook-utils"/>, 
-<xref linkend="doxygen-package"/> and 
+<xref linkend="doxygen"/> and 
 <ulink url="http://valgrind.kde.org/">Valgrind</ulink></para>
 </sect4>
Index: postlfs/security/cyrus-sasl.xml
===================================================================
--- postlfs/security/cyrus-sasl.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ postlfs/security/cyrus-sasl.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -52,5 +52,5 @@
 
 <sect4><title>Required</title>
-<para><xref linkend="openssl-package"/></para>
+<para><xref linkend="openssl"/></para>
 </sect4>
 
Index: postlfs/security/heimdal.xml
===================================================================
--- postlfs/security/heimdal.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ postlfs/security/heimdal.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -62,5 +62,5 @@
 <sect3><title><application>Heimdal</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="openssl-package"/> and
+<para><xref linkend="openssl"/> and
 <xref linkend="db"/></para>
 </sect4>
Index: postlfs/security/openssl.xml
===================================================================
--- postlfs/security/openssl.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ postlfs/security/openssl.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -12,5 +12,5 @@
 ]>
 
-<sect1 id="openssl-package" xreflabel="OpenSSL-&openssl-version;">
+<sect1 id="openssl" xreflabel="OpenSSL-&openssl-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
@@ -19,6 +19,6 @@
 <?dbhtml filename="openssl.html"?>
 <title>OpenSSL-&openssl-version;</title>
-<indexterm zone="openssl-package">
-<primary sortas="a-OpenSSL-package">OpenSSL</primary></indexterm>
+<indexterm zone="openssl">
+<primary sortas="a-OpenSSL">OpenSSL</primary></indexterm>
 
 <sect2>
@@ -110,5 +110,5 @@
 <sect3 id="openssl-config"><title>Config files</title>
 <para><filename>/etc/ssl/openssl.cnf</filename></para>
-<indexterm zone="openssl-package openssl-config">
+<indexterm zone="openssl openssl-config">
 <primary sortas="e-etc-ssl-openssl.cnf">/etc/ssl/openssl.cnf</primary>
 </indexterm>
@@ -151,10 +151,10 @@
 <listitem><para>is a <application>Perl</application> script that scans all 
 files in a directory and adds symbolic links to their hash values.</para>
-<indexterm zone="openssl-package c_rehash">
+<indexterm zone="openssl c_rehash">
 <primary sortas="b-c_rehash">c_rehash</primary></indexterm>
 </listitem>
 </varlistentry>
 
-<varlistentry id="openssl">
+<varlistentry id="openssl-prog">
 <term><command>openssl</command></term>
 <listitem><para>is a command-line tool for using the various cryptography 
@@ -162,5 +162,5 @@
 library from the shell. It can be used for various functions which are 
 documented in <command>man 1 openssl</command>.</para>
-<indexterm zone="openssl-package openssl">
+<indexterm zone="openssl openssl-prog">
 <primary sortas="b-openssl">openssl</primary></indexterm>
 </listitem>
@@ -177,5 +177,5 @@
 <application>Open<acronym>PGP</acronym></application>, and other cryptographic 
 standards.</para>
-<indexterm zone="openssl-package libcrypto">
+<indexterm zone="openssl libcrypto">
 <primary sortas="c-libcrypto">libcrypto.[so,a]</primary></indexterm>
 </listitem>
@@ -188,5 +188,5 @@
 provides a rich <acronym>API</acronym>, documentation on which can be found by 
 running <command>man 3 ssl</command>.</para>
-<indexterm zone="openssl-package libssl">
+<indexterm zone="openssl libssl">
 <primary sortas="c-libssl">libssl.[so,a]</primary></indexterm>
 </listitem>
Index: postlfs/security/stunnel.xml
===================================================================
--- postlfs/security/stunnel.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ postlfs/security/stunnel.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -52,5 +52,5 @@
 <sect3><title><application>Stunnel</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="openssl-package"/></para>
+<para><xref linkend="openssl"/></para>
 </sect4>
 
Index: pst/printing/cups.xml
===================================================================
--- pst/printing/cups.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ pst/printing/cups.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -41,5 +41,5 @@
 <sect4><title>Optional</title>
 <para><xref linkend="libjpeg"/>, <xref linkend="libpng"/>,
-<xref linkend="libtiff"/>, <xref linkend="openssl-package"/> or
+<xref linkend="libtiff"/>, <xref linkend="openssl"/> or
 <ulink url="http://www.gnu.org/software/gnutls/">GnuTLS</ulink> (which
 needs <ulink
Index: pst/printing/lprng.xml
===================================================================
--- pst/printing/lprng.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ pst/printing/lprng.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -43,5 +43,5 @@
 <sect4><title>Optional</title>
 <para>
-<xref linkend="openssl-package"/>,
+<xref linkend="openssl"/>,
 <xref linkend="tcpwrappers"/> and
 <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>
Index: pst/ps/fop.xml
===================================================================
--- pst/ps/fop.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ pst/ps/fop.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="fop-package" xreflabel="FOP-&fop-version;">
+<sect1 id="fop" xreflabel="FOP-&fop-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
@@ -20,6 +20,6 @@
 <?dbhtml filename="fop.html"?>
 <title><application><acronym>FOP</acronym></application>-&fop-version;</title>
-<indexterm zone="fop-package">
-<primary sortas="a-FOP-package">FOP</primary></indexterm>
+<indexterm zone="fop">
+<primary sortas="a-FOP">FOP</primary></indexterm>
 
 <sect2>
@@ -226,5 +226,5 @@
 <sect3 id="fop-config"><title>Config files</title>
 <para><filename>~/.foprc</filename></para>
-<indexterm zone="fop-package fop-config">
+<indexterm zone="fop fop-config">
 <primary sortas="e-AA.foprc">~/.foprc</primary></indexterm>
 </sect3>
@@ -301,5 +301,5 @@
 which sets up the <application><acronym>FOP</acronym></application> 
 environment and passes the required parameters.</para>
-<indexterm zone="fop-package fop.sh">
+<indexterm zone="fop fop.sh">
 <primary sortas="b-fop.sh">fop.sh</primary></indexterm>
 </listitem>
@@ -311,5 +311,5 @@
 <application><acronym>FOP</acronym></application>
 <application>Java</application> classes.</para>
-<indexterm zone="fop-package fop.jar">
+<indexterm zone="fop fop.jar">
 <primary sortas="c-fop.jar">fop.jar</primary></indexterm>
 </listitem>
Index: pst/typesetting/tex.xml
===================================================================
--- pst/typesetting/tex.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ pst/typesetting/tex.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -68,5 +68,5 @@
 <para><xref linkend="libpng"/>, 
 <xref linkend="x-installing"/>, 
-<xref linkend="openssl-package"/>, 
+<xref linkend="openssl"/>, 
 <xref linkend="mysql"/>, 
 <xref linkend="perl-modules"/>: Tk-&Perl-Tk-version;, <ulink 
Index: server/mail/courier.xml
===================================================================
--- server/mail/courier.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ server/mail/courier.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -54,5 +54,5 @@
 <para><xref linkend="mysql"/> or <xref linkend="postgresql"/>, 
 <xref linkend="Linux_PAM"/>,
-<xref linkend="openssl-package"/>, 
+<xref linkend="openssl"/>, 
 <xref linkend="fam"/>,
 <xref linkend="openldap"/>,
Index: server/mail/exim.xml
===================================================================
--- server/mail/exim.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ server/mail/exim.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -58,5 +58,5 @@
 <para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>), 
 <xref linkend="openldap"/>, 
-<xref linkend="openssl-package"/> or 
+<xref linkend="openssl"/> or 
 <ulink url="http://www.gnu.org/software/gnutls/">GnuTLS</ulink>, 
 <xref linkend="cyrus-sasl"/>, 
Index: server/mail/qpopper.xml
===================================================================
--- server/mail/qpopper.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ server/mail/qpopper.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -44,5 +44,5 @@
 <sect4><title>Optional</title>
 <para>
-<xref linkend="openssl-package"/>,
+<xref linkend="openssl"/>,
 <xref linkend="gdbm"/>,
 <xref linkend="Linux_PAM"/> and
Index: server/mail/sendmail.xml
===================================================================
--- server/mail/sendmail.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ server/mail/sendmail.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -12,5 +12,5 @@
 ]>
 
-<sect1 id="sendmail-package" xreflabel="Sendmail-&sendmail-version;">
+<sect1 id="sendmail" xreflabel="Sendmail-&sendmail-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
@@ -19,5 +19,5 @@
 <?dbhtml filename="sendmail.html"?>
 <title>Sendmail-&sendmail-version;</title>
-<indexterm zone="sendmail-package">
+<indexterm zone="sendmail">
 <primary sortas="a-Sendmail">Sendmail</primary></indexterm>
 
@@ -48,5 +48,5 @@
 
 <sect4><title>Optional</title>
-<para><xref linkend="openssl-package"/>, 
+<para><xref linkend="openssl"/>, 
 <xref linkend="openldap"/>, 
 <xref linkend="tcpwrappers"/>, 
@@ -157,5 +157,5 @@
 <sect3 id="sendmail-config"><title>Config files</title>
 <para><filename>/etc/mail/*</filename></para>
-<indexterm zone="sendmail-package sendmail-config">
+<indexterm zone="sendmail sendmail-config">
 <primary sortas="e-etc-mail">/etc/mail/*</primary></indexterm>
 </sect3>
@@ -192,5 +192,5 @@
 <filename>/etc/rc.d/init.d/sendmail</filename> init script included in the 
 <xref linkend="intro-important-bootscripts"/> package.</para>
-<indexterm zone="sendmail-package sendmail-init">
+<indexterm zone="sendmail sendmail-init">
 <primary sortas="f-sendmail-init">sendmail</primary></indexterm>
 
@@ -227,5 +227,5 @@
 <listitem><para>queries and edits <application>Sendmail</application> map 
 files.</para>
-<indexterm zone="sendmail-package editmap">
+<indexterm zone="sendmail editmap">
 <primary sortas="b-editmap">editmap</primary></indexterm>
 </listitem>
@@ -236,5 +236,5 @@
 <listitem><para>prints <application>Sendmail</application>'s persistent host 
 status.</para>
-<indexterm zone="sendmail-package hoststat">
+<indexterm zone="sendmail hoststat">
 <primary sortas="b-hoststat">hoststat</primary></indexterm>
 </listitem>
@@ -244,5 +244,5 @@
 <term><command>mailstats</command></term>
 <listitem><para>displays <application>Sendmail</application> statistics.</para>
-<indexterm zone="sendmail-package mailstats">
+<indexterm zone="sendmail mailstats">
 <primary sortas="b-mailstats">mailstats</primary></indexterm>
 </listitem>
@@ -253,5 +253,5 @@
 <listitem><para>prints a summary of outbound mail messages waiting for 
 delivery.</para>
-<indexterm zone="sendmail-package mailq-sendmail">
+<indexterm zone="sendmail mailq-sendmail">
 <primary sortas="b-mailq">mailq</primary></indexterm>
 </listitem>
@@ -261,5 +261,5 @@
 <term><command>makemap</command></term>
 <listitem><para>creates <application>Sendmail</application> map files.</para>
-<indexterm zone="sendmail-package makemap">
+<indexterm zone="sendmail makemap">
 <primary sortas="b-makemap">makemap</primary></indexterm>
 </listitem>
@@ -270,5 +270,5 @@
 <listitem><para>rebuilds <filename>/etc/mail/aliases.db</filename> from the 
 contents of <filename>/etc/mail/aliases</filename>.</para>
-<indexterm zone="sendmail-package newaliases-sendmail">
+<indexterm zone="sendmail newaliases-sendmail">
 <primary sortas="b-newaliases">newaliases</primary></indexterm>
 </listitem>
@@ -279,5 +279,5 @@
 <listitem><para>displays current <application>Sendmail</application> 
 aliases.</para>
-<indexterm zone="sendmail-package praliases">
+<indexterm zone="sendmail praliases">
 <primary sortas="b-praliases">praliases</primary></indexterm>
 </listitem>
@@ -288,14 +288,14 @@
 <listitem><para> causes <application>Sendmail</application> to clear (purge) 
 all its host-status information.</para>
-<indexterm zone="sendmail-package purgestat">
+<indexterm zone="sendmail purgestat">
 <primary sortas="b-purgestat">purgestat</primary></indexterm>
 </listitem>
 </varlistentry>
 
-<varlistentry id="sendmail-sendmail">
+<varlistentry id="sendmail-prog-sendmail">
 <term><command>sendmail</command></term>
 <listitem><para>is the <application>Sendmail</application> mail transport 
 agent.</para>
-<indexterm zone="sendmail-package sendmail-sendmail">
+<indexterm zone="sendmail sendmail-prog-sendmail">
 <primary sortas="b-sendmail">sendmail</primary></indexterm>
 </listitem>
@@ -306,5 +306,5 @@
 <listitem><para>is a restricted shell for 
 <application>Sendmail</application>.</para>
-<indexterm zone="sendmail-package smrsh">
+<indexterm zone="sendmail smrsh">
 <primary sortas="b-smrsh">smrsh</primary></indexterm>
 </listitem>
@@ -314,5 +314,5 @@
 <term><command>vacation</command></term>
 <listitem><para>is an email auto responder.</para>
-<indexterm zone="sendmail-package vacation-sendmail">
+<indexterm zone="sendmail vacation-sendmail">
 <primary sortas="b-vacation">vacation</primary></indexterm>
 </listitem>
Index: server/other/bind.xml
===================================================================
--- server/other/bind.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ server/other/bind.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -46,5 +46,5 @@
 dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="openssl-package"/></para>
+<para><xref linkend="openssl"/></para>
 </sect4>
 
Index: server/other/openldap.xml
===================================================================
--- server/other/openldap.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ server/other/openldap.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -45,5 +45,5 @@
 
 <sect4><title>Recommended</title>
-<para><xref linkend="cyrus-sasl"/> and <xref linkend="openssl-package"/></para>
+<para><xref linkend="cyrus-sasl"/> and <xref linkend="openssl"/></para>
 </sect4>
 
Index: server/other/openssh.xml
===================================================================
--- server/other/openssh.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ server/other/openssh.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -41,5 +41,5 @@
 dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="openssl-package"/></para>
+<para><xref linkend="openssl"/></para>
 </sect4>
 <sect4><title>Optional</title>
Index: x/lib/libxklavier.xml
===================================================================
--- x/lib/libxklavier.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ x/lib/libxklavier.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -43,5 +43,5 @@
 
 <sect4><title>Optional</title>
-<para><xref linkend="doxygen-package"/></para>
+<para><xref linkend="doxygen"/></para>
 </sect4>
 </sect3>
Index: xsoft/graphweb/dillo.xml
===================================================================
--- xsoft/graphweb/dillo.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ xsoft/graphweb/dillo.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -51,5 +51,5 @@
 
 <sect4><title>Optional</title>
-<para><xref linkend="openssl-package"/> and 
+<para><xref linkend="openssl"/> and 
 <ulink url="http://perens.com/FreeSoftware/">Electric Fence</ulink></para>
 </sect4>
Index: xsoft/graphweb/firefox.xml
===================================================================
--- xsoft/graphweb/firefox.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ xsoft/graphweb/firefox.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -55,5 +55,5 @@
 <xref linkend="mitkrb"/> or <xref linkend="heimdal"/> 
 (for the GSSAPI libraries), 
-<xref linkend="doxygen-package"/>, 
+<xref linkend="doxygen"/>, 
 <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 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ xsoft/graphweb/mozilla.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -99,5 +99,5 @@
 <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>
 (for the GSSAPI libraries),
-<xref linkend="doxygen-package"/>,
+<xref linkend="doxygen"/>,
 <ulink url="http://xprint.mozdev.org/">Xprint</ulink>,
 <ulink url="http://perens.com/FreeSoftware/">Electric Fence</ulink> and
Index: xsoft/office/evolution.xml
===================================================================
--- xsoft/office/evolution.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ xsoft/office/evolution.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -57,5 +57,5 @@
 <sect4><title>Optional</title>
 <para><xref linkend="openldap"/>, 
-<xref linkend="sendmail-package"/> (or other 
+<xref linkend="sendmail"/> (or other 
 <ulink url="../server/mail.html">MTA</ulink> that links to 
 <command>/usr/sbin/sendmail</command>), 
Index: xsoft/office/gnucash.xml
===================================================================
--- xsoft/office/gnucash.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ xsoft/office/gnucash.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -64,5 +64,5 @@
 (LWP, HTML-Parser, DateManip and Finance-Quote), 
 <ulink url="http://www.graphviz.org/">GraphViz</ulink>, 
-<xref linkend="doxygen-package"/>, 
+<xref linkend="doxygen"/>, 
 <ulink url="http://perens.com/FreeSoftware/">Electric Fence</ulink></para>
 </sect4>
Index: xsoft/other/balsa.xml
===================================================================
--- xsoft/other/balsa.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ xsoft/other/balsa.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -52,9 +52,9 @@
 <sect4><title>Optional</title>
 <para><xref linkend="libgtkhtml"/>, 
-<xref linkend="openssl-package"/>, 
+<xref linkend="openssl"/>, 
 <xref linkend="openldap"/>, 
 <xref linkend="pcre"/>, 
 <xref linkend="procmail"/>, 
-<xref linkend="sendmail-package"/> (or other 
+<xref linkend="sendmail"/> (or other 
 <ulink url="../server/mail.html">MTA</ulink> that links to 
 <command>/usr/sbin/sendmail</command>), 
Index: xsoft/other/thunderbird.xml
===================================================================
--- xsoft/other/thunderbird.xml	(revision 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ xsoft/other/thunderbird.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -80,5 +80,5 @@
 <xref linkend="mitkrb"/> or <xref linkend="heimdal"/> 
 (for the GSSAPI libraries), 
-<xref linkend="doxygen-package"/>, 
+<xref linkend="doxygen"/>, 
 <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 1ae02579a04a398023ec40a72fd53eb9e5c539ad)
+++ xsoft/suites/koffice.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
@@ -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-package"/></para>
+and <xref linkend="doxygen"/></para>
 </sect4>
 
