Index: server/mail/exim.xml
===================================================================
--- server/mail/exim.xml	(revision 793c1ba06c9c45f7f7a3d31cc469a6d2e61b03d6)
+++ server/mail/exim.xml	(revision b77ebfad8b4c579f4ab6993cd3010d9dd2e8d613)
@@ -20,4 +20,6 @@
 <?dbhtml filename="exim.html"?>
 <title><application>Exim</application>-&exim-version;</title>
+<indexterm zone="exim">
+<primary sortas="a-Exim">Exim</primary></indexterm>
 
 <sect2>
@@ -76,6 +78,6 @@
 <title>Installation of <application>Exim</application></title>
 
-<para>Before building <application>Exim</application>, you should 
-create the group and user exim which will run the 
+<para>Before building <application>Exim</application>, as the root user you 
+should create the group and user exim which will run the 
 <command>exim</command> daemon:</para>
 
@@ -95,6 +97,9 @@
   sed -e 's,^EXIM_USER.*$,EXIM_USER=exim,' | \
   sed -e 's,^EXIM_MONITOR,#EXIM_MONITOR,' > Local/Makefile &amp;&amp;
-make &amp;&amp;
-make install &amp;&amp;
+make</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make install &amp;&amp;
 install -v -m644 doc/exim.8 /usr/share/man/man8 &amp;&amp;
 install -v -d -m755 /usr/share/doc/exim-&exim-version; &amp;&amp;
@@ -195,8 +200,12 @@
 <title>Configuring Exim</title>
 
-<sect3><title>Config files</title>
+<sect3 id="exim-config"><title>Config files</title>
 
 <para><filename>/etc/exim.conf</filename> and 
 <filename>/etc/aliases</filename></para>
+<indexterm zone="exim exim-config">
+<primary sortas="e-etc-exim.conf">/etc/exim.conf</primary></indexterm>
+<indexterm zone="exim exim-config">
+<primary sortas="e-etc-aliases">/etc/aliases</primary></indexterm>
 
 </sect3>
@@ -224,7 +233,9 @@
 the mail queue. Adjust this parameter to suit your desires.</para>
 
-<para>To automate the running of <command>exim</command> at startup, install 
-the <filename>/etc/rc.d/init.d/exim</filename> init script included in the 
-<xref linkend="intro-important-bootscripts"/> package.</para>
+<para id="exim-init">To automate the running of <command>exim</command> at 
+startup, install the <filename>/etc/rc.d/init.d/exim</filename> init script 
+included in the <xref linkend="intro-important-bootscripts"/> package.</para>
+<indexterm zone="exim exim-init">
+<primary sortas="f-exim">exim</primary></indexterm>
 
 <screen><userinput><command>make install-exim</command></userinput></screen>
@@ -242,77 +253,179 @@
 <title>Contents</title>
 
-<para>The <application>Exim</application> package contains
-<command>exim</command>,
-<command>exim_dumpdb</command>,
-<command>exim_fixdb</command>,
-<command>exim_tidydb</command>,
-<command>exinext</command>,
-<command>exiwhat</command>,
-<command>exim_dbmbuild</command>,
-<command>exicyclog</command>,
-<command>exigrep</command>,
-<command>eximstats</command>,
-<command>exiqsumm</command>,
-<command>exiqgrep</command>,
-<command>exim_lock</command>, 
-<command>exim_checkaccess</command> and optionally, 
-<command>eximon</command> and 
-<command>eximon.bin</command>.</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-<sect3><title>exim</title>
-<para><command>exim</command> is the Mail Transport Agent daemon.</para></sect3>
-
-<sect3><title>exim_dumpdb</title>
-<para><command>exim_dumpdb</command> writes the contents of 
-<application>Exim</application> databases to the standard output.</para></sect3>
-
-<sect3><title>exim_fixdb</title>
-<para><command>exim_fixdb</command> modifies data in 
-<application>Exim</application> databases.</para></sect3>
-
-<sect3><title>exim_tidydb</title>
-<para><command>exim_tidydb</command> removes old records from 
-<application>Exim</application> databases.</para></sect3>
-
-<sect3><title>exinext</title>
-<para><command>exinext</command> queries remote host retry times.</para></sect3>
-
-<sect3><title>exiwhat</title>
-<para><command>exiwhat</command> queries running 
-<application>Exim</application> processes.</para></sect3>
-
-<sect3><title>exim_dbmbuild</title>
-<para><command>exim_dbmbuild</command> creates and rebuilds 
-<application>Exim</application> databases.</para></sect3>
-
-<sect3><title>exicyclog</title>
-<para><command>exicyclog</command> cycles 
-<application>Exim</application> log files.</para></sect3>
-
-<sect3><title>exigrep</title>
-<para><command>exigrep</command> searches 
-<application>Exim</application> log files.</para></sect3>
-
-<sect3><title>eximstats</title>
-<para><command>eximstats</command> generates mail statistics from 
-<application>Exim</application> log files.</para></sect3>
-
-<sect3><title>exiqsumm</title>
-<para><command>exiqsumm</command> produces a summary of the messages in the 
-mail queue.</para></sect3> 
-
-<sect3><title>exiqgrep</title>
-<para><command>exiqgrep</command> is an utility for selective queue
-listing.</para></sect3>
-
-<sect3><title>exim_lock</title>
-<para><command>exim_lock</command> locks a mailbox file.</para></sect3>
-
-<sect3><title>exim_checkaccess</title>
-<para><command>exim_checkaccess</command> states whether a given recipient 
-address from a given host is acceptable or not.</para></sect3>
+<segmentedlist>
+<segtitle>Installed Programs</segtitle>
+<segtitle>Installed Libraries</segtitle>
+<segtitle>Installed Directories</segtitle>
+
+<seglistitem>
+<seg>exicyclog, exigrep, exim, exim-4.43-2, exim_checkaccess, exim_dbmbuild, 
+exim_dumpdb, exim_fixdb, exim_lock, exim_tidydb, eximstats, exinext, exipick, 
+exiqgrep, exiqsumm, exiwhat and optionally, eximon and eximon.bin</seg>
+<seg>None</seg>
+<seg>/usr/share/doc/exim-&exim-version; and /var/spool/exim</seg>
+</seglistitem>
+</segmentedlist>
+
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
+
+<varlistentry id="exicyclog">
+<term><command>exicyclog</command></term>
+<listitem><para>cycles <application>Exim</application> log files.</para>
+<indexterm zone="exim exicyclog">
+<primary sortas="b-exicyclog">exicyclog</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="exigrep">
+<term><command>exigrep</command></term>
+<listitem><para>searches <application>Exim</application> log files.</para>
+<indexterm zone="exim exigrep">
+<primary sortas="b-exigrep">exigrep</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="exim-prog">
+<term><command>exim</command></term>
+<listitem><para>is a symlink to the <command>exim-4.43-2</command> 
+<acronym>MTA</acronym> daemon.</para>
+<indexterm zone="exim exim-prog">
+<primary sortas="g-exim">exim</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="exim-4.43-2">
+<term><command>exim-4.43-2</command></term>
+<listitem><para>is the <application>Exim</application> mail transport 
+agent daemon.</para>
+<indexterm zone="exim exim-4.43-2">
+<primary sortas="b-exim-4.43-2">exim-4.43-2</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="exim_checkaccess">
+<term><command>exim_checkaccess</command></term>
+<listitem><para>states whether a given recipient address from a given host is 
+acceptable or not.</para>
+<indexterm zone="exim exim_checkaccess">
+<primary sortas="b-exim_checkaccess">exim_checkaccess</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="exim_dbmbuild">
+<term><command>exim_dbmbuild</command></term>
+<listitem><para> creates and rebuilds <application>Exim</application> 
+databases.</para>
+<indexterm zone="exim exim_dbmbuild">
+<primary sortas="b-exim_dbmbuild">exim_dbmbuild</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="exim_dumpdb">
+<term><command>exim_dumpdb</command></term>
+<listitem><para> writes the contents of <application>Exim</application> 
+databases to the standard output.</para>
+<indexterm zone="exim exim_dumpdb">
+<primary sortas="b-exim_dumpdb">exim_dumpdb</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="exim_fixdb">
+<term><command>exim_fixdb</command></term>
+<listitem><para>modifies data in <application>Exim</application> 
+databases.</para>
+<indexterm zone="exim exim_fixdb">
+<primary sortas="b-exim_fixdb">exim_fixdb</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="exim_lock">
+<term><command>exim_lock</command></term>
+<listitem><para>locks a mailbox file.</para>
+<indexterm zone="exim exim_lock">
+<primary sortas="b-exim_lock">exim_lock</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="exim_tidydb">
+<term><command>exim_tidydb</command></term>
+<listitem><para>removes old records from <application>Exim</application> 
+databases.</para>
+<indexterm zone="exim exim_tidydb">
+<primary sortas="b-exim_tidydb">exim_tidydb</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="eximstats">
+<term><command>eximstats</command></term>
+<listitem><para>generates mail statistics from <application>Exim</application> 
+log files.</para>
+<indexterm zone="exim eximstats">
+<primary sortas="b-eximstats">eximstats</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="exinext">
+<term><command>exinext</command></term>
+<listitem><para>queries remote host retry times.</para>
+<indexterm zone="exim exinext">
+<primary sortas="b-exinext">exinext</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="exipick">
+<term><command>exipick</command></term>
+<listitem><para>selects messages based on various criteria.</para>
+<indexterm zone="exim exipick">
+<primary sortas="b-exipick">exipick</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="exiqgrep">
+<term><command>exiqgrep</command></term>
+<listitem><para>is a utility for selective queue listing.</para>
+<indexterm zone="exim exiqgrep">
+<primary sortas="b-exiqgrep">exiqgrep</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="exiqsumm">
+<term><command>exiqsumm</command></term>
+<listitem><para>produces a summary of the messages in the mail queue.</para>
+<indexterm zone="exim exiqsumm">
+<primary sortas="b-exiqsumm">exiqsumm</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="exiwhat">
+<term><command>exiwhat</command></term>
+<listitem><para>queries running <application>Exim</application> 
+processes.</para>
+<indexterm zone="exim exiwhat">
+<primary sortas="b-exiwhat">exiwhat</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="eximon">
+<term><command>eximon</command></term>
+<listitem><para>is a start-up shell script for <command>eximon.bin</command> 
+used to set the required environment variables before running the 
+program.</para>
+<indexterm zone="exim eximon">
+<primary sortas="b-eximon">eximon</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="eximon.bin">
+<term><command>eximon.bin</command></term>
+<listitem><para>is a monitor program which displays current information in an 
+<application>X</application> window, and also contains a menu interface to 
+<application>Exim</application>'s command line administration options.</para>
+<indexterm zone="exim eximon.bin">
+<primary sortas="b-eximon.bin">eximon.bin</primary>
+</indexterm></listitem>
+</varlistentry>
+</variablelist>
 
 </sect2>
