Index: server/mail/postfix.xml
===================================================================
--- server/mail/postfix.xml	(revision 59048cd94f56c35dfa1f2e6a4d7bb7f7c6fc74a4)
+++ server/mail/postfix.xml	(revision 2605bb14a8ab864bac615f408c12148d03b9289b)
@@ -5,8 +5,10 @@
   %general-entities;
 
-  <!ENTITY postfix-download-http "http://postfix.energybeam.com/source/official/postfix-&postfix-version;.tar.gz">
-  <!ENTITY postfix-download-ftp "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-&postfix-version;.tar.gz">
-  <!ENTITY postfix-md5sum "a9fdd0f204e7ca0b7d32fd0b9f8f8c72">
-  <!ENTITY postfix-size "3.5 MB">
+  <!ENTITY postfix-download-http
+  "http://postfix.energybeam.com/source/official/postfix-&postfix-version;.tar.gz">
+  <!ENTITY postfix-download-ftp
+  "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-&postfix-version;.tar.gz">
+  <!ENTITY postfix-md5sum "5c81b304a42c691671454dfe80b506ca">
+  <!ENTITY postfix-size "3.6 MB">
   <!ENTITY postfix-buildsize "132 MB">
   <!ENTITY postfix-time "0.4 SBU">
@@ -30,31 +32,45 @@
     <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 (ISP).</para>
-
-    &lfs70_checked;
+    <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>
+
+    &lfs71_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&postfix-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&postfix-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&postfix-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&postfix-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &postfix-md5sum;</para>
+        <para>
+          Download MD5 sum: &postfix-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &postfix-size;</para>
+        <para>
+          Download size: &postfix-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &postfix-buildsize;</para>
+        <para>
+          Estimated disk space required: &postfix-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &postfix-time;</para>
+        <para>
+          Estimated build time: &postfix-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -63,5 +79,7 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="db"/></para>
+    <para role="required">
+      <xref linkend="db"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -71,4 +89,5 @@
       <xref linkend="openldap"/>,
       <xref linkend="cyrus-sasl"/>, 
+      <xref linkend="sqlite"/>,
       <xref linkend="mysql"/>,
       <xref linkend="postgresql"/>, and
@@ -77,10 +96,14 @@
     </para>
 
-    <para>Note that mysql, postgresql, and cdb are only useful if
-    there is a known need for them.</para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/postfix"/></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">
+      User Notes: <ulink url="&blfs-wiki;/postfix"/>
+    </para>
   </sect2>
 
@@ -89,17 +112,50 @@
 
     <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 /dev/null -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 <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>
+      <para>
+        The README files are formatted to be read with a pager like
+        <application>Less</application> or <application>More</application>.
+        If you want to read them in a text editor, make them legible with a 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>
+
+      <para>
+        For more details read the readme files.
+      </para>
+
 <!--
-      <para>Here is an example that combines the TLS and
-      <application>Cyrus-SASL</application> arguments:</para>
+      <para>
+        Here is an example that combines the TLS and
+      <application>Cyrus-SASL</application> arguments:
+        </para>
 
 <screen><userinput>make makefiles \
@@ -112,48 +168,52 @@
     AUXLIBS='-lssl -lcrypto -lsasl2'</userinput></screen>
 -->
+
+<!-- it picks up pcre automatically now
       <sect4>
         <title>Perl compatible regular expressions</title>
 
-        <para>To use <application>PCRE</application> with
-        <application>Postfix</application>, use the following argument:</para>
+        <para>
+          To use <application>PCRE</application> with
+          <application>Postfix</application>, use the following argument:
+        </para>
 
 <screen><literal>CCARGS='-DHAS_PCRE'</literal></screen>
-
-      </sect4>
+      </sect4>
+-->
 
       <sect4>
         <title>Cyrus-SASL</title>
 
-        <para>To use <application>Cyrus-SASL</application> with
-        <application>Postfix</application>, use the following arguments:</para>
+        <para>
+          To use <application>Cyrus-SASL</application> with
+          <application>Postfix</application>, use the following arguments:
+        </para>
 
 <screen><literal>CCARGS='-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl'
 AUXLIBS='-lsasl2'</literal></screen>
-
-      </sect4>
-
-<!--
-      <sect4>
-        <title>Berkeley DB</title>
-
-        <para>To use <application>Berkeley DB</application> with
-        <application>Postfix</application>, use the following
-        arguments:</para>
-
-<screen><literal>CCARGS='-DHAS_DB -I/usr/include'
-AUXLIBS='-L/usr/lib -ldb'</literal></screen>
-
-      </sect4>
--->
+      </sect4>
+
       <sect4>
         <title>OpenLDAP</title>
 
-        <para>To use <application>OpenLDAP</application> with
-        <application>Postfix</application>, use the following
-        arguments:</para>
+        <para>
+          To use <application>OpenLDAP</application> with
+          <application>Postfix</application>, use the following arguments:
+        </para>
 
 <screen><literal>CCARGS='-DHAS_LDAP'
 AUXLIBS='-lldap -llber'</literal></screen>
-
+      </sect4>
+
+      <sect4>
+        <title>Sqlite</title>
+
+        <para>
+          To use <application>Sqlite</application> with
+          <application>Postfix</application>, use the following arguments:
+        </para>
+
+<screen><literal>CCARGS='-DHAS_SQLITE'
+AUXLIBS='-lsqlite3 -lpthread'</literal></screen>
       </sect4>
 
@@ -161,11 +221,11 @@
         <title>MySQL</title>
 
-        <para>To use <application>MySQL</application> with
-        <application>Postfix</application>, use the following
-        arguments:</para>
+        <para>
+          To use <application>MySQL</application> with
+          <application>Postfix</application>, use the following arguments:
+        </para>
 
 <screen><literal>CCARGS='-DHAS_MYSQL -I/usr/include/mysql'
 AUXLIBS='-lmysqlclient -lz -lm'</literal></screen>
-
       </sect4>
 
@@ -173,11 +233,11 @@
         <title>PostgreSQL</title>
 
-        <para>To use <application>PostgreSQL</application> with
-        <application>Postfix</application>, use the following
-        arguments:</para>
+        <para>
+          To use <application>PostgreSQL</application> with
+          <application>Postfix</application>, use the following arguments:
+        </para>
 
 <screen><literal>CCARGS='-DHAS_PGSQL -I/usr/include/postgresql'
 AUXLIBS='-lpq -lz -lm'</literal></screen>
-
       </sect4>
 
@@ -185,12 +245,12 @@
         <title>CDB/TinyCDB</title>
 
-        <para>To use <application>CDB</application> or
-        <application>TinyCDB</application> with
-        <application>Postfix</application>, use the following
-        arguments:</para>
+        <para>
+          To use <application>CDB</application> or
+          <application>TinyCDB</application> with
+          <application>Postfix</application>, use the following arguments:
+        </para>
 
 <screen><literal>CCARGS='-DHAS_CDB'
 AUXLIBS='<replaceable>&lt;/path/to/CDB&gt;</replaceable>/libcdb.a'</literal></screen>
-
       </sect4>
 
@@ -198,13 +258,12 @@
         <title>StartTLS Authentication</title>
 
-        <para>To use <application>OpenSSL</application> with
-        <application>Postfix</application>, use the following
-        arguments:</para>
+        <para>
+          To use <application>OpenSSL</application> with
+          <application>Postfix</application>, use the following arguments:
+        </para>
 
 <screen><literal>CCARGS='-DUSE_TLS -I/usr/include/openssl/'
 AUXLIBS='-lssl -lcrypto'</literal></screen>
-
-      </sect4>
-
+      </sect4>
     </sect3>
 
@@ -212,17 +271,8 @@
       <title>Installing Postfix</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 /dev/null -g postfix \
-    -s /bin/false -u 32 postfix &amp;&amp;
-chown -v postfix:postfix /var/mail</userinput></screen>
-
-      <para>Install <application>Postfix</application> by running the
-      following commands:</para>
+      <para>
+        If you have <application>OpenSSL</application> installed, install
+        <application>Postfix</application> by running the following commands:
+      </para>
 <!--
 <screen><userinput>make makefiles \
@@ -236,28 +286,24 @@
 -->
 
-<screen><userinput>PF_CCARGS="-DDEF_DAEMON_DIR=\\\"/usr/lib/postfix\\\""
-PF_CCARGS="$PF_CCARGS -DDEF_MANPAGE_DIR=\\\"/usr/share/man\\\""
-PF_CCARGS="$PF_CCARGS -DDEF_HTML_DIR=\\\"/usr/share/doc/postfix-&postfix-version;/html\\\""
-PF_CCARGS="$PF_CCARGS -DDEF_README_DIR=\\\"/usr/share/doc/postfix-&postfix-version;/README\\\""
-PF_CCARGS="$PF_CCARGS -DHAS_PCRE"
-PF_CCARGS="$PF_CCARGS -DUSE_TLS -I/usr/include/openssl"
-
-PF_AUXLIBS="-lpcre -lssl -lcrypto"
-
-make makefiles CCARGS="$PF_CCARGS" AUXLIBS="$PF_AUXLIBS" &amp;&amp;
-make &amp;&amp;
-unset PF_CCARGS PF_AUXLIBS</userinput></screen>
+<screen><userinput>make CCARGS="-DUSE_TLS -I/usr/include/openssl/ -DNO_NIS" \
+  AUXLIBS="-lssl -lcrypto" makefiles &amp;&amp;
+make</userinput></screen>
 
     <!-- There is a testsuite, 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 test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role='root'><userinput>sh postfix-install -non-interactive</userinput></screen>
-
+    <para>
+      This package does not come with a useful test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>sh postfix-install -non-interactive \
+  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>
 
@@ -265,16 +311,30 @@
     <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>\\\": This structure is used to get a literal \" into the variable
-    definition.</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 mentioned in
-    the 'make makefiles' command.</para>
-
+    <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>
+      <parameter>-DNO_NIS</parameter>: This option disables building Network
+      Information Service/Yellow Pages support. The RPC implementation in glibc
+      (on which NIS/YP depends) is deprecated.
+    </para>
+
+<!--
+    <para>
+      \\\": This structure is used to get a literal \" into the variable
+      definition.
+    </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>
   </sect2>
 
@@ -285,7 +345,9 @@
       <title>Config Files</title>
 
-      <para><filename>/etc/aliases</filename>,
-      <filename>/etc/postfix/main.cf</filename>, and
-      <filename>/etc/postfix/master.cf</filename></para>
+      <para>
+        <filename>/etc/aliases</filename>,
+        <filename>/etc/postfix/main.cf</filename>, and
+        <filename>/etc/postfix/master.cf</filename>
+      </para>
 
       <indexterm zone="postfix postfix-config">
@@ -302,4 +364,13 @@
       <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> for 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
@@ -308,49 +379,43 @@
 postmaster:       root
 
-root:             LOGIN
+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>
+
       <note>
-        <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 <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>
 
-      <para>The <filename>/etc/aliases</filename> file that was just created
-      or appended, the <filename>main.cf</filename> and the
-      <filename>master.cf</filename> must be personalized for your system.
-      The <filename>aliases</filename> file needs your non-root login identity
-      so mail addressed to <systemitem class="username">root</systemitem> can
-      be forwarded to you at the user level. The <filename>main.cf</filename>
-      file needs your fully qualified hostname. All of these edits can be done
-      with <command>sed</command> commands entered into the console with
-      appropriate substitutions of your non-root login name for
-      <replaceable>&lt;user&gt;</replaceable> and your fully qualified hostname for
-      <replaceable>&lt;localhost.localdomain&gt;</replaceable>. You will find the
-      <filename>main.cf</filename> file is self documenting, so load it into
-      your editor to make the changes you need for your situation.</para>
-
-<screen role="root"><userinput>sed -i "s/LOGIN/<replaceable>&lt;user&gt;</replaceable>/" /etc/aliases &amp;&amp;
-sed -i "s/#myhostname = host.domain.tld/myhostname = \
-  <replaceable>&lt;localhost.localdomain&gt;</replaceable>/" /etc/postfix/main.cf &amp;&amp;
-/usr/bin/newaliases</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>
+      <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="root"><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>
+      <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="root"><userinput>/usr/sbin/postfix check &amp;&amp;
 /usr/sbin/postfix start</userinput></screen>
-
     </sect3>
 
@@ -358,7 +423,9 @@
       <title>Boot Script</title>
 
-      <para>To automate the running of Postfix at startup, install the
-      <filename>/etc/rc.d/init.d/postfix</filename> init script included
-      in the <xref linkend="bootscripts"/> package.</para>
+      <para>
+        To automate the running of Postfix at startup, install the
+        <filename>/etc/rc.d/init.d/postfix</filename> init script included in
+        the <xref linkend="bootscripts"/> package.
+      </para>
 
       <indexterm zone="postfix postfix-init">
@@ -367,7 +434,5 @@
 
 <screen role="root"><userinput>make install-postfix</userinput></screen>
-
     </sect3>
-
   </sect2>
 
@@ -377,16 +442,16 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>anvil, bounce, cleanup, discard, error, flush, lmtp, local, mailq,
-        master, newaliases, nqmgr, oqmgr, pickup, pipe, postalias, postcat,
-        postconf, postdrop, postfix, postkick, postlock, postlog, postmap,
-        postqueue, postsuper, proxymap, qmgr, qmqpd, scache, sendmail, showq,
-        smtp, smtpd, spawn, tlsmgr, trivial-rewrite, verify, and virtual</seg>
-        <seg>None</seg>
-        <seg>/etc/postfix, /usr/lib/postfix and
-        /usr/share/doc/postfix-&postfix-version;</seg>
+        <seg>
+          mailq, newaliases, postaliases, postcat, postconf, postdrop, postfix,
+          postkick, postlock, postlog, postmap, postmulti, postqueue, postsuper
+          and sendmail.
+        </seg>
+        <seg>
+          /etc/postfix, /usr/libexec/postfix, /var/lib/postfix,
+          /var/spool/postfix and /usr/share/doc/postfix-&postfix-version;
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -397,96 +462,10 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="anvil">
-        <term><command>anvil</command></term>
-        <listitem>
-          <para>Provides connection and rate request limiting.</para>
-          <indexterm zone="postfix anvil">
-            <primary sortas="b-anvil">anvil</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bounce">
-        <term><command>bounce</command></term>
-        <listitem>
-          <para>A daemon that maintains per-message log files with
-          non-delivery status information.</para>
-          <indexterm zone="postfix bounce">
-            <primary sortas="b-bounce">bounce</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cleanup">
-        <term><command>cleanup</command></term>
-        <listitem>
-          <para>A daemon that processes inbound mail, inserts it into the
-          incoming mail queue, and informs the queue manager of its
-          arrival.</para>
-          <indexterm zone="postfix cleanup">
-            <primary sortas="b-cleanup">cleanup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="discard">
-        <term><command>discard</command></term>
-        <listitem>
-          <para>Processes delivery requests from the queue manager that cannot
-          be delivered to the recipient.</para>
-          <indexterm zone="postfix discard">
-            <primary sortas="b-discard">discard</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="error">
-        <term><command>error</command></term>
-        <listitem>
-          <para>A daemon that processes non-delivery requests from the
-          queue manager.</para>
-          <indexterm zone="postfix error">
-            <primary sortas="b-error">error</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="flush">
-        <term><command>flush</command></term>
-        <listitem>
-          <para>A daemon that maintains a record of deferred mail by
-          destination.</para>
-          <indexterm zone="postfix flush">
-            <primary sortas="b-flush">flush</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lmtp">
-        <term><command>lmtp</command></term>
-        <listitem>
-          <para>A daemon that processes message delivery requests from the
-          queue manager.</para>
-          <indexterm zone="postfix lmtp">
-            <primary sortas="b-lmtp">lmtp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="local">
-        <term><command>local</command></term>
-        <listitem>
-          <para>A daemon that processes delivery requests from the queue
-          manager to deliver mail to local recipients.</para>
-          <indexterm zone="postfix local">
-            <primary sortas="b-local">local</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="mailq">
         <term><command>mailq</command></term>
         <listitem>
-          <para>A symlink to <filename>sendmail</filename>.</para>
+          <para>
+            A symlink to <filename>sendmail</filename>.
+          </para>
           <indexterm zone="postfix mailq">
             <primary sortas="b-mailq">mailq</primary>
@@ -495,19 +474,10 @@
       </varlistentry>
 
-      <varlistentry id="master">
-        <term><command>master</command></term>
-        <listitem>
-          <para>The resident process that runs
-          <application>Postfix</application> daemons on demand.</para>
-          <indexterm zone="postfix master">
-            <primary sortas="b-master">master</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="newaliases">
         <term><command>newaliases</command></term>
         <listitem>
-          <para>A symlink to <filename>sendmail</filename>.</para>
+          <para>
+            A symlink to <filename>sendmail</filename>.
+          </para>
           <indexterm zone="postfix newaliases">
             <primary sortas="b-newaliases">newaliases</primary>
@@ -516,56 +486,13 @@
       </varlistentry>
 
-      <varlistentry id="nqmgr">
-        <term><command>nqmgr</command></term>
-        <listitem>
-          <para>A daemon that awaits the arrival of incoming mail and
-          arranges for its delivery.</para>
-          <indexterm zone="postfix nqmgr">
-            <primary sortas="b-nqmgr">nqmgr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="oqmgr">
-        <term><command>oqmgr</command></term>
-        <listitem>
-          <para>The old style queue manager. This will be removed soon.</para>
-          <indexterm zone="postfix oqmgr">
-            <primary sortas="b-oqmgr">oqmgr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pickup">
-        <term><command>pickup</command></term>
-        <listitem>
-          <para>A daemon that waits for hints that new mail has been
-          dropped into the maildrop directory, and feeds it into the
-          <application>cleanup</application> daemon.</para>
-          <indexterm zone="postfix pickup">
-            <primary sortas="b-pickup">pickup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pipe">
-        <term><command>pipe</command></term>
-        <listitem>
-          <para>A daemon that processes requests from the queue
-          manager to deliver messages to external commands.</para>
-          <indexterm zone="postfix pipe">
-            <primary sortas="b-pipe">pipe</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="postalias">
-        <term><command>postalias</command></term>
-        <listitem>
-          <para>Creates or queries one or more
-          <application>Postfix</application> alias databases, or updates an
-          existing one.</para>
-          <indexterm zone="postfix postalias">
-            <primary sortas="b-postalias">postalias</primary>
+      <varlistentry id="postaliases">
+        <term><command>postaliases</command></term>
+        <listitem>
+          <para>
+            is a utility for <application>Postfix</application> alias database
+            maintenance
+          </para>
+          <indexterm zone="postfix postaliases">
+            <primary sortas="b-postaliases">postaliases</primary>
           </indexterm>
         </listitem>
@@ -575,6 +502,8 @@
         <term><command>postcat</command></term>
         <listitem>
-          <para>Prints the contents of the
-          <application>named</application> files in human readable format.</para>
+          <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>
@@ -586,6 +515,8 @@
         <term><command>postconf</command></term>
         <listitem>
-          <para>Displays or changes the value of
-          <application>Postfix</application> configuration parameters.</para>
+          <para>
+            Displays or changes the value of
+            <application>Postfix</application> configuration parameters.
+          </para>
           <indexterm zone="postfix postconf">
             <primary sortas="b-postconf">postconf</primary>
@@ -597,6 +528,8 @@
         <term><command>postdrop</command></term>
         <listitem>
-          <para>Creates a file in the maildrop directory and copies
-          it's standard input to the file.</para>
+          <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>
@@ -608,6 +541,7 @@
         <term><command>postfix</command></term>
         <listitem>
-          <para>Controls the operation of the
-          <application>Postfix</application> mail system.</para>
+          <para>
+            is the <application>Postfix</application> control program.
+          </para>
           <indexterm zone="postfix postfix-bin">
             <primary sortas="b-postfix">postfix</primary>
@@ -619,6 +553,8 @@
         <term><command>postkick</command></term>
         <listitem>
-          <para>Sends requests to the specified service over a
-          local transport channel.</para>
+          <para>
+            Sends requests to the specified service over a local transport
+            channel.
+          </para>
           <indexterm zone="postfix postkick">
             <primary sortas="b-postkick">postkick</primary>
@@ -630,6 +566,8 @@
         <term><command>postlock</command></term>
         <listitem>
-          <para>Locks a mail folder for exclusive use, and executes
-          commands passed to it.</para>
+          <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>
@@ -641,6 +579,8 @@
         <term><command>postlog</command></term>
         <listitem>
-          <para>A <application>Postfix</application>-compatible logging
-          interface for use in, for example, shell scripts.</para>
+          <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>
@@ -652,6 +592,8 @@
         <term><command>postmap</command></term>
         <listitem>
-          <para>Creates or queries one or more Postfix lookup
-          tables, or updates an existing one.</para>
+          <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>
@@ -660,9 +602,25 @@
       </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>
+          <para>
+        The <application>Postfix</application> user interface for
+          queue management.
+        </para>
           <indexterm zone="postfix postqueue">
             <primary sortas="b-postqueue">postqueue</primary>
@@ -674,6 +632,8 @@
         <term><command>postsuper</command></term>
         <listitem>
-          <para>The <application>Postfix</application> user interface for
-          superuser queue management.</para>
+          <para>
+        The <application>Postfix</application> user interface for
+          superuser queue management.
+        </para>
           <indexterm zone="postfix postsuper">
             <primary sortas="b-postsuper">postsuper</primary>
@@ -682,54 +642,11 @@
       </varlistentry>
 
-      <varlistentry id="proxymap">
-        <term><command>proxymap</command></term>
-        <listitem>
-          <para>Provides read-only table lookup services to other
-          <application>Postfix</application> processes.</para>
-          <indexterm zone="postfix proxymap">
-            <primary sortas="b-proxymap">proxymap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmgr">
-        <term><command>qmgr</command></term>
-        <listitem>
-          <para>A daemon that awaits the arrival of incoming mail and
-          arranges for its delivery.</para>
-          <indexterm zone="postfix qmgr">
-            <primary sortas="b-qmgr">qmgr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmqpd">
-        <term><command>qmqpd</command></term>
-        <listitem>
-          <para>A daemon that receives one message per connection, and
-          pipes it through the <application>cleanup</application> daemon, and
-          places it into the incoming queue.</para>
-          <indexterm zone="postfix qmqpd">
-            <primary sortas="b-qmqpd">qmqpd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="scache">
-        <term><command>scache</command></term>
-        <listitem>
-          <para>Maintains a connection cache used for sharing a connection
-          multiple times.</para>
-          <indexterm zone="postfix scache">
-            <primary sortas="b-scache">scache</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="sendmail-postfix">
         <term><command>sendmail</command></term>
         <listitem>
-          <para>The <application>Postfix</application> to
-          <application>Sendmail</application> compatibility interface.</para>
+          <para>
+            is the <application>Postfix</application> to
+            <application>Sendmail</application> compatibility interface.
+          </para>
           <indexterm zone="postfix sendmail-postfix">
             <primary sortas="b-sendmail">sendmail</primary>
@@ -737,96 +654,5 @@
         </listitem>
       </varlistentry>
-
-      <varlistentry id="showq">
-        <term><command>showq</command></term>
-        <listitem>
-          <para>A daemon that reports the Postfix mail queue status.</para>
-          <indexterm zone="postfix showq">
-            <primary sortas="b-showq">showq</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="smtp">
-        <term><command>smtp</command></term>
-        <listitem>
-          <para>Looks up a list of mail exchanger addresses for the
-          destination host, sorts the list by preference, and connects to
-          each listed address until it finds a server that responds.</para>
-          <indexterm zone="postfix smtp">
-            <primary sortas="b-smtp">smtp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="smtpd">
-        <term><command>smtpd</command></term>
-        <listitem>
-          <para>Accepts network connection requests and performs zero
-          or more SMTP transactions per connection.</para>
-          <indexterm zone="postfix smtpd">
-            <primary sortas="b-smtpd">smtpd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spawn">
-        <term><command>spawn</command></term>
-        <listitem>
-          <para>Listens on a port as specified in the
-          <application>Postfix</application> <filename>master.cf</filename> file
-          and spawns an external  command whenever a connection is
-          established.</para>
-          <indexterm zone="postfix spawn">
-            <primary sortas="b-spawn">spawn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tlsmgr">
-        <term><command>tlsmgr</command></term>
-        <listitem>
-          <para>Maintains the TLS session cache and acts as the PRNG
-          manager.</para>
-          <indexterm zone="postfix tlsmgr">
-            <primary sortas="b-tlsmgr">tlsmgr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="trivial-rewrite">
-        <term><command>trivial-rewrite</command></term>
-        <listitem>
-          <para>A daemon that rewrites addresses to standard form.</para>
-          <indexterm zone="postfix trivial-rewrite">
-            <primary sortas="b-trivial-rewrite">trivial-rewrite</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="verify">
-        <term><command>verify</command></term>
-        <listitem>
-          <para>Maintains a record of what recipient addresses are known
-          to be deliverable or undeliverable.</para>
-          <indexterm zone="postfix verify">
-            <primary sortas="b-verify">verify</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="virtual">
-        <term><command>virtual</command></term>
-        <listitem>
-          <para>Delivers mail to virtual user's mail directories.</para>
-          <indexterm zone="postfix virtual">
-            <primary sortas="b-virtual">virtual</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
     </variablelist>
-
   </sect2>
-
 </sect1>
