Index: server/mail/exim/exim-config.xml
===================================================================
--- server/mail/exim/exim-config.xml	(revision 8b220c27c18a4f79f136bf0a3a484089b04df8fa)
+++ server/mail/exim/exim-config.xml	(revision 79df62689dba842c77b2ae538dbfc25a2e76652f)
@@ -3,5 +3,5 @@
 
 <sect3><title>Config files</title>
-<para><userinput>/etc/exim.conf, /etc/aliases</userinput></para>
+<para><userinput>/etc/exim.conf</userinput>, <userinput>/etc/aliases</userinput></para>
 </sect3>
 
Index: server/mail/exim/exim.ent
===================================================================
--- server/mail/exim/exim.ent	(revision 8b220c27c18a4f79f136bf0a3a484089b04df8fa)
+++ server/mail/exim/exim.ent	(revision 79df62689dba842c77b2ae538dbfc25a2e76652f)
@@ -5,7 +5,7 @@
 <!ENTITY exim-exp SYSTEM "exim-exp.xml">
 <!ENTITY exim-config SYSTEM "exim-config.xml">
-<!ENTITY exim-buildsize "8.2 MB">
-<!ENTITY exim-version "4.12">
-<!ENTITY exim-download-http "N/A">
+<!ENTITY exim-buildsize "8.7 MB">
+<!ENTITY exim-version "4.14">
+<!ENTITY exim-download-http "">
 <!ENTITY exim-download-ftp "ftp://ftp.exim.org/pub/exim/exim4/exim-&exim-version;.tar.bz2">
-<!ENTITY exim-size "1.1 MB">
+<!ENTITY exim-size "1.2 MB">
Index: server/mail/qpopper/qpopper-config.xml
===================================================================
--- server/mail/qpopper/qpopper-config.xml	(revision 8b220c27c18a4f79f136bf0a3a484089b04df8fa)
+++ server/mail/qpopper/qpopper-config.xml	(revision 79df62689dba842c77b2ae538dbfc25a2e76652f)
@@ -12,6 +12,5 @@
 entry to /etc/inetd.conf:</para>
 
-<para><screen><userinput>
-echo "pop stream tcp nowait root /usr/sbin/popper popper" >> \
+<para><screen><userinput>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;
@@ -19,6 +18,5 @@
 echo "local0.notice;local0.debug        /var/log/POP.log" >> \
 /etc/syslog.conf &amp;&amp;
-killall -HUP  syslogd
-</userinput></screen></para>
+killall -HUP  syslogd</userinput></screen></para>
 
 <para>Issue a killall -HUP inetd to reread the changed inetd.conf
@@ -28,6 +26,5 @@
 entry to /etc/xinetd.conf:</para>
 
-<para><screen><userinput>
-cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"
+<para><screen><userinput>cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"
      service pop
      {
@@ -41,6 +38,5 @@
          server_args = popper
      }
-EOF
-</userinput></screen></para>
+EOF</userinput></screen></para>
 <para>Issue a killall -HUP xinetd to reread the changed xinetd.conf
 file.</para>
Index: server/mail/qpopper/qpopper-inst.xml
===================================================================
--- server/mail/qpopper/qpopper-inst.xml	(revision 8b220c27c18a4f79f136bf0a3a484089b04df8fa)
+++ server/mail/qpopper/qpopper-inst.xml	(revision 79df62689dba842c77b2ae538dbfc25a2e76652f)
@@ -3,9 +3,7 @@
 
 <para>Install qpopper with the following commands:</para>
-<para><screen><userinput>
-./configure --prefix=/usr &amp;&amp;
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
-make install
-</userinput></screen></para>
+make install</userinput></screen></para>
 
 </sect2>
Index: server/mail/qpopper/qpopper-intro.xml
===================================================================
--- server/mail/qpopper/qpopper-intro.xml	(revision 8b220c27c18a4f79f136bf0a3a484089b04df8fa)
+++ server/mail/qpopper/qpopper-intro.xml	(revision 79df62689dba842c77b2ae538dbfc25a2e76652f)
@@ -2,5 +2,5 @@
 <title>Introduction to qpopper</title>
 
-<screen>
+<screen>Download location (HTTP):       <ulink url="&qpopper-download-http;"/>
 Download location (FTP):        <ulink url="&qpopper-download-ftp;"/>
 Version used:                   &qpopper-version;
@@ -12,7 +12,5 @@
 
 <screen>qpopper depends on: 
-<xref linkend="sendmail"/></screen>
-
-<note><para>Other MTA's may be used instead of Sendmail.</para></note>
+<xref linkend="sendmail"/> or <xref linkend="postfix"/> or <xref linkend="qmail"/></screen>
 
 </sect2>
Index: server/mail/qpopper/qpopper.ent
===================================================================
--- server/mail/qpopper/qpopper.ent	(revision 8b220c27c18a4f79f136bf0a3a484089b04df8fa)
+++ server/mail/qpopper/qpopper.ent	(revision 79df62689dba842c77b2ae538dbfc25a2e76652f)
@@ -6,5 +6,5 @@
 <!ENTITY qpopper-buildsize "6.7 MB">
 <!ENTITY qpopper-version "4.0.4">
-<!ENTITY qpopper-download-ftp
-"ftp://ftp.qualcomm.com/eudora/servers/unix/popper/qpopper4.0.4.tar.gz">
+<!ENTITY qpopper-download-http "">
+<!ENTITY qpopper-download-ftp "ftp://ftp.qualcomm.com/eudora/servers/unix/popper/qpopper4.0.4.tar.gz">
 <!ENTITY qpopper-size "2.3 MB">
