Index: server/mail/exim/exim-config.xml
===================================================================
--- server/mail/exim/exim-config.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ server/mail/exim/exim-config.xml	(revision f77c1eb020c7db928f55265dafee4ebb077afb42)
@@ -3,27 +3,29 @@
 
 <sect3><title>Config files</title>
+
 <para><filename>/etc/exim.conf</filename>, <filename>/etc/aliases</filename></para>
+
 </sect3>
 
-<sect3><title>Configuration of exim</title>
-<para>Create the exim configuration files with the following commands:
-</para> 
-<para><screen><userinput>cat &gt;&gt; /etc/aliases &lt;&lt; "EOF"</userinput>
+<sect3><title>Configuration Information</title>
+
+<para>Create the exim configuration files with the following commands:</para> 
+
+<screen><userinput><command>cat &gt;&gt; /etc/aliases &lt;&lt; "EOF"
 postmaster: root
 MAILER-DAEMON: root
-<userinput>EOF
+EOF
 exim -v -bi &amp;&amp;
-/usr/sbin/exim -bd -q1m</userinput></screen></para>
+/usr/sbin/exim -bd -q1m</command></userinput></screen>
 
 <note><para>To protect an existing <filename>/etc/aliases</filename>
-file, we will append these aliases to it if it exists.  This file
+file, we will append these aliases to it if it exists. This file
 should be checked and duplicate aliases removed, if
 present.</para></note>
 
+<para>To start and stop exim on system boot/shutdown create the
+exim boot script with the following commands:</para>
 
-<para>To start and stop exim on system boot/shutdown create the
-exim boot script with the following commands: </para>
-
-<para><screen><userinput>cat &gt; /etc/rc.d/init.d/exim &lt;&lt; "EOF"</userinput>
+<screen><userinput><command>cat &gt; /etc/rc.d/init.d/exim &lt;&lt; "EOF"
 #!/bin/sh
 # Begin $rc_base/init.d/exim
@@ -64,11 +66,10 @@
 
 # End $rc_base/init.d/exim
-<userinput>EOF
-chmod 755 /etc/rc.d/init.d/exim</userinput></screen></para>
+EOF
+chmod 755 /etc/rc.d/init.d/exim</command></userinput></screen>
 
-<para>Create the run level symlinks with the following commands:
-</para>
-<para>
-<screen><userinput>cd /etc/rc.d/init.d &amp;&amp;
+<para>Create the run level symlinks with the following commands:</para>
+
+<screen><userinput><command>cd /etc/rc.d/init.d &amp;&amp;
 ln -sf ../init.d/exim ../rc0.d/K25exim &amp;&amp;
 ln -sf ../init.d/exim ../rc1.d/K25exim &amp;&amp;
@@ -77,5 +78,6 @@
 ln -sf ../init.d/exim ../rc4.d/S35exim &amp;&amp;
 ln -sf ../init.d/exim ../rc5.d/S35exim &amp;&amp;
-ln -sf ../init.d/exim ../rc6.d/K25exim</userinput></screen></para>
+ln -sf ../init.d/exim ../rc6.d/K25exim</command></userinput></screen>
+
 </sect3>
 
Index: server/mail/exim/exim-desc.xml
===================================================================
--- server/mail/exim/exim-desc.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ server/mail/exim/exim-desc.xml	(revision f77c1eb020c7db928f55265dafee4ebb077afb42)
@@ -1,66 +1,72 @@
-<sect2><title>Contents</title>
+<sect2>
+<title>Contents</title>
 
 <para>The exim package contains
-<userinput>exim</userinput>,
-<userinput>exim_dumpdb</userinput>,
-<userinput>exim_fixdb</userinput>,
-<userinput>exim_tidydb</userinput>,
-<userinput>exinext</userinput>,
-<userinput>exiwhat</userinput>,
-<userinput>exim_dbmbuild</userinput>,
-<userinput>exicyclog</userinput>,
-<userinput>exigrep</userinput>,
-<userinput>eximstats</userinput>,
-<userinput>exiqsumm</userinput>,
-<userinput>exim_lock</userinput> and
-<userinput>exim_checkaccess</userinput>.
+<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> and
+<command>exim_checkaccess</command>.
 </para>
+
 </sect2>
 
 <sect2><title>Description</title>
 <sect3><title>exim</title>
-<para>exim is the Mail Transport Agent daemon.</para></sect3>
+<para><command>exim</command> is the Mail Transport Agent daemon.</para></sect3>
 
 <sect3><title>exim_dumpdb</title>
-<para>exim_dumpdb writes the contents of exim databases to the
-standard output .</para></sect3>
+<para><command>exim_dumpdb</command> writes the contents of exim databases to the
+standard output.</para></sect3>
 
 <sect3><title>exim_fixdb</title>
-<para>exim_fixdb modifies data in exim databases.</para></sect3>
+<para><command>exim_fixdb</command> modifies data in exim databases.</para></sect3>
 
 <sect3><title>exim_tidydb</title>
-<para>exim_tidydb removes old records from exim databases.</para></sect3>
+<para><command>exim_tidydb</command> removes old records from exim databases.</para></sect3>
 
 <sect3><title>exinext</title>
-<para>exinext queries remote host retry times.</para></sect3>
+<para><command>exinext</command> queries remote host retry times.</para></sect3>
 
 <sect3><title>exiwhat</title>
-<para>exiwhat queries running exim processes.</para></sect3>
+<para><command>exiwhat</command> queries running exim processes.</para></sect3>
 
 <sect3><title>exim_dbmbuild</title>
-<para>exim_dbmbuild creates and rebuilds exim
+<para><command>exim_dbmbuild</command> creates and rebuilds exim
 databases.</para></sect3>
 
 <sect3><title>exicyclog</title>
-<para>exicyclog cycles exim log files.</para></sect3>
+<para><command>exicyclog</command> cycles exim log files.</para></sect3>
 
 <sect3><title>exigrep</title>
-<para>exigrep searches exim log files.</para></sect3>
+<para><command>exigrep</command> searches exim log files.</para></sect3>
 
 <sect3><title>eximstats</title>
-<para>eximstats generates mail statistics from exim log
+<para><command>eximstats</command> generates mail statistics from exim log
 files.</para></sect3>
 
 <sect3><title>exiqsumm</title>
-<para>exiqsumm produces a summary of the messages on the mail
+<para><command>exiqsumm</command> produces a summary of the messages on 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>exim_lock locks a mailbox file.</para></sect3>
+<para><command>exim_lock</command> locks a mailbox file.</para></sect3>
 
 <sect3><title>exim_checkaccess</title>
-<para>exim_checkaccess states whether a given recipient address from a
+<para><command>exim_checkaccess</command> states whether a given recipient address from a
 given host is acceptable or not.</para></sect3>
 
 </sect2>
-
Index: server/mail/exim/exim-exp.xml
===================================================================
--- server/mail/exim/exim-exp.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ server/mail/exim/exim-exp.xml	(revision f77c1eb020c7db928f55265dafee4ebb077afb42)
@@ -1,21 +1,13 @@
 <sect2>
-<title>Installation command explanations</title>
+<title>Command explanations</title>
 
-<para><screen><userinput>groupadd exim
-useradd -g exim exim</userinput></screen>
-Create the group and user exim which will run the exim
-daemon.</para>
+<para><command>sed -e ... > Local/Makefile</command> : Many of exim's
+configuration options are compiled in. Here, we specify the minimum set
+of options, BIN_DIRECTORY, CONFIGURE_FILE and EXIM_USER. We also defer
+building the exim monitor program, which requires the X Window System
+support, by commenting out the EXIM_MONITOR line in the Makefile.</para>
 
-<para><screen><userinput>sed -e 's/^BIN_DIR.*$/BIN_DIRECTORY=\/usr\/sbin/' src/EDITME | \
-  sed -e 's/^CONF.*$/CONFIGURE_FILE=\/etc\/exim.conf/' | \
-  sed -e 's/^EXIM_USER.*$/EXIM_USER=exim/' | \
-  sed -e 's/^EXIM_MONITOR/#EXIM_MONITOR/' > Local/Makefile</userinput></screen>
-Many of exim's configuration options are compiled in.  Here, we
-specify the minimum set of options, BIN_DIRECTORY, CONFIGURE_FILE and
-EXIM_USER.  We also defer building the exim monitor program, which
-requires X windows support, by commenting out the EXIM_MONITOR line in
-the Makefile.</para>
-
-<para><userinput>ln -s /usr/sbin/exim /usr/sbin/sendmail</userinput> : Create a link to sendmail for applications which need it.  exim will
+<para><command>ln -s exim /usr/sbin/sendmail</command> :
+Create a link to sendmail for applications which need it. exim will
 accept most Sendmail command line options.</para>
 
Index: server/mail/exim/exim-inst.xml
===================================================================
--- server/mail/exim/exim-inst.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ server/mail/exim/exim-inst.xml	(revision f77c1eb020c7db928f55265dafee4ebb077afb42)
@@ -1,13 +1,14 @@
 <sect2>
-<title>Installation of exim</title>
+<title>Installation of <application>exim</application></title>
 
-<para>Before building exim, we need to create a user and group for
-exim with the following commands:</para>
-<para><screen><userinput>groupadd exim
-useradd -d /dev/null -g exim -s /bin/false exim</userinput></screen></para>
+<para>Before building <application>exim</application>, we need to 
+create the group and user exim which will run the exim daemon:</para>
 
-<para>Install exim with the following commands:</para>
+<screen><userinput><command>groupadd exim &amp;&amp;
+useradd -d /dev/null -g exim -s /bin/false exim</command></userinput></screen>
 
-<para><screen><userinput>sed -e 's/^BIN_DIR.*$/BIN_DIRECTORY=\/usr\/sbin/' src/EDITME | \
+<para>Install <application>exim</application> with the following commands:</para>
+
+<screen><userinput><command>sed -e 's/^BIN_DIR.*$/BIN_DIRECTORY=\/usr\/sbin/' src/EDITME | \
   sed -e 's/^CONF.*$/CONFIGURE_FILE=\/etc\/exim.conf/' | \
   sed -e 's/^EXIM_USER.*$/EXIM_USER=exim/' | \
@@ -15,5 +16,7 @@
 make &amp;&amp;
 make install &amp;&amp;
-ln -s /usr/sbin/exim /usr/sbin/sendmail</userinput></screen></para>
+cp doc/exim.8 /usr/share/man/man8 &amp;&amp;
+ln -s exim-4.24-1 /usr/sbin/exim &amp;&amp;
+ln -s exim /usr/sbin/sendmail</command></userinput></screen>
+
 </sect2>
-
Index: server/mail/exim/exim-intro.xml
===================================================================
--- server/mail/exim/exim-intro.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ server/mail/exim/exim-intro.xml	(revision f77c1eb020c7db928f55265dafee4ebb077afb42)
@@ -1,16 +1,25 @@
 <sect2>
-<title>Introduction to exim</title>
+<title>Introduction to <application>exim</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&exim-download-http;"/>
-Download location (FTP):        <ulink url="&exim-download-ftp;"/>
-Version used:                   &exim-version;
-Package size:                   &exim-size;
-Estimated Disk space required:  &exim-buildsize;</screen>
+<para>The <application>exim</application> package contains a Mail Transport Agent written by the
+University of Cambridge, released under the <acronym>GNU</acronym> Public License.</para>
 
-<para>The exim package contains a Mail Transport Agent written by the
-University of Cambridge, released under the GNU Public License.</para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&exim-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&exim-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &exim-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &exim-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &exim-time;</para></listitem></itemizedlist>
+</sect3>
 
-<screen>exim depends on:
-<xref linkend="db"/></screen>
+<sect3><title><application>exim</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="db"/>
+</para></sect4>
+<sect4><title>Optional</title>
+<para><xref linkend="xfree86"/>
+</para></sect4>
+</sect3>
 
 </sect2>
Index: server/mail/exim/exim.ent
===================================================================
--- server/mail/exim/exim.ent	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ server/mail/exim/exim.ent	(revision f77c1eb020c7db928f55265dafee4ebb077afb42)
@@ -5,7 +5,8 @@
 <!ENTITY exim-exp SYSTEM "exim-exp.xml">
 <!ENTITY exim-config SYSTEM "exim-config.xml">
-<!ENTITY exim-buildsize "8.7 MB">
-<!ENTITY exim-version "4.14">
+<!ENTITY exim-buildsize "11 MB">
+<!ENTITY exim-version "4.24">
 <!ENTITY exim-download-http "">
 <!ENTITY exim-download-ftp "ftp://ftp.exim.org/pub/exim/exim4/exim-&exim-version;.tar.bz2">
 <!ENTITY exim-size "1.2 MB">
+<!ENTITY exim-time "0.27 SBU">
