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>
