Index: server/mail/qmail/qmail-config.xml
===================================================================
--- server/mail/qmail/qmail-config.xml	(revision 2277d1bb98493be39ca401df21f86d9f9cc2c0b8)
+++ server/mail/qmail/qmail-config.xml	(revision 547df0bcb64b755c0bfb9ff265c87480ff04d65d)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring qmail</title>
+<title>Configuring <application>qmail</application></title>
 
 <sect3><title>Config files</title>
@@ -8,5 +8,5 @@
 <sect3><title>Configuration Information</title>
 
-<para>If inetd is used, the following command will add the qmaild
+<para>If <command>inetd</command> is used, the following command will add the qmaild
 entry to <filename>/etc/inetd.conf</filename>: </para>
 
@@ -14,8 +14,8 @@
 tcp-env /var/qmail/bin/qmail-smtpd" >> /etc/inetd.conf</userinput></screen></para>
 
-<para>If xinetd is used, the following command will add the qmaild
+<para>If <command>xinetd</command> is used, the following command will add the qmaild
 entry to <filename>/etc/xinetd.conf</filename>: </para>
 
-<para><screen><userinput>cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"</userinput>
+<screen><userinput><command>cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"</command>
 service smtp
 {
@@ -32,10 +32,10 @@
     log_on_failture         += USERID
 }
-<userinput>EOF</userinput></screen></para>
+<command>EOF</command></userinput></screen>
 
-<para>To automate the running of qmail, use following command to
+<para>To automate the running of <application>qmail</application>, use following command to
 create the init.d script:</para> 
 
-<para><screen><userinput>cat &gt; /etc/rc.d/init.d/qmail &lt;&lt; "EOF"</userinput>
+<screen><userinput><command>cat &gt; /etc/rc.d/init.d/qmail &lt;&lt; "EOF"</command>
 #!/bin/sh
 # Begin $rc_base/init.d/qmail
@@ -72,11 +72,11 @@
 
 # End $rc_base/init.d/qmail
-<userinput>EOF
-chmod 755 /etc/rc.d/init.d/qmail</userinput></screen></para>
+<command>EOF
+chmod 755 /etc/rc.d/init.d/qmail</command></userinput></screen>
 
 <para>Create the symbolic links to this file in the relevant
-<filename>rc.d</filename> directory with the following commands:
+<filename>rc.d</filename> directory with the following commands:</para>
 
-<screen><userinput>cd /etc/rc.d/init.d &amp;&amp;
+<screen><userinput><command>cd /etc/rc.d/init.d &amp;&amp;
 ln -sf ../init.d/qmail ../rc0.d/K25qmail &amp;&amp;
 ln -sf ../init.d/qmail ../rc1.d/K25qmail &amp;&amp;
@@ -85,5 +85,5 @@
 ln -sf ../init.d/qmail ../rc4.d/S35qmail &amp;&amp;
 ln -sf ../init.d/qmail ../rc5.d/S35qmail &amp;&amp;
-ln -sf ../init.d/qmail ../rc6.d/K25qmail</userinput></screen></para>
+ln -sf ../init.d/qmail ../rc6.d/K25qmail</command></userinput></screen>
 
 </sect3>
Index: server/mail/qmail/qmail-inst.xml
===================================================================
--- server/mail/qmail/qmail-inst.xml	(revision 2277d1bb98493be39ca401df21f86d9f9cc2c0b8)
+++ server/mail/qmail/qmail-inst.xml	(revision 547df0bcb64b755c0bfb9ff265c87480ff04d65d)
@@ -1,11 +1,11 @@
 <sect2>
-<title>Installation of qmail</title>
+<title>Installation of <application>qmail</application></title>
 
-<para>qmail needs certain user and group account to be added before
+<para><application>qmail</application> needs certain user and group account to be added before
 installation of the software.  Add the users and groups with the
 following commands:</para>
 
 
-<para><screen><userinput>mkdir /var/qmail &amp;&amp;
+<screen><userinput><command>mkdir /var/qmail &amp;&amp;
 groupadd nofiles &amp;&amp;
 useradd -g nofiles -d /var/qmail/alias alias &amp;&amp;
@@ -16,9 +16,9 @@
 useradd -g qmail -d /var/qmail qmailq &amp;&amp;
 useradd -g qmail -d /var/qmail qmailr &amp;&amp;
-useradd -g qmail -d /var/qmail qmails</userinput></screen></para>
+useradd -g qmail -d /var/qmail qmails</command></userinput></screen>
 
-<para>Install qmail by running the following commands:</para>
+<para>Install <application>qmail</application> by running the following commands:</para>
 
-<para><screen><userinput>patch -Np1 -i ../qmail-1.03.errno.patch &amp;&amp;
+<screen><userinput><command>patch -Np1 -i ../qmail-1.03.errno.patch &amp;&amp;
 make setup check &amp;&amp;
 ./config-fast `hostname` &amp;&amp;
@@ -30,4 +30,4 @@
 for mandir in 1 5 7 8; do mv /var/qmail/man/man$mandir/* \
     /usr/man/man$mandir; done &amp;&amp;
-rm -rf /var/qmail/man</userinput></screen></para>
+rm -rf /var/qmail/man</command></userinput></screen>
 </sect2>
Index: server/mail/qmail/qmail-intro.xml
===================================================================
--- server/mail/qmail/qmail-intro.xml	(revision 2277d1bb98493be39ca401df21f86d9f9cc2c0b8)
+++ server/mail/qmail/qmail-intro.xml	(revision 547df0bcb64b755c0bfb9ff265c87480ff04d65d)
@@ -1,17 +1,28 @@
 <sect2>
-<title>Introduction to qmail</title>
+<title>Introduction to <application>qmail</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&qmail-download-http;"/>
-Download location (FTP):        <ulink url="&qmail-download-ftp;"/>
-Version used:                   &qmail-version;
-Package size:                   &qmail-size;
-Estimated Disk space required:  &qmail-buildsize;</screen>
-<screen>
-Additional downloads:
-<ulink url="ftp://moni.csi.hu/pub/glibc-2.3.1/qmail-1.03.errno.patch">qmail errno patch</ulink></screen>
+<para>The <application>qmail</application> package contains Dan Bernstein's Mail Transport Agent
+(MTA). <application>qmail</application> provides local and remote mail delivery/relaying.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&qmail-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&qmail-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &qmail-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&qmail-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&qmail-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Required patch:
+<ulink url="ftp://moni.csi.hu/pub/glibc-2.3.1/qmail-1.03.errno.patch">qmail
+errno patch</ulink></para></listitem></itemizedlist>
+</sect3>
 
 
-<para>The qmail package contains Dan Bernstein's Mail Transport Agent
-(MTA). qmail provides local and remote mail delivery/relaying.</para>
-
 </sect2>
Index: server/mail/qmail/qmail.ent
===================================================================
--- server/mail/qmail/qmail.ent	(revision 2277d1bb98493be39ca401df21f86d9f9cc2c0b8)
+++ server/mail/qmail/qmail.ent	(revision 547df0bcb64b755c0bfb9ff265c87480ff04d65d)
@@ -9,2 +9,3 @@
 <!ENTITY qmail-download-ftp "">
 <!ENTITY qmail-size "225 KB">
+<!ENTITY qmail-time "">
