Index: server/mail/qpopper.xml
===================================================================
--- server/mail/qpopper.xml	(revision 7fdeb26660d1516629882287d040d6ee4c3b8c31)
+++ server/mail/qpopper.xml	(revision 1ea160c0aa6d638601147a9dc34af88ef98cf730)
@@ -5,23 +5,9 @@
   %general-entities;
 
-    <!-- Inserted as a reminder to do this. The mention of a test suite
-         is usually right before the root user installation commands. Please
-         delete these 12 (including one blank) lines after you are done.-->
-
-    <!-- Use one of the two mentions below about a test suite,
-         delete the line that is not applicable. Of course, if the
-         test suite uses syntax other than "make check", revise the
-         line to reflect the actual syntax to run the test suite -->
-
-    <!-- <para>This package does not come with a test suite.</para> -->
-    <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
-<!-- Dead link
-  <!ENTITY qpopper-download-http "http://ftp.uni-koeln.de/mail/qpopper&qpopper-version;.tar.gz">
--->
   <!ENTITY qpopper-download-http " ">
   <!ENTITY qpopper-download-ftp "ftp://ftp.qualcomm.com/eudora/servers/unix/popper/qpopper&qpopper-version;.tar.gz">
-  <!ENTITY qpopper-md5sum "de2cd15f95cfd00d0d080fd16287acad">
-  <!ENTITY qpopper-size "2.7 MB">
-  <!ENTITY qpopper-buildsize "9.1 MB">
+  <!ENTITY qpopper-md5sum "3b62b70fbcd16bb17795e1762dd33765">
+  <!ENTITY qpopper-size "1.2 MB">
+  <!ENTITY qpopper-buildsize "7.2 MB">
   <!ENTITY qpopper-time "0.1 SBU">
 ]>
@@ -47,4 +33,6 @@
     POP3 mail server.</para>
 
+    &lfs71_built;
+
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -75,8 +63,9 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="openssl"/>,
-    <!-- <xref linkend="gdbm"/>, -->
-    <xref linkend="linux-pam"/>, and
-    <xref linkend="mitkrb"/></para>
+    <para role="optional">
+      <xref linkend="openssl"/>,
+      <xref linkend="linux-pam"/>, and
+      <xref linkend="mitkrb"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -93,4 +82,6 @@
 <screen><userinput>./configure --prefix=/usr --enable-standalone &amp;&amp;
 make</userinput></screen>
+
+    <para>This package does not come with a test suite.</para> 
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
@@ -124,6 +115,5 @@
       </indexterm>
 
-<screen role="root"><userinput>echo "local0.notice;local0.debug /var/log/POP.log" &gt;&gt; \
-    /etc/syslog.conf &amp;&amp;
+<screen role="root"><userinput>echo "local0.notice;local0.debug /var/log/POP.log" &gt;&gt; /etc/syslog.conf &amp;&amp;
 killall -HUP syslogd</userinput></screen>
 
@@ -167,42 +157,10 @@
       </indexterm>
 
-<screen role="root"><userinput>echo "pop3 stream tcp nowait root /usr/sbin/popper popper" &gt;&gt; \
-    /etc/inetd.conf &amp;&amp;
+<screen role="root"><userinput>echo "pop3 stream tcp nowait root /usr/sbin/popper popper" &gt;&gt; /etc/inetd.conf &amp;&amp;
 killall inetd || inetd</userinput></screen>
 
       <para>Issue a <command>killall -HUP inetd</command> to reread the
       changed <filename>inetd.conf</filename> file.</para>
-<!--
-      <para>If you use <command>xinetd</command>, the following command will
-      create the <application>Qpopper</application> file as
-      <filename>/etc/xinetd.d/pop3</filename>:</para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/xinetd.d/pop3 &lt;&lt; "EOF"
-<literal># Begin /etc/xinetd.d/pop3
-
-service pop3
-{
-    port            = 110
-    socket_type     = stream
-    protocol        = tcp
-    wait            = no
-    user            = root
-    server          = /usr/sbin/popper
-}
-
-# End /etc/xinetd.d/pop3</literal>
-EOF</userinput></screen>
-
-      <indexterm zone="qpopper qpopper-config">
-        <primary sortas="e-etc-xinetd.conf">/etc/xinetd.conf</primary>
-      </indexterm>
-
-      <indexterm zone="qpopper qpopper-config">
-        <primary sortas="e-etc-xinetd.d-pop3">/etc/xinetd.d/pop3</primary>
-      </indexterm>
-
-      <para>Issue a <command>killall -HUP xinetd</command> to reread the
-      changed <filename>xinetd.conf</filename> file.</para>
--->
+
     </sect3>
 
