Index: server/mail/courier.xml
===================================================================
--- server/mail/courier.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/mail/courier.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect1 id="courier" xreflabel="courier">
+<?dbhtml filename="courier.html" dir="server"?>
+<title>courier</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
+
Index: server/mail/courier/courier.ent
===================================================================
--- server/mail/courier/courier.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/mail/courier/courier.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY courier SYSTEM "../courier.xml">
Index: server/mail/dovecot.xml
===================================================================
--- server/mail/dovecot.xml	(revision fd67949aeb0d4c187a3b89727742599834f1a349)
+++ 	(revision )
@@ -1,433 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY dovecot-download-http
-  "https://www.dovecot.org/releases/&dovecot-major;.&dovecot-minor;/dovecot-&dovecot-version;.tar.gz">
-  <!ENTITY dovecot-download-ftp  " ">
-  <!ENTITY dovecot-md5sum        "8961c3dafd845a25fd55e7903ffc3755">
-  <!ENTITY dovecot-size          "7.5 MB">
-  <!ENTITY dovecot-buildsize     "237 MB">
-  <!ENTITY dovecot-time          "4.8 SBU">
-]>
-
-<sect1 id="dovecot" xreflabel="Dovecot-&dovecot-version;">
-  <?dbhtml filename="dovecot.html"?>
-
-
-  <title>Dovecot-&dovecot-version;</title>
-
-  <indexterm zone="dovecot">
-    <primary sortas="a-Dovecot">Dovecot</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Dovecot</title>
-
-    <para>
-      <application>Dovecot</application> is an Internet Message Access Protocol
-      (IMAP) and Post Office Protocol (POP) server, written primarily with
-      security in mind. <application>Dovecot</application> aims to be
-      lightweight, fast and easy to set up as well as highly configurable and
-      easily extensible with plugins.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&dovecot-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&dovecot-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &dovecot-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &dovecot-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &dovecot-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &dovecot-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/dovecot-&dovecot-version;-openssl3_fixes-1.patch"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/dovecot-&dovecot-version;-security_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Dovecot Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libtirpc"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="clucene"/>,
-      <xref linkend="icu"/>,
-      <xref linkend="libcap-pam"/>,
-      <xref linkend="libunwind"/>,
-      <xref linkend="linux-pam"/>,
-      <xref linkend="lua"/>,
-      <xref linkend="mariadb"/> or <ulink url="https://www.mysql.com/">MySQL</ulink>,
-      <xref linkend="openldap"/>,
-      <xref linkend="postgresql"/>,
-      <xref linkend="sqlite"/>,
-      <xref linkend="valgrind"/>,
-      <xref linkend="xfsprogs"/>,
-      <ulink url="https://cassandra.apache.org/">Cassandra</ulink>,
-      <ulink url="https://github.com/shibukawa/snowball_py">stemmer</ulink> and
-      <ulink url="https://libsodium.gitbook.io/doc/">libsodium</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Dovecot</title>
-
-    <para>
-      There should be dedicated users and groups for unprivileged Dovecot
-      processes and for processing users' logins. Issue the following commands
-      as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 42 dovecot &amp;&amp;
-useradd -c "Dovecot unprivileged user" -d /dev/null -u 42 \
-        -g dovecot -s /bin/false dovecot &amp;&amp;
-groupadd -g 43 dovenull &amp;&amp;
-useradd -c "Dovecot login user" -d /dev/null -u 43 \
-        -g dovenull -s /bin/false dovenull</userinput></screen>
-
-    <para>
-      First, apply a patch to fix problems with OpenSSL-3:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../dovecot-&dovecot-version;-openssl3_fixes-1.patch</userinput></screen>
-
-    <para>
-      Next, apply a patch to fix a security vulnerability:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../dovecot-&dovecot-version;-security_fix-1.patch</userinput></screen>
-
-    <para>
-      Install <application>Dovecot</application> by running the following
-      commands:
-    </para>
-
-<screen revision="sysv"><userinput>CPPFLAGS="-I/usr/include/tirpc" \
-LDFLAGS+=" -ltirpc" \
-./configure --prefix=/usr                          \
-            --sysconfdir=/etc                      \
-            --localstatedir=/var                   \
-            --with-systemd=no                      \
-            --docdir=/usr/share/doc/dovecot-&dovecot-version; \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-<screen revision="systemd"><userinput>CPPFLAGS="-I/usr/include/tirpc" \
-LDFLAGS+=" -ltirpc" \
-./configure --prefix=/usr                          \
-            --sysconfdir=/etc                      \
-            --localstatedir=/var                   \
-            --docdir=/usr/share/doc/dovecot-&dovecot-version; \
-            --disable-static                       &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue <command>make -k check</command>. <!-- An error
-      may be reported if <xref linkend="valgrind"/> is present when running
-      the test.-->
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>CPPFLAGS=... LDFLAGS+=...</command>: build with libtirpc
-      instead of the recently removed RPC code provided by GlibC.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <!-- With merged-/usr, /usr/lib/systemd/system is set by default.
-    <para revision="systemd">
-      <parameter>- -with-systemdsystemunitdir=/lib/systemd/system</parameter>:
-      This switch is used to set the correct installation directory for
-      systemd units.
-    </para>
-    -->
-
-    <para>
-      <option>--with-ldap</option>: This switch enables
-      <application>OpenLDAP</application> authentication support.
-    </para>
-
-    <para>
-      <option>--with-pgsql</option>: This switch enables
-      <application>PostgreSQL</application> database support.
-    </para>
-
-    <para>
-      <option>--with-mysql</option>: This switch enables
-      <application>MySQL</application> database support.
-    </para>
-
-    <para>
-      <option>--with-sqlite</option>: This switch enables
-      <application>SQLite</application> database support.
-    </para>
-
-    <para>
-      <option>--with-lucene</option>: This switch enables
-      <application>CLucene</application> full text search support.
-    </para>
-
-    <para>
-      <option>--with-lua</option>: This switch enables
-      <application>Lua</application> plugin support. This includes
-      a mail and push notification plugin.
-    </para>
-
-<!--
-    <para>
-      <option>- -with-krb5</option>: This switch enables
-      GSSAPI authentication support.
-    </para>
--->
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Dovecot</title>
-
-    <sect3 id="dovecot-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/dovecot/dovecot.conf</filename>,
-        <filename>/etc/dovecot/conf.d/*</filename>, and
-        <filename>/etc/dovecot/local.conf</filename>
-      </para>
-
-      <indexterm zone="dovecot dovecot-config">
-        <primary sortas="e-etc-dovecot-dovecot.conf">/etc/dovecot/dovecot.conf</primary>
-      </indexterm>
-      <indexterm zone="dovecot dovecot-config">
-        <primary sortas="e-etc-dovecot-conf.d">/etc/dovecot/conf.d/*</primary>
-      </indexterm>
-      <indexterm zone="dovecot dovecot-config">
-        <primary sortas="e-etc-dovecot-local.conf">/etc/dovecot/local.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Copy an example configuration, which you can use as a starting point:
-      </para>
-
-<screen role="root"><userinput>cp -rv /usr/share/doc/dovecot-&dovecot-version;/example-config/* /etc/dovecot</userinput></screen>
-
-      <para>
-        The following configuration is a simple proof of concept with IMAP
-        service using local users for authentication and mailbox location.
-        Reading files from the <filename class="directory">conf.d</filename>
-        directory is commented out since the included example configuration
-        requires <application>OpenSSL</application> and
-        <application>Linux PAM</application>.
-      </para>
-
-<screen role="root"><userinput>sed -i '/^\!include / s/^/#/' /etc/dovecot/dovecot.conf &amp;&amp;
-chmod -v 1777 /var/mail &amp;&amp;
-cat &gt; /etc/dovecot/local.conf &lt;&lt; "EOF"
-<literal>protocols = imap
-ssl = no
-# The next line is only needed if you have no IPv6 network interfaces
-listen = *
-mail_location = mbox:~/Mail:INBOX=/var/mail/%u
-userdb {
-  driver = passwd
-}
-passdb {
-  driver = shadow
-}</literal>
-EOF</userinput></screen>
-
-      <para>
-        You will definitely want to read the official documentation at <ulink
-        url="https://wiki2.dovecot.org/"/> if you plan to use
-        <application>Dovecot</application> in a production environment.
-      </para>
-
-    </sect3>
-
-    <sect3 id="dovecot-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para revision="sysv">
-        If you want the <application>Dovecot</application>
-        server to start automatically when the system is booted, install the
-        <filename>/etc/rc.d/init.d/dovecot</filename> init script included in
-        the <xref linkend="bootscripts"/> package.
-      </para>
-
-      <para revision="systemd">
-        To start the <command>dovecot</command>
-        daemon at boot, enable the previously installed systemd unit with the
-        following command:
-      </para>
-
-      <indexterm zone="dovecot dovecot-init">
-        <primary sortas="f-dovecot">dovecot</primary>
-      </indexterm>
-
-<screen role="root" revision="sysv"><userinput>make install-dovecot</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>systemctl enable dovecot</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          doveadm, doveconf, dovecot, dovecot-sysreport, and dsync (symbolic link)
-        </seg>
-        <seg>
-          various internal plugins in
-          <filename class="directory">/usr/lib/dovecot</filename>
-        </seg>
-        <seg>
-          /etc/dovecot,
-          /usr/{include,lib,libexec,share}/dovecot and
-          /usr/share/doc/dovecot-&dovecot-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="doveadm">
-        <term><command>doveadm</command></term>
-        <listitem>
-          <para>
-            is the <application>Dovecot</application> administration tool
-          </para>
-          <indexterm zone="dovecot doveadm">
-            <primary sortas="b-doveadm">doveadm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="doveconf">
-        <term><command>doveconf</command></term>
-        <listitem>
-          <para>
-            is <application>Dovecot</application>'s configuration dumping
-            utility
-          </para>
-          <indexterm zone="dovecot doveconf">
-            <primary sortas="b-doveconf">doveconf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dovecot-prog">
-        <term><command>dovecot</command></term>
-        <listitem>
-          <para>
-            is the IMAP and POP server
-          </para>
-          <indexterm zone="dovecot dovecot-prog">
-            <primary sortas="b-dovecot">dovecot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dovecot-sysreport">
-        <term><command>dovecot-sysreport</command></term>
-        <listitem>
-          <para>
-            prints system information that is useful to the Dovecot developers
-            when submitting bug reports upstream
-          </para>
-          <indexterm zone="dovecot dovecot-sysreport">
-            <primary sortas="b-dovecot-sysreport">dovecot-sysreport</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dsync">
-        <term><command>dsync</command></term>
-        <listitem>
-          <para>
-            is <application>Dovecot</application>'s mailbox synchronization
-            utility
-          </para>
-          <indexterm zone="dovecot dsync">
-            <primary sortas="b-dsync">dsync</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: server/mail/exim.xml
===================================================================
--- server/mail/exim.xml	(revision fd67949aeb0d4c187a3b89727742599834f1a349)
+++ server/mail/exim.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,736 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
+<sect1 id="exim" xreflabel="exim">
+<?dbhtml filename="exim.html" dir="server"?>
+<title>exim</title>
 
-  <!ENTITY exim-download-http   "https://ftp.exim.org/pub/exim/exim4/exim-&exim-version;.tar.xz">
-
-  <!ENTITY exim-download-ftp    " ">
-  <!-- if above don't work, please use one of the official mirrors at
-       http://www.exim.org/mirmon/ftp_mirrors.html -->
-  <!ENTITY exim-md5sum          "3fd68ae37720767619dd305b047fe8f9">
-  <!ENTITY exim-size            "1.9 MB">
-  <!ENTITY exim-buildsize       "18 MB">
-  <!ENTITY exim-time            "0.1 SBU">
-
-  <!ENTITY exim-daemon-version  "&exim-version;-2">
-]>
-
-<sect1 id="exim" xreflabel="Exim-&exim-version;">
-  <?dbhtml filename="exim.html"?>
-
-
-  <title>Exim-&exim-version;</title>
-
-  <indexterm zone="exim">
-    <primary sortas="a-Exim">Exim</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Exim</title>
-
-    <para>
-      The <application>Exim</application> package contains a Mail
-      Transport Agent written by the University of Cambridge, released
-      under the GNU Public License.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&exim-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&exim-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &exim-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &exim-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &exim-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &exim-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Additional formats of the documentation (text-based docs are
-          shipped with the sources) can be downloaded by following the links
-          shown at <ulink url="https://exim.org/docs.html"/>.
-        </para>
-      </listitem>
-<!-- Applied in 4.96
-      <listitem>
-        <para>
-          Required patch when building with <application>PAM</application> support:
-          <ulink url="&patch-root;/exim-&exim-version;-call_pam-1.patch"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Required patch to build with openssl-3:
-          <ulink url="&patch-root;/exim-&exim-version;-openssl3_fix-1.patch"/>
-        </para>
-      </listitem>
--->
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Exim Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libnsl"/>,
-      <xref linkend="perl-file-fcntllock"/> and
-      <xref linkend="pcre2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://sourceforge.net/projects/tdb">TDB</ulink>
-      (alternative to GDBM, built in LFS),
-      <xref linkend="cyrus-sasl"/>,
-      <xref linkend="libidn"/>,
-      <xref linkend="linux-pam"/>,
-      <xref linkend="mariadb"/> or
-      <ulink url="https://www.mysql.com/">MySQL</ulink>,
-      <xref linkend="openldap"/>,
-      <xref linkend="gnutls"/>,
-      <xref linkend="postgresql"/>,
-      <xref linkend="sqlite"/>,
-      <xref linkend="x-window-system"/>,
-      <ulink url="https://github.com/heimdal/heimdal">Heimdal GSSAPI</ulink>,
-      <ulink url="https://github.com/shevek/libspf2/">libspf2</ulink>, and
-      <ulink url="http://www.trusteddomain.org/opendmarc/">OpenDMARC</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Exim</title>
-
-    <para>
-      Before building <application>Exim</application>, as the
-      <systemitem class="username">root</systemitem> user you should create
-      the group and user <systemitem class="username">exim</systemitem> which
-      will run the <command>exim</command> daemon:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 31 exim &amp;&amp;
-useradd -d /dev/null -c "Exim Daemon" -g exim -s /bin/false -u 31 exim</userinput></screen>
-
-    <para>
-      Configure <application>Exim</application> with the following commands:
-    </para>
-
-<screen><userinput>sed -e 's,^BIN_DIR.*$,BIN_DIRECTORY=/usr/sbin,'    \
-    -e 's,^CONF.*$,CONFIGURE_FILE=/etc/exim.conf,' \
-    -e 's,^EXIM_USER.*$,EXIM_USER=exim,'           \
-    -e '/# USE_OPENSSL/s,^#,,' src/EDITME > Local/Makefile &amp;&amp;
-
-printf "USE_GDBM = yes\nDBMLIB = -lgdbm\n" >> Local/Makefile
-</userinput></screen>
-
-    <para>
-      If you want to add <application>Linux PAM</application> support, also run the following commands:
-    </para>
-
-<screen role="nodump"><userinput>sed -i '/# SUPPORT_PAM=yes/s,^#,,' Local/Makefile
-echo "EXTRALIBS=-lpam" >> Local/Makefile
-</userinput></screen>
-
-    <para>
-      Build <application>Exim</application> with the following command:
-    </para>
-
-<screen><userinput>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>
-
-<!-- dev note: make INSTALL_ARG=-no_chown DESTDIR=<DESTDIR> install -->
-
-<screen role="root"><userinput>make install                                    &amp;&amp;
-install -v -m644 doc/exim.8 /usr/share/man/man8 &amp;&amp;
-
-install -vdm 755    /usr/share/doc/exim-&exim-version; &amp;&amp;
-cp      -Rv doc/*   /usr/share/doc/exim-&exim-version; &amp;&amp;
-
-ln -sfv exim /usr/sbin/sendmail                 &amp;&amp;
-install -v -d -m750 -o exim -g exim /var/spool/exim</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -e ... > Local/Makefile</command>: Most of
-      <application>Exim</application>'s configuration options are defined
-      in <filename>Local/Makefile</filename>, which is created from
-      the <filename>src/EDITME</filename> file. This command specifies the
-      minimum set of options. Descriptions for the options are listed below.
-    </para>
-
-    <para>
-      <command>printf ... > Local/Makefile</command>: Setting those
-      variables allows to use GDBM instead of the default Berkeley DB. Remove
-      this command if you have installed &berkeley-db;.
-    </para>
-
-    <para>
-      <parameter>BIN_DIRECTORY=/usr/sbin</parameter>: This installs all of
-      <application>Exim</application>'s binaries and scripts in
-      <filename class='directory'>/usr/sbin</filename>.
-    </para>
-
-    <para>
-      <parameter>CONFIGURE_FILE=/etc/exim.conf</parameter>: This installs
-      <application>Exim</application>'s main configuration file in
-      <filename class='directory'>/etc</filename>.
-    </para>
-
-    <para>
-      <parameter>EXIM_USER=exim</parameter>: This tells
-      <application>Exim</application> that after the daemon no longer needs
-      <systemitem class="username">root</systemitem> privileges, the process
-      needs to hand off the daemon to the <systemitem
-      class="username">exim</systemitem> user.
-    </para>
-    <!-- obsolete: now default 
-    <para>
-      <option>SUPPORT_TLS=yes</option>: This allows to support
-      STARTTLS connections. If you use this option, you need to select
-      whether <application>OpenSSL</application> or
-      <application>GnuTLS</application> is used (see
-      <filename>src/EDITME</filename>).
-    </para>
-    -->
-    <para>
-      <parameter>USE_OPENSSL</parameter>: uncommenting
-      <option>USE_OPENSSL=yes</option> and <option>USE_OPNSSL_PC=yes</option>
-      tells the
-      build system to use <application>OpenSSL</application>, and to
-      find the needed libraries with <application>pkg-config</application>.
-    </para>
-
-    <para>
-      Uncomment <option>EXIM_MONITOR</option>: This allows building the
-      <application>Exim</application> monitor program, which requires
-      <application>X Window System</application> support, and is commented out
-      by default.
-    </para>
-
-    <para>
-      <command>ln -sfv exim /usr/sbin/sendmail</command>: Creates a link to
-      <command>sendmail</command> for applications which need it.
-      <application>Exim</application> will accept most
-      <application>Sendmail</application> command-line options.
-    </para>
-
-    <para>
-      <command>install -v -m750 -o exim -g exim /var/spool/exim</command>:
-      Since /var/spool is owned by root and this version of
-      <command>exim</command> drops
-      <systemitem class="username">root</systemitem> privileges early, to run
-      as user <systemitem class="username">exim</systemitem>, it cannot create
-      the <filename class="directory">/var/spool/exim</filename> directory. As
-      a work around, it is created manually.
-    </para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Adding Additional Functionality</title>
-
-    <para>
-      To utilize some or all of the dependency packages, you'll need to
-      modify <filename>Local/Makefile</filename> to include the appropriate
-      directives and parameters to link additional libraries before you build
-      <application>Exim</application>. <filename>Local/Makefile</filename> is
-      heavily commented with instructions on how to do this. Listed below is
-      additional information to help you link these dependency packages or
-      add additional functionality.
-    </para>
-
-    <para>
-      If you wish to build and install the
-      <filename class='extension'>.info</filename> documentation, refer to
-      <ulink url=
-      "https://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch04.html#SECTinsinfdoc"/>.
-    </para>
-
-    <para>
-      If you wish to build in Exim's interfaces for calling virus and spam
-      scanning software directly from access control lists, uncomment the
-      <option>WITH_CONTENT_SCAN=yes</option> parameter and review the
-      information found at <ulink url=
-      "https://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch45.html"/>.
-    </para>
-
-    <para>
-      To use a backend database other than <application>GDBM
-      </application>, see the instructions at <ulink url=
-      "https://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch04.html#SECTdb"/>.
-    </para>
-
-    <para>
-      For SSL functionality, see the instructions at <ulink url=
-      "https://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch04.html#SECTinctlsssl"/>
-      and <ulink url="
-      https://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch42.html"/>.
-    </para>
-
-    <para>
-      For <application>tcpwrappers</application> functionality, see the
-      instructions at <ulink url=
-      "https://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch04.html#SECID27"/>.
-    </para>
-
-    <para>
-      For information about adding authentication mechanisms to the
-      build, see chapters 33&mdash;41 of <ulink url=
-      "https://exim.org/exim-html-&exim-version;/doc/html/spec_html/index.html"/>.
-    </para>
-
-    <para>
-      For information about linking <application>Linux-PAM</application>,
-      refer to the instructions <ulink url=
-      "https://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch11.html#SECTexpcond"/>.
-    </para>
-
-    <para>
-      For information about linking database engine libraries used for
-      <application>Exim</application> name lookups, see the instructions at
-      <ulink url=
-      "https://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch09.html"/>.
-    </para>
-
-    <para>
-      If you wish to add <application>Readline</application> support to
-      <application>Exim</application> when invoked in <quote>test
-      expansion</quote> (<option>-be</option>) mode, see the information in
-      the <option>-be</option> section of <ulink url=
-      "https://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch05.html#id2525974"/>.
-    </para>
-
-    <para>
-      You may wish to modify the default configuration and send log files to
-      syslog instead of the default
-      <filename class='directory'>/var/spool/exim/log</filename> directory. See
-      the information at <ulink url=
-      "https://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch-log_files.html"/>.
-    </para>
-
-    <para>
-      A wealth of information can be also found at the <ulink url=
-      "https://github.com/Exim/exim/wiki">Exim Wiki</ulink>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Exim</title>
-
-    <sect3 id="exim-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/exim.conf</filename> and
-        <filename>/etc/aliases</filename>
-      </para>
-
-      <indexterm zone="exim exim-config">
-        <primary sortas="e-etc-exim.conf">/etc/exim.conf</primary>
-      </indexterm>
-
-      <indexterm zone="exim exim-config">
-        <primary sortas="e-etc-aliases">/etc/aliases</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Review the file <filename>/etc/exim.conf</filename>, and modify any
-        settings to suit your needs. Note that the default configuration
-        assumes that the <filename class="directory">/var/mail</filename>
-        directory is world writable, but has the sticky bit set. If you want
-        to use the default configuration, issue as the <systemitem
-        class="username">root</systemitem> user:
-     </para>
-
-<screen role="root"><userinput>chmod -v a+wt /var/mail</userinput></screen>
-
-      <para>
-        A default (nothing but comments) <filename>/etc/aliases</filename>
-        file is installed during the package installation if this file did not
-        exist on your system. Create the necessary aliases and start the
-        <application>Exim</application> daemon using the following commands:
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/aliases &lt;&lt; "EOF"
-<literal>postmaster: root
-MAILER-DAEMON: root</literal>
-EOF
-/usr/sbin/exim -bd -q15m</userinput></screen>
-
-      <note>
-        <para>
-          To protect an existing <filename>/etc/aliases</filename> file,
-          the command above appends these aliases to it. This file should be
-          checked and duplicate aliases removed, if present.
-        </para>
-      </note>
-
-      <para>
-        The <command>/usr/sbin/exim -bd -q15m</command> command starts
-        the <application>Exim</application> daemon with a 15 minute interval
-        in processing the mail queue. Adjust this parameter to suit your
-        desires.
-      </para>
-    </sect3>
-
-    <sect3>
-      <title>Linux PAM Configuration</title>
-
-      <para>
-        If you have built <application>Exim</application> with
-        <application>Linux PAM</application> support, you need to create a
-        <application>PAM</application> configuration file to get it working
-        correctly with BLFS.
-      </para>
-
-      <para>
-        Issue the following command as the <systemitem
-        class="username">root</systemitem> user to create the configuration
-        file for <application>Linux PAM</application>:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/pam.d/exim &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/exim
-
-auth    include system-auth
-account include system-account
-session include system-session
-
-# End /etc/pam.d/exim</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-    <sect3  id="exim-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para>
-        To automatically start <command>exim</command> at boot, install the
-        <phrase revision="sysv"><filename>/etc/rc.d/init.d/exim</filename>
-        init script</phrase>
-        <phrase revision="systemd"><filename>exim.service</filename>
-        unit</phrase>
-        included in the <xref linkend="bootscripts" revision="sysv"/>
-        <xref linkend="systemd-units" revision="systemd"/> package:
-      </para>
-
-      <indexterm zone="exim exim-init">
-        <primary sortas="f-exim">exim</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-exim</userinput></screen>
-
-      <para revision="sysv">
-        The bootscript also starts the <application>Exim</application> daemon
-        and dispatches a queue runner process every 15 minutes. Modify the
-        <option>-q<replaceable>&lt;time interval&gt;</replaceable></option>
-        parameter in <filename>/etc/rc.d/init.d/exim</filename>, if necessary
-        for your installation.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>exicyclog, exigrep, exim, exim-&exim-daemon-version;, exim_checkaccess,
-        exim_dbmbuild, exim_dumpdb, exim_fixdb, exim_lock, exim_tidydb,
-        eximstats, exinext, exipick, exiqgrep, exiqsumm, exiwhat, and
-        optionally, eximon, eximon.bin, and sendmail (symlink)</seg>
-        <seg>None</seg>
-        <seg>/usr/share/doc/exim-&exim-version; and /var/spool/exim</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="exicyclog">
-        <term><command>exicyclog</command></term>
-        <listitem>
-          <para>
-            cycles <application>Exim</application> log files
-          </para>
-          <indexterm zone="exim exicyclog">
-            <primary sortas="b-exicyclog">exicyclog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exigrep">
-        <term><command>exigrep</command></term>
-        <listitem>
-          <para>
-            searches <application>Exim</application> log files
-          </para>
-          <indexterm zone="exim exigrep">
-            <primary sortas="b-exigrep">exigrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exim-prog">
-        <term><command>exim</command></term>
-        <listitem>
-          <para>
-            is a symlink to the <command>exim-&exim-daemon-version;</command>
-            MTA daemon
-          </para>
-          <indexterm zone="exim exim-prog">
-            <primary sortas="b-exim">exim</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exim-current_version">
-        <term><command>exim-&exim-daemon-version;</command></term>
-        <listitem>
-          <para>
-            is the <application>Exim</application> mail transport agent daemon
-          </para>
-          <indexterm zone="exim exim-current_version">
-            <primary sortas="b-exim-&exim-daemon-version;">exim-&exim-daemon-version;</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exim_checkaccess">
-        <term><command>exim_checkaccess</command></term>
-        <listitem>
-          <para>
-            states whether a given recipient address from a given host is
-            acceptable or not
-          </para>
-          <indexterm zone="exim exim_checkaccess">
-            <primary sortas="b-exim_checkaccess">exim_checkaccess</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exim_dbmbuild">
-        <term><command>exim_dbmbuild</command></term>
-        <listitem>
-          <para>
-            creates and rebuilds <application>Exim</application> databases
-          </para>
-          <indexterm zone="exim exim_dbmbuild">
-            <primary sortas="b-exim_dbmbuild">exim_dbmbuild</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exim_dumpdb">
-        <term><command>exim_dumpdb</command></term>
-        <listitem>
-          <para>
-            writes the contents of <application>Exim</application>
-            databases to the standard output
-          </para>
-          <indexterm zone="exim exim_dumpdb">
-            <primary sortas="b-exim_dumpdb">exim_dumpdb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exim_fixdb">
-        <term><command>exim_fixdb</command></term>
-        <listitem>
-          <para>
-            modifies data in <application>Exim</application> databases
-          </para>
-          <indexterm zone="exim exim_fixdb">
-            <primary sortas="b-exim_fixdb">exim_fixdb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exim_lock">
-        <term><command>exim_lock</command></term>
-        <listitem>
-          <para>
-            locks a mailbox file
-          </para>
-          <indexterm zone="exim exim_lock">
-            <primary sortas="b-exim_lock">exim_lock</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exim_tidydb">
-        <term><command>exim_tidydb</command></term>
-        <listitem>
-          <para>
-            removes old records from <application>Exim</application>
-            databases
-          </para>
-          <indexterm zone="exim exim_tidydb">
-            <primary sortas="b-exim_tidydb">exim_tidydb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="eximstats">
-        <term><command>eximstats</command></term>
-        <listitem>
-          <para>
-            generates mail statistics from <application>Exim</application>
-            log files
-          </para>
-          <indexterm zone="exim eximstats">
-            <primary sortas="b-eximstats">eximstats</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exinext">
-        <term><command>exinext</command></term>
-        <listitem>
-          <para>
-            queries remote host retry times
-          </para>
-          <indexterm zone="exim exinext">
-            <primary sortas="b-exinext">exinext</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exipick">
-        <term><command>exipick</command></term>
-        <listitem>
-          <para>
-            selects messages based on various criteria
-          </para>
-          <indexterm zone="exim exipick">
-            <primary sortas="b-exipick">exipick</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exiqgrep">
-        <term><command>exiqgrep</command></term>
-        <listitem>
-          <para>
-            is a utility for selective queue listing
-          </para>
-          <indexterm zone="exim exiqgrep">
-            <primary sortas="b-exiqgrep">exiqgrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exiqsumm">
-        <term><command>exiqsumm</command></term>
-        <listitem>
-          <para>
-            produces a summary of the messages in the mail queue
-          </para>
-          <indexterm zone="exim exiqsumm">
-            <primary sortas="b-exiqsumm">exiqsumm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exiwhat">
-        <term><command>exiwhat</command></term>
-        <listitem>
-          <para>
-            queries running <application>Exim</application> processes
-          </para>
-          <indexterm zone="exim exiwhat">
-            <primary sortas="b-exiwhat">exiwhat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="eximon">
-        <term><command>eximon</command></term>
-        <listitem>
-          <para>
-            is a start-up shell script for <command>eximon.bin</command>
-            used to set the required environment variables before running the
-            program
-          </para>
-          <indexterm zone="exim eximon">
-            <primary sortas="b-eximon">eximon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="eximon.bin">
-        <term><command>eximon.bin</command></term>
-        <listitem>
-          <para>
-            is a monitor program which displays current information in an
-            <application>X</application> window, and also contains a menu
-            interface to <application>Exim</application>'s command line
-            administration options
-          </para>
-          <indexterm zone="exim eximon.bin">
-            <primary sortas="b-eximon.bin">eximon.bin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+<para>TO BE DONE</para>
 
 </sect1>
+
Index: server/mail/exim/exim.ent
===================================================================
--- server/mail/exim/exim.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/mail/exim/exim.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY exim SYSTEM "../exim.xml">
Index: server/mail/mail.xml
===================================================================
--- server/mail/mail.xml	(revision fd67949aeb0d4c187a3b89727742599834f1a349)
+++ server/mail/mail.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,28 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- <!ENTITY % general-entities SYSTEM "../../general.ent">
- %general-entities;
-]>
+<chapter id="server-mail">
+<?dbhtml filename="mail.html" dir="server"?>
+<title>Mail Server Software</title>
 
-<chapter id="server-mail" xreflabel="MTA">
-  <?dbhtml filename="mail.html"?>
+<para>MTAs are the programs which transport mail from one machine to the
+other.  The traditional MTA is <emphasis>sendmail</emphasis> however
+there are several other choices.</para>
 
-  <title>Mail Server Software</title>
+<para>As well as SMTP servers there are two other packages here, a POP
+server (qpopper) and an IMAP server (Courier-IMAP).</para>
 
-  <para>
-    MTAs are the programs which transport mail from one machine to the
-    other. The traditional MTA is <application>Sendmail</application>, however
-    there are several other choices.
-  </para>
-
-  <para>
-    In addition to the SMTP servers, there is also a POP/IMAP server (Dovecot).
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dovecot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="exim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="postfix.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sendmail.xml"/>
+&postfix;
+&qmail;
+&sendmail;
+&exim;
+&qpopper;
+&courier;
 
 </chapter>
Index: server/mail/postfix.xml
===================================================================
--- server/mail/postfix.xml	(revision fd67949aeb0d4c187a3b89727742599834f1a349)
+++ server/mail/postfix.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,760 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
+<sect1 id="postfix" xreflabel="postfix-&postfix-version;">
+<?dbhtml filename="postfix.html" dir="server"?>
+<title>postfix-&postfix-version;</title>
 
-  <!-- editors: upstream postfix is ftp only, some of the mirrors offer
-  https - http://www.porcupine.org/mirmon/postfix-source.html lists the
-  mirror status, some of the mirrors shown as http are actually https -->
-  <!ENTITY postfix-download-http "https://ghostarchive.org/postfix/postfix-release/official/postfix-&postfix-version;.tar.gz">
-  <!ENTITY postfix-download-ftp  " ">
-  <!ENTITY postfix-md5sum        "3eda9b945ed6cdf11ef58a731c574a04">
-  <!ENTITY postfix-size          "4.7 MB">
-  <!ENTITY postfix-buildsize     "208 MB">
-  <!ENTITY postfix-time          "0.1 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="postfix" xreflabel="Postfix-&postfix-version;">
-  <?dbhtml filename="postfix.html"?>
-
-
-  <title>Postfix-&postfix-version;</title>
-
-  <indexterm zone="postfix">
-    <primary sortas="a-Postfix">Postfix</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Postfix</title>
-
-    <para>
-      The <application>Postfix</application> package contains a Mail Transport
-      Agent (MTA). This is useful for sending email to other users of your host
-      machine.  It can also be configured to be a central mail server for your
-      domain, a mail relay agent or simply a mail delivery agent to your local
-      Internet Service Provider.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&postfix-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&postfix-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &postfix-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &postfix-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &postfix-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &postfix-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/postfix-&postfix-version;-glibc230_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Postfix Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="cyrus-sasl"/>,
-      <xref linkend="libnsl"/>, and
-      <xref linkend="lmdb"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="icu"/> for Email Address Internationalization (SMTPUTF8) support,
-      <xref linkend="mariadb"/> or <ulink url="https://www.mysql.com/">MySQL</ulink>,
-      <xref linkend="openldap"/>,
-      <xref linkend="pcre2"/>,
-      <xref linkend="postgresql"/>,
-      <xref linkend="sqlite"/>,
-      &berkeley-db;, and
-      <ulink url="https://cr.yp.to/cdb.html">CDB</ulink> or
-      <ulink url="https://www.corpit.ru/mjt/tinycdb.html">TinyCDB</ulink>
-    </para>
-
-    <para>
-      Note that <application>SQLite</application>,
-      <application>MySQL</application>, <application>PostgreSQL</application>
-      and <application>CDB</application> are only useful if there is a known
-      need for them.
-    </para>
-
-    <para condition="html" role="usernotes">
-      Editor Notes: <ulink url="&blfs-wiki;/postfix"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Postfix</title>
-
-    <sect3>
-      <title>Adding Users and Groups</title>
-
-      <para>
-        Before you compile the program, you need to create users and groups that
-        will be expected to be in place during the installation. Add the users
-        and groups with the following commands issued by the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>groupadd -g 32 postfix &amp;&amp;
-groupadd -g 33 postdrop &amp;&amp;
-useradd -c "Postfix Daemon User" -d /var/spool/postfix -g postfix \
-        -s /bin/false -u 32 postfix &amp;&amp;
-chown -v postfix:postfix /var/mail</userinput></screen>
-    </sect3>
-
-    <sect3>
-      <title>Configuring the Build</title>
-
-      <para>
-        The README files are formatted to be read with a pager like
-        <application>less</application> or <application>more</application>.
-        If you want to use a text editor, make them legible with the
-        following sed:
-      </para>
-
-<screen><userinput>sed -i 's/.\x08//g' README_FILES/*</userinput></screen>
-
-      <para>
-        The <application>Postfix</application> source tree does not contain a
-        <filename>configure</filename> script, rather the makefile in the
-        top-level directory contains a <option>makefiles</option> target that
-        regenerates all the other makefiles in the build tree. If you wish to
-        use additional software such as a database back-end for virtual users,
-        or TLS/SSL authentication, you will need to regenerate the makefiles
-        using one or more of the appropriate <envar>CCARGS</envar> and
-        <envar>AUXLIBS</envar> settings listed below.
-      </para>
-
-      <note>
-        <para>
-          For all variants of the CCARGS you should ensure that -DNO_NIS is
-          specified so that the build does not attempt to access an rpcsvc
-          header which do not exist in BLFS.  If &berkeley-db; is
-          not installed, -DNO_DB needs to be specified as well.
-        </para>
-      </note>
-
-      <para>
-        For more details read the readme files.
-      </para>
-
-      <para>
-        Initialize the <envar>CCARGS</envar> and <envar>AUXLIBS</envar>
-        according to the note above:
-      </para>
-
-<screen><userinput>CCARGS="-DNO_NIS -DNO_DB"
-AUXLIBS=""</userinput></screen>
-
-      <para>
-        Next, the <envar>CCARGS</envar> and the <envar>AUXLIBS</envar>
-        variables are filled with settings depending on the actual
-        system configuration. If an optional package is installed but
-        should <emphasis>not</emphasis> be included in the
-        <application>Postfix</application> build, simply skip the
-        corresponding <code>if [ ... ]; then</code> scriptlets.
-      </para>
-
-      <sect4>
-        <title>Cyrus-SASL</title>
-
-        <para>
-          To use <application>Cyrus-SASL</application> with
-          <application>Postfix</application>, use the following arguments:
-        </para>
-
-<screen><userinput>if [ -r /usr/lib/libsasl2.so ]; then
-  CCARGS="$CCARGS -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
-  AUXLIBS="$AUXLIBS -lsasl2"
-fi</userinput></screen>
-      </sect4>
-
-      <sect4>
-        <title>LMDB</title>
-        <para>
-          To use <application>LMDB</application> with
-          <application>Postfix</application>, use the following arguments:
-        </para>
-
-<screen><userinput>if [ -r /usr/lib/liblmdb.so ]; then
-  CCARGS="$CCARGS -DHAS_LMDB"
-  AUXLIBS="$AUXLIBS -llmdb"
-fi</userinput></screen>
-      </sect4>
-
-      <sect4>
-        <title>OpenLDAP</title>
-
-        <para>
-          To use <application>OpenLDAP</application> with
-          <application>Postfix</application>, use the following arguments:
-        </para>
-
-<screen><userinput>if [ -r /usr/lib/libldap.so -a -r /usr/lib/liblber.so ]; then
-  CCARGS="$CCARGS -DHAS_LDAP"
-  AUXLIBS="$AUXLIBS -lldap -llber"
-fi</userinput></screen>
-
-      </sect4>
-
-      <sect4>
-        <title>Sqlite</title>
-
-        <para>
-          To use <application>Sqlite</application> with
-          <application>Postfix</application>, use the following arguments:
-        </para>
-
-<screen><userinput>if [ -r /usr/lib/libsqlite3.so ]; then
-  CCARGS="$CCARGS -DHAS_SQLITE"
-  AUXLIBS="$AUXLIBS -lsqlite3 -lpthread"
-fi</userinput></screen>
-
-      </sect4>
-
-      <sect4>
-        <title>MySQL</title>
-
-        <para>
-          To use <application>MySQL</application> with
-          <application>Postfix</application>, use the following arguments:
-        </para>
-
-<screen><userinput>if [ -r /usr/lib/libmysqlclient.so ]; then
-  CCARGS="$CCARGS -DHAS_MYSQL -I/usr/include/mysql"
-  AUXLIBS="$AUXLIBS -lmysqlclient -lz -lm"
-fi</userinput></screen>
-
-      </sect4>
-
-      <sect4>
-        <title>PostgreSQL</title>
-
-        <para>
-          To use <application>PostgreSQL</application> with
-          <application>Postfix</application>, use the following arguments:
-        </para>
-
-<screen><userinput>if [ -r /usr/lib/libpq.so ]; then
-  CCARGS="$CCARGS -DHAS_PGSQL -I/usr/include/postgresql"
-  AUXLIBS="$AUXLIBS -lpq -lz -lm"
-fi</userinput></screen>
-
-      </sect4>
-
-      <sect4>
-        <title>CDB/TinyCDB</title>
-
-        <para>
-          To use <application>CDB</application> or
-          <application>TinyCDB</application> with
-          <application>Postfix</application>, use the following arguments:
-        </para>
-
-<screen><literal>if [ -r <replaceable>&lt;/path/to/CDB&gt;</replaceable>/libcdb.a ]; then
-  CCARGS="$CCARGS -DHAS_CDB"
-  AUXLIBS="$AUXLIBS <replaceable>&lt;/path/to/CDB&gt;</replaceable>/libcdb.a"
-fi</literal></screen>
-
-      </sect4>
-
-      <sect4>
-        <title>StartTLS Authentication</title>
-
-        <para>
-          To use <application>OpenSSL</application> with
-          <application>Postfix</application>, use the following arguments:
-        </para>
-
-<screen><userinput>if [ -r /usr/lib/libssl.so -a -r /usr/lib/libcrypto.so ]; then
-  CCARGS="$CCARGS -DUSE_TLS -I/usr/include/openssl/"
-  AUXLIBS="$AUXLIBS -lssl -lcrypto"
-fi</userinput></screen>
-        <para>
-          <application>OpenSSL</application> is installed by LFS so it
-          should be always there. The <code>if ... then</code> is here
-          just for consistency.
-        </para>
-      </sect4>
-
-    </sect3>
-
-    <sect3>
-      <title>Installing Postfix</title>
-
-      <para>
-        There might be duplicate settings in <envar>AUXLIBS</envar>
-        like <code>-lm</code> when both, <application>MariaDB</application>
-        and <application>PostgreSQL</application> are used. They do
-        not harm. Install <application>Postfix</application> by
-        running the following commands:
-      </para>
-
-<screen><userinput>make CCARGS="$CCARGS" AUXLIBS="$AUXLIBS" makefiles &amp;&amp;
-make</userinput></screen>
-
-    <!-- There is a test suite, but it fails a lot. It seems to need
-         the host to be specifically setup for the tests.
-         Run with `make tests' and `make root_tests' -->
-    <para>
-      This package does not come with a useful test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<!-- dev note: sh postfix-install -non-interactive install_root=<DESTDIR> ... -->
-
-<screen role="root"><userinput>sh postfix-install -non-interactive \
-   daemon_directory=/usr/lib/postfix \
-   manpage_directory=/usr/share/man \
-   html_directory=/usr/share/doc/postfix-&postfix-version;/html \
-   readme_directory=/usr/share/doc/postfix-&postfix-version;/readme</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>make makefiles</command>: This command rebuilds the makefiles
-      throughout the source tree to use the options contained in the
-      <envar>CCARGS</envar> and <envar>AUXLIBS</envar> variables.
-    </para>
-
-    <para>
-      <command>sh postfix-install -non-interactive</command>: This keeps the
-      install script from asking any questions, thereby accepting default
-      destination directories in all but the few cases. If the
-      <option>html_directory</option> and <option>readme_directory</option>
-      options are not set then the documentation will not be installed.
-    </para>
-
-    <para>
-      <option>CCARGS="-DNO_EAI ..."</option>: this will turn off SMTPUTF8
-      support, for example  if the rest of your email address infrastructure
-      cannot handle UTF-8 email addresses and message header values.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Postfix</title>
-
-    <sect3 id="postfix-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/aliases</filename>,
-        <filename>/etc/postfix/main.cf</filename>, and
-        <filename>/etc/postfix/master.cf</filename>
-      </para>
-
-      <indexterm zone="postfix postfix-config">
-        <primary sortas="e-etc-aliases">/etc/aliases</primary>
-      </indexterm>
-
-      <indexterm zone="postfix postfix-config">
-        <primary sortas="e-etc-postfix-star">/etc/postfix/*</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Create (or append to an existing) <filename>/etc/aliases</filename>
-        with the following command. Change
-        <replaceable>&lt;LOGIN&gt;</replaceable> to your non-root login
-        identity so mail addressed to
-        <systemitem class="username">root</systemitem> can be forwarded to you.
-        As the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/aliases &lt;&lt; "EOF"
-<literal># Begin /etc/aliases
-
-MAILER-DAEMON:    postmaster
-postmaster:       root
-
-root:             <replaceable>&lt;LOGIN&gt;</replaceable>
-# End /etc/aliases</literal>
-EOF</userinput></screen>
-
-      <para>
-        To protect an existing <filename>/etc/aliases</filename> file,
-        the above command appends these aliases to it if it exists. This file
-        should be checked and duplicate aliases removed, if present.
-      </para>
-
-      <para>
-        The BLFS editors recommend to use LMDB instead of Berkeley DB for
-        Postfix tables.  Add three lines into
-        <filename>/etc/postfix/main.cf</filename> to make
-        <command>postmap</command> encode the lookup tables in the LMDB
-        format by default and to change the default hash setting of the
-        alias tables:
-      </para>
-
-<screen role="root"><userinput>echo 'default_database_type = lmdb'       &gt;&gt; /etc/postfix/main.cf &amp;&amp;
-echo 'alias_database = lmdb:/etc/aliases' &gt;&gt; /etc/postfix/main.cf &amp;&amp;
-echo 'alias_maps = lmdb:/etc/aliases'     &gt;&gt; /etc/postfix/main.cf</userinput></screen>
-
-      <para>
-        To protect your server against the recent SMTP smuggling attacks,
-        additional steps are required. Add two lines into
-        <filename>/etc/postfix/main.cf</filename> to disconnect remote SMTP
-        clients that send bare newlines in the DATA section, while also
-        allowing clients on your network with non-standard SMTP implementations
-        to still send mail:
-      </para>
-
-<screen role="root"><userinput>echo 'smtpd_forbid_bare_newline = normalize' &gt;&gt; /etc/postfix/main.cf &amp;&amp;
-echo 'smtpd_forbid_bare_newline_exclusions = $mynetworks' &gt;&gt; /etc/postfix/main.cf</userinput></screen>
-
-      <para>
-        Note that if you are following an online tutorial to configure
-        Postfix, the tutorial may refer to a lookup table with
-        <literal>hash:/path/to/lookup_table</literal>.  You should replace
-        <literal>hash</literal> with <literal>lmdb</literal> in order to use
-        a lookup table encoded in the LMDB format.
-      </para>
-
-      <note>
-        <para>
-          The <filename>/etc/postfix/main.cf</filename> and
-          <filename>/etc/postfix/master.cf</filename> files must be personalized
-          for your system. The <filename>main.cf</filename> file needs your
-          fully qualified hostname. You will find that
-          <filename>main.cf</filename> is self documenting, so load it into your
-          editor to make the changes you need for your situation.
-        </para>
-      </note>
-
-      <note>
-        <para>
-          <application>Postfix</application> can also be set up to
-          run in a chroot jail. See the file in the source
-          <filename>examples/chroot-setup/LINUX2</filename> for details.
-        </para>
-      </note>
-
-      <para>
-        To ensure that all permissions are set properly, <application>postfix</application>
-        provides a tool which is to be run as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="nodump"><userinput>/usr/sbin/postfix -c /etc/postfix set-permissions</userinput></screen>
-
-      <para>
-        If you have an existing configuration, you can run the
-        <command>postfix</command> utility to add any necessary definitions to
-        your existing files. As the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="nodump"><userinput>/usr/sbin/postfix upgrade-configuration</userinput></screen>
-
-      <para>
-        Before starting <application>Postfix</application>, you should check
-        that your configuration and file permissions will work properly. Run the
-        following commands as the <systemitem class="username">root</systemitem>
-        user to check and start your <application>Postfix</application> server:
-      </para>
-
-<screen role="nodump"><userinput>/usr/sbin/postfix check &amp;&amp;
-/usr/sbin/postfix start</userinput></screen>
-
-    </sect3>
-
-    <sect3 id="postfix-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para>
-        To automate the running of Postfix at startup, install the
-        <phrase revision="sysv"><filename>/etc/rc.d/init.d/postfix</filename>
-        init script</phrase>
-        <phrase revision="systemd"><filename>postfix.service</filename>
-        unit</phrase> included in the
-        <xref linkend="bootscripts" revision="sysv"/>
-        <xref linkend="systemd-units" revision="systemd"/> package:
-      </para>
-
-      <indexterm zone="postfix postfix-init">
-        <primary sortas="f-postfix">postfix</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-postfix</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          mailq (symlink), newaliases (symlink), postalias, postcat, postconf,
-          postdrop, postfix, postkick, postlock, postlog, postmap, postmulti,
-          postqueue, postsuper, and sendmail
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /{etc,usr/lib}/postfix,
-          /usr/share/doc/postfix-&postfix-version; and
-          /var/{lib,spool}/postfix
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mailq">
-        <term><command>mailq</command></term>
-        <listitem>
-          <para>
-            A symlink to <filename>sendmail</filename>
-          </para>
-          <indexterm zone="postfix mailq">
-            <primary sortas="b-mailq">mailq</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="newaliases">
-        <term><command>newaliases</command></term>
-        <listitem>
-          <para>
-            A symlink to <filename>sendmail</filename>
-          </para>
-          <indexterm zone="postfix newaliases">
-            <primary sortas="b-newaliases">newaliases</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="postalias">
-        <term><command>postalias</command></term>
-        <listitem>
-          <para>
-            is a utility for <application>Postfix</application> alias database
-            maintenance
-          </para>
-          <indexterm zone="postfix postalias">
-            <primary sortas="b-postalias">postalias</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="postcat">
-        <term><command>postcat</command></term>
-        <listitem>
-          <para>
-            Prints the contents of files from the
-            <application>Postfix</application> queue in human readable format
-          </para>
-          <indexterm zone="postfix postcat">
-            <primary sortas="b-postcat">postcat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="postconf">
-        <term><command>postconf</command></term>
-        <listitem>
-          <para>
-            Displays or changes the value of
-            <application>Postfix</application> configuration parameters
-          </para>
-          <indexterm zone="postfix postconf">
-            <primary sortas="b-postconf">postconf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="postdrop">
-        <term><command>postdrop</command></term>
-        <listitem>
-          <para>
-            Creates a file in the maildrop directory and copies its standard
-            input to the file
-          </para>
-          <indexterm zone="postfix postdrop">
-            <primary sortas="b-postdrop">postdrop</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="postfix-bin">
-        <term><command>postfix</command></term>
-        <listitem>
-          <para>
-            is the <application>Postfix</application> control program
-          </para>
-          <indexterm zone="postfix postfix-bin">
-            <primary sortas="b-postfix">postfix</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="postkick">
-        <term><command>postkick</command></term>
-        <listitem>
-          <para>
-            Sends requests to the specified service over a local transport
-            channel
-          </para>
-          <indexterm zone="postfix postkick">
-            <primary sortas="b-postkick">postkick</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="postlock">
-        <term><command>postlock</command></term>
-        <listitem>
-          <para>
-            Locks a mail folder for exclusive use, and executes commands passed
-            to it
-          </para>
-          <indexterm zone="postfix postlock">
-            <primary sortas="b-postlock">postlock</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="postlog">
-        <term><command>postlog</command></term>
-        <listitem>
-          <para>
-            A <application>Postfix</application>-compatible logging interface
-            for use in, for example, shell scripts
-          </para>
-          <indexterm zone="postfix postlog">
-            <primary sortas="b-postlog">postlog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="postmap">
-        <term><command>postmap</command></term>
-        <listitem>
-          <para>
-            Creates or queries one or more Postfix lookup tables, or updates an
-            existing one
-          </para>
-          <indexterm zone="postfix postmap">
-            <primary sortas="b-postmap">postmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="postmulti">
-        <term><command>postmulti</command></term>
-        <listitem>
-          <para>
-            is the <application>Postfix</application> multi-instance manager.
-            It allows a system administrator to manage multiple
-            <application>Postfix</application> instances on a single host
-          </para>
-          <indexterm zone="postfix postmulti">
-            <primary sortas="b-postmulti">postmulti</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="postqueue">
-        <term><command>postqueue</command></term>
-        <listitem>
-          <para>
-            The <application>Postfix</application> user interface for
-            queue management
-          </para>
-          <indexterm zone="postfix postqueue">
-            <primary sortas="b-postqueue">postqueue</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="postsuper">
-        <term><command>postsuper</command></term>
-        <listitem>
-          <para>
-            The <application>Postfix</application> user interface for
-            superuser queue management
-          </para>
-          <indexterm zone="postfix postsuper">
-            <primary sortas="b-postsuper">postsuper</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sendmail-postfix">
-        <term><command>sendmail</command></term>
-        <listitem>
-          <para>
-            is the <application>Postfix</application> to
-            <application>Sendmail</application> compatibility interface
-          </para>
-          <indexterm zone="postfix sendmail-postfix">
-            <primary sortas="b-sendmail">sendmail</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+&postfix-intro;
+&postfix-inst;
+&postfix-config;
+&postfix-desc;
 
 </sect1>
+
Index: server/mail/postfix/postfix-config.xml
===================================================================
--- server/mail/postfix/postfix-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/mail/postfix/postfix-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,103 @@
+<sect2>
+<title>Configuring postfix</title>
+
+<sect3><title>Config files</title>
+<para><userinput>/etc/aliases, /etc/postfix/main.cf</userinput> and <userinput>/etc/postfix/master.cf</userinput></para>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para><screen><userinput>cat > /etc/aliases << "EOF"</userinput>
+# Begin /etc/aliases
+
+MAILER-DAEMON:    postmaster
+postmaster:       root
+
+root:             LOGIN
+# End /etc/aliases
+<userinput>EOF</userinput></screen></para>
+
+<para>The /etc/aliases file that was just created, the main.cf and the 
+master.cf must be personalized for your system. The aliases file needs your 
+non-root login identity so mail addressed to root can be forwarded to 
+you at the user level.  The main.cf file needs your fully qualified 
+hostname.  The master.cf needs to be modified to prevent your machine from 
+becoming a relay for unauthorized entities.  All of these edits can be done 
+with sed commands entered into the console with appropriate substitutions of 
+your non-root login name for [user] and your fully qualified hostname for 
+[localhost.localdomain]. These edits will create a single host mail system, 
+other edits are necessary to perform the many other functions available.  
+You will find the main.cf file is self documenting, so load it into your editor to make the changes you need for your situation.</para>
+
+<para><screen><userinput>cp /etc/aliases /etc/aliases.bak
+cp /etc/postfix/main.cf /etc/postfix/main.cf.bak
+cp /etc/postfix/master.cf /etc/postfix/master.cf.bak
+sed "s/LOGIN/[user]/" /etc/aliases.bak > /etc/aliases
+sed "s/#myhostname = host.domain.tld/myhostname = \ 
+	[localhost.localdomain]/" \
+	/etc/postfix/main.cf.bak > /etc/postfix/main.cf
+sed '/^smtp.*smtpd$/s/inet/unix/' /etc/postfix/master.cf.bak > \
+	/etc/postfix/master.cf
+/usr/bin/newaliases
+/usr/sbin/postfix start</userinput></screen></para></sect3>
+
+<sect3><title>postfix init.d script</title>
+
+<para>To automate the running of postfix, use following command to create the init.d script:</para>
+
+<para><screen><userinput>cat &gt; /etc/rc.d/init.d/postfix &lt;&lt; "EOF"</userinput>
+#!/bin/sh
+# Begin $rc_base/init.d/postfix
+
+# Based on sysklogd script from LFS-3.1 and earlier.
+# Rewritten by Gerard Beekmans  - gerard@linuxfromscratch.org
+
+source /etc/sysconfig/rc
+source $rc_functions
+
+case "$1" in
+
+        start)
+        echo "Starting Mail Service..."
+        loadproc postfix start
+        ;;
+
+        stop)
+        echo "Stopping Mail Service..."
+        loadproc postfix stop
+        ;;
+		
+        reload)
+        echo "Reloading Mail Service..."
+        loadproc postfix reload
+        ;;
+
+        restart)
+        $0 stop
+        sleep 1
+        $0 start
+        ;;
+
+        *)
+        echo "Usage: $0 {start|stop|reload|restart}"
+        exit 1
+        ;;
+esac
+
+# End $rc_base/init.d/postfix
+<userinput>EOF
+chmod 755 /etc/rc.d/init.d/postfix</userinput></screen></para>
+
+<para>Create the symbolic links to this file in the relevant rc.d directory with the following commands:
+
+<screen><userinput>cd /etc/rc.d/init.d &amp;&amp;
+ln -sf ../init.d/postfix ../rc0.d/K25postfix &amp;&amp;
+ln -sf ../init.d/postfix ../rc1.d/K25postfix &amp;&amp;
+ln -sf ../init.d/postfix ../rc2.d/K25postfix &amp;&amp;
+ln -sf ../init.d/postfix ../rc3.d/S35postfix &amp;&amp;
+ln -sf ../init.d/postfix ../rc4.d/S35postfix &amp;&amp;
+ln -sf ../init.d/postfix ../rc5.d/S35postfix &amp;&amp;
+ln -sf ../init.d/postfix ../rc6.d/K25postfix</userinput></screen></para>
+</sect3>
+
+</sect2>
Index: server/mail/postfix/postfix-desc.xml
===================================================================
--- server/mail/postfix/postfix-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/mail/postfix/postfix-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,82 @@
+<sect2>
+<title>Contents</title>
+
+<para>The postfix package contains <userinput>bounce</userinput>,
+<userinput>cleanup</userinput>, <userinput>error</userinput>,
+<userinput>flush</userinput>, <userinput>lmtp</userinput>,
+<userinput>local</userinput>, <userinput>mailq</userinput>,
+<userinput>master</userinput>, <userinput>newaliases</userinput>,
+<userinput>nqmgr</userinput>, <userinput>pickup</userinput>,
+<userinput>pipe</userinput>, <userinput>postalias</userinput>,
+<userinput>postcat</userinput>, <userinput>postconf</userinput>,
+<userinput>postdrop</userinput>, <userinput>postfix</userinput>,
+<userinput>postkick</userinput>, <userinput>postlock</userinput>,
+<userinput>postlog</userinput>, <userinput>postmap</userinput>,
+<userinput>postqueue</userinput>, <userinput>postsuper</userinput>,
+<userinput>qmgr</userinput>, <userinput>qmqpd</userinput>,
+<userinput>sendmail</userinput>, <userinput>showq</userinput>,
+<userinput>smtp</userinput>, <userinput>smtpd</userinput>,
+<userinput>spawn</userinput>, <userinput>trivial-rewrite</userinput>,
+and <userinput>virtual</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>postfix</title>
+<para>postfix is the program that starts and stops the mail delivery system.</para></sect3>
+
+<sect3><title>master</title>
+<para>master is the resident process that runs bounce, cleanup, error, flush, 
+lmtp, local, nqmgr, pickup, pipe, qmgr, qmqpd, showq, smtp, smtpd, spawn, 
+trivial-rewrite and virtual on demand. These programs are not designed to 
+work as user commands.</para></sect3>
+
+<sect3><title>postqueue</title>
+<para>postqueue implements the Postfix user interface for queue management.  
+It implements all the operations that are traditionally available via the 
+sendmail command.</para></sect3>
+
+<sect3><title>sendmail</title>
+<para>sendmail implements the Postfix to Sendmail compatibility interface.  
+mailq and newaliases are symlinks to sendmail.</para></sect3>
+
+<sect3><title>showq</title>
+<para>showq will emulate the mailq command when the Postfix mail system is 
+not running.</para></sect3>
+
+<sect3><title>postsuper</title>
+<para>postsuper does maintenance jobs on the Postfix queue.</para></sect3>
+
+<sect3><title>postalias</title>
+<para>postalias creates, queries or updates Postfix alias 
+databases.</para></sect3>
+
+<sect3><title>postcat</title>
+<para>postcat prints the contents of a Postfix queue file in human-readable 
+form.</para></sect3>
+
+<sect3><title>postconf</title>
+<para>postconf prints or changes the value of configuration 
+parameters.</para></sect3>
+
+<sect3><title>postdrop</title>
+<para>postdrop creates a file in the maildrop directory and copies its standard input to the file.</para></sect3>
+
+<sect3><title>postkick</title>
+<para>postkick makes the mail system private IPC accessible for use in shell 
+scripts.</para></sect3>
+
+<sect3><title>postlock</title>
+<para>postlock locks a file for exclusive access and executes a command
+on that file.</para></sect3>
+
+<sect3><title>postlog</title>
+<para>postlog implements a logging interface for use in shell 
+scripts.</para></sect3>
+
+<sect3><title>postmap</title>
+<para>postmap creates, queries or updates Postfix lookup tables.</para></sect3>
+
+</sect2>
+
Index: server/mail/postfix/postfix-inst.xml
===================================================================
--- server/mail/postfix/postfix-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/mail/postfix/postfix-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,29 @@
+<sect2>
+<title>Installation of postfix</title>
+
+<para>Before you compile the program, you need to create users and groups that will be expected to be in place when the install script executes.  Add the users and groups with the following commands:</para>
+
+<para><screen><userinput>groupadd postfix &amp;&amp;
+groupadd postdrop &amp;&amp;
+groupadd -g 65534 nogroup &amp;&amp;
+useradd -c postfix -d /dev/null -g postfix -s /bin/false postfix &amp;&amp;
+useradd -c nobody -d /home -g nogroup -s /bin/bash -u 65534 nobody &amp;&amp;
+chown postfix:postfix /var/mail</userinput></screen></para>
+
+<para>Install postfix by running the following commands:</para>
+
+<para><screen><userinput>make &amp;&amp;
+make install</userinput></screen></para>
+
+<para>The install script will enter an interactive stage with questions in the form of '*_directory:[default]input'.  Defaults can be accepted in all but three cases.  The following shows the three cases and the modified response.</para>
+
+<para><screen><userinput>daemon_directory:[/usr/libexec/postfix]/usr/sbin
+manpage_directory:[/usr/local/man]/usr/share/man
+sample_directory:[/etc/postfix]/usr/share/doc/postfix</userinput></screen></para>
+
+<para>The final installation step is to install the program's documentation with this command:</para>
+
+<para><screen><userinput>cp -rf html/* /usr/share/doc/postfix</userinput></screen></para>
+
+</sect2>
+
Index: server/mail/postfix/postfix-intro.xml
===================================================================
--- server/mail/postfix/postfix-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/mail/postfix/postfix-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,18 @@
+<sect2>
+<title>Introduction to postfix</title>
+
+<screen>Download location:              <ulink url="&postfix-download;"/>
+Version used:                   &postfix-version;
+Package size:                   &postfix-size;
+Estimated Disk space required:  &postfix-buildsize;</screen>
+
+<para>The postfix package contains a Mail Transport Agent (MTA). This
+is useful for sending email to other users of your host machine.  It can
+also be configured to be a central mail server for your domain, a mail
+relay agent or simply a mail delivery agent to your local Internet
+Service Provider (ISP).</para>
+
+<screen>postfix depends on: 
+<xref linkend="db"/></screen>
+
+</sect2>
Index: server/mail/postfix/postfix.ent
===================================================================
--- server/mail/postfix/postfix.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/mail/postfix/postfix.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<!ENTITY postfix SYSTEM "../postfix.xml">
+<!ENTITY postfix-intro SYSTEM "postfix-intro.xml">
+<!ENTITY postfix-inst SYSTEM "postfix-inst.xml">
+<!ENTITY postfix-desc SYSTEM "postfix-desc.xml">
+<!ENTITY postfix-config SYSTEM "postfix-config.xml">
+<!ENTITY postfix-buildsize "47 MB">
+<!ENTITY postfix-version "1.1.11">
+<!ENTITY postfix-download "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-1.1.11.tar.gz">
+<!ENTITY postfix-size "1.2 MB">
Index: server/mail/qmail.xml
===================================================================
--- server/mail/qmail.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/mail/qmail.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect1 id="qmail" xreflabel="qmail">
+<?dbhtml filename="qmail.html" dir="server"?>
+<title>qmail</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
+
Index: server/mail/qmail/qmail.ent
===================================================================
--- server/mail/qmail/qmail.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/mail/qmail/qmail.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY qmail SYSTEM "../qmail.xml">
Index: server/mail/qpopper.xml
===================================================================
--- server/mail/qpopper.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/mail/qpopper.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect1 id="qpopper" xreflabel="qpopper">
+<?dbhtml filename="qpopper.html" dir="server"?>
+<title>qpopper</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
+
Index: server/mail/qpopper/qpopper.ent
===================================================================
--- server/mail/qpopper/qpopper.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/mail/qpopper/qpopper.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY qpopper SYSTEM "../qpopper.xml">
Index: server/mail/sendmail.xml
===================================================================
--- server/mail/sendmail.xml	(revision fd67949aeb0d4c187a3b89727742599834f1a349)
+++ server/mail/sendmail.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,521 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
+<sect1 id="sendmail" xreflabel="sendmail">
+<?dbhtml filename="sendmail.html" dir="server"?>
+<title>sendmail</title>
 
-  <!ENTITY sendmail-download-http "https://ftp.sendmail.org/sendmail.&sendmail-version;.tar.gz">
-  <!ENTITY sendmail-download-ftp  " ">
-  <!ENTITY sendmail-md5sum        "b6b332295b5779036d4c9246f96f673c">
-  <!ENTITY sendmail-size          "2.3 MB">
-  <!ENTITY sendmail-buildsize     "21 MB">
-  <!ENTITY sendmail-time          "0.1 SBU">
-]>
-
-<sect1 id="sendmail" xreflabel="sendmail-&sendmail-version;">
-  <?dbhtml filename="sendmail.html"?>
-
-
-  <title>sendmail-&sendmail-version;</title>
-
-  <indexterm zone="sendmail">
-    <primary sortas="a-sendmail">sendmail</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to sendmail</title>
-
-    <para>
-      The <application>sendmail</application> package contains a Mail
-      Transport Agent (MTA).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&sendmail-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&sendmail-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &sendmail-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &sendmail-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &sendmail-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &sendmail-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!-- Sendmail 8.16.1 does have official support for OpenSSL 1.1
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/sendmail.&sendmail-version;-openssl-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">sendmail Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="openldap"/> (client)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="cyrus-sasl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gs"/> (for creating PDF documentation),
-      <xref linkend="procmail"/> (the configuration proposed below requires
-      that <command>procmail</command> be present at run-time), and
-      <ulink url="https://github.com/chaos/nph">nph</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of sendmail</title>
-
-    <para>
-      Before building <application>sendmail</application>, create the
-      required user, group and directory with the following commands issued as
-      the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 26 smmsp                               &amp;&amp;
-useradd -c "Sendmail Daemon" -g smmsp -d /dev/null \
-        -s /bin/false -u 26 smmsp                  &amp;&amp;
-chmod -v 1777 /var/mail                            &amp;&amp;
-install -v -m700 -d /var/spool/mqueue</userinput></screen>
-
-    <note>
-      <para>
-        See the source tree <filename>sendmail/README</filename> file
-        for information on linking optional packages into the build. Use the
-        example below, which adds support for SASL, StartTLS
-        (<application>OpenSSL</application>) and
-        <application>OpenLDAP</application>, as a starting point.  Of course,
-        modify it to suit your particular needs.
-      </para>
-    </note>
-
-<screen><userinput>cat &gt;&gt; devtools/Site/site.config.m4 &lt;&lt; "EOF"
-<literal>APPENDDEF(`confENVDEF',`-DSTARTTLS -DSASL -DLDAPMAP -DHASFLOCK')
-APPENDDEF(`confLIBS', `-lssl -lcrypto -lsasl2 -lldap -llber')
-APPENDDEF(`confINCDIRS', `-I/usr/include/sasl')</literal>
-EOF</userinput></screen>
-
-    <para>
-      Install <application>sendmail</application> with the following commands:
-    </para>
-
-<screen><userinput>cat &gt;&gt; devtools/Site/site.config.m4 &lt;&lt; "EOF"
-<literal>define(`confMANGRP',`root')
-define(`confMANOWN',`root')
-define(`confSBINGRP',`root')
-define(`confUBINGRP',`root')
-define(`confUBINOWN',`root')</literal>
-EOF
-
-sed -i 's|/usr/man/man|/usr/share/man/man|' \
-    devtools/OS/Linux           &amp;&amp;
-
-cd sendmail                     &amp;&amp;
-sh Build                        &amp;&amp;
-cd ../cf/cf                     &amp;&amp;
-cp generic-linux.mc sendmail.mc &amp;&amp;
-sh Build sendmail.cf</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-<!-- When doing a DESTDIR= build, for example, for an update to check for new
-     installed files, you need to create $DEST/usr/{bin,sbin,share/man/man{1,5,8}
-     first. "sh Build" is a wrapper for Make, so it will accept DESTDIR=
-     as an argument. -->
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -d -m755 /etc/mail &amp;&amp;
-sh Build install-cf &amp;&amp;
-
-cd ../..            &amp;&amp;
-sh Build install    &amp;&amp;
-
-install -v -m644 cf/cf/{submit,sendmail}.mc /etc/mail &amp;&amp;
-cp -v -R cf/* /etc/mail                               &amp;&amp;
-
-install -v -m755 -d /usr/share/doc/sendmail-&sendmail-version;/{cf,sendmail} &amp;&amp;
-
-install -v -m644 CACerts FAQ KNOWNBUGS LICENSE PGPKEYS README RELEASE_NOTES \
-        /usr/share/doc/sendmail-&sendmail-version; &amp;&amp;
-
-install -v -m644 sendmail/{README,SECURITY,TRACEFLAGS,TUNING} \
-        /usr/share/doc/sendmail-&sendmail-version;/sendmail &amp;&amp;
-
-install -v -m644 cf/README /usr/share/doc/sendmail-&sendmail-version;/cf &amp;&amp;
-
-for manpage in sendmail editmap mailstats makemap praliases smrsh
-do
-    install -v -m644 $manpage/$manpage.8 /usr/share/man/man8
-done &amp;&amp;
-
-install -v -m644 sendmail/aliases.5    /usr/share/man/man5 &amp;&amp;
-install -v -m644 sendmail/mailq.1      /usr/share/man/man1 &amp;&amp;
-install -v -m644 sendmail/newaliases.1 /usr/share/man/man1 &amp;&amp;
-install -v -m644 vacation/vacation.1   /usr/share/man/man1</userinput></screen>
-
-    <para>
-      Install the <application>sendmail</application> Installation and
-      Operations Guide with the following commands:
-    </para>
-
-    <note>
-      <para>
-        Remove <filename>op.pdf</filename> from the <command>make</command>
-        and <command>install</command> commands below if
-        you don't have <application>Ghostscript</application> installed.
-      </para>
-    </note>
-
-<screen remap="doc"><userinput>cd doc/op                                       &amp;&amp;
-sed -i 's/groff/GROFF_NO_SGR=1 groff/' Makefile &amp;&amp;
-make op.txt op.pdf</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -v -d -m755 /usr/share/doc/sendmail-&sendmail-version; &amp;&amp;
-install -v -m644 op.ps op.txt op.pdf /usr/share/doc/sendmail-&sendmail-version; &amp;&amp;
-cd ../..</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>cat &gt; devtools/Site/site.config.m4 &lt;&lt; "EOF"</command>:
-      This creates a configuration file changing some of the default settings.
-    </para>
-
-    <para>
-      <command>sed ... devtools/OS/Linux</command>: The site.config.m4
-      does not honor a change to the man directory, so fix it in the OS
-      definitions.
-    </para>
-
-<!-- No longer valid with 8.16.1
-    <para>
-      <command>sed ... include/sm/bdb.h</command>: This allows sendmail to
-      build properly with <xref linkend='db'/> versions 5 and above.
-    </para>
--->
-
-    <para>
-      <command>sh Build; sh Build sendmail.cf; sh Build install-cf;
-      sh Build install</command>: <application>sendmail</application> uses an
-      <application>m4</application> based build script to create the various
-      <filename>Makefile</filename>s. These commands build and install the
-      package.
-    </para>
-
-    <para>
-      <command>for manpage in...;do...;done; install ...</command>: The man
-      pages are installed already formatted and <command>man</command> displays
-      them somewhat garbled. These commands replace the formatted pages with
-      pages <command>man</command> can display properly.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring sendmail</title>
-
-    <sect3 id="sendmail-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/mail/*</filename>
-      </para>
-
-      <indexterm zone="sendmail sendmail-config">
-        <primary sortas="e-etc-mail">/etc/mail/*</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <note>
-        <para>
-          Ensure you have a fully qualified domain name defined
-          in <filename>/etc/hosts</filename> for your system before proceeding.
-        </para>
-      </note>
-
-      <para>
-        Create the <filename>/etc/mail/local-host-names</filename> and
-        <filename>/etc/mail/aliases</filename> files using the following
-        commands as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>echo $(hostname) > /etc/mail/local-host-names
-cat &gt; /etc/mail/aliases &lt;&lt; "EOF"
-<literal>postmaster: root
-MAILER-DAEMON: root</literal>
-
-EOF
-# Does not work if there is no database backend compiled in:
-#newaliases</userinput></screen>
-
-      <para>
-        <application>sendmail</application>'s primary configuration file,
-        <filename>/etc/mail/sendmail.cf</filename>, is complex and not meant to
-        be directly edited. The recommended method for changing it is to modify
-        <filename>/etc/mail/sendmail.mc</filename> and various
-        <application>m4</application> files, then run the <command>m4</command>
-        macro processor from within
-        <filename class='directory'>/etc/mail</filename> as follows:
-      </para>
-
-<screen role="root"><userinput>cd /etc/mail &amp;&amp;
-m4 m4/cf.m4 sendmail.mc > sendmail.cf</userinput></screen>
-
-      <para>
-        A full explanation of the files to modify, and the available
-        parameters can be found in <filename>/etc/mail/README</filename>.
-      </para>
-
-    </sect3>
-
-    <sect3  id="sendmail-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para>
-        To automate the running of <application>sendmail</application>
-        at startup, install the
-        <phrase revision="sysv"><filename>/etc/rc.d/init.d/sendmail</filename>
-        init script</phrase>
-        <phrase revision="systemd"><filename>sendmail.service</filename>
-        unit</phrase> included in the
-        <xref linkend="bootscripts" revision="sysv"/>
-        <xref linkend="systemd-units" revision="systemd"/> package:
-      </para>
-
-      <indexterm zone="sendmail sendmail-init">
-        <primary sortas="f-sendmail-init">sendmail</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-sendmail</userinput></screen>
-
-      <note>
-        <para>
-          The -qNm option to <command>sendmail</command>, where N is number
-          of minutes, controls how often <application>sendmail</application>
-          will process the mail queue. A default of 5 minutes is used in the
-          <phrase revision="sysv">init script.</phrase>
-          <phrase revision="systemd">systemd unit.</phrase> Individual
-          workstation users may want to set this as low as 1 minute, large
-          installations handling more mail may want to set it higher.
-        </para>
-      </note>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>editmap, mailstats, makemap, praliases, sendmail, smrsh,
-        and vacation; symlinks to /usr/sbin/sendmail: hoststat, mailq,
-        newaliases, and purgestat</seg>
-        <seg>None</seg>
-        <seg>/etc/mail, /usr/share/doc/sendmail-&sendmail-version;,
-        and /var/spool/clientmqueue</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="editmap">
-        <term><command>editmap</command></term>
-        <listitem>
-          <para>
-            queries and edits <application>sendmail</application> map files
-          </para>
-          <indexterm zone="sendmail editmap">
-            <primary sortas="b-editmap">editmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hoststat">
-        <term><command>hoststat</command></term>
-        <listitem>
-          <para>
-            prints <application>sendmail</application>'s persistent host status
-          </para>
-          <indexterm zone="sendmail hoststat">
-            <primary sortas="b-hoststat">hoststat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mailstats">
-        <term><command>mailstats</command></term>
-        <listitem>
-          <para>
-            displays <application>sendmail</application> statistics
-          </para>
-          <indexterm zone="sendmail mailstats">
-            <primary sortas="b-mailstats">mailstats</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mailq-sendmail">
-        <term><command>mailq</command></term>
-        <listitem>
-          <para>
-            prints a summary of outbound mail messages waiting for delivery
-          </para>
-          <indexterm zone="sendmail mailq-sendmail">
-            <primary sortas="b-mailq">mailq</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="makemap">
-        <term><command>makemap</command></term>
-        <listitem>
-          <para>
-            creates <application>sendmail</application> map files
-          </para>
-          <indexterm zone="sendmail makemap">
-            <primary sortas="b-makemap">makemap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="newaliases-sendmail">
-        <term><command>newaliases</command></term>
-        <listitem>
-          <para>
-            rebuilds <filename>/etc/mail/aliases.db</filename> from the
-            contents of <filename>/etc/mail/aliases</filename>
-          </para>
-          <indexterm zone="sendmail newaliases-sendmail">
-            <primary sortas="b-newaliases">newaliases</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="praliases">
-        <term><command>praliases</command></term>
-        <listitem>
-          <para>
-            displays current <application>sendmail</application> aliases
-          </para>
-          <indexterm zone="sendmail praliases">
-            <primary sortas="b-praliases">praliases</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="purgestat">
-        <term><command>purgestat</command></term>
-        <listitem>
-          <para>
-            causes <application>sendmail</application> to clear (purge)
-            all its host-status information
-          </para>
-          <indexterm zone="sendmail purgestat">
-            <primary sortas="b-purgestat">purgestat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sendmail-prog-sendmail">
-        <term><command>sendmail</command></term>
-        <listitem>
-          <para>
-            is the <application>sendmail</application> mail transport agent
-          </para>
-          <indexterm zone="sendmail sendmail-prog-sendmail">
-            <primary sortas="b-sendmail">sendmail</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="smrsh">
-        <term><command>smrsh</command></term>
-        <listitem>
-          <para>
-            is a restricted shell for <application>sendmail</application>
-          </para>
-          <indexterm zone="sendmail smrsh">
-            <primary sortas="b-smrsh">smrsh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vacation-sendmail">
-        <term><command>vacation</command></term>
-        <listitem>
-          <para>
-            is an email auto responder
-          </para>
-          <indexterm zone="sendmail vacation-sendmail">
-            <primary sortas="b-vacation">vacation</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+<para>TO BE DONE</para>
 
 </sect1>
+
Index: server/mail/sendmail/sendmail.ent
===================================================================
--- server/mail/sendmail/sendmail.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ server/mail/sendmail/sendmail.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY sendmail SYSTEM "../sendmail.xml">
