r3335 - in trunk/BOOK: basicnet/mailnews basicnet/netlibs basicnet/netprogs basicnet/netutils basicnet/textweb content/databases content/web general/genlib general/prog gnome/core gnome/otherlibs kde/add kde/core multimedia/libdriv postlfs/security pst/printing pst/ps pst/typesetting server/mail server/other x/lib xsoft/graphweb xsoft/office xsoft/other xsoft/suites

randy at linuxfromscratch.org randy at linuxfromscratch.org
Tue Jan 25 08:02:06 PST 2005


Author: randy
Date: 2005-01-25 09:02:00 -0700 (Tue, 25 Jan 2005)
New Revision: 3335

Modified:
   trunk/BOOK/basicnet/mailnews/fetchmail.xml
   trunk/BOOK/basicnet/mailnews/mutt.xml
   trunk/BOOK/basicnet/mailnews/nail.xml
   trunk/BOOK/basicnet/mailnews/pine.xml
   trunk/BOOK/basicnet/mailnews/slrn.xml
   trunk/BOOK/basicnet/netlibs/curl.xml
   trunk/BOOK/basicnet/netlibs/wvstreams.xml
   trunk/BOOK/basicnet/netprogs/ntp.xml
   trunk/BOOK/basicnet/netprogs/subversion.xml
   trunk/BOOK/basicnet/netprogs/wget.xml
   trunk/BOOK/basicnet/netutils/bind-utils.xml
   trunk/BOOK/basicnet/netutils/ethereal.xml
   trunk/BOOK/basicnet/netutils/nmap.xml
   trunk/BOOK/basicnet/textweb/links.xml
   trunk/BOOK/basicnet/textweb/lynx.xml
   trunk/BOOK/basicnet/textweb/w3m.xml
   trunk/BOOK/content/databases/mysql.xml
   trunk/BOOK/content/databases/postgresql.xml
   trunk/BOOK/content/web/apache.xml
   trunk/BOOK/content/web/php.xml
   trunk/BOOK/content/web/vsftpd.xml
   trunk/BOOK/general/genlib/libesmtp.xml
   trunk/BOOK/general/prog/doxygen.xml
   trunk/BOOK/general/prog/python.xml
   trunk/BOOK/general/prog/ruby.xml
   trunk/BOOK/gnome/core/gnome-vfs.xml
   trunk/BOOK/gnome/core/orbit2.xml
   trunk/BOOK/gnome/otherlibs/gnome-vfs1.xml
   trunk/BOOK/gnome/otherlibs/soup.xml
   trunk/BOOK/kde/add/kdegames.xml
   trunk/BOOK/kde/add/kdenetwork.xml
   trunk/BOOK/kde/add/kdepim.xml
   trunk/BOOK/kde/add/kdevelop.xml
   trunk/BOOK/kde/core/kdebase.xml
   trunk/BOOK/kde/core/kdelibs.xml
   trunk/BOOK/multimedia/libdriv/alsa-lib.xml
   trunk/BOOK/multimedia/libdriv/flac.xml
   trunk/BOOK/postlfs/security/cyrus-sasl.xml
   trunk/BOOK/postlfs/security/heimdal.xml
   trunk/BOOK/postlfs/security/openssl.xml
   trunk/BOOK/postlfs/security/stunnel.xml
   trunk/BOOK/pst/printing/cups.xml
   trunk/BOOK/pst/printing/lprng.xml
   trunk/BOOK/pst/ps/fop.xml
   trunk/BOOK/pst/typesetting/tex.xml
   trunk/BOOK/server/mail/courier.xml
   trunk/BOOK/server/mail/exim.xml
   trunk/BOOK/server/mail/qpopper.xml
   trunk/BOOK/server/mail/sendmail.xml
   trunk/BOOK/server/other/bind.xml
   trunk/BOOK/server/other/openldap.xml
   trunk/BOOK/server/other/openssh.xml
   trunk/BOOK/x/lib/libxklavier.xml
   trunk/BOOK/xsoft/graphweb/dillo.xml
   trunk/BOOK/xsoft/graphweb/firefox.xml
   trunk/BOOK/xsoft/graphweb/mozilla.xml
   trunk/BOOK/xsoft/office/evolution.xml
   trunk/BOOK/xsoft/office/gnucash.xml
   trunk/BOOK/xsoft/other/balsa.xml
   trunk/BOOK/xsoft/other/thunderbird.xml
   trunk/BOOK/xsoft/suites/koffice.xml
Log:
Round 1 of renaming package-name entities

Modified: trunk/BOOK/basicnet/mailnews/fetchmail.xml
===================================================================
--- trunk/BOOK/basicnet/mailnews/fetchmail.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/basicnet/mailnews/fetchmail.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -44,7 +44,7 @@
 
 <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>
 

Modified: trunk/BOOK/basicnet/mailnews/mutt.xml
===================================================================
--- trunk/BOOK/basicnet/mailnews/mutt.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/basicnet/mailnews/mutt.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -56,7 +56,7 @@
 <screen><userinput><command>groupadd mail</command></userinput></screen>
 
 <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>
 
 <screen><userinput><command>chgrp mail /var/mail</command></userinput></screen>

Modified: trunk/BOOK/basicnet/mailnews/nail.xml
===================================================================
--- trunk/BOOK/basicnet/mailnews/nail.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/basicnet/mailnews/nail.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -49,7 +49,7 @@
 
 <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 
 <xref linkend="firefox"/> or 

Modified: trunk/BOOK/basicnet/mailnews/pine.xml
===================================================================
--- trunk/BOOK/basicnet/mailnews/pine.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/basicnet/mailnews/pine.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -49,7 +49,7 @@
 
 <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>
 <xref linkend="openldap"/> and

Modified: trunk/BOOK/basicnet/mailnews/slrn.xml
===================================================================
--- trunk/BOOK/basicnet/mailnews/slrn.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/basicnet/mailnews/slrn.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -42,7 +42,7 @@
 
 <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>,
 <ulink url="http://www.isc.org/index.pl?/sw/inn/">INN</ulink> and

Modified: trunk/BOOK/basicnet/netlibs/curl.xml
===================================================================
--- trunk/BOOK/basicnet/netlibs/curl.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/basicnet/netlibs/curl.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -43,7 +43,7 @@
 <sect3><title><application>cURL</application> dependencies</title>
 <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"/>, 
 <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>, 
@@ -95,7 +95,7 @@
 <sect3><title>curl</title>
 <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>
 

Modified: trunk/BOOK/basicnet/netlibs/wvstreams.xml
===================================================================
--- trunk/BOOK/basicnet/netlibs/wvstreams.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/basicnet/netlibs/wvstreams.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -43,7 +43,7 @@
 <sect3><title><application>WvStreams</application> dependencies</title>
 <sect4><title>Required</title>
 <para>
-<xref linkend="openssl-package"/>
+<xref linkend="openssl"/>
 </para></sect4>
 <sect4><title>Optional</title>
 <para>

Modified: trunk/BOOK/basicnet/netprogs/ntp.xml
===================================================================
--- trunk/BOOK/basicnet/netprogs/ntp.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/basicnet/netprogs/ntp.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -37,7 +37,7 @@
 
 <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>
 
 </sect2>

Modified: trunk/BOOK/basicnet/netprogs/subversion.xml
===================================================================
--- trunk/BOOK/basicnet/netprogs/subversion.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/basicnet/netprogs/subversion.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -66,7 +66,7 @@
 <xref linkend="python"/>, 
 <xref linkend="apache"/>, 
 <xref linkend="j2sdk"/>, 
-<xref linkend="openssl-package"/>, 
+<xref linkend="openssl"/>, 
 <xref linkend="openssh"/>, 
 <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>, 
 <ulink url="http://www.swig.org">SWIG</ulink>, 

Modified: trunk/BOOK/basicnet/netprogs/wget.xml
===================================================================
--- trunk/BOOK/basicnet/netprogs/wget.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/basicnet/netprogs/wget.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -40,7 +40,7 @@
 
 <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>
 </sect3>

Modified: trunk/BOOK/basicnet/netutils/bind-utils.xml
===================================================================
--- trunk/BOOK/basicnet/netutils/bind-utils.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/basicnet/netutils/bind-utils.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -50,7 +50,7 @@
 <sect3><title><application><acronym>BIND</acronym> Utilities</application> 
 dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="openssl-package"/></para>
+<para><xref linkend="openssl"/></para>
 </sect4>
 </sect3>
 

Modified: trunk/BOOK/basicnet/netutils/ethereal.xml
===================================================================
--- trunk/BOOK/basicnet/netutils/ethereal.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/basicnet/netutils/ethereal.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -60,11 +60,11 @@
 <para><xref linkend="pkgconfig"/>, 
 <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>
 </sect4>

Modified: trunk/BOOK/basicnet/netutils/nmap.xml
===================================================================
--- trunk/BOOK/basicnet/netutils/nmap.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/basicnet/netutils/nmap.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -41,7 +41,7 @@
 
 <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 
 <xref linkend="libpcap"/></para>

Modified: trunk/BOOK/basicnet/textweb/links.xml
===================================================================
--- trunk/BOOK/basicnet/textweb/links.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/basicnet/textweb/links.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -38,7 +38,7 @@
 <sect3><title><application>Links</application> dependencies</title>
 <sect4><title>Optional</title>
 <para><xref linkend="gpm-package"/>, 
-<xref linkend="openssl-package"/>, 
+<xref linkend="openssl"/>, 
 <xref linkend="libpng"/>, 
 <xref linkend="libjpeg"/>, 
 <xref linkend="libtiff"/>, 

Modified: trunk/BOOK/basicnet/textweb/lynx.xml
===================================================================
--- trunk/BOOK/basicnet/textweb/lynx.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/basicnet/textweb/lynx.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -39,7 +39,7 @@
 
 <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
 url="ftp://ftp.gnupg.org/gcrypt/alpha/libgpg-error/">libgpg-error</ulink>,

Modified: trunk/BOOK/basicnet/textweb/w3m.xml
===================================================================
--- trunk/BOOK/basicnet/textweb/w3m.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/basicnet/textweb/w3m.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -42,7 +42,7 @@
 <sect4><title>Optional</title>
 <para><xref linkend="pkgconfig"/>, 
 <xref linkend="gpm-package"/>, 
-<xref linkend="openssl-package"/>, 
+<xref linkend="openssl"/>, 
 <xref linkend="imlib"/>, 
 <xref linkend="imlib2"/>, 
 <xref linkend="gdk"/>, 

Modified: trunk/BOOK/content/databases/mysql.xml
===================================================================
--- trunk/BOOK/content/databases/mysql.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/content/databases/mysql.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -47,13 +47,13 @@
 </title>
 <sect4><title>Optional</title>
 <para>
-<xref linkend="openssl-package"/>,
+<xref linkend="openssl"/>,
 <xref linkend="tcpwrappers"/>,
 <ulink url="http://sourceforge.net/projects/libedit/">libedit</ulink> 
 (as an alternative to readline), 
 <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>
 </sect3>

Modified: trunk/BOOK/content/databases/postgresql.xml
===================================================================
--- trunk/BOOK/content/databases/postgresql.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/content/databases/postgresql.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -52,7 +52,7 @@
 <xref linkend="python"/>,
 <xref linkend="tcl"/>,
 <xref linkend="tk"/>,
-<xref linkend="openssl-package"/>,
+<xref linkend="openssl"/>,
 <xref linkend="Linux_PAM"/>,
 <xref linkend="sgml-dtd-3"/>, 
 <xref linkend="docbook-dsssl"/>,

Modified: trunk/BOOK/content/web/apache.xml
===================================================================
--- trunk/BOOK/content/web/apache.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/content/web/apache.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -52,10 +52,10 @@
 <sect3><title><application>Apache</application> dependencies</title>
 <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>
 

Modified: trunk/BOOK/content/web/php.xml
===================================================================
--- trunk/BOOK/content/web/php.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/content/web/php.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -52,7 +52,7 @@
 <para>
 <xref linkend="libxml2"/>,
 <xref linkend="libxslt"/>,
-<xref linkend="openssl-package"/>,
+<xref linkend="openssl"/>,
 <ulink url="http://www.fastio.com/">ClibPDF</ulink>,
 <xref linkend="libjpeg"/>,
 <xref linkend="libtiff"/>,

Modified: trunk/BOOK/content/web/vsftpd.xml
===================================================================
--- trunk/BOOK/content/web/vsftpd.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/content/web/vsftpd.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -43,7 +43,7 @@
 <sect3><title><application>vsFTPD</application> dependencies</title>
 <sect4><title>Optional</title>
 <para><xref linkend="Linux_PAM"/>,
-<xref linkend="openssl-package"/>, and
+<xref linkend="openssl"/>, and
 <xref linkend="tcpwrappers"/></para>
 </sect4>
 </sect3>

Modified: trunk/BOOK/general/genlib/libesmtp.xml
===================================================================
--- trunk/BOOK/general/genlib/libesmtp.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/general/genlib/libesmtp.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -43,7 +43,7 @@
 <title><application>libesmtp</application> dependencies</title>
 
 <sect4><title>Optional</title>
-<para><xref linkend="openssl-package"/></para>
+<para><xref linkend="openssl"/></para>
 </sect4>
 
 </sect3>

Modified: trunk/BOOK/general/prog/doxygen.xml
===================================================================
--- trunk/BOOK/general/prog/doxygen.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/general/prog/doxygen.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -11,14 +11,14 @@
   <!ENTITY doxygen-time          "1.77 SBU (includes building documentation)">
 ]>
 
-<sect1 id="doxygen-package" xreflabel="Doxygen-&doxygen-version;">
+<sect1 id="doxygen" xreflabel="Doxygen-&doxygen-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
 <date>$Date$</date>
 </sect1info>
 <?dbhtml filename="doxygen.html"?>
 <title>Doxygen-&doxygen-version;</title>
-<indexterm zone="doxygen-package">
+<indexterm zone="doxygen">
 <primary sortas="a-Doxygen">Doxygen</primary></indexterm>
 
 <sect2>
@@ -139,13 +139,13 @@
 <bridgehead renderas="sect3">Short Descriptions</bridgehead>
 <?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 
 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">
+<indexterm zone="doxygen doxygen-prog">
 <primary sortas="b-doxygen">doxygen</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -154,7 +154,7 @@
 <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">
+<indexterm zone="doxygen doxytag">
 <primary sortas="b-doxytag">doxytag</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -163,7 +163,7 @@
 <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">
+<indexterm zone="doxygen doxywizard">
 <primary sortas="b-doxywizard">doxywizard</primary></indexterm>
 </listitem>
 </varlistentry>

Modified: trunk/BOOK/general/prog/python.xml
===================================================================
--- trunk/BOOK/general/prog/python.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/general/prog/python.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -47,7 +47,7 @@
 
 <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
 <xref linkend="db"/></para>

Modified: trunk/BOOK/general/prog/ruby.xml
===================================================================
--- trunk/BOOK/general/prog/ruby.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/general/prog/ruby.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -45,7 +45,7 @@
 
 <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"/>, 
 <xref linkend="gdbm"/></para>

Modified: trunk/BOOK/gnome/core/gnome-vfs.xml
===================================================================
--- trunk/BOOK/gnome/core/gnome-vfs.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/gnome/core/gnome-vfs.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -59,7 +59,7 @@
 <xref linkend="fam"/>,
 <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"/>, 
 <ulink url="http://www.openafs.org/">OpenAFS</ulink>, 

Modified: trunk/BOOK/gnome/core/orbit2.xml
===================================================================
--- trunk/BOOK/gnome/core/orbit2.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/gnome/core/orbit2.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -50,7 +50,7 @@
 </sect4>
 
 <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>
 

Modified: trunk/BOOK/gnome/otherlibs/gnome-vfs1.xml
===================================================================
--- trunk/BOOK/gnome/otherlibs/gnome-vfs1.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/gnome/otherlibs/gnome-vfs1.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -62,7 +62,7 @@
 <xref linkend="oaf"/>, 
 <xref linkend="GConf1"/>, 
 <xref linkend="bonobo14"/>, 
-<xref linkend="openssl-package"/>, 
+<xref linkend="openssl"/>, 
 <xref linkend="cdparanoia-package"/>, 
 <xref linkend="gtk-doc"/> and 
 <xref linkend="docbook-utils"/></para>

Modified: trunk/BOOK/gnome/otherlibs/soup.xml
===================================================================
--- trunk/BOOK/gnome/otherlibs/soup.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/gnome/otherlibs/soup.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -58,7 +58,7 @@
 
 <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 
 <xref linkend="docbook-utils"/></para>

Modified: trunk/BOOK/kde/add/kdegames.xml
===================================================================
--- trunk/BOOK/kde/add/kdegames.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/kde/add/kdegames.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -48,7 +48,7 @@
 
 <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>
 

Modified: trunk/BOOK/kde/add/kdenetwork.xml
===================================================================
--- trunk/BOOK/kde/add/kdenetwork.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/kde/add/kdenetwork.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -46,7 +46,7 @@
 <para><xref linkend="libjpeg"/>, 
 <xref linkend="libxml2"/>, 
 <xref linkend="libxslt"/> and 
-<xref linkend="openssl-package"/></para>
+<xref linkend="openssl"/></para>
 </sect4>
 
 <sect4><title>Optional</title>
@@ -58,7 +58,7 @@
 Tools</ulink>, 
 <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>
 </sect3>

Modified: trunk/BOOK/kde/add/kdepim.xml
===================================================================
--- trunk/BOOK/kde/add/kdepim.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/kde/add/kdepim.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -46,7 +46,7 @@
 <para><xref linkend="libjpeg"/>, 
 <xref linkend="libxml2"/>, 
 <xref linkend="gnupg"/> and 
-<xref linkend="openssl-package"/></para>
+<xref linkend="openssl"/></para>
 </sect4>
 
 <sect4><title>Optional</title>
@@ -71,7 +71,7 @@
 <ulink url="http://www.gnokii.org/">gnokii</ulink>, 
 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>
 

Modified: trunk/BOOK/kde/add/kdevelop.xml
===================================================================
--- trunk/BOOK/kde/add/kdevelop.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/kde/add/kdevelop.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -50,7 +50,7 @@
 <para><xref linkend="python"/>, 
 <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>
 

Modified: trunk/BOOK/kde/core/kdebase.xml
===================================================================
--- trunk/BOOK/kde/core/kdebase.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/kde/core/kdebase.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -58,7 +58,7 @@
 <para><xref linkend="libjpeg"/>, 
 <xref linkend="libart_lgpl"/>, 
 <xref linkend="libxml2"/>, 
-<xref linkend="openssl-package"/> and 
+<xref linkend="openssl"/> and 
 <xref linkend="j2sdk"/></para>
 </sect4>
 
@@ -76,7 +76,7 @@
 <ulink url="http://secure.netroedge.com/~lm78/">lm_sensors</ulink>, 
 <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>
 
 </sect3>

Modified: trunk/BOOK/kde/core/kdelibs.xml
===================================================================
--- trunk/BOOK/kde/core/kdelibs.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/kde/core/kdelibs.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -70,7 +70,7 @@
 <xref linkend="libxslt"/>, 
 <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>
 
@@ -84,7 +84,7 @@
 <ulink url="http://www.openexr.com/">OpenEXR</ulink>, 
 <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>
 
 </sect3>

Modified: trunk/BOOK/multimedia/libdriv/alsa-lib.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/alsa-lib.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/multimedia/libdriv/alsa-lib.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -40,7 +40,7 @@
 dependencies</title>
 <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>
 

Modified: trunk/BOOK/multimedia/libdriv/flac.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/flac.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/multimedia/libdriv/flac.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -43,7 +43,7 @@
 <xref linkend="xmms-package"/>, 
 <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>
 </sect3>

Modified: trunk/BOOK/postlfs/security/cyrus-sasl.xml
===================================================================
--- trunk/BOOK/postlfs/security/cyrus-sasl.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/postlfs/security/cyrus-sasl.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -51,7 +51,7 @@
 dependencies</title>
 
 <sect4><title>Required</title>
-<para><xref linkend="openssl-package"/></para>
+<para><xref linkend="openssl"/></para>
 </sect4>
 
 <sect4><title>Optional</title>

Modified: trunk/BOOK/postlfs/security/heimdal.xml
===================================================================
--- trunk/BOOK/postlfs/security/heimdal.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/postlfs/security/heimdal.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -61,7 +61,7 @@
 
 <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>
 <sect4><title>Optional</title>

Modified: trunk/BOOK/postlfs/security/openssl.xml
===================================================================
--- trunk/BOOK/postlfs/security/openssl.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/postlfs/security/openssl.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -11,15 +11,15 @@
 <!ENTITY openssl-time "1.16 SBU">
 ]>
 
-<sect1 id="openssl-package" xreflabel="OpenSSL-&openssl-version;">
+<sect1 id="openssl" xreflabel="OpenSSL-&openssl-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
 <date>$Date$</date>
 </sect1info>
 <?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>
 <title>Introduction to <application>Open<acronym>SSL</acronym></application>
@@ -109,7 +109,7 @@
 
 <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>
 </sect3>
@@ -150,18 +150,18 @@
 <term><command>c_rehash</command></term>
 <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 
 functions of <application>Open<acronym>SSL</acronym></application>'s crypto 
 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>
 </varlistentry>
@@ -176,7 +176,7 @@
 <application>Open<acronym>SSH</acronym></application>, 
 <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>
 </varlistentry>
@@ -187,7 +187,7 @@
 v2/v3) and Transport Layer Security (<acronym>TLS</acronym> v1) protocols. It 
 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>
 </varlistentry>

Modified: trunk/BOOK/postlfs/security/stunnel.xml
===================================================================
--- trunk/BOOK/postlfs/security/stunnel.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/postlfs/security/stunnel.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -51,7 +51,7 @@
 
 <sect3><title><application>Stunnel</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="openssl-package"/></para>
+<para><xref linkend="openssl"/></para>
 </sect4>
 
 <sect4><title>Optional</title>

Modified: trunk/BOOK/pst/printing/cups.xml
===================================================================
--- trunk/BOOK/pst/printing/cups.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/pst/printing/cups.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -40,7 +40,7 @@
 </title>
 <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
 url="ftp://ftp.gnupg.org/gcrypt/alpha/libgpg-error/">libgpg-error</ulink>,

Modified: trunk/BOOK/pst/printing/lprng.xml
===================================================================
--- trunk/BOOK/pst/printing/lprng.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/pst/printing/lprng.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -42,7 +42,7 @@
 <sect3><title><application>LPRng</application> dependencies</title>
 <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>
 </para></sect4>

Modified: trunk/BOOK/pst/ps/fop.xml
===================================================================
--- trunk/BOOK/pst/ps/fop.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/pst/ps/fop.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -12,15 +12,15 @@
   <!ENTITY fop-time          "0.25 SBU">
 ]>
 
-<sect1 id="fop-package" xreflabel="FOP-&fop-version;">
+<sect1 id="fop" xreflabel="FOP-&fop-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
 <date>$Date$</date>
 </sect1info>
 <?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>
 <title>Introduction to <application><acronym>FOP</acronym></application></title>
@@ -225,7 +225,7 @@
 
 <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>
 
@@ -300,7 +300,7 @@
 <listitem><para>is a wrapper script to the <command>java</command> command 
 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>
 </varlistentry>
@@ -310,7 +310,7 @@
 <listitem><para>contains all the 
 <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>
 </varlistentry>

Modified: trunk/BOOK/pst/typesetting/tex.xml
===================================================================
--- trunk/BOOK/pst/typesetting/tex.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/pst/typesetting/tex.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -67,7 +67,7 @@
 <sect4><title>Optional</title>
 <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 
 url="http://gd.tuwien.ac.at/visual/ibiblio/libs/graphics/t1lib-5.0.2.tar.gz">

Modified: trunk/BOOK/server/mail/courier.xml
===================================================================
--- trunk/BOOK/server/mail/courier.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/server/mail/courier.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -53,7 +53,7 @@
 <sect4><title>Optional</title>
 <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"/>,
 <xref linkend="apache"/>,

Modified: trunk/BOOK/server/mail/exim.xml
===================================================================
--- trunk/BOOK/server/mail/exim.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/server/mail/exim.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -57,7 +57,7 @@
 <sect4><title>Optional</title>
 <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"/>, 
 <xref linkend="mysql"/>, 

Modified: trunk/BOOK/server/mail/qpopper.xml
===================================================================
--- trunk/BOOK/server/mail/qpopper.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/server/mail/qpopper.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -43,7 +43,7 @@
 </para></sect4>
 <sect4><title>Optional</title>
 <para>
-<xref linkend="openssl-package"/>,
+<xref linkend="openssl"/>,
 <xref linkend="gdbm"/>,
 <xref linkend="Linux_PAM"/> and
 <xref linkend="mitkrb"/>

Modified: trunk/BOOK/server/mail/sendmail.xml
===================================================================
--- trunk/BOOK/server/mail/sendmail.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/server/mail/sendmail.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -11,14 +11,14 @@
 <!ENTITY sendmail-time "0.38 SBU">
 ]>
 
-<sect1 id="sendmail-package" xreflabel="Sendmail-&sendmail-version;">
+<sect1 id="sendmail" xreflabel="Sendmail-&sendmail-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
 <date>$Date$</date>
 </sect1info>
 <?dbhtml filename="sendmail.html"?>
 <title>Sendmail-&sendmail-version;</title>
-<indexterm zone="sendmail-package">
+<indexterm zone="sendmail">
 <primary sortas="a-Sendmail">Sendmail</primary></indexterm>
 
 <sect2>
@@ -47,7 +47,7 @@
 </para></sect4>
 
 <sect4><title>Optional</title>
-<para><xref linkend="openssl-package"/>, 
+<para><xref linkend="openssl"/>, 
 <xref linkend="openldap"/>, 
 <xref linkend="tcpwrappers"/>, 
 <xref linkend="pcre"/>, 
@@ -156,7 +156,7 @@
 
 <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>
 
@@ -191,7 +191,7 @@
 <application>Sendmail</application> at startup, install the 
 <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>
 
 <screen><userinput><command>make install-sendmail</command></userinput></screen>
@@ -226,7 +226,7 @@
 <term><command>editmap</command></term>
 <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>
 </varlistentry>
@@ -235,7 +235,7 @@
 <term><command>hoststat</command></term>
 <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>
 </varlistentry>
@@ -243,7 +243,7 @@
 <varlistentry id="mailstats">
 <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>
 </varlistentry>
@@ -252,7 +252,7 @@
 <term><command>mailq</command></term>
 <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>
 </varlistentry>
@@ -260,7 +260,7 @@
 <varlistentry id="makemap">
 <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>
 </varlistentry>
@@ -269,7 +269,7 @@
 <term><command>newaliases</command></term>
 <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>
 </varlistentry>
@@ -278,7 +278,7 @@
 <term><command>praliases</command></term>
 <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>
 </varlistentry>
@@ -287,16 +287,16 @@
 <term><command>purgestat</command></term>
 <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>
 </varlistentry>
@@ -305,7 +305,7 @@
 <term><command>smrsh</command></term>
 <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>
 </varlistentry>
@@ -313,7 +313,7 @@
 <varlistentry id="vacation-sendmail">
 <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>
 </varlistentry>

Modified: trunk/BOOK/server/other/bind.xml
===================================================================
--- trunk/BOOK/server/other/bind.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/server/other/bind.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -45,7 +45,7 @@
 <sect3><title><application><acronym>BIND</acronym></application> 
 dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="openssl-package"/></para>
+<para><xref linkend="openssl"/></para>
 </sect4>
 
 <sect4><title>Optional (to run the full test suite)</title>

Modified: trunk/BOOK/server/other/openldap.xml
===================================================================
--- trunk/BOOK/server/other/openldap.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/server/other/openldap.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -44,7 +44,7 @@
 </sect4>
 
 <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>
 
 <sect4><title>Optional</title>

Modified: trunk/BOOK/server/other/openssh.xml
===================================================================
--- trunk/BOOK/server/other/openssh.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/server/other/openssh.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -40,7 +40,7 @@
 <sect3><title><application>Open<acronym>SSH</acronym></application> 
 dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="openssl-package"/></para>
+<para><xref linkend="openssl"/></para>
 </sect4>
 <sect4><title>Optional</title>
 <para><xref linkend="Linux_PAM"/>, 

Modified: trunk/BOOK/x/lib/libxklavier.xml
===================================================================
--- trunk/BOOK/x/lib/libxklavier.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/x/lib/libxklavier.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -42,7 +42,7 @@
 </sect4>
 
 <sect4><title>Optional</title>
-<para><xref linkend="doxygen-package"/></para>
+<para><xref linkend="doxygen"/></para>
 </sect4>
 </sect3>
 

Modified: trunk/BOOK/xsoft/graphweb/dillo.xml
===================================================================
--- trunk/BOOK/xsoft/graphweb/dillo.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/xsoft/graphweb/dillo.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -50,7 +50,7 @@
 </sect4>
 
 <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>
 </sect3>

Modified: trunk/BOOK/xsoft/graphweb/firefox.xml
===================================================================
--- trunk/BOOK/xsoft/graphweb/firefox.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/xsoft/graphweb/firefox.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -54,7 +54,7 @@
 <xref linkend="libgnome"/>, 
 <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 
 <ulink url="http://cairographics.org/">Cairo</ulink></para>

Modified: trunk/BOOK/xsoft/graphweb/mozilla.xml
===================================================================
--- trunk/BOOK/xsoft/graphweb/mozilla.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/xsoft/graphweb/mozilla.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -98,7 +98,7 @@
 <xref linkend="libart_lgpl"/>,
 <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
 <ulink url="http://cairographics.org/">Cairo</ulink></para>

Modified: trunk/BOOK/xsoft/office/evolution.xml
===================================================================
--- trunk/BOOK/xsoft/office/evolution.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/xsoft/office/evolution.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -56,7 +56,7 @@
 
 <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>), 
 <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>, 

Modified: trunk/BOOK/xsoft/office/gnucash.xml
===================================================================
--- trunk/BOOK/xsoft/office/gnucash.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/xsoft/office/gnucash.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -63,7 +63,7 @@
 <xref linkend="perl-modules"/>: 
 (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>
 

Modified: trunk/BOOK/xsoft/other/balsa.xml
===================================================================
--- trunk/BOOK/xsoft/other/balsa.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/xsoft/other/balsa.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -51,11 +51,11 @@
 
 <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>), 
 <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>, 

Modified: trunk/BOOK/xsoft/other/thunderbird.xml
===================================================================
--- trunk/BOOK/xsoft/other/thunderbird.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/xsoft/other/thunderbird.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -79,7 +79,7 @@
 <xref linkend="libgnome"/>, 
 <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 <ulink url="http://cairographics.org/">Cairo</ulink></para>

Modified: trunk/BOOK/xsoft/suites/koffice.xml
===================================================================
--- trunk/BOOK/xsoft/suites/koffice.xml	2005-01-25 15:05:27 UTC (rev 3334)
+++ trunk/BOOK/xsoft/suites/koffice.xml	2005-01-25 16:02:00 UTC (rev 3335)
@@ -86,7 +86,7 @@
 <ulink 
 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>
 
 </sect3>




More information about the blfs-book mailing list