Index: server/mail/qpopper.xml
===================================================================
--- server/mail/qpopper.xml	(revision 417f9e7c6c1cfdbb0400f1a4fdc2e2b0152522f2)
+++ server/mail/qpopper.xml	(revision 9140bfa783a7e27cab63cb6ac5dfc0236ebedecf)
@@ -5,113 +5,121 @@
   %general-entities;
 
-<!ENTITY qpopper-download-http "http://ftp.uni-koeln.de/mail/qpopper&qpopper-version;.tar.gz">
-<!ENTITY qpopper-download-ftp "ftp://ftp.qualcomm.com/eudora/servers/unix/popper/qpopper&qpopper-version;.tar.gz">
-<!ENTITY qpopper-md5sum "e00853280c9e899711f0b0239d3d8f86">
-<!ENTITY qpopper-size "2.2 MB">
-<!ENTITY qpopper-buildsize "9.0 MB">
-<!ENTITY qpopper-time "0.13 SBU">
+  <!ENTITY qpopper-download-http "http://ftp.uni-koeln.de/mail/qpopper&qpopper-version;.tar.gz">
+  <!ENTITY qpopper-download-ftp "ftp://ftp.qualcomm.com/eudora/servers/unix/popper/qpopper&qpopper-version;.tar.gz">
+  <!ENTITY qpopper-md5sum "e00853280c9e899711f0b0239d3d8f86">
+  <!ENTITY qpopper-size "2.2 MB">
+  <!ENTITY qpopper-buildsize "9.0 MB">
+  <!ENTITY qpopper-time "0.13 SBU">
 ]>
 
 <sect1 id="qpopper" xreflabel="Qpopper-&qpopper-version;">
-<sect1info>
-  <othername>$LastChangedBy$</othername>
-  <date>$Date$</date>
-</sect1info>
+  <?dbhtml filename="qpopper.html"?>
 
-<?dbhtml filename="qpopper.html"?>
-<title>Qpopper-&qpopper-version;</title>
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
 
-<indexterm zone="qpopper">
-  <primary sortas="a-Qpopper">Qpopper</primary>
-</indexterm>
+  <title>Qpopper-&qpopper-version;</title>
 
-<sect2>
-<title>Introduction to <application>Qpopper</application></title>
+  <indexterm zone="qpopper">
+    <primary sortas="a-Qpopper">Qpopper</primary>
+  </indexterm>
 
-<para>The <application>Qpopper</application> package contains a
-<acronym>POP</acronym>3 mail server.</para>
+  <sect2 role="package">
+    <title>Introduction to Qpopper</title>
 
-<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 MD5 sum: &qpopper-md5sum;</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>
+    <para>The <application>Qpopper</application> package contains a
+    POP3 mail server.</para>
 
-<sect3>
-<title><application>Qpopper</application> dependencies</title>
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <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 MD5 sum: &qpopper-md5sum;</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>
 
-<sect4>
-<title>Required</title>
-  <para><ulink url="../server/mail.html">MTA</ulink></para>
-</sect4>
+    <bridgehead renderas="sect3">Qpopper Dependencies</bridgehead>
 
-<sect4>
-<title>Optional</title>
-  <para><xref linkend="openssl"/>,
-  <xref linkend="gdbm"/>,
-  <xref linkend="Linux_PAM"/>, and
-  <xref linkend="mitkrb"/> or <xref linkend="heimdal"/></para>
-</sect4>
-</sect3>
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para><ulink url="../server/mail.html">MTA</ulink></para>
 
-</sect2>
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para><xref linkend="openssl"/>,
+    <xref linkend="gdbm"/>,
+    <xref linkend="Linux_PAM"/>, and
+    <xref linkend="mitkrb"/> or <xref linkend="heimdal"/></para>
 
-<sect2>
-<title>Installation of <application>Qpopper</application></title>
+  </sect2>
 
-<para>Install <application>Qpopper</application> with the following 
-commands:</para>
+  <sect2 role="installation">
+    <title>Installation of Qpopper</title>
 
-<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
-make</command></userinput></screen>
+    <para>Install <application>Qpopper</application> with the following
+    commands:</para>
 
-<para>Now, as the root user:</para>
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
 
-<screen><userinput role='root'><command>make install</command></userinput></screen>
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-</sect2>
+<screen role="root"><userinput>make install</userinput></screen>
 
-<sect2>
-<title>Configuring <application>Qpopper</application></title>
+  </sect2>
 
-<sect3 id="qpopper-config"><title>Configuration Information</title>
+  <sect2 role="configuration">
+    <title>Configuring Qpopper</title>
 
-<para>Update the <application>Syslog</application> configuration file and 
-force the <command>syslogd</command> daemon to reread the new file so that 
-<application>Qpopper</application> events are logged:</para>
+    <sect3 id="qpopper-config">
+      <title>Configuration Information</title>
 
-<indexterm zone="qpopper qpopper-config">
-  <primary sortas="e-etc-syslog.conf">/etc/syslog.conf</primary>
-</indexterm>
+      <para>Update the <application>Syslog</application> configuration file and
+      force the <command>syslogd</command> daemon to reread the new file so that
+      <application>Qpopper</application> events are logged:</para>
 
-<screen><userinput><command>echo "local0.notice;local0.debug /var/log/POP.log" &gt;&gt; \
+      <indexterm zone="qpopper qpopper-config">
+        <primary sortas="e-etc-syslog.conf">/etc/syslog.conf</primary>
+      </indexterm>
+
+<screen role="root"><userinput>echo "local0.notice;local0.debug /var/log/POP.log" &gt;&gt; \
     /etc/syslog.conf &amp;&amp;
-killall -HUP syslogd</command></userinput></screen>
+killall -HUP syslogd</userinput></screen>
 
-<para>If you use <command>inetd</command>, the following command will add the 
-<application>Qpopper</application> entry to 
-<filename>/etc/inetd.conf</filename>:</para>
+      <para>If you use <command>inetd</command>, the following command will
+      add the <application>Qpopper</application> entry to
+      <filename>/etc/inetd.conf</filename>:</para>
 
-<indexterm zone="qpopper qpopper-config">
-  <primary sortas="e-etc-inetd.conf">/etc/inetd.conf</primary>
-</indexterm>
+      <indexterm zone="qpopper qpopper-config">
+        <primary sortas="e-etc-inetd.conf">/etc/inetd.conf</primary>
+      </indexterm>
 
-<screen><userinput><command>echo "pop3 stream tcp nowait root /usr/sbin/popper popper" &gt;&gt; \
+<screen role="root"><userinput>echo "pop3 stream tcp nowait root /usr/sbin/popper popper" &gt;&gt; \
     /etc/inetd.conf &amp;&amp;
-killall inetd || inetd</command></userinput></screen>
+killall inetd || inetd</userinput></screen>
 
-<para>Issue a <command>killall -HUP inetd</command> 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 <command>xinetd</command>, the following command will create the 
-<application>Qpopper</application> file as <filename>/etc/xinetd.d/pop3</filename>:</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><userinput><command>cat &gt;&gt; /etc/xinetd.d/pop3 &lt;&lt; "EOF"</command>
-# Begin /etc/xinetd.d/pop3
+<screen role="root"><userinput>cat &gt;&gt; /etc/xinetd.d/pop3 &lt;&lt; "EOF"
+<literal># Begin /etc/xinetd.d/pop3
 
 service pop3
@@ -125,51 +133,55 @@
 }
 
-# End /etc/xinetd.d/pop3
-<command>EOF</command></userinput></screen>
+# 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.conf">/etc/xinetd.conf</primary>
+      </indexterm>
 
-<indexterm zone="qpopper qpopper-config">
-  <primary sortas="e-etc-xinetd.d-pop3">/etc/xinetd.d/pop3</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>
+      <para>Issue a <command>killall -HUP xinetd</command> to reread the
+      changed <filename>xinetd.conf</filename> file.</para>
 
-</sect2>
+    </sect3>
 
-<sect2>
-<title>Contents</title>
+  </sect2>
 
-<segmentedlist>
-<segtitle>Installed Program</segtitle>
-<segtitle>Installed Libraries</segtitle>
-<segtitle>Installed Directories</segtitle>
+  <sect2 role="content">
+    <title>Contents</title>
 
-<seglistitem>
-<seg>popper</seg>
-<seg>None</seg>
-<seg>None</seg>
-</seglistitem>
-</segmentedlist>
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
-<variablelist>
-<bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
+      <seglistitem>
+        <seg>popper</seg>
+        <seg>None</seg>
+        <seg>None</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<varlistentry id="popper-qpopper">
-<term><command>popper</command></term>
-<listitem><para>is the <acronym>POP</acronym>3 server daemon.</para>
-<indexterm zone="qpopper popper-qpopper">
-<primary sortas="b-popper">popper</primary>
-</indexterm></listitem>
-</varlistentry>
-</variablelist>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
 
-</sect2>
+      <varlistentry id="popper-qpopper">
+        <term><command>popper</command></term>
+        <listitem>
+          <para>is the POP3 server daemon.</para>
+          <indexterm zone="qpopper popper-qpopper">
+            <primary sortas="b-popper">popper</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
 
 </sect1>
-
