Index: server/mail/qpopper/qpopper-config.xml
===================================================================
--- server/mail/qpopper/qpopper-config.xml	(revision 5c5cdbc82c506210980428d587bf449766c102f5)
+++ server/mail/qpopper/qpopper-config.xml	(revision 7d5ce9d30fa23a91387f658f51e7f45d60fa6631)
@@ -1,16 +1,11 @@
 <sect2>
-<title>Configuring qpopper</title>
+<title>Configuring <application>qpopper</application></title>
 
-<sect3><title>Config files</title>
-<para><filename>/etc/inetd.conf</filename> and
-<filename>/etc/syslogd.conf</filename></para>
-</sect3>
-
-<sect3><title>Configuring qpopper</title>
+<sect3><title>Configuration Information</title>
 
 <para>If you use inetd, the following command will add the qpopper
 entry to <filename>/etc/inetd.conf</filename>:</para>
 
-<para><screen><userinput>echo "pop stream tcp nowait root /usr/sbin/popper popper" >> \
+<screen><userinput><command>echo "pop stream tcp nowait root /usr/sbin/popper popper" >> \
 /etc/inetd.conf &amp;&amp;
 echo "pop 110/tcp" &gt;&gt; /etc/services &amp;&amp;
@@ -18,14 +13,13 @@
 echo "local0.notice;local0.debug        /var/log/POP.log" >> \
 /etc/syslog.conf &amp;&amp;
-killall -HUP  syslogd</userinput></screen></para>
+killall -HUP  syslogd</command></userinput></screen>
 
-<para>Issue a killall -HUP inetd to reread the changed
-<filename>inetd.conf</filename>
-file.</para>
+<para>Issue a <command>killall -HUP inetd</command> to reread the changed
+<filename>inetd.conf</filename> file.</para>
 
 <para>If you use xinetd, the following command will add the qpopper
 entry to <filename>/etc/xinetd.conf</filename>:</para>
 
-<para><screen><userinput>cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"
+<screen><userinput><command>cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"
      service pop
      {
@@ -39,9 +33,10 @@
          server_args = popper
      }
-EOF</userinput></screen></para>
-<para>Issue a killall -HUP xinetd to reread the changed
-<filename>xinetd.conf</filename>
-file.</para>
+EOF</command></userinput></screen>
+
+<para>Issue a <command>killall -HUP xinetd</command> to reread the changed
+<filename>xinetd.conf</filename> file.</para>
 
 </sect3>
+
 </sect2>
Index: server/mail/qpopper/qpopper-desc.xml
===================================================================
--- server/mail/qpopper/qpopper-desc.xml	(revision 5c5cdbc82c506210980428d587bf449766c102f5)
+++ server/mail/qpopper/qpopper-desc.xml	(revision 7d5ce9d30fa23a91387f658f51e7f45d60fa6631)
@@ -2,12 +2,14 @@
 <title>Contents</title>
 
-<para>The qpopper package contains
-<userinput>qpopper</userinput>.
+<para>The <application>qpopper</application> package contains
+<command>qpopper</command>.
 </para>
-</sect2>
-<sect2><title>Description</title>
-<sect3><title>popper</title>
-<para>popper is the POP 3 server daemon.</para></sect3>
 
 </sect2>
 
+<sect2><title>Description</title>
+
+<sect3><title>popper</title>
+<para><command>popper</command> is the POP 3 server daemon.</para></sect3>
+
+</sect2>
Index: server/mail/qpopper/qpopper-inst.xml
===================================================================
--- server/mail/qpopper/qpopper-inst.xml	(revision 5c5cdbc82c506210980428d587bf449766c102f5)
+++ server/mail/qpopper/qpopper-inst.xml	(revision 7d5ce9d30fa23a91387f658f51e7f45d60fa6631)
@@ -1,9 +1,10 @@
 <sect2>
-<title>Installation of qpopper</title>
+<title>Installation of <application>qpopper</application></title>
 
-<para>Install qpopper with the following commands:</para>
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+<para>Install <application>qpopper</application> with the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: server/mail/qpopper/qpopper-intro.xml
===================================================================
--- server/mail/qpopper/qpopper-intro.xml	(revision 5c5cdbc82c506210980428d587bf449766c102f5)
+++ server/mail/qpopper/qpopper-intro.xml	(revision 7d5ce9d30fa23a91387f658f51e7f45d60fa6631)
@@ -1,16 +1,23 @@
 <sect2>
-<title>Introduction to qpopper</title>
+<title>Introduction to <application>qpopper</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&qpopper-download-http;"/>
-Download location (FTP):        <ulink url="&qpopper-download-ftp;"/>
-Version used:                   &qpopper-version;
-Package size:                   &qpopper-size;
-Estimated Disk space required:  &qpopper-buildsize;</screen>
+<para>The <application>qpopper</application> package contains a POP 3
+mail server.</para>
 
-<para>The qpopper package contains a POP 3 mail server.  </para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&qpopper-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&qpopper-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &qpopper-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &qpopper-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &qpopper-time;</para></listitem></itemizedlist>
+</sect3>
 
-
-<screen>qpopper depends on: 
-<xref linkend="sendmail"/> or <xref linkend="postfix"/> or <xref linkend="qmail"/></screen>
+<sect3><title><application>qpopper</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="sendmail"/> or <xref linkend="postfix"/> or <xref
+linkend="qmail"/>
+</para></sect4>
+</sect3>
 
 </sect2>
Index: server/mail/qpopper/qpopper.ent
===================================================================
--- server/mail/qpopper/qpopper.ent	(revision 5c5cdbc82c506210980428d587bf449766c102f5)
+++ server/mail/qpopper/qpopper.ent	(revision 7d5ce9d30fa23a91387f658f51e7f45d60fa6631)
@@ -4,7 +4,8 @@
 <!ENTITY qpopper-desc SYSTEM "qpopper-desc.xml">
 <!ENTITY qpopper-config SYSTEM "qpopper-config.xml">
-<!ENTITY qpopper-buildsize "9 MB">
+<!ENTITY qpopper-buildsize "9.0 MB">
 <!ENTITY qpopper-version "4.0.5">
 <!ENTITY qpopper-download-http "">
-<!ENTITY qpopper-download-ftp "ftp://ftp.qualcomm.com/eudora/servers/unix/popper/qpopper4.0.5.tar.gz">
+<!ENTITY qpopper-download-ftp "ftp://ftp.qualcomm.com/eudora/servers/unix/popper/qpopper&qpopper-version;.tar.gz">
 <!ENTITY qpopper-size "2.2 MB">
+<!ENTITY qpopper-time "0.13 SBU">
