Index: basicnet/mailnews/nail.xml
===================================================================
--- basicnet/mailnews/nail.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
+++ basicnet/mailnews/nail.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
@@ -12,5 +12,5 @@
 ]>
 
-<sect1 id="nail-package" xreflabel="Nail-&nail-version;">
+<sect1 id="nail" xreflabel="Nail-&nail-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
@@ -19,5 +19,5 @@
 <?dbhtml filename="nail.html"?>
 <title>Nail-&nail-version;</title>
-<indexterm zone="nail-package">
+<indexterm zone="nail">
 <primary sortas="a-Nail">Nail</primary></indexterm>
 
@@ -96,9 +96,9 @@
 <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>
@@ -122,9 +122,9 @@
 <?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>
@@ -134,5 +134,5 @@
 <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>
@@ -142,5 +142,5 @@
 <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>
Index: basicnet/netprogs/inetutils.xml
===================================================================
--- basicnet/netprogs/inetutils.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
+++ basicnet/netprogs/inetutils.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
@@ -91,5 +91,5 @@
 <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 
Index: basicnet/netutils/whois.xml
===================================================================
--- basicnet/netutils/whois.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
+++ basicnet/netutils/whois.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="whois-package" xreflabel="Whois-&whois-version;">
+<sect1 id="whois" xreflabel="Whois-&whois-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
@@ -20,5 +20,5 @@
 <?dbhtml filename="whois.html"?>
 <title>Whois-&whois-version;</title>
-<indexterm zone="whois-package">
+<indexterm zone="whois">
 <primary sortas="a-Whois">Whois</primary></indexterm>
 
@@ -71,9 +71,9 @@
 <?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>
Index: basicnet/textweb/links.xml
===================================================================
--- basicnet/textweb/links.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
+++ basicnet/textweb/links.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
@@ -38,5 +38,5 @@
 <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"/>, 
@@ -69,5 +69,5 @@
 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>
Index: basicnet/textweb/w3m.xml
===================================================================
--- basicnet/textweb/w3m.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
+++ basicnet/textweb/w3m.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
@@ -42,5 +42,5 @@
 <sect4><title>Optional</title>
 <para><xref linkend="pkgconfig"/>, 
-<xref linkend="gpm-package"/>, 
+<xref linkend="gpm"/>, 
 <xref linkend="openssl"/>, 
 <xref linkend="imlib"/>, 
Index: general/graphlib/aalib.xml
===================================================================
--- general/graphlib/aalib.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
+++ general/graphlib/aalib.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
@@ -43,5 +43,5 @@
 <para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>), 
 <xref linkend="slang"/> and 
-<xref linkend="gpm-package"/></para>
+<xref linkend="gpm"/></para>
 </sect4>
 </sect3>
Index: general/prog/ruby.xml
===================================================================
--- general/prog/ruby.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
+++ general/prog/ruby.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="ruby-package" xreflabel="Ruby-&ruby-version;">
+<sect1 id="ruby" xreflabel="Ruby-&ruby-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
@@ -20,5 +20,5 @@
 <?dbhtml filename="ruby.html"?>
 <title>Ruby-&ruby-version;</title>
-<indexterm zone="ruby-package">
+<indexterm zone="ruby">
 <primary sortas="a-Ruby">Ruby</primary></indexterm>
 
@@ -97,9 +97,9 @@
 <?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>
@@ -110,5 +110,5 @@
 <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>
@@ -119,5 +119,5 @@
 <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>
@@ -128,5 +128,5 @@
 <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>
@@ -137,5 +137,5 @@
 <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>
Index: general/sysutils/gpm.xml
===================================================================
--- general/sysutils/gpm.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
+++ general/sysutils/gpm.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
@@ -12,5 +12,5 @@
 ]>
 
-<sect1 id="gpm-package" xreflabel="GPM-&gpm-version;">
+<sect1 id="gpm" xreflabel="GPM-&gpm-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
@@ -19,6 +19,6 @@
 <?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>
@@ -91,5 +91,5 @@
 
 <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>
 
@@ -121,9 +121,9 @@
 <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>
@@ -168,14 +168,14 @@
 <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>
@@ -186,5 +186,5 @@
 <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>
@@ -195,5 +195,5 @@
 <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>
@@ -203,5 +203,5 @@
 <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>
@@ -212,5 +212,5 @@
 <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>
Index: general/sysutils/mc.xml
===================================================================
--- general/sysutils/mc.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
+++ general/sysutils/mc.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
@@ -50,5 +50,5 @@
 
 <sect4><title>Optional</title>
-<para><xref linkend="gpm-package"/>, 
+<para><xref linkend="gpm"/>, 
 X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>),
 <xref linkend="samba3"/>,
Index: kde/add/kdeaddons.xml
===================================================================
--- kde/add/kdeaddons.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
+++ kde/add/kdeaddons.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
@@ -53,5 +53,5 @@
 <xref linkend="kdegames"/>, 
 <xref linkend="db"/>, 
-<xref linkend="xmms-package"/> and 
+<xref linkend="xmms"/> and 
 <xref linkend="sdl"/></para>
 </sect4>
Index: kde/add/kdebindings.xml
===================================================================
--- kde/add/kdebindings.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
+++ kde/add/kdebindings.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
@@ -60,5 +60,5 @@
 <xref linkend="GTK"/>,
 <xref linkend="python"/>,
-<xref linkend="ruby-package"/>,
+<xref linkend="ruby"/>,
 <xref linkend="j2sdk"/>,
 <xref linkend="mozilla"/>, 
Index: kde/add/kdemultimedia.xml
===================================================================
--- kde/add/kdemultimedia.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
+++ kde/add/kdemultimedia.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
@@ -52,5 +52,5 @@
 <sect4><title>Optional</title>
 <para><xref linkend="cdparanoia-package"/>, 
-<xref linkend="lame-package"/>,
+<xref linkend="lame"/>,
 <xref linkend="audiofile"/>,
 <xref linkend="libogg"/>,
Index: kde/add/kdenetwork.xml
===================================================================
--- kde/add/kdenetwork.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
+++ kde/add/kdenetwork.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
@@ -52,5 +52,5 @@
 <sect4><title>Optional</title>
 <para><xref linkend="ppp"/>, 
-<xref linkend="xmms-package"/>, 
+<xref linkend="xmms"/>, 
 <ulink url="http://www.openslp.org/">OpenSLP</ulink>, 
 <ulink 
Index: multimedia/audioutils/lame.xml
===================================================================
--- multimedia/audioutils/lame.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
+++ multimedia/audioutils/lame.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
@@ -11,5 +11,5 @@
 ]>
 
-<sect1 id="lame-package" xreflabel="LAME-&lame-version;">
+<sect1 id="lame" xreflabel="LAME-&lame-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
@@ -18,5 +18,5 @@
 <?dbhtml filename="lame.html"?>
 <title>LAME-&lame-version;</title>
-<indexterm zone="lame-package">
+<indexterm zone="lame">
 <primary sortas="a-LAME">LAME</primary></indexterm>
 
@@ -100,9 +100,9 @@
 <?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>
@@ -113,5 +113,5 @@
 <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>
@@ -124,5 +124,5 @@
 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>
@@ -134,5 +134,5 @@
 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>
Index: multimedia/audioutils/xmms.xml
===================================================================
--- multimedia/audioutils/xmms.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
+++ multimedia/audioutils/xmms.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
@@ -11,5 +11,5 @@
 ]>
 
-<sect1 id="xmms-package" xreflabel="XMMS-&XMMS-version;">
+<sect1 id="xmms" xreflabel="XMMS-&XMMS-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
@@ -18,5 +18,5 @@
 <?dbhtml filename="xmms.html"?>
 <title>XMMS-&XMMS-version;</title>
-<indexterm zone="xmms-package">
+<indexterm zone="xmms">
 <primary sortas="a-XMMS">XMMS</primary></indexterm>
 
@@ -78,5 +78,5 @@
 <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>
@@ -112,5 +112,5 @@
 <?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 
@@ -120,5 +120,5 @@
 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>
@@ -129,5 +129,5 @@
 <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>
@@ -139,5 +139,5 @@
 <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>
@@ -149,5 +149,5 @@
 <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>
Index: multimedia/cdwriteutils/cdrdao.xml
===================================================================
--- multimedia/cdwriteutils/cdrdao.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
+++ multimedia/cdwriteutils/cdrdao.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
@@ -57,5 +57,5 @@
 <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>
@@ -164,5 +164,5 @@
 <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>
Index: multimedia/libdriv/flac.xml
===================================================================
--- multimedia/libdriv/flac.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
+++ multimedia/libdriv/flac.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
@@ -41,5 +41,5 @@
 <sect4><title>Optional</title>
 <para><xref linkend="libogg"/>, 
-<xref linkend="xmms-package"/>, 
+<xref linkend="xmms"/>, 
 <xref linkend="NASM"/>, 
 <xref linkend="docbook-utils"/>, 
Index: multimedia/libdriv/gst-plugins.xml
===================================================================
--- multimedia/libdriv/gst-plugins.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
+++ multimedia/libdriv/gst-plugins.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
@@ -81,5 +81,5 @@
 <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>, 
Index: multimedia/videoutils/avifile.xml
===================================================================
--- multimedia/videoutils/avifile.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
+++ multimedia/videoutils/avifile.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
@@ -68,5 +68,5 @@
 <xref linkend="libvorbis"/>, 
 <xref linkend="liba52"/>, 
-<xref linkend="lame-package"/>, 
+<xref linkend="lame"/>, 
 <xref linkend="libmad"/>, 
 <xref linkend="xvid"/>, 
Index: multimedia/videoutils/ffmpeg.xml
===================================================================
--- multimedia/videoutils/ffmpeg.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
+++ multimedia/videoutils/ffmpeg.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
@@ -50,5 +50,5 @@
 <sect4><title>Optional</title>
 <para><xref linkend="libvorbis"/>, 
-<xref linkend="lame-package"/>, 
+<xref linkend="lame"/>, 
 <xref linkend="liba52"/>, 
 <xref linkend="imlib2"/>, 
Index: multimedia/videoutils/mplayer.xml
===================================================================
--- multimedia/videoutils/mplayer.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
+++ multimedia/videoutils/mplayer.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
@@ -111,5 +111,5 @@
 <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 
@@ -143,5 +143,5 @@
 <xref linkend="LZO"/>, 
 <xref linkend="libmad"/>, 
-<xref linkend="lame-package"/>, 
+<xref linkend="lame"/>, 
 <xref linkend="libfame"/>, 
 <ulink url="http://www.theora.org/">Theora</ulink>, 
Index: multimedia/videoutils/transcode.xml
===================================================================
--- multimedia/videoutils/transcode.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
+++ multimedia/videoutils/transcode.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
@@ -68,5 +68,5 @@
 
 <sect4><title>Recommended</title>
-<para><xref linkend="NASM"/> and <xref linkend="lame-package"/></para>
+<para><xref linkend="NASM"/> and <xref linkend="lame"/></para>
 </sect4>
 
Index: postlfs/editors/vim.xml
===================================================================
--- postlfs/editors/vim.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
+++ postlfs/editors/vim.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
@@ -68,6 +68,6 @@
 <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>
Index: postlfs/security/cyrus-sasl.xml
===================================================================
--- postlfs/security/cyrus-sasl.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
+++ postlfs/security/cyrus-sasl.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
@@ -64,5 +64,5 @@
 <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 
Index: server/mail/courier.xml
===================================================================
--- server/mail/courier.xml	(revision cef3a2f2ede8a1d798babcdc4ce40d03de87845f)
+++ server/mail/courier.xml	(revision 5db3785e8c562a1b1c0b2176f15fe813b7ab5fd2)
@@ -10,8 +10,7 @@
 <!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>
@@ -20,6 +19,6 @@
 <?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>
@@ -203,5 +202,5 @@
 <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>
 
@@ -388,5 +387,5 @@
 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>
 
@@ -530,14 +529,14 @@
 <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>
@@ -547,5 +546,5 @@
 <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>
@@ -556,5 +555,5 @@
 <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>
@@ -564,5 +563,5 @@
 <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>
@@ -574,5 +573,5 @@
 <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>
@@ -582,5 +581,5 @@
 <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>
@@ -589,7 +588,7 @@
 <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>
@@ -600,5 +599,5 @@
 <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>
@@ -609,5 +608,5 @@
 <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>
@@ -619,5 +618,5 @@
 <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>
@@ -628,5 +627,5 @@
 <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>
@@ -637,5 +636,5 @@
 <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>
@@ -647,5 +646,5 @@
 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>
@@ -655,5 +654,5 @@
 <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>
@@ -664,5 +663,5 @@
 <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>
@@ -672,5 +671,5 @@
 <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>
@@ -682,5 +681,5 @@
 <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>
@@ -690,5 +689,5 @@
 <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>
@@ -698,5 +697,5 @@
 <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>
@@ -706,5 +705,5 @@
 <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>
@@ -716,5 +715,5 @@
 <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>
@@ -724,5 +723,5 @@
 <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>
@@ -733,5 +732,5 @@
 <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>
@@ -742,5 +741,5 @@
 <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>
@@ -752,5 +751,5 @@
 <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>
@@ -761,5 +760,5 @@
 <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>
@@ -770,5 +769,5 @@
 <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>
@@ -779,5 +778,5 @@
 <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>
@@ -788,5 +787,5 @@
 <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>
@@ -797,5 +796,5 @@
 <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>
@@ -807,5 +806,5 @@
 <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>
@@ -817,5 +816,5 @@
 <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>
@@ -826,5 +825,5 @@
 <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>
@@ -835,5 +834,5 @@
 <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>
@@ -844,5 +843,5 @@
 <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>
@@ -853,5 +852,5 @@
 <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>
@@ -862,5 +861,5 @@
 <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>
@@ -871,5 +870,5 @@
 <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>
@@ -881,5 +880,5 @@
 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>
@@ -890,5 +889,5 @@
 <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>
@@ -899,5 +898,5 @@
 <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>
@@ -908,5 +907,5 @@
 <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>
@@ -917,5 +916,5 @@
 <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>
@@ -926,5 +925,5 @@
 <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>
@@ -935,5 +934,5 @@
 <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>
@@ -944,5 +943,5 @@
 <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>
@@ -953,5 +952,5 @@
 <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>
