r3336 - in trunk/BOOK: basicnet/mailnews basicnet/netprogs basicnet/netutils basicnet/textweb general/graphlib general/prog general/sysutils kde/add multimedia/audioutils multimedia/cdwriteutils multimedia/libdriv multimedia/videoutils postlfs/editors postlfs/security server/mail

randy at linuxfromscratch.org randy at linuxfromscratch.org
Tue Jan 25 08:48:35 PST 2005


Author: randy
Date: 2005-01-25 09:48:26 -0700 (Tue, 25 Jan 2005)
New Revision: 3336

Modified:
   trunk/BOOK/basicnet/mailnews/nail.xml
   trunk/BOOK/basicnet/netprogs/inetutils.xml
   trunk/BOOK/basicnet/netutils/whois.xml
   trunk/BOOK/basicnet/textweb/links.xml
   trunk/BOOK/basicnet/textweb/w3m.xml
   trunk/BOOK/general/graphlib/aalib.xml
   trunk/BOOK/general/prog/ruby.xml
   trunk/BOOK/general/sysutils/gpm.xml
   trunk/BOOK/general/sysutils/mc.xml
   trunk/BOOK/kde/add/kdeaddons.xml
   trunk/BOOK/kde/add/kdebindings.xml
   trunk/BOOK/kde/add/kdemultimedia.xml
   trunk/BOOK/kde/add/kdenetwork.xml
   trunk/BOOK/multimedia/audioutils/lame.xml
   trunk/BOOK/multimedia/audioutils/xmms.xml
   trunk/BOOK/multimedia/cdwriteutils/cdrdao.xml
   trunk/BOOK/multimedia/libdriv/flac.xml
   trunk/BOOK/multimedia/libdriv/gst-plugins.xml
   trunk/BOOK/multimedia/videoutils/avifile.xml
   trunk/BOOK/multimedia/videoutils/ffmpeg.xml
   trunk/BOOK/multimedia/videoutils/mplayer.xml
   trunk/BOOK/multimedia/videoutils/transcode.xml
   trunk/BOOK/postlfs/editors/vim.xml
   trunk/BOOK/postlfs/security/cyrus-sasl.xml
   trunk/BOOK/server/mail/courier.xml
Log:
Round 2 of renaming package-name entities

Modified: trunk/BOOK/basicnet/mailnews/nail.xml
===================================================================
--- trunk/BOOK/basicnet/mailnews/nail.xml	2005-01-25 16:02:00 UTC (rev 3335)
+++ trunk/BOOK/basicnet/mailnews/nail.xml	2005-01-25 16:48:26 UTC (rev 3336)
@@ -11,14 +11,14 @@
   <!ENTITY nail-time          "0.05 SBU">
 ]>
 
-<sect1 id="nail-package" xreflabel="Nail-&nail-version;">
+<sect1 id="nail" xreflabel="Nail-&nail-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
 <date>$Date$</date>
 </sect1info>
 <?dbhtml filename="nail.html"?>
 <title>Nail-&nail-version;</title>
-<indexterm zone="nail-package">
+<indexterm zone="nail">
 <primary sortas="a-Nail">Nail</primary></indexterm>
 
 <sect2>
@@ -95,11 +95,11 @@
 <sect3 id="nail-config"><title>Config files</title>
 <para><filename>/etc/nail.rc</filename>, <filename>~/.mailrc</filename> and 
 <filename>~/.nailrc</filename></para>
-<indexterm zone="nail-package nail-config">
+<indexterm zone="nail nail-config">
 <primary sortas="e-etc-nail.rc">/etc/nail.rc</primary></indexterm>
-<indexterm zone="nail-package nail-config">
+<indexterm zone="nail nail-config">
 <primary sortas="e-AA.mailrc">~/.mailrc</primary></indexterm>
-<indexterm zone="nail-package nail-config">
+<indexterm zone="nail nail-config">
 <primary sortas="e-AA.nailrc">~/.nailrc</primary></indexterm>
 </sect3>
 
@@ -121,11 +121,11 @@
 <bridgehead renderas="sect3">Short Descriptions</bridgehead>
 <?dbfo list-presentation="list"?>
 
-<varlistentry id="nail">
+<varlistentry id="nail-prog">
 <term><command>nail</command></term>
 <listitem><para>is a command-line mail user agent compatible with the 
 <command>mail</command> command found on commercial Unix versions.</para>
-<indexterm zone="nail-package nail">
+<indexterm zone="nail nail-prog">
 <primary sortas="b-nail">nail</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -133,7 +133,7 @@
 <varlistentry id="mail-nail">
 <term><command>mail</command></term>
 <listitem><para>is a symbolic link to <command>nail</command>.</para>
-<indexterm zone="nail-package mail-nail">
+<indexterm zone="nail mail-nail">
 <primary sortas="g-mail">mail</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -141,7 +141,7 @@
 <varlistentry id="mailx-nail">
 <term><command>mailx</command></term>
 <listitem><para>is a symbolic link to <command>nail</command>.</para>
-<indexterm zone="nail-package mailx-nail">
+<indexterm zone="nail mailx-nail">
 <primary sortas="g-mailx">mailx</primary></indexterm>
 </listitem>
 </varlistentry>

Modified: trunk/BOOK/basicnet/netprogs/inetutils.xml
===================================================================
--- trunk/BOOK/basicnet/netprogs/inetutils.xml	2005-01-25 16:02:00 UTC (rev 3335)
+++ trunk/BOOK/basicnet/netprogs/inetutils.xml	2005-01-25 16:48:26 UTC (rev 3336)
@@ -90,7 +90,7 @@
 <para><option>--disable-whois</option>: This switch will prevent
 <application>Inetutils</application> installing an outdated 
 <command>whois</command> client. Add this option if you plan on installing 
-<xref linkend="whois-package"/>.</para>
+<xref linkend="whois"/>.</para>
 
 <para><option>--with-pam</option>: This switch makes 
 <application>Inetutils</application> link against 

Modified: trunk/BOOK/basicnet/netutils/whois.xml
===================================================================
--- trunk/BOOK/basicnet/netutils/whois.xml	2005-01-25 16:02:00 UTC (rev 3335)
+++ trunk/BOOK/basicnet/netutils/whois.xml	2005-01-25 16:48:26 UTC (rev 3336)
@@ -12,14 +12,14 @@
   <!ENTITY whois-time          "0.01 SBU">
 ]>
 
-<sect1 id="whois-package" xreflabel="Whois-&whois-version;">
+<sect1 id="whois" xreflabel="Whois-&whois-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
 <date>$Date$</date>
 </sect1info>
 <?dbhtml filename="whois.html"?>
 <title>Whois-&whois-version;</title>
-<indexterm zone="whois-package">
+<indexterm zone="whois">
 <primary sortas="a-Whois">Whois</primary></indexterm>
 
 <sect2>
@@ -70,11 +70,11 @@
 <bridgehead renderas="sect3">Short Descriptions</bridgehead>
 <?dbfo list-presentation="list"?>
 
-<varlistentry id="whois">
+<varlistentry id="whois-prog">
 <term><command>whois</command></term>
 <listitem><para>is a client-side application which queries the whois directory 
 service for information pertaining to a particular domain name.</para>
-<indexterm zone="whois-package whois">
+<indexterm zone="whois whois-prog">
 <primary sortas="b-whois">whois</primary></indexterm>
 </listitem>
 </varlistentry>

Modified: trunk/BOOK/basicnet/textweb/links.xml
===================================================================
--- trunk/BOOK/basicnet/textweb/links.xml	2005-01-25 16:02:00 UTC (rev 3335)
+++ trunk/BOOK/basicnet/textweb/links.xml	2005-01-25 16:48:26 UTC (rev 3336)
@@ -37,7 +37,7 @@
 
 <sect3><title><application>Links</application> dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="gpm-package"/>, 
+<para><xref linkend="gpm"/>, 
 <xref linkend="openssl"/>, 
 <xref linkend="libpng"/>, 
 <xref linkend="libjpeg"/>, 
@@ -68,7 +68,7 @@
 <para><option>--enable-graphics</option>: Add this switch if you want to 
 use <application>Links</application> in graphics mode. You will either
 need to install the X Window System or enable frame buffer support in
-your kernel and install <xref linkend="gpm-package"/>.</para>
+your kernel and install <xref linkend="gpm"/>.</para>
 
 </sect2>
 

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

Modified: trunk/BOOK/general/graphlib/aalib.xml
===================================================================
--- trunk/BOOK/general/graphlib/aalib.xml	2005-01-25 16:02:00 UTC (rev 3335)
+++ trunk/BOOK/general/graphlib/aalib.xml	2005-01-25 16:48:26 UTC (rev 3336)
@@ -42,7 +42,7 @@
 <sect4><title>Optional</title>
 <para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>), 
 <xref linkend="slang"/> and 
-<xref linkend="gpm-package"/></para>
+<xref linkend="gpm"/></para>
 </sect4>
 </sect3>
 

Modified: trunk/BOOK/general/prog/ruby.xml
===================================================================
--- trunk/BOOK/general/prog/ruby.xml	2005-01-25 16:02:00 UTC (rev 3335)
+++ trunk/BOOK/general/prog/ruby.xml	2005-01-25 16:48:26 UTC (rev 3336)
@@ -12,14 +12,14 @@
 <!ENTITY ruby-time "0.62 SBU">
 ]>
 
-<sect1 id="ruby-package" xreflabel="Ruby-&ruby-version;">
+<sect1 id="ruby" xreflabel="Ruby-&ruby-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
 <date>$Date$</date>
 </sect1info>
 <?dbhtml filename="ruby.html"?>
 <title>Ruby-&ruby-version;</title>
-<indexterm zone="ruby-package">
+<indexterm zone="ruby">
 <primary sortas="a-Ruby">Ruby</primary></indexterm>
 
 <sect2>
@@ -96,11 +96,11 @@
 <bridgehead renderas="sect3">Short Descriptions</bridgehead>
 <?dbfo list-presentation="list"?>
 
-<varlistentry id="ruby">
+<varlistentry id="ruby-prog">
 <term><command>ruby</command></term>
 <listitem><para>is an interpreted scripting language for quick
 and easy object-oriented programming.</para>
-<indexterm zone="ruby-package ruby">
+<indexterm zone="ruby ruby-prog">
 <primary sortas="b-ruby">ruby</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -109,7 +109,7 @@
 <term><command>irb</command></term>
 <listitem><para>is the interactive interface for
 <application>Ruby</application>.</para>
-<indexterm zone="ruby-package irb">
+<indexterm zone="ruby irb">
 <primary sortas="b-irb">irb</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -118,7 +118,7 @@
 <term><command>erb</command></term>
 <listitem><para>is Tiny eRuby. It interprets a
 <application>Ruby</application> code embedded text file.</para>
-<indexterm zone="ruby-package erb">
+<indexterm zone="ruby erb">
 <primary sortas="b-erb">erb</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -127,7 +127,7 @@
 <term><command>ri</command></term>
 <listitem><para>displays documentation from a database on
 <application>Ruby</application> classes, modules and methods.</para>
-<indexterm zone="ruby-package ri">
+<indexterm zone="ruby ri">
 <primary sortas="b-ri">ri</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -136,7 +136,7 @@
 <term><filename role="library">libruby.so</filename></term>
 <listitem><para>contains the <acronym>API</acronym> functions required
 by <application>Ruby</application>.</para>
-<indexterm zone="ruby-package libruby">
+<indexterm zone="ruby libruby">
 <primary sortas="c-libruby">libruby.so</primary></indexterm>
 </listitem>
 </varlistentry>

Modified: trunk/BOOK/general/sysutils/gpm.xml
===================================================================
--- trunk/BOOK/general/sysutils/gpm.xml	2005-01-25 16:02:00 UTC (rev 3335)
+++ trunk/BOOK/general/sysutils/gpm.xml	2005-01-25 16:48:26 UTC (rev 3336)
@@ -11,15 +11,15 @@
 <!ENTITY gpm-time "0.09 SBU">
 ]>
 
-<sect1 id="gpm-package" xreflabel="GPM-&gpm-version;">
+<sect1 id="gpm" xreflabel="GPM-&gpm-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
 <date>$Date$</date>
 </sect1info>
 <?dbhtml filename="gpm.html"?>
 <title><acronym>GPM</acronym>-&gpm-version;</title>
-<indexterm zone="gpm-package">
-<primary sortas="a-GPM-package">GPM</primary></indexterm>
+<indexterm zone="gpm">
+<primary sortas="a-GPM">GPM</primary></indexterm>
 
 <sect2>
 <title>Introduction to <application><acronym>GPM</acronym></application></title>
@@ -90,7 +90,7 @@
 <title>Configuring <application><acronym>GPM</acronym></application></title>
 
 <sect3 id="gpm-init"><title>gpm init.d script</title>
-<indexterm zone="gpm-package gpm-init">
+<indexterm zone="gpm gpm-init">
 <primary sortas="f-gpm-init">gpm</primary></indexterm>
 
 <para>Install the <filename>/etc/rc.d/init.d/gpm</filename>
@@ -120,11 +120,11 @@
 # End /etc/sysconfig/mouse
 <command>EOF</command></userinput></screen>
 
-<indexterm zone="gpm-package gpm-config">
+<indexterm zone="gpm gpm-config">
 <primary sortas="e-AA.gpm-root">~/.gpm-root</primary></indexterm>
-<indexterm zone="gpm-package gpm-config">
+<indexterm zone="gpm gpm-config">
 <primary sortas="e-etc-gpm-root.conf">/etc/gpm-root.conf</primary></indexterm>
-<indexterm zone="gpm-package gpm-config">
+<indexterm zone="gpm gpm-config">
 <primary sortas="e-etc-sysconfig-mouse">/etc/sysconfig/mouse</primary>
 </indexterm>
 </sect3>
@@ -167,16 +167,16 @@
 <varlistentry id="disable-paste">
 <term><command>disable-paste</command></term>
 <listitem><para>is a security mechanism used to disable the paste buffer.</para>
-<indexterm zone="gpm-package disable-paste">
+<indexterm zone="gpm disable-paste">
 <primary sortas="b-disable-paste">disable-paste</primary></indexterm>
 </listitem>
 </varlistentry>
 
-<varlistentry id="gpm">
+<varlistentry id="gpm-prog">
 <term><command>gpm</command></term>
 <listitem><para>is a cut and paste utility and mouse server for virtual 
 consoles.</para>
-<indexterm zone="gpm-package gpm">
+<indexterm zone="gpm gpm-prog">
 <primary sortas="b-gpm">gpm</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -185,7 +185,7 @@
 <term><command>gpm-root</command></term>
 <listitem><para>is a default handler for <command>gpm</command>. It is used to 
 draw menus on the root window.</para>
-<indexterm zone="gpm-package gpm-root">
+<indexterm zone="gpm gpm-root">
 <primary sortas="b-gpm-root">gpm-root</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -194,7 +194,7 @@
 <term><command>hltest</command></term>
 <listitem><para>is a simple sample application using the high-level library, 
 meant to be read by programmers trying to use the high-level library.</para>
-<indexterm zone="gpm-package hltest">
+<indexterm zone="gpm hltest">
 <primary sortas="b-hltest">hltest</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -202,7 +202,7 @@
 <varlistentry id="mev">
 <term><command>mev</command></term>
 <listitem><para>is a program to report mouse events.</para>
-<indexterm zone="gpm-package mev">
+<indexterm zone="gpm mev">
 <primary sortas="b-mev">mev</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -211,7 +211,7 @@
 <term><command>mouse-test</command></term>
 <listitem><para>is a tool for determining the mouse type and device it's 
 attached to.</para>
-<indexterm zone="gpm-package mouse-test">
+<indexterm zone="gpm mouse-test">
 <primary sortas="b-mouse-test">mouse-test</primary></indexterm>
 </listitem>
 </varlistentry>

Modified: trunk/BOOK/general/sysutils/mc.xml
===================================================================
--- trunk/BOOK/general/sysutils/mc.xml	2005-01-25 16:02:00 UTC (rev 3335)
+++ trunk/BOOK/general/sysutils/mc.xml	2005-01-25 16:48:26 UTC (rev 3336)
@@ -49,7 +49,7 @@
 </sect4>
 
 <sect4><title>Optional</title>
-<para><xref linkend="gpm-package"/>, 
+<para><xref linkend="gpm"/>, 
 X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>),
 <xref linkend="samba3"/>,
 <xref linkend="slang"/>,

Modified: trunk/BOOK/kde/add/kdeaddons.xml
===================================================================
--- trunk/BOOK/kde/add/kdeaddons.xml	2005-01-25 16:02:00 UTC (rev 3335)
+++ trunk/BOOK/kde/add/kdeaddons.xml	2005-01-25 16:48:26 UTC (rev 3336)
@@ -52,7 +52,7 @@
 <xref linkend="kdepim"/>, 
 <xref linkend="kdegames"/>, 
 <xref linkend="db"/>, 
-<xref linkend="xmms-package"/> and 
+<xref linkend="xmms"/> and 
 <xref linkend="sdl"/></para>
 </sect4>
 </sect3>

Modified: trunk/BOOK/kde/add/kdebindings.xml
===================================================================
--- trunk/BOOK/kde/add/kdebindings.xml	2005-01-25 16:02:00 UTC (rev 3335)
+++ trunk/BOOK/kde/add/kdebindings.xml	2005-01-25 16:48:26 UTC (rev 3336)
@@ -59,7 +59,7 @@
 <para><xref linkend="GLib"/>, 
 <xref linkend="GTK"/>,
 <xref linkend="python"/>,
-<xref linkend="ruby-package"/>,
+<xref linkend="ruby"/>,
 <xref linkend="j2sdk"/>,
 <xref linkend="mozilla"/>, 
 <ulink url="http://go-mono.org">Mono</ulink>, 

Modified: trunk/BOOK/kde/add/kdemultimedia.xml
===================================================================
--- trunk/BOOK/kde/add/kdemultimedia.xml	2005-01-25 16:02:00 UTC (rev 3335)
+++ trunk/BOOK/kde/add/kdemultimedia.xml	2005-01-25 16:48:26 UTC (rev 3336)
@@ -51,7 +51,7 @@
 
 <sect4><title>Optional</title>
 <para><xref linkend="cdparanoia-package"/>, 
-<xref linkend="lame-package"/>,
+<xref linkend="lame"/>,
 <xref linkend="audiofile"/>,
 <xref linkend="libogg"/>,
 <xref linkend="libvorbis"/>,

Modified: trunk/BOOK/kde/add/kdenetwork.xml
===================================================================
--- trunk/BOOK/kde/add/kdenetwork.xml	2005-01-25 16:02:00 UTC (rev 3335)
+++ trunk/BOOK/kde/add/kdenetwork.xml	2005-01-25 16:48:26 UTC (rev 3336)
@@ -51,7 +51,7 @@
 
 <sect4><title>Optional</title>
 <para><xref linkend="ppp"/>, 
-<xref linkend="xmms-package"/>, 
+<xref linkend="xmms"/>, 
 <ulink url="http://www.openslp.org/">OpenSLP</ulink>, 
 <ulink 
 url="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html">Wireless 

Modified: trunk/BOOK/multimedia/audioutils/lame.xml
===================================================================
--- trunk/BOOK/multimedia/audioutils/lame.xml	2005-01-25 16:02:00 UTC (rev 3335)
+++ trunk/BOOK/multimedia/audioutils/lame.xml	2005-01-25 16:48:26 UTC (rev 3336)
@@ -10,14 +10,14 @@
   <!ENTITY lame-time          "0.39 SBU">
 ]>
 
-<sect1 id="lame-package" xreflabel="LAME-&lame-version;">
+<sect1 id="lame" xreflabel="LAME-&lame-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
 <date>$Date$</date>
 </sect1info>
 <?dbhtml filename="lame.html"?>
 <title>LAME-&lame-version;</title>
-<indexterm zone="lame-package">
+<indexterm zone="lame">
 <primary sortas="a-LAME">LAME</primary></indexterm>
 
 <sect2>
@@ -99,11 +99,11 @@
 <bridgehead renderas="sect3">Short Descriptions</bridgehead>
 <?dbfo list-presentation="list"?>
 
-<varlistentry id="lame">
+<varlistentry id="lame-prog">
 <term><command>lame</command></term>
 <listitem><para>creates <acronym>MP3</acronym> audio files from raw 
 <acronym>PCM</acronym> or <filename>.wav</filename> data.</para>
-<indexterm zone="lame-package lame">
+<indexterm zone="lame lame-prog">
 <primary sortas="b-lame">lame</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -112,7 +112,7 @@
 <term><command>mp3rtp</command></term>
 <listitem><para>is used to encode <acronym>MP3</acronym> with 
 <acronym>RTP</acronym> streaming of the output.</para>
-<indexterm zone="lame-package mp3rtp">
+<indexterm zone="lame mp3rtp">
 <primary sortas="b-mp3rtp">mp3rtp</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -123,7 +123,7 @@
 graphical <acronym>MP3</acronym> frame analyzer used for debugging, 
 development and studying <acronym>MP3</acronym> frames produced by any 
 encoder.</para>
-<indexterm zone="lame-package mp3x">
+<indexterm zone="lame mp3x">
 <primary sortas="b-mp3x">mp3x</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -133,7 +133,7 @@
 <listitem><para>libraries provide the functions necessary to convert 
 raw <acronym>PCM</acronym> and <acronym>WAV</acronym> files to 
 <acronym>MP3</acronym> files.</para>
-<indexterm zone="lame-package libmp3lame">
+<indexterm zone="lame libmp3lame">
 <primary sortas="c-libmp3lame">libmp3lame.[so,a]</primary></indexterm>
 </listitem>
 </varlistentry>

Modified: trunk/BOOK/multimedia/audioutils/xmms.xml
===================================================================
--- trunk/BOOK/multimedia/audioutils/xmms.xml	2005-01-25 16:02:00 UTC (rev 3335)
+++ trunk/BOOK/multimedia/audioutils/xmms.xml	2005-01-25 16:48:26 UTC (rev 3336)
@@ -10,14 +10,14 @@
   <!ENTITY XMMS-time          "0.84 SBU">
 ]>
 
-<sect1 id="xmms-package" xreflabel="XMMS-&XMMS-version;">
+<sect1 id="xmms" xreflabel="XMMS-&XMMS-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
 <date>$Date$</date>
 </sect1info>
 <?dbhtml filename="xmms.html"?>
 <title>XMMS-&XMMS-version;</title>
-<indexterm zone="xmms-package">
+<indexterm zone="xmms">
 <primary sortas="a-XMMS">XMMS</primary></indexterm>
 
 <sect2>
@@ -77,7 +77,7 @@
 
 <sect3 id="xmms-config-config"><title>Config files</title>
 <para><filename>~/.xmms/config</filename></para>
-<indexterm zone="xmms-package xmms-config-config">
+<indexterm zone="xmms xmms-config-config">
 <primary sortas="e-AA.xmms-config">~/.xmms/config</primary>
 </indexterm>
 </sect3>
@@ -111,7 +111,7 @@
 <bridgehead renderas="sect3">Short Descriptions</bridgehead>
 <?dbfo list-presentation="list"?>
 
-<varlistentry id="xmms">
+<varlistentry id="xmms-prog">
 <term><command>xmms</command></term>
 <listitem><para> (an acronym for X MultiMedia System) is a program comparable 
 in function with <application>WinAMP</application>. Its main function is 
@@ -119,7 +119,7 @@
 <filename>MP3</filename>. It can be extended with plugins to play a number of 
 other audio or video formats. Its look can be customized with 
 <application>WinAMP</application> style skins.</para>
-<indexterm zone="xmms-package xmms">
+<indexterm zone="xmms xmms-prog">
 <primary sortas="b-xmms">xmms</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -128,7 +128,7 @@
 <term><command>xmms-config</command></term>
 <listitem><para>is used by other programs which need to link with 
 <command>xmms</command> to retrieve the library and include paths.</para>
-<indexterm zone="xmms-package xmms-config">
+<indexterm zone="xmms xmms-config">
 <primary sortas="b-xmms-config">xmms-config</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -138,7 +138,7 @@
 <listitem><para>is a dock applet for the 
 <application>Window Maker</application> window manager. From the applet you 
 can start and control <command>xmms</command>.</para>
-<indexterm zone="xmms-package wmxmms">
+<indexterm zone="xmms wmxmms">
 <primary sortas="b-wmxmms">wmxmms</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -148,7 +148,7 @@
 <listitem><para>contains graphics and playback functions used by 
 <command>xmms</command>. These functions can also be utilized by other 
 packages.</para>
-<indexterm zone="xmms-package libxmms">
+<indexterm zone="xmms libxmms">
 <primary sortas="c-libxmms">libxmms.[so,a]</primary></indexterm>
 </listitem>
 </varlistentry>

Modified: trunk/BOOK/multimedia/cdwriteutils/cdrdao.xml
===================================================================
--- trunk/BOOK/multimedia/cdwriteutils/cdrdao.xml	2005-01-25 16:02:00 UTC (rev 3335)
+++ trunk/BOOK/multimedia/cdwriteutils/cdrdao.xml	2005-01-25 16:48:26 UTC (rev 3336)
@@ -56,7 +56,7 @@
 
 <sect3><title><application>Cdrdao</application> dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="lame-package"/> (required to build 
+<para><xref linkend="lame"/> (required to build 
 <command>toc2mp3</command>) and 
 <ulink url="http://www.polhode.com/pccts.html">PCCTS</ulink></para>
 </sect4>
@@ -163,7 +163,7 @@
 <term><command>toc2mp3</command></term>
 <listitem><para>converts an audio <acronym>CD</acronym>
 disk image (<filename>.toc</filename> file) to MP3 files (requires 
-<xref linkend="lame-package"/> to build).</para>
+<xref linkend="lame"/> to build).</para>
 <indexterm zone="cdrdao-package toc2mp3">
 <primary sortas="b-toc2mp3">toc2mp3</primary></indexterm>
 </listitem>

Modified: trunk/BOOK/multimedia/libdriv/flac.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/flac.xml	2005-01-25 16:02:00 UTC (rev 3335)
+++ trunk/BOOK/multimedia/libdriv/flac.xml	2005-01-25 16:48:26 UTC (rev 3336)
@@ -40,7 +40,7 @@
 dependencies</title>
 <sect4><title>Optional</title>
 <para><xref linkend="libogg"/>, 
-<xref linkend="xmms-package"/>, 
+<xref linkend="xmms"/>, 
 <xref linkend="NASM"/>, 
 <xref linkend="docbook-utils"/>, 
 <xref linkend="doxygen"/> and 

Modified: trunk/BOOK/multimedia/libdriv/gst-plugins.xml
===================================================================
--- trunk/BOOK/multimedia/libdriv/gst-plugins.xml	2005-01-25 16:02:00 UTC (rev 3335)
+++ trunk/BOOK/multimedia/libdriv/gst-plugins.xml	2005-01-25 16:48:26 UTC (rev 3336)
@@ -80,7 +80,7 @@
 <xref linkend="flac"/>, 
 <ulink url="http://kbs.cs.tu-berlin.de/~jutta/toast.html">GSM</ulink>, 
 <ulink url="http://jackit.sourceforge.net/">JACK</ulink>, 
-<xref linkend="lame-package"/>, 
+<xref linkend="lame"/>, 
 <xref linkend="liba52"/>, 
 <ulink url="http://www.videolan.org/libdca.html">libdts</ulink>, 
 <xref linkend="libmad"/> (and 

Modified: trunk/BOOK/multimedia/videoutils/avifile.xml
===================================================================
--- trunk/BOOK/multimedia/videoutils/avifile.xml	2005-01-25 16:02:00 UTC (rev 3335)
+++ trunk/BOOK/multimedia/videoutils/avifile.xml	2005-01-25 16:48:26 UTC (rev 3336)
@@ -67,7 +67,7 @@
 <xref linkend="libogg"/>, 
 <xref linkend="libvorbis"/>, 
 <xref linkend="liba52"/>, 
-<xref linkend="lame-package"/>, 
+<xref linkend="lame"/>, 
 <xref linkend="libmad"/>, 
 <xref linkend="xvid"/>, 
 <ulink url="http://www.audiocoding.com/modules/mydownloads/">FAAD2</ulink>, 

Modified: trunk/BOOK/multimedia/videoutils/ffmpeg.xml
===================================================================
--- trunk/BOOK/multimedia/videoutils/ffmpeg.xml	2005-01-25 16:02:00 UTC (rev 3335)
+++ trunk/BOOK/multimedia/videoutils/ffmpeg.xml	2005-01-25 16:48:26 UTC (rev 3336)
@@ -49,7 +49,7 @@
 <sect3><title><application>FFmpeg</application> dependencies</title>
 <sect4><title>Optional</title>
 <para><xref linkend="libvorbis"/>, 
-<xref linkend="lame-package"/>, 
+<xref linkend="lame"/>, 
 <xref linkend="liba52"/>, 
 <xref linkend="imlib2"/>, 
 X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>), 

Modified: trunk/BOOK/multimedia/videoutils/mplayer.xml
===================================================================
--- trunk/BOOK/multimedia/videoutils/mplayer.xml	2005-01-25 16:02:00 UTC (rev 3335)
+++ trunk/BOOK/multimedia/videoutils/mplayer.xml	2005-01-25 16:48:26 UTC (rev 3336)
@@ -110,7 +110,7 @@
 <xref linkend="esound"/>, 
 <xref linkend="nas"/>, 
 <xref linkend="sdl"/> (also used for video output), 
-<xref linkend="xmms-package"/>, 
+<xref linkend="xmms"/>, 
 <ulink url="http://0pointer.de/lennart/projects/polypaudio/">polypaudio</ulink>, 
 <ulink url="http://bio2jack.sourceforge.net/">bio2jack</ulink> (requires 
 <ulink url="http://jackit.sourceforge.net/">JACK</ulink>)</para>
@@ -142,7 +142,7 @@
 <xref linkend="xvid"/>, 
 <xref linkend="LZO"/>, 
 <xref linkend="libmad"/>, 
-<xref linkend="lame-package"/>, 
+<xref linkend="lame"/>, 
 <xref linkend="libfame"/>, 
 <ulink url="http://www.theora.org/">Theora</ulink>, 
 <ulink url="http://www.xiph.org/ogg/vorbis/index.html">Tremor</ulink>, 

Modified: trunk/BOOK/multimedia/videoutils/transcode.xml
===================================================================
--- trunk/BOOK/multimedia/videoutils/transcode.xml	2005-01-25 16:02:00 UTC (rev 3335)
+++ trunk/BOOK/multimedia/videoutils/transcode.xml	2005-01-25 16:48:26 UTC (rev 3336)
@@ -67,7 +67,7 @@
 </sect4>
 
 <sect4><title>Recommended</title>
-<para><xref linkend="NASM"/> and <xref linkend="lame-package"/></para>
+<para><xref linkend="NASM"/> and <xref linkend="lame"/></para>
 </sect4>
 
 <sect4><title>Optional</title>

Modified: trunk/BOOK/postlfs/editors/vim.xml
===================================================================
--- trunk/BOOK/postlfs/editors/vim.xml	2005-01-25 16:02:00 UTC (rev 3335)
+++ trunk/BOOK/postlfs/editors/vim.xml	2005-01-25 16:48:26 UTC (rev 3336)
@@ -67,8 +67,8 @@
 <xref linkend="lesstif"/>, 
 <xref linkend="python"/>, 
 <xref linkend="tcl"/>, 
-<xref linkend="ruby-package"/> 
-and <xref linkend="gpm-package"/>
+<xref linkend="ruby"/> 
+and <xref linkend="gpm"/>
 </para></sect4>
 </sect3>
 

Modified: trunk/BOOK/postlfs/security/cyrus-sasl.xml
===================================================================
--- trunk/BOOK/postlfs/security/cyrus-sasl.xml	2005-01-25 16:02:00 UTC (rev 3335)
+++ trunk/BOOK/postlfs/security/cyrus-sasl.xml	2005-01-25 16:48:26 UTC (rev 3336)
@@ -63,7 +63,7 @@
 <xref linkend="postgresql"/>, 
 <xref linkend="db"/>, 
 <xref linkend="gdbm"/>, 
-<xref linkend="courier-package"/>, 
+<xref linkend="courier"/>, 
 <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>, 
 <ulink url="http://sqlite.org/">SQLite</ulink> and 
 <ulink url="http://dmalloc.com/">Dmalloc</ulink></para>

Modified: trunk/BOOK/server/mail/courier.xml
===================================================================
--- trunk/BOOK/server/mail/courier.xml	2005-01-25 16:02:00 UTC (rev 3335)
+++ trunk/BOOK/server/mail/courier.xml	2005-01-25 16:48:26 UTC (rev 3336)
@@ -9,18 +9,17 @@
 <!ENTITY courier-size "4.3 MB">
 <!ENTITY courier-buildsize "102 MB">
 <!ENTITY courier-time "2.62 SBU">
-
 ]>
 
-<sect1 id="courier-package" xreflabel="Courier-&courier-version;">
+<sect1 id="courier" xreflabel="Courier-&courier-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
 <date>$Date$</date>
 </sect1info>
 <?dbhtml filename="courier.html"?>
 <title>Courier-&courier-version;</title>
-<indexterm zone="courier-package">
-<primary sortas="a-courier-package">Courier MTA</primary></indexterm>
+<indexterm zone="courier">
+<primary sortas="a-Courier">Courier MTA</primary></indexterm>
 
 <sect2>
 <title>Introduction to <application>Courier</application></title>
@@ -202,7 +201,7 @@
 
 <sect2 id="etc-courier-star">
 <title>Configuring <application>Courier</application></title>
-<indexterm zone="courier-package etc-courier-star">
+<indexterm zone="courier etc-courier-star">
 <primary sortas="e-etc-courier-star">/etc/courier/*</primary></indexterm>
 
 <sect3><title>Configuration Files</title>
@@ -387,7 +386,7 @@
 <application>Courier</application> server at boot, install 
 the <filename>/etc/rc.d/init.d/courier</filename> bootscript included in the
 <xref linkend="intro-important-bootscripts"/> package.</para>
-<indexterm zone="courier-package courier-init">
+<indexterm zone="courier courier-init">
 <primary sortas="f-courier-init">courier</primary></indexterm>
 
 <screen><userinput role="root"><command>make install-courier</command></userinput></screen>
@@ -529,16 +528,16 @@
 <varlistentry id="cancelmsg">
 <term><command>cancelmsg</command></term>
 <listitem><para>removes a message from the mail queue.</para>
-<indexterm zone="courier-package cancelmsg">
+<indexterm zone="courier cancelmsg">
 <primary sortas="b-cancelmsg">cancelmsg</primary></indexterm>
 </listitem>
 </varlistentry>
 
-<varlistentry id="courier">
+<varlistentry id="courier-prog">
 <term><command>courier</command></term>
-<listitem><para>administrative command used to control the 
+<listitem><para>is an administrative command used to control the 
 <application>Courier</application> scheduling engine.</para>
-<indexterm zone="courier-package courier">
+<indexterm zone="courier courier-prog">
 <primary sortas="b-courier">courier</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -546,7 +545,7 @@
 <varlistentry id="courierfax">
 <term><command>courierfax</command></term>
 <listitem><para>sends email messages by fax.</para>
-<indexterm zone="courier-package courierfax">
+<indexterm zone="courier courierfax">
 <primary sortas="b-courierfax">courierfax</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -555,7 +554,7 @@
 <term><command>courierfilter</command></term>
 <listitem><para>starts and stops all mail filters installed by
 <command>filterctl</command>.</para>
-<indexterm zone="courier-package courierfilter">
+<indexterm zone="courier courierfilter">
 <primary sortas="b-courierfilter">courierfilter</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -563,7 +562,7 @@
 <varlistentry id="courierldapaliasd">
 <term><command>courierldapaliasd</command></term>
 <listitem><para>supports mail address aliasing using an LDAP directory.</para>
-<indexterm zone="courier-package courierldapaliasd">
+<indexterm zone="courier courierldapaliasd">
 <primary sortas="b-courierldapaliasd">courierldapaliasd</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -573,7 +572,7 @@
 <listitem><para>captures error messages from other
 <application>Courier</application> applications and forwards them to
 the system logger.</para>
-<indexterm zone="courier-package courierlogger">
+<indexterm zone="courier courierlogger">
 <primary sortas="b-courierlogger">courierlogger</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -581,16 +580,16 @@
 <varlistentry id="couriermlm">
 <term><command>couriermlm</command></term>
 <listitem><para>sets up, maintains, and manages mailing lists.</para>
-<indexterm zone="courier-package couriermlm">
+<indexterm zone="courier couriermlm">
 <primary sortas="b-couriermlm">couriermlm</primary></indexterm>
 </listitem>
 </varlistentry>
 
 <varlistentry id="courierperlfilter">
 <term><command>courierperlfilter</command></term>
-<listitem><para>a sample filter written in 
+<listitem><para>is a sample filter written in 
 <application>Perl</application>.</para>
-<indexterm zone="courier-package courierperlfilter">
+<indexterm zone="courier courierperlfilter">
 <primary sortas="b-courierperlfilter">courierperlfilter</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -599,7 +598,7 @@
 <term><command>courierpop3d</command></term>
 <listitem><para>is a <application>Courier</application> 
 <acronym>POP</acronym>3 server.</para>
-<indexterm zone="courier-package courierpop3d">
+<indexterm zone="courier courierpop3d">
 <primary sortas="b-courierpop3d">courierpop3d</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -608,7 +607,7 @@
 <term><command>courierpop3login</command></term>
 <listitem><para>reads the <acronym>POP</acronym>3 userid and password and 
 passes them to the authentication modules.</para>
-<indexterm zone="courier-package courierpop3login">
+<indexterm zone="courier courierpop3login">
 <primary sortas="b-courierpop3login">courierpop3login</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -618,7 +617,7 @@
 <listitem><para>accepts incoming network connections, and runs other
 <application>Courier</application> programs after establishing each network 
 connection.</para>
-<indexterm zone="courier-package couriertcpd">
+<indexterm zone="courier couriertcpd">
 <primary sortas="b-couriertcpd">couriertcpd</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -627,7 +626,7 @@
 <term><command>couriertls</command></term>
 <listitem><para>is used by applications to encrypt a network connection
 using <acronym>SSL</acronym>/<acronym>TLS</acronym>.</para>
-<indexterm zone="courier-package couriertls">
+<indexterm zone="courier couriertls">
 <primary sortas="b-couriertls">couriertls</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -636,7 +635,7 @@
 <term><command>dotforward</command></term>
 <listitem><para>is a compatibility module that reads forwarding
 instructions in <filename>$HOME/.forward</filename>.</para>
-<indexterm zone="courier-package dotforward">
+<indexterm zone="courier dotforward">
 <primary sortas="b-dotforward">dotforward</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -646,7 +645,7 @@
 <listitem><para>is a threaded filter that tries to block junk E-mail by
 attempting to detect multiple copies of the same message, which are
 rejected.</para>
-<indexterm zone="courier-package dupfilter">
+<indexterm zone="courier dupfilter">
 <primary sortas="b-dupfilter">dupfilter</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -654,7 +653,7 @@
 <varlistentry id="esmtpd">
 <term><command>esmtpd</command></term>
 <listitem><para>is a control script for courieresmtpd.</para>
-<indexterm zone="courier-package esmtpd">
+<indexterm zone="courier esmtpd">
 <primary sortas="b-esmtpd">esmtpd</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -663,7 +662,7 @@
 <term><command>esmtpd-msa</command></term>
 <listitem><para>is a control script for courieresmtpd, but adds message
 submission port 587 for the <acronym>MSA</acronym> protocol.</para>
-<indexterm zone="courier-package esmtpd-msa">
+<indexterm zone="courier esmtpd-msa">
 <primary sortas="b-esmtpd-msa">esmtpd-msa</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -671,7 +670,7 @@
 <varlistentry id="filterctl">
 <term><command>filterctl</command></term>
 <listitem><para>installs or uninstalls global mail filters.</para>
-<indexterm zone="courier-package filterctl">
+<indexterm zone="courier filterctl">
 <primary sortas="b-filterctl">filterctl</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -681,7 +680,7 @@
 <listitem><para>is the 
 <application>Courier</application>-<acronym>IMAP</acronym> 
 server.</para>
-<indexterm zone="courier-package imapd">
+<indexterm zone="courier imapd">
 <primary sortas="b-imapd">imapd</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -689,7 +688,7 @@
 <varlistentry id="lockmail">
 <term><command>lockmail</command></term>
 <listitem><para>is a helper utility for locking  mailbox files.</para>
-<indexterm zone="courier-package lockmail">
+<indexterm zone="courier lockmail">
 <primary sortas="b-lockmail">lockmail</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -697,7 +696,7 @@
 <varlistentry id="mailbot">
 <term><command>mailbot</command></term>
 <listitem><para>is a <acronym>MIME</acronym>-aware autoresponder utility.</para>
-<indexterm zone="courier-package mailbot">
+<indexterm zone="courier mailbot">
 <primary sortas="b-mailbot">mailbot</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -705,7 +704,7 @@
 <varlistentry id="maildiracl">
 <term><command>maildiracl</command></term>
 <listitem><para>manages access control lists.</para>
-<indexterm zone="courier-package maildiracl">
+<indexterm zone="courier maildiracl">
 <primary sortas="b-maildiracl">maildiracl</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -715,7 +714,7 @@
 <listitem><para>modifies 
 <application>Courier</application>-<acronym>IMAP</acronym> compatible maildir 
 message keywords.</para>
-<indexterm zone="courier-package maildirkw">
+<indexterm zone="courier maildirkw">
 <primary sortas="b-maildirkw">maildirkw</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -723,7 +722,7 @@
 <varlistentry id="maildirmake">
 <term><command>maildirmake</command></term>
 <listitem><para>creates maildirs, and maildir folders.</para>
-<indexterm zone="courier-package maildirmake">
+<indexterm zone="courier maildirmake">
 <primary sortas="b-maildirmake">maildirmake</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -732,7 +731,7 @@
 <term><command>maildrop</command></term>
 <listitem><para>is a replacement local mail delivery agent that includes a 
 mail filtering language.</para>
-<indexterm zone="courier-package maildrop">
+<indexterm zone="courier maildrop">
 <primary sortas="b-maildrop">maildrop</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -741,7 +740,7 @@
 <term><command>mailq</command></term>
 <listitem><para>displays a list of all messages that have not been
 delivered yet.</para>
-<indexterm zone="courier-package mailq-courier">
+<indexterm zone="courier mailq-courier">
 <primary sortas="b-mailq">mailq</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -751,7 +750,7 @@
 <listitem><para>builds a list of domains to accept mail for, from the
 <filename class="directory">/etc/courier/esmtpacceptmailfor.dir</filename> 
 directory.</para>
-<indexterm zone="courier-package makeacceptmailfor">
+<indexterm zone="courier makeacceptmailfor">
 <primary sortas="b-makeacceptmailfor">makeacceptmailfor</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -760,7 +759,7 @@
 <term><command>makealiases</command></term>
 <listitem><para>builds an alias database from one or more plain text
 source files.</para>
-<indexterm zone="courier-package makealiases">
+<indexterm zone="courier makealiases">
 <primary sortas="b-makealiases">makealiases</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -769,7 +768,7 @@
 <term><command>makedat</command></term>
 <listitem><para>is a utility to create <application>GDBM</application> or 
 <application>DB</application> files from plain text files.</para>
-<indexterm zone="courier-package makedat">
+<indexterm zone="courier makedat">
 <primary sortas="b-makedat">makedat</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -778,7 +777,7 @@
 <term><command>makehosteddomains</command></term>
 <listitem><para>rebuilds the contents of the hosteddomains database from the 
 contents of <filename>/tools/etc/courier/hosteddomains</filename>.</para>
-<indexterm zone="courier-package makehosteddomains">
+<indexterm zone="courier makehosteddomains">
 <primary sortas="b-makehosteddomains">makehosteddomains</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -787,7 +786,7 @@
 <term><command>makemime</command></term>
 <listitem><para>creates <acronym>MIME</acronym>-formatted messages from one 
 or more files.</para>
-<indexterm zone="courier-package makemime">
+<indexterm zone="courier makemime">
 <primary sortas="b-makemime">makemime</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -796,7 +795,7 @@
 <term><command>makepercentrelay</command></term>
 <listitem><para>builds a list of %-relayed domains from the 
 <filename class="directory">percentrelay.dir</filename> directory.</para>
-<indexterm zone="courier-package makepercentrelay">
+<indexterm zone="courier makepercentrelay">
 <primary sortas="b-makepercentrelay">makepercentrelay</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -806,7 +805,7 @@
 <listitem><para>builds <acronym>ESMTP</acronym> server access files from the 
 <filename class="directory">/etc/courier/smtpaccess</filename> 
 directory.</para>
-<indexterm zone="courier-package makesmtpaccess">
+<indexterm zone="courier makesmtpaccess">
 <primary sortas="b-makesmtpaccess">makesmtpaccess</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -816,7 +815,7 @@
 <listitem><para>builds <acronym>ESMTP</acronym> server access files from the 
 <filename class="directory">/etc/courier/smtpaccess</filename> directory. 
 This esmtp list is for the <acronym>MSA</acronym> protocol.</para>
-<indexterm zone="courier-package makesmtpaccess-msa">
+<indexterm zone="courier makesmtpaccess-msa">
 <primary sortas="b-makesmtpaccess-msa">makesmtpaccess-msa</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -825,7 +824,7 @@
 <term><command>makeuserdb</command></term>
 <listitem><para>builds a user/password db from the contents
 of <filename class="directory">/tools/etc/courier/userdb</filename>.</para>
-<indexterm zone="courier-package makeuserdb">
+<indexterm zone="courier makeuserdb">
 <primary sortas="b-makeuserdb">makeuserdb</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -834,7 +833,7 @@
 <term><command>mimegpg</command></term>
 <listitem><para>signs, encrypts, or decrypts <acronym>MIME</acronym>-formatted 
 email messages using <application>GnuPG</application>.</para>
-<indexterm zone="courier-package mimegpg">
+<indexterm zone="courier mimegpg">
 <primary sortas="b-mimegpg">mimegpg</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -843,7 +842,7 @@
 <term><command>mkesmtpdcert</command></term>
 <listitem><para>creates a secure <acronym>SMTP</acronym> test 
 certificate.</para>
-<indexterm zone="courier-package mkesmtpdcert">
+<indexterm zone="courier mkesmtpdcert">
 <primary sortas="b-mkesmtpdcert">mkesmtpdcert</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -852,7 +851,7 @@
 <term><command>mkimapdcert</command></term>
 <listitem><para>creates a secure <acronym>IMAP</acronym> test
 certificate.</para>
-<indexterm zone="courier-package mkimapdcert">
+<indexterm zone="courier mkimapdcert">
 <primary sortas="b-mkimapdcert">mkimapdcert</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -861,7 +860,7 @@
 <term><command>mkpop3dcert</command></term>
 <listitem><para>creates a secure <acronym>POP3</acronym> test
 certificate.</para>
-<indexterm zone="courier-package mkpop3dcert">
+<indexterm zone="courier mkpop3dcert">
 <primary sortas="b-mkpop3dcert">mkpop3dcert</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -870,7 +869,7 @@
 <term><command>pop3d</command></term>
 <listitem><para>is a wrapper script for <command>couriertcpd</command> to
 start and stop the <acronym>POP3</acronym> service.</para>
-<indexterm zone="courier-package pop3d">
+<indexterm zone="courier pop3d">
 <primary sortas="b-pop3d">pop3d</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -880,7 +879,7 @@
 <listitem><para>is a wrapper script for <command>couriertcpd</command> to
 start and stop the <acronym>POP3</acronym> over <acronym>SSL</acronym> 
 service.</para>
-<indexterm zone="courier-package pop3d-ssl">
+<indexterm zone="courier pop3d-ssl">
 <primary sortas="b-pop3d-ssl">pop3d-ssl</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -889,7 +888,7 @@
 <term><command>preline</command></term>
 <listitem><para>prepends legacy <filename>mbox</filename> headers to mail 
 messages.</para>
-<indexterm zone="courier-package preline">
+<indexterm zone="courier preline">
 <primary sortas="b-preline">preline</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -898,7 +897,7 @@
 <term><command>reformail</command></term>
 <listitem><para>reads a message on standard input, reformats it in some
 way, and writes the message to standard output.</para>
-<indexterm zone="courier-package reformail">
+<indexterm zone="courier reformail">
 <primary sortas="b-reformail">reformail</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -907,7 +906,7 @@
 <term><command>reformime</command></term>
 <listitem><para>is a utility for reformatting <acronym>MIME</acronym> 
 messages.</para>
-<indexterm zone="courier-package reformime">
+<indexterm zone="courier reformime">
 <primary sortas="b-reformime">reformime</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -916,7 +915,7 @@
 <term><command>sendmail</command></term>
 <listitem><para>reads an email message and delivers the message to its
 recipients.</para>
-<indexterm zone="courier-package sendmail-courier">
+<indexterm zone="courier sendmail-courier">
 <primary sortas="b-sendmail">sendmail</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -925,7 +924,7 @@
 <term><command>submit</command></term>
 <listitem><para>submits messages to <application>Courier</application> for 
 processing.</para>
-<indexterm zone="courier-package submit">
+<indexterm zone="courier submit">
 <primary sortas="b-submit">submit</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -934,7 +933,7 @@
 <term><command>testmxlookup</command></term>
 <listitem><para>lists the names and <acronym>IP</acronym> addresses of mail 
 relays that receive mail for the domain.</para>
-<indexterm zone="courier-package testmxlookup">
+<indexterm zone="courier testmxlookup">
 <primary sortas="b-testmxlookup">testmxlookup</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -943,7 +942,7 @@
 <term><command>userdb</command></term>
 <listitem><para>is a script to individually manipulate entries in
 <filename>/tools/etc/courier/userdb.</filename></para>
-<indexterm zone="courier-package userdb">
+<indexterm zone="courier userdb">
 <primary sortas="b-userdb">userdb</primary></indexterm>
 </listitem>
 </varlistentry>
@@ -952,7 +951,7 @@
 <term><command>userdbpw</command></term>
 <listitem><para>reads a single line of text on standard input, encrypts
 it, and prints the encrypted result to standard output.</para>
-<indexterm zone="courier-package userdbpw">
+<indexterm zone="courier userdbpw">
 <primary sortas="b-userdbpw">userdbpw</primary></indexterm>
 </listitem>
 </varlistentry>




More information about the blfs-book mailing list