Index: server/databases/databases.xml
===================================================================
--- server/databases/databases.xml	(revision 30fe7dd079b201be71a15825bd8d8481148a8f18)
+++ server/databases/databases.xml	(revision 6bc9f4879451ee675fd27a660cb9650ed84526dc)
@@ -23,6 +23,6 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="db.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mariadb.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="postgresql.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mariadb-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="postgresql-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sqlite.xml"/>
 
Index: server/databases/mariadb-systemd.xml
===================================================================
--- server/databases/mariadb-systemd.xml	(revision 6bc9f4879451ee675fd27a660cb9650ed84526dc)
+++ server/databases/mariadb-systemd.xml	(revision 6bc9f4879451ee675fd27a660cb9650ed84526dc)
@@ -0,0 +1,431 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!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 mariadb-download-http "https://downloads.mariadb.org/interstitial/mariadb-&mariadb-version;/source/mariadb-&mariadb-version;.tar.gz">
+  <!ENTITY mariadb-download-ftp  "ftp://mirrors.fe.up.pt/pub/mariadb/mariadb-&mariadb-version;/source/mariadb-&mariadb-version;.tar.gz">
+  <!ENTITY mariadb-md5sum        "6e9a7c075526f8f2f83ad8e0933bab2f">
+  <!ENTITY mariadb-size          "49 MB">
+  <!ENTITY mariadb-buildsize     "1.4 GB">
+  <!ENTITY mariadb-time          "8.7 SBU (additional 0.4 SBU for the tests)">
+]>
+
+<sect1 id="mariadb" xreflabel="MariaDB-&mariadb-version;">
+  <?dbhtml filename="mariadb.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>MariaDB-&mariadb-version;</title>
+
+  <indexterm zone="mariadb">
+    <primary sortas="a-MariaDB">MariaDB</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to MariaDB</title>
+
+    <para>
+      <application>MariaDB</application> is a community-developed fork and a
+      drop-in replacement for the <application>MySQL</application> relational
+      database management system.
+    </para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&mariadb-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&mariadb-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &mariadb-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &mariadb-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &mariadb-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &mariadb-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <note><para>The installed size of MariaDB is 297 MB, but this can be
+    reduced by about 160 MB, if desired, by removing the /usr/share/mysql/test
+    directory after installation.</para></note>
+
+    <bridgehead renderas="sect3">MariaDB Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="cmake"/> and
+      <xref linkend="openssl"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="libevent"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="boost"/>,
+      <xref linkend="libxml2"/>,
+      <xref linkend="linux-pam"/>,
+      <xref linkend="pcre"/>,
+      <xref linkend="unixodbc"/>,
+      <xref linkend="valgrind"/>,
+      <ulink url="http://packages.debian.org/source/sid/libaio">libaio</ulink>,
+      <ulink url="http://sourceforge.net/projects/judy/">Judy</ulink>,
+      <ulink url="http://sphinxsearch.com/downloads/">Sphinx</ulink>, and
+      <ulink url="http://www.tokutek.com/products/mysql-download-for-mysql-mariadb/">TokuDB</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/mariadb"/>
+    </para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of MariaDB</title>
+
+    <warning>
+      <para>
+        MariaDB and MySQL cannot be installed on the same system without 
+        extensive changes to the build configuration of one of the two applications.
+      </para>
+    </warning>
+
+    <para>
+      For security reasons, running the server as an unprivileged user
+      and group is strongly encouraged. Issue the following (as
+      <systemitem class="username">root</systemitem>) to create the
+      user and group:
+    </para>
+
+<screen role="root"><userinput>groupadd -g 40 mysql &amp;&amp;
+useradd -c "MySQL Server" -d /srv/mysql -g mysql -s /bin/false -u 40 mysql</userinput></screen>
+
+    <para>
+      Install <application>MariaDB</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>sed -i "s@data/test@\${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt &amp;&amp;
+sed -i "s/srv_buf_size/srv_sort_buf_size/" storage/innobase/row/row0log.cc &amp;&amp;
+mkdir build &amp;&amp;
+cd build &amp;&amp;
+cmake -DCMAKE_BUILD_TYPE=Release \
+      -DCMAKE_INSTALL_PREFIX=/usr \
+      -DINSTALL_DOCDIR=share/doc/mysql \
+      -DINSTALL_DOCREADMEDIR=share/doc/mysql \
+      -DINSTALL_MANDIR=share/man \
+      -DINSTALL_MYSQLSHAREDIR=share/mysql \
+      -DINSTALL_MYSQLTESTDIR=share/mysql/test \
+      -DINSTALL_PLUGINDIR=lib/mysql/plugin \
+      -DINSTALL_SBINDIR=sbin \
+      -DINSTALL_SCRIPTDIR=bin \
+      -DINSTALL_SQLBENCHDIR=share/mysql/bench \
+      -DINSTALL_SUPPORTFILESDIR=share/mysql \
+      -DMYSQL_DATADIR=/srv/mysql \
+      -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \
+      -DWITH_EXTRA_CHARSETS=complex \
+      -DWITH_EMBEDDED_SERVER=ON \
+      -DTOKUDB_OK=0 \
+      .. &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make test</command>.
+    </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>sed -i ...</command>: First sed sets correct installation
+      directory for some components. Second sed fixes a bug in the code.
+    </para>
+
+    <para>
+      <parameter>-DWITH_EMBEDDED_SERVER=ON</parameter>: This switch enables
+      compiling the embedded server library needed by certain applications,
+      such as <application>Amarok</application>..
+    </para>
+
+    <para>
+      <parameter>-DWITH_EXTRA_CHARSETS=complex</parameter>: This switch enables
+      support for the complex character sets.
+    </para>
+
+    <!-- Manually-specified variables were not used by the project: WITH_LIBEVENT
+    <para>
+      <parameter>-DWITH_LIBEVENT=system</parameter>: This switch is used to
+      tell the build system to use installed <application>libevent</application>.
+      Remove it if you didn't install <application>libevent</application>.
+    </para> -->
+
+    <para>
+      <option>-DWITHOUT_SERVER=ON -DWITH_UNIT_TESTS=OFF</option>: Use these
+      switches if you don't want the server and would like to build the client
+      only.
+    </para>
+
+    <note><para>
+      There are numerous options available to <command>cmake</command>. Check
+      the output of the <command>cmake . -LH</command> for additional
+      customization options.
+    </para></note>
+
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring MySQL</title>
+
+    <sect3 id="mariadb-config">
+      <title>Config Files</title>
+
+      <para>
+        <filename>/etc/mysql/my.cnf</filename> and
+        <filename>~/.my.cnf</filename>
+      </para>
+
+      <indexterm zone="mariadb mariadb-config">
+        <primary sortas="e-AA.my.cnf">~/.my.cnf</primary>
+      </indexterm>
+
+      <indexterm zone="mariadb mariadb-config">
+        <primary sortas="e-etc-mysql-my.cnf">/etc/mysql/my.cnf</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para>
+        Create basic <filename>/etc/mysql/my.cnf</filename>
+        using the following command as the <systemitem
+        class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>install -v -dm 755 /etc/mysql &amp;&amp;
+cat &gt; /etc/mysql/my.cnf &lt;&lt; "EOF"
+<literal># Begin /etc/mysql/my.cnf
+
+# The following options will be passed to all MySQL clients
+[client]
+#password       = your_password
+port            = 3306
+socket          = /run/mysqld/mysqld.sock
+
+# The MySQL server
+[mysqld]
+port            = 3306
+socket          = /run/mysqld/mysqld.sock
+datadir         = /srv/mysql
+skip-external-locking
+key_buffer_size = 16M
+max_allowed_packet = 1M
+sort_buffer_size = 512K
+net_buffer_length = 16K
+myisam_sort_buffer_size = 8M
+
+# Don't listen on a TCP/IP port at all.
+skip-networking
+
+# required unique id between 1 and 2^32 - 1
+server-id       = 1
+
+# Uncomment the following if you are using BDB tables
+#bdb_cache_size = 4M
+#bdb_max_lock = 10000
+
+# Uncomment the following if you are using InnoDB tables
+#innodb_data_home_dir = /srv/mysql
+#innodb_data_file_path = ibdata1:10M:autoextend
+#innodb_log_group_home_dir = /srv/mysql
+# You can set .._buffer_pool_size up to 50 - 80 %
+# of RAM but beware of setting memory usage too high
+#innodb_buffer_pool_size = 16M
+#innodb_additional_mem_pool_size = 2M
+# Set .._log_file_size to 25 % of buffer pool size
+#innodb_log_file_size = 5M
+#innodb_log_buffer_size = 8M
+#innodb_flush_log_at_trx_commit = 1
+#innodb_lock_wait_timeout = 50
+
+[mysqldump]
+quick
+max_allowed_packet = 16M
+
+[mysql]
+no-auto-rehash
+# Remove the next comment character if you are not familiar with SQL
+#safe-updates
+
+[isamchk]
+key_buffer = 20M
+sort_buffer_size = 20M
+read_buffer = 2M
+write_buffer = 2M
+
+[myisamchk]
+key_buffer_size = 20M
+sort_buffer_size = 20M
+read_buffer = 2M
+write_buffer = 2M
+
+[mysqlhotcopy]
+interactive-timeout
+
+# End /etc/mysql/my.cnf</literal>
+EOF</userinput></screen>
+
+      <para>
+        You can now install a database and change the ownership to the
+        unprivileged user and group (perform as the <systemitem
+        class="username">root</systemitem> user):
+      </para>
+
+<screen role="root"><userinput>mysql_install_db --basedir=/usr --datadir=/srv/mysql --user=mysql &amp;&amp;
+chown -R mysql:mysql /srv/mysql</userinput></screen>
+
+      <para>
+        Further configuration requires that the
+        <application>MariaDB</application> server is running. Start
+        the server using the following commands as the <systemitem
+        class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>install -v -m755 -o mysql -g mysql -d /run/mysqld &amp;&amp;
+mysqld_safe --user=mysql 2&gt;&amp;1 &gt;/dev/null &amp;</userinput></screen>
+
+      <para>
+        A default installation does not set up a password for the
+        administrator, so use the following command as the <systemitem
+        class="username">root</systemitem> user to set one. Replace
+        <replaceable>&lt;new-password&gt;</replaceable> with your own.
+      </para>
+
+<screen role="root"><userinput>mysqladmin -u root password <replaceable>&lt;new-password&gt;</replaceable></userinput></screen>
+
+      <para>
+        Configuration of the server is now finished. Shut the server
+        down using the following command as the <systemitem
+        class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>mysqladmin -p shutdown</userinput></screen>
+
+    </sect3>
+
+    <sect3 id="mariadb-init">
+      <title>Systemd Units</title>
+
+      <para>
+        To start the <command>mysqld</command> daemon at boot,
+        install the systemd unit from the <xref linkend="bootscripts"/>
+        package by running the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+      <indexterm zone="mariadb mariadb-init">
+        <primary sortas="f-mysql">mysql</primary>
+      </indexterm>
+
+<screen role="root"><userinput>make install-mysqld</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>
+          aria_chk, aria_dump_log, aria_ftdump, aria_pack, aria_read_log,
+          innochecksum, msql2mysql, my_print_defaults, myisam_ftdump,
+          myisamchk, myisamlog, myisampack, mysql, mysql_client_test,
+          mysql_client_test_embedded, mysql_config, mysql_convert_table_format,
+          mysql_embedded, mysql_find_rows, mysql_fix_extensions,
+          mysql_install_db, mysql_plugin, mysql_secure_installation,
+          mysql_setpermission, mysql_tzinfo_to_sql, mysql_upgrade,
+          mysql_waitpid, mysql_zap, mysqlaccess, mysqladmin, mysqlbinlog,
+          mysqlbug, mysqlcheck, mysqld, mysqld_multi, mysqld_safe, mysqldump,
+          mysqldumpslow, mysqlhotcopy, mysqlimport, mysqlshow, mysqlslap,
+          mysqltest, mysqltest_embedded, mytop, perror, replace,
+          resolve_stack_dump, and resolveip
+        </seg>
+        <seg>
+          libmysqlclient.{so,a},
+          libmysqlclient_r.{so,a} (symbolic links to libmysqlclient.{so,a}),
+          libmysqld.{so,a}, libmysqlservices.a,
+          and several under /usr/lib/mysql/plugin/
+        </seg>
+        <seg>
+          /etc/mysql,
+          /srv/mysql,
+          /usr/include/mysql,
+          /usr/lib/mysql,
+          /usr/share/doc/mysql, and
+          /usr/share/mysql
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+
+    <para>
+      Descriptions of all the programs and libraries would be several
+      pages long. Instead, consult the man pages
+      or the online documentation at <ulink
+      url="https://mariadb.com/kb/en/mariadb-documentation/"/>.
+    </para>
+
+    <para>
+      The <application>Perl</application> DBI modules must be installed
+      for some of the <application>MariaDB</application> support programs to
+      function properly.
+    </para>
+
+  </sect2>
+
+</sect1>
Index: server/databases/mariadb.xml
===================================================================
--- server/databases/mariadb.xml	(revision 30fe7dd079b201be71a15825bd8d8481148a8f18)
+++ 	(revision )
@@ -1,431 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!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 mariadb-download-http "https://downloads.mariadb.org/interstitial/mariadb-&mariadb-version;/source/mariadb-&mariadb-version;.tar.gz">
-  <!ENTITY mariadb-download-ftp  "ftp://mirrors.fe.up.pt/pub/mariadb/mariadb-&mariadb-version;/source/mariadb-&mariadb-version;.tar.gz">
-  <!ENTITY mariadb-md5sum        "6e9a7c075526f8f2f83ad8e0933bab2f">
-  <!ENTITY mariadb-size          "49 MB">
-  <!ENTITY mariadb-buildsize     "1.4 GB">
-  <!ENTITY mariadb-time          "8.7 SBU (additional 0.4 SBU for the tests)">
-]>
-
-<sect1 id="mariadb" xreflabel="MariaDB-&mariadb-version;">
-  <?dbhtml filename="mariadb.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>MariaDB-&mariadb-version;</title>
-
-  <indexterm zone="mariadb">
-    <primary sortas="a-MariaDB">MariaDB</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to MariaDB</title>
-
-    <para>
-      <application>MariaDB</application> is a community-developed fork and a
-      drop-in replacement for the <application>MySQL</application> relational
-      database management system.
-    </para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&mariadb-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&mariadb-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &mariadb-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &mariadb-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &mariadb-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &mariadb-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <note><para>The installed size of MariaDB is 297 MB, but this can be
-    reduced by about 160 MB, if desired, by removing the /usr/share/mysql/test
-    directory after installation.</para></note>
-
-    <bridgehead renderas="sect3">MariaDB Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/> and
-      <xref linkend="openssl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libevent"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="boost"/>,
-      <xref linkend="libxml2"/>,
-      <xref linkend="linux-pam"/>,
-      <xref linkend="pcre"/>,
-      <xref linkend="unixodbc"/>,
-      <xref linkend="valgrind"/>,
-      <ulink url="http://packages.debian.org/source/sid/libaio">libaio</ulink>,
-      <ulink url="http://sourceforge.net/projects/judy/">Judy</ulink>,
-      <ulink url="http://sphinxsearch.com/downloads/">Sphinx</ulink>, and
-      <ulink url="http://www.tokutek.com/products/mysql-download-for-mysql-mariadb/">TokuDB</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/mariadb"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of MariaDB</title>
-
-    <warning>
-      <para>
-        MariaDB and MySQL cannot be installed on the same system without 
-        extensive changes to the build configuration of one of the two applications.
-      </para>
-    </warning>
-
-    <para>
-      For security reasons, running the server as an unprivileged user
-      and group is strongly encouraged. Issue the following (as
-      <systemitem class="username">root</systemitem>) to create the
-      user and group:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 40 mysql &amp;&amp;
-useradd -c "MySQL Server" -d /srv/mysql -g mysql -s /bin/false -u 40 mysql</userinput></screen>
-
-    <para>
-      Install <application>MariaDB</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>sed -i "s@data/test@\${INSTALL_MYSQLTESTDIR}@g" sql/CMakeLists.txt &amp;&amp;
-sed -i "s/srv_buf_size/srv_sort_buf_size/" storage/innobase/row/row0log.cc &amp;&amp;
-mkdir build &amp;&amp;
-cd build &amp;&amp;
-cmake -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DINSTALL_DOCDIR=share/doc/mysql \
-      -DINSTALL_DOCREADMEDIR=share/doc/mysql \
-      -DINSTALL_MANDIR=share/man \
-      -DINSTALL_MYSQLSHAREDIR=share/mysql \
-      -DINSTALL_MYSQLTESTDIR=share/mysql/test \
-      -DINSTALL_PLUGINDIR=lib/mysql/plugin \
-      -DINSTALL_SBINDIR=sbin \
-      -DINSTALL_SCRIPTDIR=bin \
-      -DINSTALL_SQLBENCHDIR=share/mysql/bench \
-      -DINSTALL_SUPPORTFILESDIR=share/mysql \
-      -DMYSQL_DATADIR=/srv/mysql \
-      -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \
-      -DWITH_EXTRA_CHARSETS=complex \
-      -DWITH_EMBEDDED_SERVER=ON \
-      -DTOKUDB_OK=0 \
-      .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-    </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>sed -i ...</command>: First sed sets correct installation
-      directory for some components. Second sed fixes a bug in the code.
-    </para>
-
-    <para>
-      <parameter>-DWITH_EMBEDDED_SERVER=ON</parameter>: This switch enables
-      compiling the embedded server library needed by certain applications,
-      such as <application>Amarok</application>..
-    </para>
-
-    <para>
-      <parameter>-DWITH_EXTRA_CHARSETS=complex</parameter>: This switch enables
-      support for the complex character sets.
-    </para>
-
-    <!-- Manually-specified variables were not used by the project: WITH_LIBEVENT
-    <para>
-      <parameter>-DWITH_LIBEVENT=system</parameter>: This switch is used to
-      tell the build system to use installed <application>libevent</application>.
-      Remove it if you didn't install <application>libevent</application>.
-    </para> -->
-
-    <para>
-      <option>-DWITHOUT_SERVER=ON -DWITH_UNIT_TESTS=OFF</option>: Use these
-      switches if you don't want the server and would like to build the client
-      only.
-    </para>
-
-    <note><para>
-      There are numerous options available to <command>cmake</command>. Check
-      the output of the <command>cmake . -LH</command> for additional
-      customization options.
-    </para></note>
-
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring MySQL</title>
-
-    <sect3 id="mariadb-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/mysql/my.cnf</filename> and
-        <filename>~/.my.cnf</filename>
-      </para>
-
-      <indexterm zone="mariadb mariadb-config">
-        <primary sortas="e-AA.my.cnf">~/.my.cnf</primary>
-      </indexterm>
-
-      <indexterm zone="mariadb mariadb-config">
-        <primary sortas="e-etc-mysql-my.cnf">/etc/mysql/my.cnf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Create basic <filename>/etc/mysql/my.cnf</filename>
-        using the following command as the <systemitem
-        class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>install -v -dm 755 /etc/mysql &amp;&amp;
-cat &gt; /etc/mysql/my.cnf &lt;&lt; "EOF"
-<literal># Begin /etc/mysql/my.cnf
-
-# The following options will be passed to all MySQL clients
-[client]
-#password       = your_password
-port            = 3306
-socket          = /run/mysqld/mysqld.sock
-
-# The MySQL server
-[mysqld]
-port            = 3306
-socket          = /run/mysqld/mysqld.sock
-datadir         = /srv/mysql
-skip-external-locking
-key_buffer_size = 16M
-max_allowed_packet = 1M
-sort_buffer_size = 512K
-net_buffer_length = 16K
-myisam_sort_buffer_size = 8M
-
-# Don't listen on a TCP/IP port at all.
-skip-networking
-
-# required unique id between 1 and 2^32 - 1
-server-id       = 1
-
-# Uncomment the following if you are using BDB tables
-#bdb_cache_size = 4M
-#bdb_max_lock = 10000
-
-# Uncomment the following if you are using InnoDB tables
-#innodb_data_home_dir = /srv/mysql
-#innodb_data_file_path = ibdata1:10M:autoextend
-#innodb_log_group_home_dir = /srv/mysql
-# You can set .._buffer_pool_size up to 50 - 80 %
-# of RAM but beware of setting memory usage too high
-#innodb_buffer_pool_size = 16M
-#innodb_additional_mem_pool_size = 2M
-# Set .._log_file_size to 25 % of buffer pool size
-#innodb_log_file_size = 5M
-#innodb_log_buffer_size = 8M
-#innodb_flush_log_at_trx_commit = 1
-#innodb_lock_wait_timeout = 50
-
-[mysqldump]
-quick
-max_allowed_packet = 16M
-
-[mysql]
-no-auto-rehash
-# Remove the next comment character if you are not familiar with SQL
-#safe-updates
-
-[isamchk]
-key_buffer = 20M
-sort_buffer_size = 20M
-read_buffer = 2M
-write_buffer = 2M
-
-[myisamchk]
-key_buffer_size = 20M
-sort_buffer_size = 20M
-read_buffer = 2M
-write_buffer = 2M
-
-[mysqlhotcopy]
-interactive-timeout
-
-# End /etc/mysql/my.cnf</literal>
-EOF</userinput></screen>
-
-      <para>
-        You can now install a database and change the ownership to the
-        unprivileged user and group (perform as the <systemitem
-        class="username">root</systemitem> user):
-      </para>
-
-<screen role="root"><userinput>mysql_install_db --basedir=/usr --datadir=/srv/mysql --user=mysql &amp;&amp;
-chown -R mysql:mysql /srv/mysql</userinput></screen>
-
-      <para>
-        Further configuration requires that the
-        <application>MariaDB</application> server is running. Start
-        the server using the following commands as the <systemitem
-        class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>install -v -m755 -o mysql -g mysql -d /run/mysqld &amp;&amp;
-mysqld_safe --user=mysql 2&gt;&amp;1 &gt;/dev/null &amp;</userinput></screen>
-
-      <para>
-        A default installation does not set up a password for the
-        administrator, so use the following command as the <systemitem
-        class="username">root</systemitem> user to set one. Replace
-        <replaceable>&lt;new-password&gt;</replaceable> with your own.
-      </para>
-
-<screen role="root"><userinput>mysqladmin -u root password <replaceable>&lt;new-password&gt;</replaceable></userinput></screen>
-
-      <para>
-        Configuration of the server is now finished. Shut the server
-        down using the following command as the <systemitem
-        class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>mysqladmin -p shutdown</userinput></screen>
-
-    </sect3>
-
-    <sect3 id="mariadb-init">
-      <title>Boot Script</title>
-
-      <para>
-        Install the <filename>/etc/rc.d/init.d/mysql</filename> init script
-        included in the <xref linkend="bootscripts"/> package as
-        the <systemitem class="username">root</systemitem> user to start the
-        <application>MariaDB</application> server during system boot-up.
-      </para>
-
-      <indexterm zone="mariadb mariadb-init">
-        <primary sortas="f-mysql">mysql</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-mysql</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>
-          aria_chk, aria_dump_log, aria_ftdump, aria_pack, aria_read_log,
-          innochecksum, msql2mysql, my_print_defaults, myisam_ftdump,
-          myisamchk, myisamlog, myisampack, mysql, mysql_client_test,
-          mysql_client_test_embedded, mysql_config, mysql_convert_table_format,
-          mysql_embedded, mysql_find_rows, mysql_fix_extensions,
-          mysql_install_db, mysql_plugin, mysql_secure_installation,
-          mysql_setpermission, mysql_tzinfo_to_sql, mysql_upgrade,
-          mysql_waitpid, mysql_zap, mysqlaccess, mysqladmin, mysqlbinlog,
-          mysqlbug, mysqlcheck, mysqld, mysqld_multi, mysqld_safe, mysqldump,
-          mysqldumpslow, mysqlhotcopy, mysqlimport, mysqlshow, mysqlslap,
-          mysqltest, mysqltest_embedded, mytop, perror, replace,
-          resolve_stack_dump, and resolveip
-        </seg>
-        <seg>
-          libmysqlclient.{so,a},
-          libmysqlclient_r.{so,a} (symbolic links to libmysqlclient.{so,a}),
-          libmysqld.{so,a}, libmysqlservices.a,
-          and several under /usr/lib/mysql/plugin/
-        </seg>
-        <seg>
-          /etc/mysql,
-          /srv/mysql,
-          /usr/include/mysql,
-          /usr/lib/mysql,
-          /usr/share/doc/mysql, and
-          /usr/share/mysql
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-
-    <para>
-      Descriptions of all the programs and libraries would be several
-      pages long. Instead, consult the man pages
-      or the online documentation at <ulink
-      url="https://mariadb.com/kb/en/mariadb-documentation/"/>.
-    </para>
-
-    <para>
-      The <application>Perl</application> DBI modules must be installed
-      for some of the <application>MariaDB</application> support programs to
-      function properly.
-    </para>
-
-  </sect2>
-
-</sect1>
Index: server/databases/postgresql-systemd.xml
===================================================================
--- server/databases/postgresql-systemd.xml	(revision 6bc9f4879451ee675fd27a660cb9650ed84526dc)
+++ server/databases/postgresql-systemd.xml	(revision 6bc9f4879451ee675fd27a660cb9650ed84526dc)
@@ -0,0 +1,735 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!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 postgresql-download-http "http://ftp.postgresql.org/pub/source/v&postgresql-version;/postgresql-&postgresql-version;.tar.bz2">
+  <!ENTITY postgresql-download-ftp  "ftp://ftp.postgresql.org/pub/source/v&postgresql-version;/postgresql-&postgresql-version;.tar.bz2">
+  <!ENTITY postgresql-md5sum        "d0a41f54c377b2d2fab4a003b0dac762">
+  <!ENTITY postgresql-size          "16 MB">
+  <!ENTITY postgresql-buildsize     "184 MB (additional 169 MB to run the testsuite)">
+  <!ENTITY postgresql-time          "1.5 SBU (additional 0.2 SBU to run the testsuite)">
+]>
+
+<sect1 id="postgresql" xreflabel="PostgreSQL-&postgresql-version;">
+  <?dbhtml filename="postgresql.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>PostgreSQL-&postgresql-version;</title>
+
+  <indexterm zone="postgresql">
+    <primary sortas="a-PostgreSQL">PostgreSQL</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to PostgreSQL</title>
+
+    <para><application>PostgreSQL</application> is an advanced
+    object-relational database management system (ORDBMS), derived
+    from the Berkeley Postgres database management system.</para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&postgresql-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&postgresql-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &postgresql-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &postgresql-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &postgresql-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &postgresql-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">PostgreSQL Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="python2"/>,
+      <xref linkend="tcl"/>,
+      <xref linkend="openssl"/>,
+      <xref linkend="libxml2"/>,
+      <xref linkend="libxslt"/>,
+      <xref linkend="openldap"/>,
+      <xref linkend="linux-pam"/>,
+      <xref linkend="mitkrb"/> and
+      <ulink url="http://developer.apple.com/networking/bonjour/">Bonjour</ulink>
+    </para>
+
+    <bridgehead renderas="sect4">Optional (To Regenerate Documentation)</bridgehead>
+    <para role="optional">
+      <xref linkend="sgml-dtd"/>,
+      <xref linkend="docbook-dsssl"/>,
+      <xref linkend="openjade"/>, and
+      <xref linkend="perl-sgmlspm"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/postgresql"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of PostgreSQL</title>
+
+    <para>Install <application>PostgreSQL</application> with the
+    following commands: </para>
+
+<screen><userinput>sed -i '/DEFAULT_PGSOCKET_DIR/s@/tmp@/run/postgresql@' src/include/pg_config_manual.h &amp;&amp;
+sed -i -e 's@psql\\"@&amp; -h /tmp@' src/test/regress/pg_regress{,_main}.c &amp;&amp;
+sed -i -e 's@gres\\"@&amp; -k /tmp@' src/test/regress/pg_regress.c &amp;&amp;
+./configure --prefix=/usr          \
+            --enable-thread-safety \
+            --docdir=/usr/share/doc/postgresql-&postgresql-version; &amp;&amp;
+make</userinput></screen>
+
+    <warning>
+      <para>This package contains a known security hole that allows other
+      users on the same machine to gain access to an operating system account
+      while it is doing "make check": CVE-2014-0067. Until the fix is available,
+      users are strongly advised not to run "make check" on machines where
+      untrusted users have accounts. </para>
+    </warning>
+
+    <para>To test the results, issue: <command>make check</command>.</para>
+
+    <para>There are a number of programs in the
+    <filename class="directory">contrib/</filename> directory. If you are going
+    to run this installation as a server and wish to build some of them, enter
+    <command>make -C contrib</command> or
+    <command>make -C contrib/<replaceable>&lt;SUBDIR-NAME&gt;</replaceable></command> for each subdirectory.
+    </para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install      &amp;&amp;
+make install-docs</userinput></screen>
+
+    <para>If you made any of the <filename class="directory">contrib/</filename>
+    programs, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="nodump/"><userinput>make -C contrib/<replaceable>&lt;SUBDIR-NAME&gt;</replaceable> install</userinput></screen>
+
+    <para><emphasis>If you only intend to use <application>PostgreSQL</application>
+    as a client to connect to a server on another machine, your installation is
+    complete and you should not run the remaining commands.</emphasis></para>
+
+    <!-- 'Upgrading' seems to only ever exist in the docs for *previous* version -->
+    <note>
+      <para>If you are upgrading an existing system and are going to install
+      the new files over the old ones, then you should back up your data, shut
+      down the old server and follow the instructions in <ulink
+      url="http://www.postgresql.org/docs/9.0/static/install-upgrading.html">the
+      official <application>PostgreSQL</application> documentation</ulink>.</para>
+    </note>
+
+    <para>Initialize a database cluster with the following commands issued by the
+    <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>install -v -dm700 /srv/pgsql/data &amp;&amp;
+install -v -dm755 /run/postgresql &amp;&amp;
+groupadd -g 41 postgres &amp;&amp;
+useradd -c "PostgreSQL Server" -g postgres -d /srv/pgsql/data \
+        -u 41 postgres &amp;&amp;
+chown -Rv postgres:postgres /srv/pgsql /run/postgresql &amp;&amp;
+su - postgres -c '/usr/bin/initdb -D /srv/pgsql/data'</userinput></screen>
+
+    <para>As the <systemitem class="username">root</systemitem> user, start the
+    database server with the following command:</para>
+
+<screen role="root"><userinput>su - postgres -c '/usr/bin/postmaster -D /srv/pgsql/data > \
+    /srv/pgsql/data/logfile 2&gt;&amp;1 &amp;'</userinput></screen>
+
+    <para>Still as user <systemitem class="username">root</systemitem>, create
+    a database and verify the installation:</para>
+
+<screen role="root"><userinput>su - postgres -c '/usr/bin/createdb test' &amp;&amp;
+echo "create table t1 ( name varchar(20), state_province varchar(20) );" \
+    | (su - postgres -c '/usr/bin/psql test ') &amp;&amp;
+echo "insert into t1 values ('Billy', 'NewYork');" \
+    | (su - postgres -c '/usr/bin/psql test ') &amp;&amp;
+echo "insert into t1 values ('Evanidus', 'Quebec');" \
+    | (su - postgres -c '/usr/bin/psql test ') &amp;&amp;
+echo "insert into t1 values ('Jesse', 'Ontario');" \
+    | (su - postgres -c '/usr/bin/psql test ') &amp;&amp;
+echo "select * from t1;" | (su - postgres -c '/usr/bin/psql test')</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <command>sed -i ...</command>: These seds change server socket location
+      from <filename class="directory">/tmp</filename> to
+      <filename class="directory">/run/postgresql</filename> and fix up the
+      regression tests to use <filename class="directory">/tmp</filename> so
+      that they can work reliably.
+    </para>
+
+    <para><parameter>--docdir=/usr/share/doc/postgresql-&postgresql-version;</parameter>:
+    This switch puts the documentation in a versioned directory.</para>
+
+    <para><parameter>--enable-thread-safety</parameter>: This switch makes the
+    client libraries thread-safe by allowing concurrent threads in
+    <filename class="libraryfile">libpq</filename> and ECPG programs to safely
+    control their private connection handles.</para>
+
+    <para><option>--with-openssl</option>: build with support for
+    <application>OpenSSL</application> encrypted connections.</para>
+
+    <para><option>--with-perl</option>: build the PL/Perl server-side language.
+    </para>
+
+    <para><option>--with-python</option>: build the PL/Python server-side
+    language.</para>
+
+    <para><option>--with-tcl</option>: build the PL/Tcl server-side language.</para>
+
+    <para><command>groupadd ...</command>; <command>useradd ...</command>:
+    These commands add an unprivileged user and group to run the database
+    server.</para>
+
+    <para><command>createdb test; create table t1; insert into t1 values...;
+    select * from t1</command>: Create a database, add a table to it, insert
+    some rows into the table and select them to verify that the installation
+    is working properly.</para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring PostgreSQL</title>
+
+    <sect3 id="postgresql-config">
+      <title>Config Files</title>
+
+      <para><filename>$PGDATA/pg_ident.con</filename>,
+      <filename>$PGDATA/pg_hba.conf</filename> and
+      <filename>$PGDATA/postgresql.conf</filename></para>
+
+      <indexterm zone="postgresql postgresql-config">
+        <primary sortas="e-A.PGDATA-pg_ident.con">$PGDATA/pg_indent.con</primary>
+      </indexterm>
+
+      <indexterm zone="postgresql postgresql-config">
+        <primary sortas="e-A.PGDATA-pg_hba.conf">$PGDATA/pg_hba_conf</primary>
+      </indexterm>
+
+      <indexterm zone="postgresql postgresql-config">
+        <primary sortas="e-A.PGDATA-postgresql.conf">$PGDATA/postgresql.conf</primary>
+      </indexterm>
+
+      <para>The <envar>PGDATA</envar> environment variable is used to
+      distinguish database clusters from one another by setting it to
+      the value of the directory which contains the cluster desired.
+      The three configuration files exist in every <filename
+      class="directory">PGDATA/</filename> directory. Details on the
+      format of the files and the options that can be set in each can
+      be found in <ulink
+      url="file:///usr/share/doc/postgresql-&postgresql-version;/html/index.html"/>.</para>
+
+    </sect3>
+
+    <sect3  id="postgresql-init">
+      <title>Systemd Units</title>
+
+      <para>
+        To start the <command>postgresql</command> daemon at boot,
+        install the systemd unit from the <xref linkend="bootscripts"/>
+        package by running the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+      <indexterm zone="postgresql postgresql-init">
+        <primary sortas="f-postgresql">postgresql</primary>
+      </indexterm>
+
+<screen role="root"><userinput>make install-postgresql</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>clusterdb, createdb, createlang, createuser, dropdb, droplang,
+        dropuser, ecpg, initdb, pg_basebackup, pg_config, pg_controldata, pg_ctl,
+        pg_dump, pg_dumpall, pg_isready, pg_receivexlog, pg_resetxlog, pg_restore, pltcl_delmod,
+        pltcl_listmod, pltcl_loadmod, postgres, postmaster, psql,
+        reindexdb, vacuumdb, and optionally (in contrib/) oid2name, pg_archivecleanup,
+        pgbench, pg_standby, pg_test_fsync, pg_test_timing, pg_upgrade, pg_xlogdump,
+        vacuumlo,</seg>
+        <seg>libecpg.{so,a}, libecpg_compat.{so,a}, libpgport.a, libpgtypes.{so,a},
+        libpq.{so,a}, various charset modules, and optionally programming language
+        modules.</seg>
+        <seg>/srv/pgsql, /usr/include/libpq, /usr/include/postgresql,
+        /usr/lib/postgresql, /usr/share/doc/postgresql-&postgresql-version;, and
+        /usr/share/postgresql</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="clusterdb">
+        <term><command>clusterdb</command></term>
+        <listitem>
+          <para>is a utility for reclustering tables in a
+          <application>PostgreSQL</application> database.</para>
+          <indexterm zone="postgresql clusterdb">
+            <primary sortas="b-clusterdb">clusterdb</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="createdb">
+        <term><command>createdb</command></term>
+        <listitem>
+          <para> creates a new <application>PostgreSQL</application>
+          database.</para>
+          <indexterm zone="postgresql createdb">
+            <primary sortas="b-createdb">createdb</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="createlang">
+        <term><command>createlang</command></term>
+        <listitem>
+          <para>defines a new <application>PostgreSQL</application> procedural
+          language.</para>
+          <indexterm zone="postgresql createlang">
+            <primary sortas="b-createlang">createlang</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="createuser">
+        <term><command>createuser</command></term>
+        <listitem>
+          <para>defines a new <application>PostgreSQL</application>
+          user account.</para>
+          <indexterm zone="postgresql createuser">
+            <primary sortas="b-createuser">createuser</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="dropdb">
+        <term><command>dropdb</command></term>
+        <listitem>
+          <para>removes a <application>PostgreSQL</application> database.</para>
+          <indexterm zone="postgresql dropdb">
+            <primary sortas="b-dropdb">dropdb</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="droplang">
+        <term><command>droplang</command></term>
+        <listitem>
+          <para>removes a <application>PostgreSQL</application> procedural
+          language.</para>
+          <indexterm zone="postgresql droplang">
+            <primary sortas="b-droplang">droplang</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="dropuser">
+        <term><command>dropuser</command></term>
+        <listitem>
+          <para>removes a <application>PostgreSQL</application>
+          user account.</para>
+          <indexterm zone="postgresql dropuser">
+            <primary sortas="b-dropuser">dropuser</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ecpg">
+        <term><command>ecpg</command></term>
+        <listitem>
+          <para>is the embedded SQL preprocessor.</para>
+          <indexterm zone="postgresql ecpg">
+            <primary sortas="b-ecpg">ecpg</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="initdb">
+        <term><command>initdb</command></term>
+        <listitem>
+          <para>creates a new database cluster.</para>
+          <indexterm zone="postgresql initdb">
+            <primary sortas="b-initdb">initdb</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="oid2name">
+        <term><command>oid2name</command></term>
+        <listitem>
+          <para>resolves OIDs (Object IDs) and file nodes in a PostgreSQL data
+          directory.</para>
+          <indexterm zone="postgresql oid2name">
+            <primary sortas="b-oid2name">oid2name</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pg_archivecleanup">
+        <term><command>pg_archivecleanup</command></term>
+        <listitem>
+          <para>clean up PostgreSQL WAL (write-ahead log) archive files.</para>
+          <indexterm zone="postgresql pg_archivecleanup">
+            <primary sortas="b-pg_archivecleanup">pg_archivecleanup</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pg_basebackup">
+        <term><command>pg_basebackup</command></term>
+        <listitem>
+          <para>takes base backups of a running
+          <application>PostgreSQL</application> cluster.</para>
+          <indexterm zone="postgresql pg_basebackup">
+            <primary sortas="b-pg_basebackup">pg_basebackup</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pg_config">
+        <term><command>pg_config</command></term>
+        <listitem>
+          <para>retrieves <application>PostgreSQL</application> version
+          information.</para>
+          <indexterm zone="postgresql pg_config">
+            <primary sortas="b-pg_config">pg_config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pg_controldata">
+        <term><command>pg_controldata</command></term>
+        <listitem>
+          <para>returns information initialized during
+          <command>initdb</command>, such as the catalog version and server
+          locale.</para>
+          <indexterm zone="postgresql pg_controldata">
+            <primary sortas="b-pg_controldata">pg_controldata</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pg_ctl">
+        <term><command>pg_ctl</command></term>
+        <listitem>
+          <para>controls stopping and starting the database server.</para>
+          <indexterm zone="postgresql pg_ctl">
+            <primary sortas="b-pg_ctl">pg_ctl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pg_dump">
+        <term><command>pg_dump</command></term>
+        <listitem>
+          <para>dumps database data and metadata into scripts which are used
+          to recreate the database.</para>
+          <indexterm zone="postgresql pg_dump">
+            <primary sortas="b-pg_dump">pg_dump</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pg_dumpall">
+        <term><command>pg_dumpall</command></term>
+        <listitem>
+          <para>recursively calls <command>pg_dump</command> for each
+          database in a cluster.</para>
+          <indexterm zone="postgresql pg_dumpall">
+            <primary sortas="b-pg_dumpall">pg_dumpall</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pg_isready">
+        <term><command>pg_isready</command></term>
+        <listitem>
+          <para>check the connection status of a PostgreSQL server.</para>
+          <indexterm zone="postgresql pg_isready">
+            <primary sortas="b-pg_isready">pg_isready</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pg_resetxlog">
+        <term><command>pg_resetxlog</command></term>
+        <listitem>
+          <para>clears the write-ahead log and optionally resets some
+          fields in the <filename>pg_control</filename> file.</para>
+          <indexterm zone="postgresql pg_resetxlog">
+            <primary sortas="b-pg_resetxlog">pg_resetxlog</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pg_restore">
+        <term><command>pg_restore</command></term>
+        <listitem>
+          <para>creates databases from dump files created by
+          <command>pg_dump</command>.</para>
+          <indexterm zone="postgresql pg_restore">
+            <primary sortas="b-pg_restore">pg_restore</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pg_standby">
+        <term><command>pg_standby</command></term>
+        <listitem>
+          <para>supports the creation of a PostgreSQL warm standby
+          server.</para>
+          <indexterm zone="postgresql pg_standby">
+            <primary sortas="b-pg_standby">pg_standby</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pg_test_fsync">
+        <term><command>pg_test_fsync</command></term>
+        <listitem>
+          <para>determine fastest wal_sync method for PostgreSQL.</para>
+          <indexterm zone="postgresql pg_test_fsync">
+            <primary sortas="b-pg_test_fsync">pg_test_fsync</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pg_test_timing">
+        <term><command>pg_test_timing</command></term>
+        <listitem>
+          <para>measure timing overhead.</para>
+          <indexterm zone="postgresql pg_test_timing">
+            <primary sortas="b-pg_test_timing">pg_test_timing</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pg_upgrade">
+        <term><command>pg_upgrade</command></term>
+        <listitem>
+          <para>upgrade a PostgreSQL server instance.</para>
+          <indexterm zone="postgresql pg_upgrade">
+            <primary sortas="b-pg_upgrade">pg_upgrade</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pg_xlogdump">
+        <term><command>pg_xlogdump</command></term>
+        <listitem>
+          <para>display a human-readable rendering of the write-ahead log of a
+          PostgreSQL database cluster.</para>
+          <indexterm zone="postgresql pg_xlogdump">
+            <primary sortas="b-pg_xlogdump">pg_xlogdump</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pgbench">
+        <term><command>pgbench</command></term>
+        <listitem>
+          <para>run a benchmark test on PostgreSQL.</para>
+          <indexterm zone="postgresql pgbench">
+            <primary sortas="b-pgbench">pgbench</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pltcl_delmod">
+        <term><command>pltcl_delmod</command></term>
+        <listitem>
+          <para>is a support script used to delete a module from a
+          PL/<application>Tcl</application> table. The command
+          requires the <ulink
+          url="http://flightaware.github.io/Pgtcl/">Pgtcl</ulink>
+          package to be installed also.</para>
+          <indexterm zone="postgresql pltcl_delmod">
+            <primary sortas="b-pltcl_delmod">pltcl_delmod</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pltcl_listmod">
+        <term><command>pltcl_listmod</command></term>
+        <listitem>
+          <para>is a support script used to list the modules in a
+          PL/<application>Tcl</application> table. The command
+          requires the <ulink
+          url="http://gborg.postgresql.org/project/pgtcl/">Pgtcl</ulink>
+          package to be installed also.</para>
+          <indexterm zone="postgresql pltcl_listmod">
+            <primary sortas="b-pltcl_listmod">pltcl_listmod</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pltcl_loadmod">
+        <term><command>pltcl_loadmod</command></term>
+        <listitem>
+          <para>is a support script used to load a module into a
+          PL/<application>Tcl</application> table. The command
+          requires the <ulink
+          url="http://gborg.postgresql.org/project/pgtcl/">Pgtcl</ulink>
+          package to be installed also.</para>
+          <indexterm zone="postgresql pltcl_loadmod">
+            <primary sortas="b-pltcl_loadmod">pltcl_loadmod</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="postgres">
+        <term><command>postgres</command></term>
+        <listitem>
+          <para>is a single user database server, generally used for
+          debugging.</para>
+          <indexterm zone="postgresql postgres">
+            <primary sortas="b-postgres">postgres</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="postmaster">
+        <term><command>postmaster</command></term>
+        <listitem>
+          <para>(a symlink to <command>postgres</command>) is a multi-user
+          database daemon.</para>
+          <indexterm zone="postgresql postmaster">
+            <primary sortas="b-postmaster">postmaster</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="psql">
+        <term><command>psql</command></term>
+        <listitem>
+          <para>is a console based database shell.</para>
+          <indexterm zone="postgresql psql">
+            <primary sortas="b-psql">psql</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+       <varlistentry id="reindexdb">
+        <term><command>reindexdb</command></term>
+        <listitem>
+          <para>is a utility for rebuilding indexes in a database.</para>
+          <indexterm zone="postgresql reindexdb">
+            <primary sortas="b-reindexdb">reindexdb</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="vacuumdb">
+        <term><command>vacuumdb</command></term>
+        <listitem>
+          <para>compacts databases and generates statistics for the query
+          analyzer.</para>
+          <indexterm zone="postgresql vacuumdb">
+            <primary sortas="b-vacuumdb">vacuumdb</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="vacuumlo">
+        <term><command>vacuumlo</command></term>
+        <listitem>
+          <para>remove orphaned large objects from a PostgreSQL database.</para>
+          <indexterm zone="postgresql vacuumlo">
+            <primary sortas="b-vacuumlo">vacuumlo</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libecpg">
+        <term><filename class='libraryfile'>libecpg.{so,a}</filename></term>
+        <listitem>
+          <para>contains functions to support embedded SQL in C programs.</para>
+          <indexterm zone="postgresql libecpg">
+            <primary sortas="c-libecpg">libecpg.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libecpg_compat">
+        <term><filename class='libraryfile'>libecpg_compat.{so,a}</filename></term>
+        <listitem>
+          <para>is the ecpg compatibility library.</para>
+          <indexterm zone="postgresql libecpg_compat">
+            <primary sortas="c-libecpg_compat">libecpg_compat.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgport">
+        <term><filename class='libraryfile'>libgport.a</filename></term>
+        <listitem>
+          <para>is the port-specific subsystem of the Postgres backend.</para>
+          <indexterm zone="postgresql libgport">
+            <primary sortas="c-libgport">libgport.a</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libpgtypes">
+        <term><filename class='libraryfile'>libpgtypes.{so,a}</filename></term>
+        <listitem>
+          <para>contains functions for dealing with Postgres data types.</para>
+          <indexterm zone="postgresql libpgtypes">
+            <primary sortas="c-libpgtypes">libpgtypes.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libpq">
+        <term><filename class='libraryfile'>libpq.{so,a}</filename></term>
+        <listitem>
+          <para>is the C programmer's API to Postgres.</para>
+          <indexterm zone="postgresql libpq">
+            <primary sortas="c-libpq">libpq.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: server/databases/postgresql.xml
===================================================================
--- server/databases/postgresql.xml	(revision 30fe7dd079b201be71a15825bd8d8481148a8f18)
+++ 	(revision )
@@ -1,732 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!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 postgresql-download-http "http://ftp.postgresql.org/pub/source/v&postgresql-version;/postgresql-&postgresql-version;.tar.bz2">
-  <!ENTITY postgresql-download-ftp  "ftp://ftp.postgresql.org/pub/source/v&postgresql-version;/postgresql-&postgresql-version;.tar.bz2">
-  <!ENTITY postgresql-md5sum        "d0a41f54c377b2d2fab4a003b0dac762">
-  <!ENTITY postgresql-size          "16 MB">
-  <!ENTITY postgresql-buildsize     "184 MB (additional 169 MB to run the testsuite)">
-  <!ENTITY postgresql-time          "1.5 SBU (additional 0.2 SBU to run the testsuite)">
-]>
-
-<sect1 id="postgresql" xreflabel="PostgreSQL-&postgresql-version;">
-  <?dbhtml filename="postgresql.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>PostgreSQL-&postgresql-version;</title>
-
-  <indexterm zone="postgresql">
-    <primary sortas="a-PostgreSQL">PostgreSQL</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to PostgreSQL</title>
-
-    <para><application>PostgreSQL</application> is an advanced
-    object-relational database management system (ORDBMS), derived
-    from the Berkeley Postgres database management system.</para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&postgresql-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&postgresql-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &postgresql-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &postgresql-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &postgresql-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &postgresql-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">PostgreSQL Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="python2"/>,
-      <xref linkend="tcl"/>,
-      <xref linkend="openssl"/>,
-      <xref linkend="libxml2"/>,
-      <xref linkend="libxslt"/>,
-      <xref linkend="openldap"/>,
-      <xref linkend="linux-pam"/>,
-      <xref linkend="mitkrb"/> and
-      <ulink url="http://developer.apple.com/networking/bonjour/">Bonjour</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (To Regenerate Documentation)</bridgehead>
-    <para role="optional">
-      <xref linkend="sgml-dtd"/>,
-      <xref linkend="docbook-dsssl"/>,
-      <xref linkend="openjade"/>, and
-      <xref linkend="perl-sgmlspm"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/postgresql"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of PostgreSQL</title>
-
-    <para>Install <application>PostgreSQL</application> with the
-    following commands: </para>
-
-<screen><userinput>sed -i '/DEFAULT_PGSOCKET_DIR/s@/tmp@/run/postgresql@' src/include/pg_config_manual.h &amp;&amp;
-sed -i -e 's@psql\\"@&amp; -h /tmp@' src/test/regress/pg_regress{,_main}.c &amp;&amp;
-sed -i -e 's@gres\\"@&amp; -k /tmp@' src/test/regress/pg_regress.c &amp;&amp;
-./configure --prefix=/usr          \
-            --enable-thread-safety \
-            --docdir=/usr/share/doc/postgresql-&postgresql-version; &amp;&amp;
-make</userinput></screen>
-
-    <warning>
-      <para>This package contains a known security hole that allows other
-      users on the same machine to gain access to an operating system account
-      while it is doing "make check": CVE-2014-0067. Until the fix is available,
-      users are strongly advised not to run "make check" on machines where
-      untrusted users have accounts. </para>
-    </warning>
-
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>There are a number of programs in the
-    <filename class="directory">contrib/</filename> directory. If you are going
-    to run this installation as a server and wish to build some of them, enter
-    <command>make -C contrib</command> or
-    <command>make -C contrib/<replaceable>&lt;SUBDIR-NAME&gt;</replaceable></command> for each subdirectory.
-    </para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install      &amp;&amp;
-make install-docs</userinput></screen>
-
-    <para>If you made any of the <filename class="directory">contrib/</filename>
-    programs, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="nodump/"><userinput>make -C contrib/<replaceable>&lt;SUBDIR-NAME&gt;</replaceable> install</userinput></screen>
-
-    <para><emphasis>If you only intend to use <application>PostgreSQL</application>
-    as a client to connect to a server on another machine, your installation is
-    complete and you should not run the remaining commands.</emphasis></para>
-
-    <!-- 'Upgrading' seems to only ever exist in the docs for *previous* version -->
-    <note>
-      <para>If you are upgrading an existing system and are going to install
-      the new files over the old ones, then you should back up your data, shut
-      down the old server and follow the instructions in <ulink
-      url="http://www.postgresql.org/docs/9.0/static/install-upgrading.html">the
-      official <application>PostgreSQL</application> documentation</ulink>.</para>
-    </note>
-
-    <para>Initialize a database cluster with the following commands issued by the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>install -v -dm700 /srv/pgsql/data &amp;&amp;
-install -v -dm755 /run/postgresql &amp;&amp;
-groupadd -g 41 postgres &amp;&amp;
-useradd -c "PostgreSQL Server" -g postgres -d /srv/pgsql/data \
-        -u 41 postgres &amp;&amp;
-chown -Rv postgres:postgres /srv/pgsql /run/postgresql &amp;&amp;
-su - postgres -c '/usr/bin/initdb -D /srv/pgsql/data'</userinput></screen>
-
-    <para>As the <systemitem class="username">root</systemitem> user, start the
-    database server with the following command:</para>
-
-<screen role="root"><userinput>su - postgres -c '/usr/bin/postmaster -D /srv/pgsql/data > \
-    /srv/pgsql/data/logfile 2&gt;&amp;1 &amp;'</userinput></screen>
-
-    <para>Still as user <systemitem class="username">root</systemitem>, create
-    a database and verify the installation:</para>
-
-<screen role="root"><userinput>su - postgres -c '/usr/bin/createdb test' &amp;&amp;
-echo "create table t1 ( name varchar(20), state_province varchar(20) );" \
-    | (su - postgres -c '/usr/bin/psql test ') &amp;&amp;
-echo "insert into t1 values ('Billy', 'NewYork');" \
-    | (su - postgres -c '/usr/bin/psql test ') &amp;&amp;
-echo "insert into t1 values ('Evanidus', 'Quebec');" \
-    | (su - postgres -c '/usr/bin/psql test ') &amp;&amp;
-echo "insert into t1 values ('Jesse', 'Ontario');" \
-    | (su - postgres -c '/usr/bin/psql test ') &amp;&amp;
-echo "select * from t1;" | (su - postgres -c '/usr/bin/psql test')</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i ...</command>: These seds change server socket location
-      from <filename class="directory">/tmp</filename> to
-      <filename class="directory">/run/postgresql</filename> and fix up the
-      regression tests to use <filename class="directory">/tmp</filename> so
-      that they can work reliably.
-    </para>
-
-    <para><parameter>--docdir=/usr/share/doc/postgresql-&postgresql-version;</parameter>:
-    This switch puts the documentation in a versioned directory.</para>
-
-    <para><parameter>--enable-thread-safety</parameter>: This switch makes the
-    client libraries thread-safe by allowing concurrent threads in
-    <filename class="libraryfile">libpq</filename> and ECPG programs to safely
-    control their private connection handles.</para>
-
-    <para><option>--with-openssl</option>: build with support for
-    <application>OpenSSL</application> encrypted connections.</para>
-
-    <para><option>--with-perl</option>: build the PL/Perl server-side language.
-    </para>
-
-    <para><option>--with-python</option>: build the PL/Python server-side
-    language.</para>
-
-    <para><option>--with-tcl</option>: build the PL/Tcl server-side language.</para>
-
-    <para><command>groupadd ...</command>; <command>useradd ...</command>:
-    These commands add an unprivileged user and group to run the database
-    server.</para>
-
-    <para><command>createdb test; create table t1; insert into t1 values...;
-    select * from t1</command>: Create a database, add a table to it, insert
-    some rows into the table and select them to verify that the installation
-    is working properly.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring PostgreSQL</title>
-
-    <sect3 id="postgresql-config">
-      <title>Config Files</title>
-
-      <para><filename>$PGDATA/pg_ident.con</filename>,
-      <filename>$PGDATA/pg_hba.conf</filename> and
-      <filename>$PGDATA/postgresql.conf</filename></para>
-
-      <indexterm zone="postgresql postgresql-config">
-        <primary sortas="e-A.PGDATA-pg_ident.con">$PGDATA/pg_indent.con</primary>
-      </indexterm>
-
-      <indexterm zone="postgresql postgresql-config">
-        <primary sortas="e-A.PGDATA-pg_hba.conf">$PGDATA/pg_hba_conf</primary>
-      </indexterm>
-
-      <indexterm zone="postgresql postgresql-config">
-        <primary sortas="e-A.PGDATA-postgresql.conf">$PGDATA/postgresql.conf</primary>
-      </indexterm>
-
-      <para>The <envar>PGDATA</envar> environment variable is used to
-      distinguish database clusters from one another by setting it to
-      the value of the directory which contains the cluster desired.
-      The three configuration files exist in every <filename
-      class="directory">PGDATA/</filename> directory. Details on the
-      format of the files and the options that can be set in each can
-      be found in <ulink
-      url="file:///usr/share/doc/postgresql-&postgresql-version;/html/index.html"/>.</para>
-
-    </sect3>
-
-    <sect3  id="postgresql-init">
-      <title>Boot Script</title>
-
-      <para>Install the <filename>/etc/rc.d/init.d/postgresql</filename>
-      init script included in the
-      <xref linkend="bootscripts"/> package.</para>
-
-      <indexterm zone="postgresql postgresql-init">
-        <primary sortas="f-postgresql">postgresql</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-postgresql</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>clusterdb, createdb, createlang, createuser, dropdb, droplang,
-        dropuser, ecpg, initdb, pg_basebackup, pg_config, pg_controldata, pg_ctl,
-        pg_dump, pg_dumpall, pg_isready, pg_receivexlog, pg_resetxlog, pg_restore, pltcl_delmod,
-        pltcl_listmod, pltcl_loadmod, postgres, postmaster, psql,
-        reindexdb, vacuumdb, and optionally (in contrib/) oid2name, pg_archivecleanup,
-        pgbench, pg_standby, pg_test_fsync, pg_test_timing, pg_upgrade, pg_xlogdump,
-        vacuumlo,</seg>
-        <seg>libecpg.{so,a}, libecpg_compat.{so,a}, libpgport.a, libpgtypes.{so,a},
-        libpq.{so,a}, various charset modules, and optionally programming language
-        modules.</seg>
-        <seg>/srv/pgsql, /usr/include/libpq, /usr/include/postgresql,
-        /usr/lib/postgresql, /usr/share/doc/postgresql-&postgresql-version;, and
-        /usr/share/postgresql</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="clusterdb">
-        <term><command>clusterdb</command></term>
-        <listitem>
-          <para>is a utility for reclustering tables in a
-          <application>PostgreSQL</application> database.</para>
-          <indexterm zone="postgresql clusterdb">
-            <primary sortas="b-clusterdb">clusterdb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="createdb">
-        <term><command>createdb</command></term>
-        <listitem>
-          <para> creates a new <application>PostgreSQL</application>
-          database.</para>
-          <indexterm zone="postgresql createdb">
-            <primary sortas="b-createdb">createdb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="createlang">
-        <term><command>createlang</command></term>
-        <listitem>
-          <para>defines a new <application>PostgreSQL</application> procedural
-          language.</para>
-          <indexterm zone="postgresql createlang">
-            <primary sortas="b-createlang">createlang</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="createuser">
-        <term><command>createuser</command></term>
-        <listitem>
-          <para>defines a new <application>PostgreSQL</application>
-          user account.</para>
-          <indexterm zone="postgresql createuser">
-            <primary sortas="b-createuser">createuser</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dropdb">
-        <term><command>dropdb</command></term>
-        <listitem>
-          <para>removes a <application>PostgreSQL</application> database.</para>
-          <indexterm zone="postgresql dropdb">
-            <primary sortas="b-dropdb">dropdb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="droplang">
-        <term><command>droplang</command></term>
-        <listitem>
-          <para>removes a <application>PostgreSQL</application> procedural
-          language.</para>
-          <indexterm zone="postgresql droplang">
-            <primary sortas="b-droplang">droplang</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dropuser">
-        <term><command>dropuser</command></term>
-        <listitem>
-          <para>removes a <application>PostgreSQL</application>
-          user account.</para>
-          <indexterm zone="postgresql dropuser">
-            <primary sortas="b-dropuser">dropuser</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ecpg">
-        <term><command>ecpg</command></term>
-        <listitem>
-          <para>is the embedded SQL preprocessor.</para>
-          <indexterm zone="postgresql ecpg">
-            <primary sortas="b-ecpg">ecpg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="initdb">
-        <term><command>initdb</command></term>
-        <listitem>
-          <para>creates a new database cluster.</para>
-          <indexterm zone="postgresql initdb">
-            <primary sortas="b-initdb">initdb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="oid2name">
-        <term><command>oid2name</command></term>
-        <listitem>
-          <para>resolves OIDs (Object IDs) and file nodes in a PostgreSQL data
-          directory.</para>
-          <indexterm zone="postgresql oid2name">
-            <primary sortas="b-oid2name">oid2name</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg_archivecleanup">
-        <term><command>pg_archivecleanup</command></term>
-        <listitem>
-          <para>clean up PostgreSQL WAL (write-ahead log) archive files.</para>
-          <indexterm zone="postgresql pg_archivecleanup">
-            <primary sortas="b-pg_archivecleanup">pg_archivecleanup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg_basebackup">
-        <term><command>pg_basebackup</command></term>
-        <listitem>
-          <para>takes base backups of a running
-          <application>PostgreSQL</application> cluster.</para>
-          <indexterm zone="postgresql pg_basebackup">
-            <primary sortas="b-pg_basebackup">pg_basebackup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg_config">
-        <term><command>pg_config</command></term>
-        <listitem>
-          <para>retrieves <application>PostgreSQL</application> version
-          information.</para>
-          <indexterm zone="postgresql pg_config">
-            <primary sortas="b-pg_config">pg_config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg_controldata">
-        <term><command>pg_controldata</command></term>
-        <listitem>
-          <para>returns information initialized during
-          <command>initdb</command>, such as the catalog version and server
-          locale.</para>
-          <indexterm zone="postgresql pg_controldata">
-            <primary sortas="b-pg_controldata">pg_controldata</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg_ctl">
-        <term><command>pg_ctl</command></term>
-        <listitem>
-          <para>controls stopping and starting the database server.</para>
-          <indexterm zone="postgresql pg_ctl">
-            <primary sortas="b-pg_ctl">pg_ctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg_dump">
-        <term><command>pg_dump</command></term>
-        <listitem>
-          <para>dumps database data and metadata into scripts which are used
-          to recreate the database.</para>
-          <indexterm zone="postgresql pg_dump">
-            <primary sortas="b-pg_dump">pg_dump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg_dumpall">
-        <term><command>pg_dumpall</command></term>
-        <listitem>
-          <para>recursively calls <command>pg_dump</command> for each
-          database in a cluster.</para>
-          <indexterm zone="postgresql pg_dumpall">
-            <primary sortas="b-pg_dumpall">pg_dumpall</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg_isready">
-        <term><command>pg_isready</command></term>
-        <listitem>
-          <para>check the connection status of a PostgreSQL server.</para>
-          <indexterm zone="postgresql pg_isready">
-            <primary sortas="b-pg_isready">pg_isready</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg_resetxlog">
-        <term><command>pg_resetxlog</command></term>
-        <listitem>
-          <para>clears the write-ahead log and optionally resets some
-          fields in the <filename>pg_control</filename> file.</para>
-          <indexterm zone="postgresql pg_resetxlog">
-            <primary sortas="b-pg_resetxlog">pg_resetxlog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg_restore">
-        <term><command>pg_restore</command></term>
-        <listitem>
-          <para>creates databases from dump files created by
-          <command>pg_dump</command>.</para>
-          <indexterm zone="postgresql pg_restore">
-            <primary sortas="b-pg_restore">pg_restore</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg_standby">
-        <term><command>pg_standby</command></term>
-        <listitem>
-          <para>supports the creation of a PostgreSQL warm standby
-          server.</para>
-          <indexterm zone="postgresql pg_standby">
-            <primary sortas="b-pg_standby">pg_standby</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg_test_fsync">
-        <term><command>pg_test_fsync</command></term>
-        <listitem>
-          <para>determine fastest wal_sync method for PostgreSQL.</para>
-          <indexterm zone="postgresql pg_test_fsync">
-            <primary sortas="b-pg_test_fsync">pg_test_fsync</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg_test_timing">
-        <term><command>pg_test_timing</command></term>
-        <listitem>
-          <para>measure timing overhead.</para>
-          <indexterm zone="postgresql pg_test_timing">
-            <primary sortas="b-pg_test_timing">pg_test_timing</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg_upgrade">
-        <term><command>pg_upgrade</command></term>
-        <listitem>
-          <para>upgrade a PostgreSQL server instance.</para>
-          <indexterm zone="postgresql pg_upgrade">
-            <primary sortas="b-pg_upgrade">pg_upgrade</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg_xlogdump">
-        <term><command>pg_xlogdump</command></term>
-        <listitem>
-          <para>display a human-readable rendering of the write-ahead log of a
-          PostgreSQL database cluster.</para>
-          <indexterm zone="postgresql pg_xlogdump">
-            <primary sortas="b-pg_xlogdump">pg_xlogdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pgbench">
-        <term><command>pgbench</command></term>
-        <listitem>
-          <para>run a benchmark test on PostgreSQL.</para>
-          <indexterm zone="postgresql pgbench">
-            <primary sortas="b-pgbench">pgbench</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pltcl_delmod">
-        <term><command>pltcl_delmod</command></term>
-        <listitem>
-          <para>is a support script used to delete a module from a
-          PL/<application>Tcl</application> table. The command
-          requires the <ulink
-          url="http://flightaware.github.io/Pgtcl/">Pgtcl</ulink>
-          package to be installed also.</para>
-          <indexterm zone="postgresql pltcl_delmod">
-            <primary sortas="b-pltcl_delmod">pltcl_delmod</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pltcl_listmod">
-        <term><command>pltcl_listmod</command></term>
-        <listitem>
-          <para>is a support script used to list the modules in a
-          PL/<application>Tcl</application> table. The command
-          requires the <ulink
-          url="http://gborg.postgresql.org/project/pgtcl/">Pgtcl</ulink>
-          package to be installed also.</para>
-          <indexterm zone="postgresql pltcl_listmod">
-            <primary sortas="b-pltcl_listmod">pltcl_listmod</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pltcl_loadmod">
-        <term><command>pltcl_loadmod</command></term>
-        <listitem>
-          <para>is a support script used to load a module into a
-          PL/<application>Tcl</application> table. The command
-          requires the <ulink
-          url="http://gborg.postgresql.org/project/pgtcl/">Pgtcl</ulink>
-          package to be installed also.</para>
-          <indexterm zone="postgresql pltcl_loadmod">
-            <primary sortas="b-pltcl_loadmod">pltcl_loadmod</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="postgres">
-        <term><command>postgres</command></term>
-        <listitem>
-          <para>is a single user database server, generally used for
-          debugging.</para>
-          <indexterm zone="postgresql postgres">
-            <primary sortas="b-postgres">postgres</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="postmaster">
-        <term><command>postmaster</command></term>
-        <listitem>
-          <para>(a symlink to <command>postgres</command>) is a multi-user
-          database daemon.</para>
-          <indexterm zone="postgresql postmaster">
-            <primary sortas="b-postmaster">postmaster</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="psql">
-        <term><command>psql</command></term>
-        <listitem>
-          <para>is a console based database shell.</para>
-          <indexterm zone="postgresql psql">
-            <primary sortas="b-psql">psql</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-       <varlistentry id="reindexdb">
-        <term><command>reindexdb</command></term>
-        <listitem>
-          <para>is a utility for rebuilding indexes in a database.</para>
-          <indexterm zone="postgresql reindexdb">
-            <primary sortas="b-reindexdb">reindexdb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vacuumdb">
-        <term><command>vacuumdb</command></term>
-        <listitem>
-          <para>compacts databases and generates statistics for the query
-          analyzer.</para>
-          <indexterm zone="postgresql vacuumdb">
-            <primary sortas="b-vacuumdb">vacuumdb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vacuumlo">
-        <term><command>vacuumlo</command></term>
-        <listitem>
-          <para>remove orphaned large objects from a PostgreSQL database.</para>
-          <indexterm zone="postgresql vacuumlo">
-            <primary sortas="b-vacuumlo">vacuumlo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libecpg">
-        <term><filename class='libraryfile'>libecpg.{so,a}</filename></term>
-        <listitem>
-          <para>contains functions to support embedded SQL in C programs.</para>
-          <indexterm zone="postgresql libecpg">
-            <primary sortas="c-libecpg">libecpg.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libecpg_compat">
-        <term><filename class='libraryfile'>libecpg_compat.{so,a}</filename></term>
-        <listitem>
-          <para>is the ecpg compatibility library.</para>
-          <indexterm zone="postgresql libecpg_compat">
-            <primary sortas="c-libecpg_compat">libecpg_compat.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgport">
-        <term><filename class='libraryfile'>libgport.a</filename></term>
-        <listitem>
-          <para>is the port-specific subsystem of the Postgres backend.</para>
-          <indexterm zone="postgresql libgport">
-            <primary sortas="c-libgport">libgport.a</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpgtypes">
-        <term><filename class='libraryfile'>libpgtypes.{so,a}</filename></term>
-        <listitem>
-          <para>contains functions for dealing with Postgres data types.</para>
-          <indexterm zone="postgresql libpgtypes">
-            <primary sortas="c-libpgtypes">libpgtypes.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpq">
-        <term><filename class='libraryfile'>libpq.{so,a}</filename></term>
-        <listitem>
-          <para>is the C programmer's API to Postgres.</para>
-          <indexterm zone="postgresql libpq">
-            <primary sortas="c-libpq">libpq.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: server/mail/dovecot-systemd.xml
===================================================================
--- server/mail/dovecot-systemd.xml	(revision 6bc9f4879451ee675fd27a660cb9650ed84526dc)
+++ server/mail/dovecot-systemd.xml	(revision 6bc9f4879451ee675fd27a660cb9650ed84526dc)
@@ -0,0 +1,351 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!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
+  "http://www.dovecot.org/releases/&dovecot-major;.&dovecot-minor;/dovecot-&dovecot-version;.tar.gz">
+  <!ENTITY dovecot-download-ftp  " ">
+  <!ENTITY dovecot-md5sum        "a3eb1c0b1822c4f2b0fe9247776baa71">
+  <!ENTITY dovecot-size          "4.4 MB">
+  <!ENTITY dovecot-buildsize     "203 MB">
+  <!ENTITY dovecot-time          "1.6 SBU">
+]>
+
+<sect1 id="dovecot" xreflabel="Dovecot-&dovecot-version;">
+  <?dbhtml filename="dovecot.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <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>
+
+    &lfs75_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">Dovecot Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="libcap-pam"/>,
+      <xref linkend="openssl"/>,
+      <xref linkend="mitkrb"/> (for GSSAPI support),
+      <xref linkend="linux-pam"/>,
+      <xref linkend="openldap"/>,
+      <xref linkend="postgresql"/>,
+      <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
+      <xref linkend="sqlite"/>, and
+      <xref linkend="clucene"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/dovecot"/>
+    </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>
+      Install <application>Dovecot</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --localstatedir=/var \
+            --docdir=/usr/share/doc/dovecot-&dovecot-version; \
+            --disable-static \
+            --with-systemdsystemunitdir=/lib/systemd/system &amp;&amp;
+make</userinput></screen>
+
+    <para>To test the results, issue <command>make check</command>.</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>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+    <para>
+      <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> authentication support.
+    </para>
+
+    <para>
+      <option>--with-mysql</option>: This switch enables
+      <application>MySQL</application> authentication support.
+    </para>
+
+    <para>
+      <option>--with-sqlite</option>: This switch enables
+      <application>SQLite</application> authentication support.
+    </para>
+
+    <para>
+      <option>--with-lucene</option>: This switch enables
+      <application>CLucene</application> full text search support.
+    </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="http://wiki2.dovecot.org/"/> if you plan to use
+        <application>Dovecot</application> in production environment.
+      </para>
+
+    </sect3>
+
+    <sect3 id="dovecot-init">
+      <title>Systemd Units</title>
+
+      <para>
+        To start the <command>dovecot</command> daemon at boot,
+        install the systemd unit from the <xref linkend="bootscripts"/>
+        package by running the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+      <indexterm zone="dovecot dovecot-init">
+        <primary sortas="f-dovecot">dovecot</primary>
+      </indexterm>
+
+<screen role="root"><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, dsync, and various internal programs
+        </seg>
+        <seg>
+          various internal plugins
+        </seg>
+        <seg>
+          /etc/dovecot,
+          /usr/include/dovecot,
+          /usr/lib/dovecot,
+          /usr/libexec/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="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/dovecot.xml
===================================================================
--- server/mail/dovecot.xml	(revision 30fe7dd079b201be71a15825bd8d8481148a8f18)
+++ 	(revision )
@@ -1,342 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!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
-  "http://www.dovecot.org/releases/&dovecot-major;.&dovecot-minor;/dovecot-&dovecot-version;.tar.gz">
-  <!ENTITY dovecot-download-ftp  " ">
-  <!ENTITY dovecot-md5sum        "a3eb1c0b1822c4f2b0fe9247776baa71">
-  <!ENTITY dovecot-size          "4.4 MB">
-  <!ENTITY dovecot-buildsize     "203 MB">
-  <!ENTITY dovecot-time          "1.6 SBU">
-]>
-
-<sect1 id="dovecot" xreflabel="Dovecot-&dovecot-version;">
-  <?dbhtml filename="dovecot.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <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>
-
-    &lfs75_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">Dovecot Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libcap-pam"/>,
-      <xref linkend="openssl"/>,
-      <xref linkend="mitkrb"/> (for GSSAPI support),
-      <xref linkend="linux-pam"/>,
-      <xref linkend="openldap"/>,
-      <xref linkend="postgresql"/>,
-      <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
-      <xref linkend="sqlite"/>, and
-      <xref linkend="clucene"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/dovecot"/>
-    </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>
-      Install <application>Dovecot</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./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 check</command>.</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>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <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> authentication support.
-    </para>
-
-    <para>
-      <option>--with-mysql</option>: This switch enables
-      <application>MySQL</application> authentication support.
-    </para>
-
-    <para>
-      <option>--with-sqlite</option>: This switch enables
-      <application>SQLite</application> authentication support.
-    </para>
-
-    <para>
-      <option>--with-lucene</option>: This switch enables
-      <application>CLucene</application> full text search support.
-    </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="http://wiki2.dovecot.org/"/> if you plan to use
-        <application>Dovecot</application> in production environment.
-      </para>
-
-    </sect3>
-
-    <sect3 id="dovecot-init">
-      <title>Boot Script</title>
-
-      <para>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>
-
-      <indexterm zone="dovecot dovecot-init">
-        <primary sortas="f-dovecot">dovecot</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-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, dsync, and various internal programs
-        </seg>
-        <seg>
-          various internal plugins
-        </seg>
-        <seg>
-          /etc/dovecot,
-          /usr/include/dovecot,
-          /usr/lib/dovecot,
-          /usr/libexec/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="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-systemd.xml
===================================================================
--- server/mail/exim-systemd.xml	(revision 6bc9f4879451ee675fd27a660cb9650ed84526dc)
+++ server/mail/exim-systemd.xml	(revision 6bc9f4879451ee675fd27a660cb9650ed84526dc)
@@ -0,0 +1,523 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!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 exim-download-http   "http://ftp.exim.org/pub/exim/exim4/exim-&exim-version;.tar.bz2">
+  <!ENTITY exim-download-ftp    "ftp://ftp.exim.org/pub/exim/exim4/exim-&exim-version;.tar.bz2">
+  <!ENTITY exim-md5sum          "4544696ce6689ba9141a0697f25a74cb">
+  <!ENTITY exim-size            "1.7 MB">
+  <!ENTITY exim-buildsize       "16 MB">
+  <!ENTITY exim-time            "0.2 SBU">
+]>
+
+<sect1 id="exim" xreflabel="Exim-&exim-version;">
+  <?dbhtml filename="exim.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <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>
+
+    &lfs75_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="http://exim.org/docs.html"/>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Exim Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="pcre"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="db"/> or
+      <ulink url="http://sourceforge.net/projects/tdb">TDB</ulink> (as an
+      alternative to GDBM, built in LFS),
+      <xref linkend="x-window-system"/>,
+      <xref linkend="openldap"/>,
+      <xref linkend="openssl"/> or <xref linkend="gnutls"/>,
+      <xref linkend="cyrus-sasl"/>,
+      <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
+      <xref linkend="postgresql"/>,
+      <xref linkend="sqlite"/>,
+      <xref linkend="linux-pam"/>, and
+      <ulink url="http://www.trusteddomain.org/opendmarc/">OpenDMARC</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/exim"/></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>Install <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 's,^EXIM_MONITOR,#EXIM_MONITOR,' src/EDITME > Local/Makefile &amp;&amp;
+echo -e "USE_GDBM = yes\nDBMLIB = -lgdbm" >> Local/Makefile &amp;&amp;
+make</userinput></screen>
+
+    <para>This package does not come with a test suite.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<!-- 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 -v -d -m755 /usr/share/doc/exim-&exim-version; &amp;&amp;
+install -v -m644 doc/* /usr/share/doc/exim-&exim-version; &amp;&amp;
+ln -sfv exim /usr/sbin/sendmail</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 compiled in using
+    the directives 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>echo -e ... > Local/Makefile</command>: Setting those
+    variables allows to use GDBM instead of the default Berkeley DB. Remove
+    this command if you have installed <xref linkend="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
+    hands off the daemon to the <systemitem
+    class="username">exim</systemitem> user.</para>
+
+    <para><parameter>#EXIM_MONITOR</parameter>: This defers building the
+    <application>Exim</application> monitor program, as it requires
+    <application>X Window System</application> support, by commenting out the
+    <parameter>EXIM_MONITOR</parameter> line in the <filename>Makefile</filename>.
+    If you wish to build the monitor program, omit this <command>sed</command>
+    command and issue the following command before building the package (modify
+    <filename>Local/eximon.conf</filename>, if necessary):
+    <command>cp exim_monitor/EDITME Local/eximon.conf</command>.</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>
+
+  </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="http://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="http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch41.html"/>.</para>
+
+    <para>To use a backend database other than <application>Berkeley
+    DB</application>, see the instructions at <ulink
+    url="http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch04.html#SECTdb"/>.</para>
+
+    <para>For SSL functionality, see the instructions at <ulink
+    url="http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch04.html#SECTinctlsssl"/>
+    and <ulink
+    url="http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch39.html"/>.</para>
+
+    <para>For <application>tcpwrappers</application> functionality, see the
+    instructions at <ulink
+    url="http://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-37 of <ulink
+    url="http://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="http://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="http://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="http://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="http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch49.html"/>.</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>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
+exim -v -bi &amp;&amp;
+/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  id="exim-init">
+      <title>Systemd Units</title>
+
+      <para>
+        To start the <command>exim</command> daemon at boot,
+        install the systemd unit from the <xref linkend="bootscripts"/>
+        package by running the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+      <indexterm zone="exim exim-init">
+        <primary sortas="f-exim">exim</primary>
+      </indexterm>
+
+<screen role="root"><userinput>make install-exim</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>exicyclog, exigrep, exim, exim-4.82_1-5b7a7c0-XX-3,
+        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-4.82_1-5b7a7c0-XX-3</command>
+          MTA daemon.</para>
+          <indexterm zone="exim exim-prog">
+            <primary sortas="b-exim">exim</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="exim-4.82_1-5b7a7c0-XX-3">
+        <term><command>exim-4.82_1-5b7a7c0-XX-3</command></term>
+        <listitem>
+          <para>is the <application>Exim</application> mail transport
+          agent daemon.</para>
+          <indexterm zone="exim exim-4.82_1-5b7a7c0-XX-3">
+            <primary sortas="b-exim-4.82_1-5b7a7c0-XX-3">exim-4.82_1-5b7a7c0-XX-3</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>
+
+</sect1>
Index: server/mail/exim.xml
===================================================================
--- server/mail/exim.xml	(revision 30fe7dd079b201be71a15825bd8d8481148a8f18)
+++ 	(revision )
@@ -1,527 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!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 exim-download-http   "http://ftp.exim.org/pub/exim/exim4/exim-&exim-version;.tar.bz2">
-  <!ENTITY exim-download-ftp    "ftp://ftp.exim.org/pub/exim/exim4/exim-&exim-version;.tar.bz2">
-  <!ENTITY exim-md5sum          "4544696ce6689ba9141a0697f25a74cb">
-  <!ENTITY exim-size            "1.7 MB">
-  <!ENTITY exim-buildsize       "16 MB">
-  <!ENTITY exim-time            "0.2 SBU">
-]>
-
-<sect1 id="exim" xreflabel="Exim-&exim-version;">
-  <?dbhtml filename="exim.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <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>
-
-    &lfs75_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="http://exim.org/docs.html"/>.</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Exim Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="pcre"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="db"/> or
-      <ulink url="http://sourceforge.net/projects/tdb">TDB</ulink> (as an
-      alternative to GDBM, built in LFS),
-      <xref linkend="x-window-system"/>,
-      <xref linkend="openldap"/>,
-      <xref linkend="openssl"/> or <xref linkend="gnutls"/>,
-      <xref linkend="cyrus-sasl"/>,
-      <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
-      <xref linkend="postgresql"/>,
-      <xref linkend="sqlite"/>,
-      <xref linkend="linux-pam"/>, and
-      <ulink url="http://www.trusteddomain.org/opendmarc/">OpenDMARC</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/exim"/></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>Install <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 's,^EXIM_MONITOR,#EXIM_MONITOR,' src/EDITME > Local/Makefile &amp;&amp;
-echo -e "USE_GDBM = yes\nDBMLIB = -lgdbm" >> Local/Makefile &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<!-- 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 -v -d -m755 /usr/share/doc/exim-&exim-version; &amp;&amp;
-install -v -m644 doc/* /usr/share/doc/exim-&exim-version; &amp;&amp;
-ln -sfv exim /usr/sbin/sendmail</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 compiled in using
-    the directives 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>echo -e ... > Local/Makefile</command>: Setting those
-    variables allows to use GDBM instead of the default Berkeley DB. Remove
-    this command if you have installed <xref linkend="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
-    hands off the daemon to the <systemitem
-    class="username">exim</systemitem> user.</para>
-
-    <para><parameter>#EXIM_MONITOR</parameter>: This defers building the
-    <application>Exim</application> monitor program, as it requires
-    <application>X Window System</application> support, by commenting out the
-    <parameter>EXIM_MONITOR</parameter> line in the <filename>Makefile</filename>.
-    If you wish to build the monitor program, omit this <command>sed</command>
-    command and issue the following command before building the package (modify
-    <filename>Local/eximon.conf</filename>, if necessary):
-    <command>cp exim_monitor/EDITME Local/eximon.conf</command>.</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>
-
-  </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="http://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="http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch41.html"/>.</para>
-
-    <para>To use a backend database other than <application>Berkeley
-    DB</application>, see the instructions at <ulink
-    url="http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch04.html#SECTdb"/>.</para>
-
-    <para>For SSL functionality, see the instructions at <ulink
-    url="http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch04.html#SECTinctlsssl"/>
-    and <ulink
-    url="http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch39.html"/>.</para>
-
-    <para>For <application>tcpwrappers</application> functionality, see the
-    instructions at <ulink
-    url="http://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-37 of <ulink
-    url="http://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="http://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="http://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="http://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="http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch49.html"/>.</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>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
-exim -v -bi &amp;&amp;
-/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  id="exim-init">
-      <title>Boot Script</title>
-
-      <para>To automate the running of <command>exim</command> at startup,
-      install the <filename>/etc/rc.d/init.d/exim</filename> init script
-      included in the <xref linkend="bootscripts"/>
-      package.</para>
-
-      <indexterm zone="exim exim-init">
-        <primary sortas="f-exim">exim</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-exim</userinput></screen>
-
-      <para>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-4.82_1-5b7a7c0-XX-3,
-        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-4.82_1-5b7a7c0-XX-3</command>
-          MTA daemon.</para>
-          <indexterm zone="exim exim-prog">
-            <primary sortas="b-exim">exim</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exim-4.82_1-5b7a7c0-XX-3">
-        <term><command>exim-4.82_1-5b7a7c0-XX-3</command></term>
-        <listitem>
-          <para>is the <application>Exim</application> mail transport
-          agent daemon.</para>
-          <indexterm zone="exim exim-4.82_1-5b7a7c0-XX-3">
-            <primary sortas="b-exim-4.82_1-5b7a7c0-XX-3">exim-4.82_1-5b7a7c0-XX-3</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>
-
-</sect1>
Index: server/mail/mail.xml
===================================================================
--- server/mail/mail.xml	(revision 30fe7dd079b201be71a15825bd8d8481148a8f18)
+++ server/mail/mail.xml	(revision 6bc9f4879451ee675fd27a660cb9650ed84526dc)
@@ -23,7 +23,7 @@
   server (Courier-IMAP).</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="dovecot-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="exim-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="postfix-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sendmail.xml"/>
 
Index: server/mail/postfix-systemd.xml
===================================================================
--- server/mail/postfix-systemd.xml	(revision 6bc9f4879451ee675fd27a660cb9650ed84526dc)
+++ server/mail/postfix-systemd.xml	(revision 6bc9f4879451ee675fd27a660cb9650ed84526dc)
@@ -0,0 +1,656 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!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 postfix-download-http " ">
+  <!ENTITY postfix-download-ftp
+           "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-&postfix-version;.tar.gz">
+  <!ENTITY postfix-md5sum        "56ac1f1a79737c4ac1e24535a122a4a6">
+  <!ENTITY postfix-size          "3.9 MB">
+  <!ENTITY postfix-buildsize     "170 MB">
+  <!ENTITY postfix-time          "0.4 SBU">
+]>
+
+<sect1 id="postfix" xreflabel="Postfix-&postfix-version;">
+  <?dbhtml filename="postfix.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <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>
+
+    &lfs75_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">Postfix Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="db"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="cyrus-sasl"/> and
+      <xref linkend="openssl"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
+      <xref linkend="openldap"/>,
+      <xref linkend="pcre"/>,
+      <xref linkend="postgresql"/>,
+      <xref linkend="sqlite"/>, and
+      <ulink url="http://cr.yp.to/cdb.html">CDB</ulink> or
+      <ulink url="http://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">
+      User 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>
+        Run the following command to enable <application>Postfix</application>
+        to compile against the current version of
+        <application>BerkeleyDB</application>:
+      </para>
+
+<screen><userinput>sed -i "s/DB_VERSION_MAJOR == 5/DB_VERSION_MAJOR >= 5/" src/util/dict_db.c</userinput></screen>
+
+      <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>
+
+      <sect4>
+        <title>Cyrus-SASL</title>
+
+        <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>OpenLDAP</title>
+
+        <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>
+
+      <sect4>
+        <title>MySQL</title>
+
+        <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>
+
+      <sect4>
+        <title>PostgreSQL</title>
+
+        <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>
+
+      <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>CCARGS='-DHAS_CDB'
+AUXLIBS='<replaceable>&lt;/path/to/CDB&gt;</replaceable>/libcdb.a'</literal></screen>
+
+      </sect4>
+
+      <sect4>
+        <title>StartTLS Authentication</title>
+
+        <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>
+
+    </sect3>
+
+    <sect3>
+      <title>Installing Postfix</title>
+
+      <para>
+        If you have <application>Cyrus SASL</application> and
+        <application>OpenSSL</application> installed, install
+        <application>Postfix</application> by running the following commands:
+      </para>
+
+<screen><userinput>make CCARGS="-DUSE_TLS -I/usr/include/openssl/                     \
+             -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl" \
+     AUXLIBS="-lssl -lcrypto -lsasl2"                              \
+     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 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>
+
+  </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> 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
+
+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>
+
+      <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>
+        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>
+
+<screen role="root"><userinput>/usr/sbin/postfix check &amp;&amp;
+/usr/sbin/postfix start</userinput></screen>
+
+    </sect3>
+
+    <sect3 id="postfix-init">
+      <title>Systemd Unit</title>
+
+      <para>
+        To start the <command>postfix</command> daemon at boot,
+        install the systemd unit from the <xref linkend="bootscripts"/>
+        package by running the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </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, newaliases, postalias, postcat, postconf, postdrop, postfix,
+          postkick, postlock, postlog, postmap, postmulti, postqueue, postsuper,
+          and sendmail
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /etc/postfix,
+          /usr/lib/postfix,
+          /usr/share/doc/postfix-&postfix-version;,
+          /var/lib/postfix, and
+          /var/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>
+
+</sect1>
Index: server/mail/postfix.xml
===================================================================
--- server/mail/postfix.xml	(revision 30fe7dd079b201be71a15825bd8d8481148a8f18)
+++ 	(revision )
@@ -1,655 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!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 postfix-download-http " ">
-  <!ENTITY postfix-download-ftp
-           "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-&postfix-version;.tar.gz">
-  <!ENTITY postfix-md5sum        "56ac1f1a79737c4ac1e24535a122a4a6">
-  <!ENTITY postfix-size          "3.9 MB">
-  <!ENTITY postfix-buildsize     "170 MB">
-  <!ENTITY postfix-time          "0.4 SBU">
-]>
-
-<sect1 id="postfix" xreflabel="Postfix-&postfix-version;">
-  <?dbhtml filename="postfix.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <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>
-
-    &lfs75_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">Postfix Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="db"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="cyrus-sasl"/> and
-      <xref linkend="openssl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
-      <xref linkend="openldap"/>,
-      <xref linkend="pcre"/>,
-      <xref linkend="postgresql"/>,
-      <xref linkend="sqlite"/>, and
-      <ulink url="http://cr.yp.to/cdb.html">CDB</ulink> or
-      <ulink url="http://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">
-      User 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>
-        Run the following command to enable <application>Postfix</application>
-        to compile against the current version of
-        <application>BerkeleyDB</application>:
-      </para>
-
-<screen><userinput>sed -i "s/DB_VERSION_MAJOR == 5/DB_VERSION_MAJOR >= 5/" src/util/dict_db.c</userinput></screen>
-
-      <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>
-
-      <sect4>
-        <title>Cyrus-SASL</title>
-
-        <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>OpenLDAP</title>
-
-        <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>
-
-      <sect4>
-        <title>MySQL</title>
-
-        <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>
-
-      <sect4>
-        <title>PostgreSQL</title>
-
-        <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>
-
-      <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>CCARGS='-DHAS_CDB'
-AUXLIBS='<replaceable>&lt;/path/to/CDB&gt;</replaceable>/libcdb.a'</literal></screen>
-
-      </sect4>
-
-      <sect4>
-        <title>StartTLS Authentication</title>
-
-        <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>
-
-    </sect3>
-
-    <sect3>
-      <title>Installing Postfix</title>
-
-      <para>
-        If you have <application>Cyrus SASL</application> and
-        <application>OpenSSL</application> installed, install
-        <application>Postfix</application> by running the following commands:
-      </para>
-
-<screen><userinput>make CCARGS="-DUSE_TLS -I/usr/include/openssl/                     \
-             -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl" \
-     AUXLIBS="-lssl -lcrypto -lsasl2"                              \
-     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 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>
-
-  </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> 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
-
-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>
-
-      <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>
-        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>
-
-<screen role="root"><userinput>/usr/sbin/postfix check &amp;&amp;
-/usr/sbin/postfix start</userinput></screen>
-
-    </sect3>
-
-    <sect3 id="postfix-init">
-      <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>
-
-      <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, newaliases, postalias, postcat, postconf, postdrop, postfix,
-          postkick, postlock, postlog, postmap, postmulti, postqueue, postsuper,
-          and sendmail
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /etc/postfix,
-          /usr/lib/postfix,
-          /usr/share/doc/postfix-&postfix-version;,
-          /var/lib/postfix, and
-          /var/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>
-
-</sect1>
Index: server/other/openldap-systemd.xml
===================================================================
--- server/other/openldap-systemd.xml	(revision 6bc9f4879451ee675fd27a660cb9650ed84526dc)
+++ server/other/openldap-systemd.xml	(revision 6bc9f4879451ee675fd27a660cb9650ed84526dc)
@@ -0,0 +1,813 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!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 openldap-download-http " ">
+  <!ENTITY openldap-download-ftp  "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-&openldap-version;.tgz">
+  <!ENTITY openldap-md5sum        "b0d5ee4b252c841dec6b332d679cf943">
+  <!ENTITY openldap-size          "5.3 MB">
+  <!ENTITY openldap-buildsize     "48 MB (client) 103 MB (server)">
+  <!ENTITY openldap-time          "0.9 SBU (client) 1.8 SBU (server)">
+]>
+
+<sect1 id="openldap" xreflabel="OpenLDAP-&openldap-version;">
+  <?dbhtml filename="openldap.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>OpenLDAP-&openldap-version;</title>
+
+  <indexterm zone="openldap">
+    <primary sortas="a-OpenLDAP">OpenLDAP</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to OpenLDAP</title>
+
+    <para>
+      The <application>OpenLDAP</application> package provides an open
+      source implementation of the Lightweight Directory Access Protocol.
+    </para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&openldap-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&openldap-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &openldap-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &openldap-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &openldap-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &openldap-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/openldap-&openldap-version;-blfs_paths-1.patch"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/openldap-&openldap-version;-symbol_versions-1.patch"/>
+        </para>
+      </listitem>
+      <!-- <listitem>
+        <para>
+          Optional patch:
+          <ulink url="&patch-root;/openldap-&openldap-version;-ntlm-1.patch"/>
+        </para>
+      </listitem> -->
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">OpenLDAP Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="db"/> (only if building server)
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="cyrus-sasl"/> and
+      <xref linkend="openssl"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="icu"/>,
+        <xref linkend="mariadb"/> or 
+        <ulink url="http://www.mysql.com/">MySQL</ulink> or
+        <xref linkend="postgresql"/>,
+      <ulink url="http://www.openslp.org/">OpenSLP</ulink>,
+      <xref linkend="pth"/> and
+      <xref linkend="unixodbc"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/openldap"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of OpenLDAP</title>
+
+    <!-- <important>
+      <para>
+        Without the following patch, the <application>Evolution</application>
+        Exchange addressbook integration uses simple binds with cleartext
+        passwords. If you are going to build
+        <application>Evolution Data Server</application> with
+        <application>OpenLDAP</application> support, apply the following patch:
+      </para>
+
+<screen><userinput>patch -Np1 -i ../openldap-&openldap-version;-ntlm-1.patch</userinput></screen>
+    </important> -->
+
+    <note>
+      <para>
+        If you only need to install the client side <command>ldap*</command>
+        binaries, corresponding man pages, libraries and header files (referred to
+        as a <quote>client-only</quote> install), issue these
+        commands instead of the following ones (no test suite available):
+      </para>
+
+<screen><userinput>patch -Np1 -i ../openldap-&openldap-version;-blfs_paths-1.patch &amp;&amp;
+patch -Np1 -i ../openldap-&openldap-version;-symbol_versions-1.patch &amp;&amp;
+autoconf &amp;&amp;
+./configure --prefix=/usr     \
+            --sysconfdir=/etc \
+            --disable-static  \
+            --enable-dynamic  \
+            --disable-debug   \
+            --disable-slapd &amp;&amp;
+make depend &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      Then, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+    </note>
+
+    <para>
+      There should be a dedicated user and group to take control
+      of the <command>slapd</command> daemon after it is
+      started. Issue the following commands as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>groupadd -g 83 ldap &amp;&amp;
+useradd -c "OpenLDAP Daemon Owner" -d /var/lib/openldap -u 83 \
+        -g ldap -s /bin/false ldap</userinput></screen>
+
+    <para>
+      Install <application>OpenLDAP</application> by
+      running the following commands:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../openldap-&openldap-version;-blfs_paths-1.patch &amp;&amp;
+patch -Np1 -i ../openldap-&openldap-version;-symbol_versions-1.patch &amp;&amp;
+autoconf &amp;&amp;
+./configure --prefix=/usr         \
+            --sysconfdir=/etc     \
+            --localstatedir=/var  \
+            --libexecdir=/usr/lib \
+            --disable-static      \
+            --disable-debug       \
+            --enable-dynamic      \
+            --enable-crypt        \
+            --enable-spasswd      \
+            --enable-modules      \
+            --enable-rlookups     \
+            --enable-backends=mod \
+            --enable-overlays=mod \
+            --disable-ndb         \
+            --disable-sql &amp;&amp;
+make depend &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make test</command>. Tests may fail
+      after a long time (~ 5 SBU).
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install &amp;&amp;
+
+chmod -v 700 /var/lib/openldap                                         &amp;&amp;
+chown -v -R root:ldap /var/lib/openldap                                &amp;&amp;
+chmod -v 640 /etc/openldap/{slapd.{conf,ldif},DB_CONFIG.example}       &amp;&amp;
+chown -v root:ldap /etc/openldap/{slapd.{conf,ldif},DB_CONFIG.example} &amp;&amp;
+install -v -dm700 -o ldap -g ldap /etc/openldap/slapd.d                &amp;&amp;
+
+install -v -dm755  /usr/share/doc/openldap-&openldap-version; &amp;&amp;
+cp -vfr doc/drafts /usr/share/doc/openldap-&openldap-version; &amp;&amp;
+cp -vfr doc/rfc    /usr/share/doc/openldap-&openldap-version; &amp;&amp;
+cp -vfr doc/guide  /usr/share/doc/openldap-&openldap-version;</userinput></screen>
+
+    <para>
+      Having slapd configuration files and ldap databases in /var/lib/openldap
+      readable by anyone is a SECURITY ISSUE, especially since a file stores
+      admin password in PLAIN TEXT. That's why mode 640 and root:ldap ownership
+      were used. Owner is root, so only root can modify the file, and group is
+      ldap, so that the group which owns slapd daemon could read but not modify
+      the file in case of a security breach. 
+    </para>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+    <para>
+      <parameter>--disable-debug</parameter>: This switch disables
+      the debugging code in <application>OpenLDAP</application>.
+    </para>
+
+    <para>
+      <parameter>--enable-dynamic</parameter>: This switch forces the
+      <application>OpenLDAP</application> libraries to be dynamically
+      linked to the executable programs.
+    </para>
+
+    <para>
+      <parameter>--enable-crypt</parameter>: This switch enables using of
+      <command>crypt(3)</command> passwords.
+    </para>
+
+    <para>
+      <parameter>--enable-spasswd</parameter>: This switch enables
+      <application>SASL</application> password verification.
+    </para>
+
+    <para>
+      <parameter>--enable-modules</parameter>: This switch enables dynamic
+      module support.
+    </para>
+
+    <para>
+      <parameter>--enable-rlookups</parameter>: This switch enables
+      reverse lookups of client hostnames.
+    </para>
+
+    <para>
+      <parameter>--enable-backends</parameter>: This switch enables
+      all available backends.
+    </para>
+
+    <para>
+      <parameter>--enable-overlays</parameter>: This switch enables
+      all available overlays.
+    </para>
+
+    <para>
+      <parameter>--disable-ndb</parameter>: This switch disables
+      <application>MySQL</application> NDB Cluster backend
+      which causes configure to fail if
+      <application>MySQL</application> is present.
+    </para>
+
+    <para>
+      <parameter>--disable-sql</parameter>: This switch explicitly
+      disables the SQL backend.  Omit this switch if a SQL server is
+      installed and you are going to use a SQL backend.
+    </para>
+
+    <para>
+     <parameter>--libexecdir=/usr/lib</parameter>: This switch controls where
+     the <filename class="directory">/usr/lib/openldap</filename> directory is
+     installed.  Everything in that directory is a library, so it belongs under
+     <filename class="directory">/usr/lib</filename> instead of
+     <filename class="directory">/usr/libexec</filename>.
+    </para>
+
+    <para>
+      <option>--enable-slp</option>: This switch enables
+      SLPv2 support. Use it if you have installed
+      <ulink url="http://www.openslp.org/">OpenSLP</ulink>.
+    </para>
+
+    <note>
+      <para>
+        You can run <command>./configure --help</command> to see if there
+        are other switch you can pass to the <command>configure</command>
+        command to enable other options or dependency packages.
+      </para>
+    </note>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring OpenLDAP</title>
+
+    <sect3 id="openldap-config">
+      <title>Config Files</title>
+
+      <para>
+        <filename>/etc/openldap/*</filename>
+      </para>
+
+      <indexterm zone="openldap openldap-config">
+        <primary sortas="e-etc-openldap">/etc/openldap/*</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para>
+        Configuring the <command>slapd</command> servers can be complex.
+        Securing the LDAP directory, especially if you are storing non-public
+        data such as password databases, can also be a challenging task. You'll
+        need to modify the <filename>/etc/openldap/slapd.conf</filename> and
+        <filename>/etc/openldap/ldap.conf</filename> files to set up
+        <application>OpenLDAP</application> for your particular needs.
+      </para>
+
+      <indexterm zone="openldap openldap-config">
+        <primary
+        sortas="e-etc-openldap-slapd.conf">/etc/openldap/slapd.conf</primary>
+      </indexterm>
+
+      <indexterm zone="openldap openldap-config">
+        <primary
+        sortas="e-etc-openldap-ldap.conf">/etc/openldap/ldap.conf</primary>
+      </indexterm>
+
+      <para>
+        Resources to assist you with topics such as choosing a directory
+        configuration, backend and database definitions, access control settings,
+        running as a user other than <systemitem class="username">root</systemitem>
+        and setting a <command>chroot</command> environment include:
+      </para>
+
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            The <command>slapd</command> man page.
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            The <filename>slapd.conf</filename> man page.
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            The <ulink url="http://www.openldap.org/doc/admin24/">
+            OpenLDAP 2.4 Administrator's Guide</ulink>
+            (also installed locally in <filename class='directory'>
+            /usr/share/doc/openldap-&openldap-version;/guide/admin</filename>).
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Documents located at
+            <ulink url="http://www.openldap.org/pub/"/>.
+          </para>
+        </listitem>
+      </itemizedlist>
+
+    </sect3>
+
+    <sect3>
+      <title>Mozilla Address Directory</title>
+
+      <para>
+        By default, LDAPv2 support is disabled in the
+        <filename>slapd.conf</filename> file. Once the database is properly
+        set up and <application>Mozilla</application> is configured to use the
+        directory, you must add <option>allow bind_v2</option> to the
+        <filename>slapd.conf</filename> file.
+      </para>
+
+    </sect3>
+
+    <sect3 id="openldap-init">
+      <title>Systemd Units</title>
+
+      <para>
+        To start the <command>slapd</command> daemon at boot,
+        install the systemd unit from the <xref linkend="bootscripts"/>
+        package by running the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+      <indexterm zone="openldap openldap-init">
+        <primary sortas="f-slapd">slapd</primary>
+      </indexterm>
+
+<screen role="root"><userinput>make install-slapd</userinput></screen>
+
+      <note>
+        <para>
+          You'll need to modify the
+          <filename>/etc/default/slapd</filename> to include the
+          parameters needed for your specific configuration. See the
+          <command>slapd</command> man page for parameter information.
+        </para>
+      </note>
+
+    </sect3>
+
+    <sect3>
+      <title>Testing the Configuration</title>
+
+      <para>
+        Start the LDAP server using <command>systemctl</command>:
+      </para>
+
+<screen role="root"><userinput>systemctl start slapd</userinput></screen>
+
+      <para>
+        Verify access to the LDAP server with the following command:
+      </para>
+
+<screen><userinput>ldapsearch -x -b '' -s base '(objectclass=*)' namingContexts</userinput></screen>
+
+      <para>
+        The expected result is:
+      </para>
+
+<screen><computeroutput># extended LDIF
+#
+# LDAPv3
+# base &lt;&gt; with scope base
+# filter: (objectclass=*)
+# requesting: namingContexts
+#
+
+#
+dn:
+namingContexts: dc=my-domain,dc=com
+
+# search result
+search: 2
+result: 0 Success
+
+# numResponses: 2
+# numEntries: 1</computeroutput></screen>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          ldapadd, ldapcompare, ldapdelete, ldapexop, ldapmodify, ldapmodrdn,
+          ldappasswd, ldapsearch, ldapurl, ldapwhoami, slapacl, slapadd,
+          slapauth, slapcat, slapd, slapdn, slapindex, slappasswd, slapschema,
+          and slaptest
+        </seg>
+        <seg>
+          liblber.so, libldap.so, libldap_r.so,
+          and several under /usr/lib/openldap
+        </seg>
+        <seg>
+          /etc/openldap,
+          /usr/lib/openldap,
+          /usr/share/doc/openldap-&openldap-version;, and
+          /var/lib/openldap
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="ldapadd">
+        <term><command>ldapadd</command></term>
+        <listitem>
+          <para>
+            opens a connection to an LDAP server, binds and adds entries.
+          </para>
+          <indexterm zone="openldap ldapadd">
+            <primary sortas="b-ldapadd">ldapadd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ldapcompare">
+        <term><command>ldapcompare</command></term>
+        <listitem>
+          <para>
+            opens a connection to an LDAP server, binds and performs
+            a compare using specified parameters.
+          </para>
+          <indexterm zone="openldap ldapcompare">
+            <primary sortas="b-ldapcompare">ldapcompare</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ldapdelete">
+        <term><command>ldapdelete</command></term>
+        <listitem>
+          <para>
+            opens a connection to an LDAP server, binds and deletes
+            one or more entries.
+          </para>
+          <indexterm zone="openldap ldapdelete">
+            <primary sortas="b-ldapdelete">ldapdelete</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ldapexop">
+        <term><command>ldapexop</command></term>
+        <listitem>
+          <para>
+            issues the LDAP extended operation specified by
+            oid or one of the  special  keywords  whoami,
+            cancel, or refresh.
+          </para>
+          <indexterm zone="openldap ldapexop">
+            <primary sortas="b-ldapexop">ldapexop</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ldapmodify">
+        <term><command>ldapmodify</command></term>
+        <listitem>
+          <para>
+            opens a connection to an LDAP server, binds and modifies entries.
+          </para>
+          <indexterm zone="openldap ldapmodify">
+            <primary sortas="b-ldapmodify">ldapmodify</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ldapmodrdn">
+        <term><command>ldapmodrdn</command></term>
+        <listitem>
+          <para>
+            opens a connection to an LDAP server, binds and modifies
+            the RDN of entries.
+          </para>
+          <indexterm zone="openldap ldapmodrdn">
+            <primary sortas="b-ldapmodrdn">ldapmodrdn</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ldappasswd">
+        <term><command>ldappasswd</command></term>
+        <listitem>
+          <para>
+            is a tool used to set the password of an LDAP user.
+          </para>
+          <indexterm zone="openldap ldappasswd">
+            <primary sortas="b-ldappasswd">ldappasswd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ldapsearch">
+        <term><command>ldapsearch</command></term>
+        <listitem>
+          <para>
+            opens a connection to an LDAP server, binds and performs
+            a search using specified parameters.
+          </para>
+          <indexterm zone="openldap ldapsearch">
+            <primary sortas="b-ldapsearch">ldapsearch</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ldapurl">
+        <term><command>ldapurl</command></term>
+        <listitem>
+          <para>
+            is a command that allows to either compose or
+            decompose LDAP URIs.
+          </para>
+          <indexterm zone="openldap ldapurl">
+            <primary sortas="b-ldapurl">ldapurl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ldapwhoami">
+        <term><command>ldapwhoami</command></term>
+        <listitem>
+          <para>
+            opens a connection to an LDAP server, binds and displays
+            whoami information.
+          </para>
+          <indexterm zone="openldap ldapwhoami">
+            <primary sortas="b-ldapwhoami">ldapwhoami</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="slapacl">
+        <term><command>slapacl</command></term>
+        <listitem>
+          <para>
+            is used to check the behavior of slapd by verifying
+            access to directory data according to the access control
+            list directives defined in its configuration.
+          </para>
+          <indexterm zone="openldap slapacl">
+            <primary sortas="b-slapacl">slapacl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="slapadd">
+        <term><command>slapadd</command></term>
+        <listitem>
+          <para>
+            is used to add entries specified in LDAP Directory Interchange
+            Format (LDIF) to an LDAP database.
+          </para>
+          <indexterm zone="openldap slapadd">
+            <primary sortas="b-slapadd">slapadd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="slapauth">
+        <term><command>slapauth</command></term>
+        <listitem>
+          <para>
+            is used to check the behavior of the slapd
+            in mapping identities for authentication and
+            authorization purposes, as specified in slapd.conf.
+          </para>
+          <indexterm zone="openldap slapauth">
+            <primary sortas="b-slapauth">slapauth</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="slapcat">
+        <term><command>slapcat</command></term>
+        <listitem>
+          <para>
+            is used to generate an LDAP LDIF output based upon the
+            contents of a slapd database.
+          </para>
+          <indexterm zone="openldap slapcat">
+            <primary sortas="b-slapcat">slapcat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="slapd">
+        <term><command>slapd</command></term>
+        <listitem>
+          <para>
+            is the standalone LDAP server.
+          </para>
+          <indexterm zone="openldap slapd">
+            <primary sortas="b-slapd">slapd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="slapdn">
+        <term><command>slapdn</command></term>
+        <listitem>
+          <para>
+            checks a list of string-represented DNs based on schema syntax.
+          </para>
+          <indexterm zone="openldap slapdn">
+            <primary sortas="b-slapdn">slapdn</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="slapindex">
+        <term><command>slapindex</command></term>
+        <listitem>
+          <para>
+            is used to regenerate slapd indexes based upon the current
+            contents of a database.
+          </para>
+          <indexterm zone="openldap slapindex">
+            <primary sortas="b-slapindex">slapindex</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="slappasswd">
+        <term><command>slappasswd</command></term>
+        <listitem>
+          <para>
+            is an <application>OpenLDAP</application> password utility.
+          </para>
+          <indexterm zone="openldap slappasswd">
+            <primary sortas="b-slappasswd">slappasswd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="slapschema">
+        <term><command>slapschema</command></term>
+        <listitem>
+          <para>
+            is used to check schema compliance of the contents
+            of a slapd database.
+          </para>
+          <indexterm zone="openldap slapschema">
+            <primary sortas="b-slapschema">slapschema</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="slaptest">
+        <term><command>slaptest</command></term>
+        <listitem>
+          <para>
+            checks the sanity of the <filename>slapd.conf</filename> file.
+          </para>
+          <indexterm zone="openldap slaptest">
+            <primary sortas="b-slaptest">slaptest</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="liblber">
+        <term><filename class="libraryfile">liblber.so</filename></term>
+        <listitem>
+          <para>
+            is a set of Lightweight Basic Encoding Rules routines. These
+            routines are used by the LDAP library routines to encode and decode
+            LDAP protocol elements using the (slightly simplified) Basic
+            Encoding Rules defined by LDAP. They are not normally used directly
+            by an LDAP application program except in the handling of controls
+            and extended operations.
+          </para>
+          <indexterm zone="openldap liblber">
+            <primary sortas="c-liblber">liblber.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libldap">
+        <term><filename class="libraryfile">libldap.so</filename></term>
+        <listitem>
+          <para>
+            supports the LDAP programs and provide functionality for
+            other programs interacting with LDAP.
+          </para>
+          <indexterm zone="openldap libldap">
+            <primary sortas="c-libldap">libldap.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libldap_r">
+        <term><filename class="libraryfile">libldap_r.so</filename></term>
+        <listitem>
+          <para>
+            contains the functions required by the LDAP programs to
+            produce the results from LDAP requests.
+          </para>
+          <indexterm zone="openldap libldap_r">
+            <primary sortas="c-libldap_r">libldap_r.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: server/other/openldap.xml
===================================================================
--- server/other/openldap.xml	(revision 30fe7dd079b201be71a15825bd8d8481148a8f18)
+++ 	(revision )
@@ -1,813 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!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 openldap-download-http " ">
-  <!ENTITY openldap-download-ftp  "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-&openldap-version;.tgz">
-  <!ENTITY openldap-md5sum        "b0d5ee4b252c841dec6b332d679cf943">
-  <!ENTITY openldap-size          "5.3 MB">
-  <!ENTITY openldap-buildsize     "48 MB (client) 103 MB (server)">
-  <!ENTITY openldap-time          "0.9 SBU (client) 1.8 SBU (server)">
-]>
-
-<sect1 id="openldap" xreflabel="OpenLDAP-&openldap-version;">
-  <?dbhtml filename="openldap.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>OpenLDAP-&openldap-version;</title>
-
-  <indexterm zone="openldap">
-    <primary sortas="a-OpenLDAP">OpenLDAP</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to OpenLDAP</title>
-
-    <para>
-      The <application>OpenLDAP</application> package provides an open
-      source implementation of the Lightweight Directory Access Protocol.
-    </para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&openldap-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&openldap-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &openldap-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &openldap-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &openldap-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &openldap-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/openldap-&openldap-version;-blfs_paths-1.patch"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/openldap-&openldap-version;-symbol_versions-1.patch"/>
-        </para>
-      </listitem>
-      <!-- <listitem>
-        <para>
-          Optional patch:
-          <ulink url="&patch-root;/openldap-&openldap-version;-ntlm-1.patch"/>
-        </para>
-      </listitem> -->
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">OpenLDAP Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="db"/> (only if building server)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="cyrus-sasl"/> and
-      <xref linkend="openssl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="icu"/>,
-        <xref linkend="mariadb"/> or 
-        <ulink url="http://www.mysql.com/">MySQL</ulink> or
-        <xref linkend="postgresql"/>,
-      <ulink url="http://www.openslp.org/">OpenSLP</ulink>,
-      <xref linkend="pth"/> and
-      <xref linkend="unixodbc"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/openldap"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of OpenLDAP</title>
-
-    <!-- <important>
-      <para>
-        Without the following patch, the <application>Evolution</application>
-        Exchange addressbook integration uses simple binds with cleartext
-        passwords. If you are going to build
-        <application>Evolution Data Server</application> with
-        <application>OpenLDAP</application> support, apply the following patch:
-      </para>
-
-<screen><userinput>patch -Np1 -i ../openldap-&openldap-version;-ntlm-1.patch</userinput></screen>
-    </important> -->
-
-    <note>
-      <para>
-        If you only need to install the client side <command>ldap*</command>
-        binaries, corresponding man pages, libraries and header files (referred to
-        as a <quote>client-only</quote> install), issue these
-        commands instead of the following ones (no test suite available):
-      </para>
-
-<screen><userinput>patch -Np1 -i ../openldap-&openldap-version;-blfs_paths-1.patch &amp;&amp;
-patch -Np1 -i ../openldap-&openldap-version;-symbol_versions-1.patch &amp;&amp;
-autoconf &amp;&amp;
-./configure --prefix=/usr     \
-            --sysconfdir=/etc \
-            --disable-static  \
-            --enable-dynamic  \
-            --disable-debug   \
-            --disable-slapd &amp;&amp;
-make depend &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      Then, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    </note>
-
-    <para>
-      There should be a dedicated user and group to take control
-      of the <command>slapd</command> daemon after it is
-      started. Issue the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 83 ldap &amp;&amp;
-useradd -c "OpenLDAP Daemon Owner" -d /var/lib/openldap -u 83 \
-        -g ldap -s /bin/false ldap</userinput></screen>
-
-    <para>
-      Install <application>OpenLDAP</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../openldap-&openldap-version;-blfs_paths-1.patch &amp;&amp;
-patch -Np1 -i ../openldap-&openldap-version;-symbol_versions-1.patch &amp;&amp;
-autoconf &amp;&amp;
-./configure --prefix=/usr         \
-            --sysconfdir=/etc     \
-            --localstatedir=/var  \
-            --libexecdir=/usr/lib \
-            --disable-static      \
-            --disable-debug       \
-            --enable-dynamic      \
-            --enable-crypt        \
-            --enable-spasswd      \
-            --enable-modules      \
-            --enable-rlookups     \
-            --enable-backends=mod \
-            --enable-overlays=mod \
-            --disable-ndb         \
-            --disable-sql &amp;&amp;
-make depend &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>. Tests may fail
-      after a long time (~ 5 SBU).
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-
-chmod -v 700 /var/lib/openldap                                         &amp;&amp;
-chown -v -R root:ldap /var/lib/openldap                                &amp;&amp;
-chmod -v 640 /etc/openldap/{slapd.{conf,ldif},DB_CONFIG.example}       &amp;&amp;
-chown -v root:ldap /etc/openldap/{slapd.{conf,ldif},DB_CONFIG.example} &amp;&amp;
-install -v -dm700 -o ldap -g ldap /etc/openldap/slapd.d                &amp;&amp;
-
-install -v -dm755  /usr/share/doc/openldap-&openldap-version; &amp;&amp;
-cp -vfr doc/drafts /usr/share/doc/openldap-&openldap-version; &amp;&amp;
-cp -vfr doc/rfc    /usr/share/doc/openldap-&openldap-version; &amp;&amp;
-cp -vfr doc/guide  /usr/share/doc/openldap-&openldap-version;</userinput></screen>
-
-    <para>
-      Having slapd configuration files and ldap databases in /var/lib/openldap
-      readable by anyone is a SECURITY ISSUE, especially since a file stores
-      admin password in PLAIN TEXT. That's why mode 640 and root:ldap ownership
-      were used. Owner is root, so only root can modify the file, and group is
-      ldap, so that the group which owns slapd daemon could read but not modify
-      the file in case of a security breach. 
-    </para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <parameter>--disable-debug</parameter>: This switch disables
-      the debugging code in <application>OpenLDAP</application>.
-    </para>
-
-    <para>
-      <parameter>--enable-dynamic</parameter>: This switch forces the
-      <application>OpenLDAP</application> libraries to be dynamically
-      linked to the executable programs.
-    </para>
-
-    <para>
-      <parameter>--enable-crypt</parameter>: This switch enables using of
-      <command>crypt(3)</command> passwords.
-    </para>
-
-    <para>
-      <parameter>--enable-spasswd</parameter>: This switch enables
-      <application>SASL</application> password verification.
-    </para>
-
-    <para>
-      <parameter>--enable-modules</parameter>: This switch enables dynamic
-      module support.
-    </para>
-
-    <para>
-      <parameter>--enable-rlookups</parameter>: This switch enables
-      reverse lookups of client hostnames.
-    </para>
-
-    <para>
-      <parameter>--enable-backends</parameter>: This switch enables
-      all available backends.
-    </para>
-
-    <para>
-      <parameter>--enable-overlays</parameter>: This switch enables
-      all available overlays.
-    </para>
-
-    <para>
-      <parameter>--disable-ndb</parameter>: This switch disables
-      <application>MySQL</application> NDB Cluster backend
-      which causes configure to fail if
-      <application>MySQL</application> is present.
-    </para>
-
-    <para>
-      <parameter>--disable-sql</parameter>: This switch explicitly
-      disables the SQL backend.  Omit this switch if a SQL server is
-      installed and you are going to use a SQL backend.
-    </para>
-
-    <para>
-     <parameter>--libexecdir=/usr/lib</parameter>: This switch controls where
-     the <filename class="directory">/usr/lib/openldap</filename> directory is
-     installed.  Everything in that directory is a library, so it belongs under
-     <filename class="directory">/usr/lib</filename> instead of
-     <filename class="directory">/usr/libexec</filename>.
-    </para>
-
-    <para>
-      <option>--enable-slp</option>: This switch enables
-      SLPv2 support. Use it if you have installed
-      <ulink url="http://www.openslp.org/">OpenSLP</ulink>.
-    </para>
-
-    <note>
-      <para>
-        You can run <command>./configure --help</command> to see if there
-        are other switch you can pass to the <command>configure</command>
-        command to enable other options or dependency packages.
-      </para>
-    </note>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring OpenLDAP</title>
-
-    <sect3 id="openldap-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/openldap/*</filename>
-      </para>
-
-      <indexterm zone="openldap openldap-config">
-        <primary sortas="e-etc-openldap">/etc/openldap/*</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Configuring the <command>slapd</command> servers can be complex.
-        Securing the LDAP directory, especially if you are storing non-public
-        data such as password databases, can also be a challenging task. You'll
-        need to modify the <filename>/etc/openldap/slapd.conf</filename> and
-        <filename>/etc/openldap/ldap.conf</filename> files to set up
-        <application>OpenLDAP</application> for your particular needs.
-      </para>
-
-      <indexterm zone="openldap openldap-config">
-        <primary
-        sortas="e-etc-openldap-slapd.conf">/etc/openldap/slapd.conf</primary>
-      </indexterm>
-
-      <indexterm zone="openldap openldap-config">
-        <primary
-        sortas="e-etc-openldap-ldap.conf">/etc/openldap/ldap.conf</primary>
-      </indexterm>
-
-      <para>
-        Resources to assist you with topics such as choosing a directory
-        configuration, backend and database definitions, access control settings,
-        running as a user other than <systemitem class="username">root</systemitem>
-        and setting a <command>chroot</command> environment include:
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            The <command>slapd</command> man page.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            The <filename>slapd.conf</filename> man page.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            The <ulink url="http://www.openldap.org/doc/admin24/">
-            OpenLDAP 2.4 Administrator's Guide</ulink>
-            (also installed locally in <filename class='directory'>
-            /usr/share/doc/openldap-&openldap-version;/guide/admin</filename>).
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Documents located at
-            <ulink url="http://www.openldap.org/pub/"/>.
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3>
-      <title>Mozilla Address Directory</title>
-
-      <para>
-        By default, LDAPv2 support is disabled in the
-        <filename>slapd.conf</filename> file. Once the database is properly
-        set up and <application>Mozilla</application> is configured to use the
-        directory, you must add <option>allow bind_v2</option> to the
-        <filename>slapd.conf</filename> file.
-      </para>
-
-    </sect3>
-
-    <sect3 id="openldap-init">
-      <title>Boot Script</title>
-
-      <para>
-        To automate the startup of the LDAP server at system bootup,
-        install the <filename>/etc/rc.d/init.d/slapd</filename> init script
-        included in the <xref linkend="bootscripts"/> package
-        using the following command:
-      </para>
-
-      <indexterm zone="openldap openldap-init">
-        <primary sortas="f-slapd">slapd</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-slapd</userinput></screen>
-
-      <note>
-        <para>
-          You'll need to modify the
-          <filename>/etc/sysconfig/slapd</filename> to include the
-          parameters needed for your specific configuration. See the
-          <command>slapd</command> man page for parameter information.
-        </para>
-      </note>
-
-    </sect3>
-
-    <sect3>
-      <title>Testing the Configuration</title>
-
-      <para>
-        Start the LDAP server using the init script:
-      </para>
-
-<screen role="root"><userinput>/etc/rc.d/init.d/slapd start</userinput></screen>
-
-      <para>
-        Verify access to the LDAP server with the following command:
-      </para>
-
-<screen><userinput>ldapsearch -x -b '' -s base '(objectclass=*)' namingContexts</userinput></screen>
-
-      <para>
-        The expected result is:
-      </para>
-
-<screen><computeroutput># extended LDIF
-#
-# LDAPv3
-# base &lt;&gt; with scope base
-# filter: (objectclass=*)
-# requesting: namingContexts
-#
-
-#
-dn:
-namingContexts: dc=my-domain,dc=com
-
-# search result
-search: 2
-result: 0 Success
-
-# numResponses: 2
-# numEntries: 1</computeroutput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          ldapadd, ldapcompare, ldapdelete, ldapexop, ldapmodify, ldapmodrdn,
-          ldappasswd, ldapsearch, ldapurl, ldapwhoami, slapacl, slapadd,
-          slapauth, slapcat, slapd, slapdn, slapindex, slappasswd, slapschema,
-          and slaptest
-        </seg>
-        <seg>
-          liblber.so, libldap.so, libldap_r.so,
-          and several under /usr/lib/openldap
-        </seg>
-        <seg>
-          /etc/openldap,
-          /usr/lib/openldap,
-          /usr/share/doc/openldap-&openldap-version;, and
-          /var/lib/openldap
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ldapadd">
-        <term><command>ldapadd</command></term>
-        <listitem>
-          <para>
-            opens a connection to an LDAP server, binds and adds entries.
-          </para>
-          <indexterm zone="openldap ldapadd">
-            <primary sortas="b-ldapadd">ldapadd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ldapcompare">
-        <term><command>ldapcompare</command></term>
-        <listitem>
-          <para>
-            opens a connection to an LDAP server, binds and performs
-            a compare using specified parameters.
-          </para>
-          <indexterm zone="openldap ldapcompare">
-            <primary sortas="b-ldapcompare">ldapcompare</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ldapdelete">
-        <term><command>ldapdelete</command></term>
-        <listitem>
-          <para>
-            opens a connection to an LDAP server, binds and deletes
-            one or more entries.
-          </para>
-          <indexterm zone="openldap ldapdelete">
-            <primary sortas="b-ldapdelete">ldapdelete</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ldapexop">
-        <term><command>ldapexop</command></term>
-        <listitem>
-          <para>
-            issues the LDAP extended operation specified by
-            oid or one of the  special  keywords  whoami,
-            cancel, or refresh.
-          </para>
-          <indexterm zone="openldap ldapexop">
-            <primary sortas="b-ldapexop">ldapexop</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ldapmodify">
-        <term><command>ldapmodify</command></term>
-        <listitem>
-          <para>
-            opens a connection to an LDAP server, binds and modifies entries.
-          </para>
-          <indexterm zone="openldap ldapmodify">
-            <primary sortas="b-ldapmodify">ldapmodify</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ldapmodrdn">
-        <term><command>ldapmodrdn</command></term>
-        <listitem>
-          <para>
-            opens a connection to an LDAP server, binds and modifies
-            the RDN of entries.
-          </para>
-          <indexterm zone="openldap ldapmodrdn">
-            <primary sortas="b-ldapmodrdn">ldapmodrdn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ldappasswd">
-        <term><command>ldappasswd</command></term>
-        <listitem>
-          <para>
-            is a tool used to set the password of an LDAP user.
-          </para>
-          <indexterm zone="openldap ldappasswd">
-            <primary sortas="b-ldappasswd">ldappasswd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ldapsearch">
-        <term><command>ldapsearch</command></term>
-        <listitem>
-          <para>
-            opens a connection to an LDAP server, binds and performs
-            a search using specified parameters.
-          </para>
-          <indexterm zone="openldap ldapsearch">
-            <primary sortas="b-ldapsearch">ldapsearch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ldapurl">
-        <term><command>ldapurl</command></term>
-        <listitem>
-          <para>
-            is a command that allows to either compose or
-            decompose LDAP URIs.
-          </para>
-          <indexterm zone="openldap ldapurl">
-            <primary sortas="b-ldapurl">ldapurl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ldapwhoami">
-        <term><command>ldapwhoami</command></term>
-        <listitem>
-          <para>
-            opens a connection to an LDAP server, binds and displays
-            whoami information.
-          </para>
-          <indexterm zone="openldap ldapwhoami">
-            <primary sortas="b-ldapwhoami">ldapwhoami</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="slapacl">
-        <term><command>slapacl</command></term>
-        <listitem>
-          <para>
-            is used to check the behavior of slapd by verifying
-            access to directory data according to the access control
-            list directives defined in its configuration.
-          </para>
-          <indexterm zone="openldap slapacl">
-            <primary sortas="b-slapacl">slapacl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="slapadd">
-        <term><command>slapadd</command></term>
-        <listitem>
-          <para>
-            is used to add entries specified in LDAP Directory Interchange
-            Format (LDIF) to an LDAP database.
-          </para>
-          <indexterm zone="openldap slapadd">
-            <primary sortas="b-slapadd">slapadd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="slapauth">
-        <term><command>slapauth</command></term>
-        <listitem>
-          <para>
-            is used to check the behavior of the slapd
-            in mapping identities for authentication and
-            authorization purposes, as specified in slapd.conf.
-          </para>
-          <indexterm zone="openldap slapauth">
-            <primary sortas="b-slapauth">slapauth</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="slapcat">
-        <term><command>slapcat</command></term>
-        <listitem>
-          <para>
-            is used to generate an LDAP LDIF output based upon the
-            contents of a slapd database.
-          </para>
-          <indexterm zone="openldap slapcat">
-            <primary sortas="b-slapcat">slapcat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="slapd">
-        <term><command>slapd</command></term>
-        <listitem>
-          <para>
-            is the standalone LDAP server.
-          </para>
-          <indexterm zone="openldap slapd">
-            <primary sortas="b-slapd">slapd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="slapdn">
-        <term><command>slapdn</command></term>
-        <listitem>
-          <para>
-            checks a list of string-represented DNs based on schema syntax.
-          </para>
-          <indexterm zone="openldap slapdn">
-            <primary sortas="b-slapdn">slapdn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="slapindex">
-        <term><command>slapindex</command></term>
-        <listitem>
-          <para>
-            is used to regenerate slapd indexes based upon the current
-            contents of a database.
-          </para>
-          <indexterm zone="openldap slapindex">
-            <primary sortas="b-slapindex">slapindex</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="slappasswd">
-        <term><command>slappasswd</command></term>
-        <listitem>
-          <para>
-            is an <application>OpenLDAP</application> password utility.
-          </para>
-          <indexterm zone="openldap slappasswd">
-            <primary sortas="b-slappasswd">slappasswd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="slapschema">
-        <term><command>slapschema</command></term>
-        <listitem>
-          <para>
-            is used to check schema compliance of the contents
-            of a slapd database.
-          </para>
-          <indexterm zone="openldap slapschema">
-            <primary sortas="b-slapschema">slapschema</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="slaptest">
-        <term><command>slaptest</command></term>
-        <listitem>
-          <para>
-            checks the sanity of the <filename>slapd.conf</filename> file.
-          </para>
-          <indexterm zone="openldap slaptest">
-            <primary sortas="b-slaptest">slaptest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="liblber">
-        <term><filename class="libraryfile">liblber.so</filename></term>
-        <listitem>
-          <para>
-            is a set of Lightweight Basic Encoding Rules routines. These
-            routines are used by the LDAP library routines to encode and decode
-            LDAP protocol elements using the (slightly simplified) Basic
-            Encoding Rules defined by LDAP. They are not normally used directly
-            by an LDAP application program except in the handling of controls
-            and extended operations.
-          </para>
-          <indexterm zone="openldap liblber">
-            <primary sortas="c-liblber">liblber.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libldap">
-        <term><filename class="libraryfile">libldap.so</filename></term>
-        <listitem>
-          <para>
-            supports the LDAP programs and provide functionality for
-            other programs interacting with LDAP.
-          </para>
-          <indexterm zone="openldap libldap">
-            <primary sortas="c-libldap">libldap.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libldap_r">
-        <term><filename class="libraryfile">libldap_r.so</filename></term>
-        <listitem>
-          <para>
-            contains the functions required by the LDAP programs to
-            produce the results from LDAP requests.
-          </para>
-          <indexterm zone="openldap libldap_r">
-            <primary sortas="c-libldap_r">libldap_r.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: server/other/other.xml
===================================================================
--- server/other/other.xml	(revision 30fe7dd079b201be71a15825bd8d8481148a8f18)
+++ server/other/other.xml	(revision 6bc9f4879451ee675fd27a660cb9650ed84526dc)
@@ -23,9 +23,9 @@
   that you can analyze the risks.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openldap.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openldap-systemd.xml"/>
 <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="soprano.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="unbound.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="unbound-systemd.xml"/>
 <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="virtuoso.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xinetd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xinetd-systemd.xml"/>
 
 </chapter>
Index: server/other/unbound-systemd.xml
===================================================================
--- server/other/unbound-systemd.xml	(revision 6bc9f4879451ee675fd27a660cb9650ed84526dc)
+++ server/other/unbound-systemd.xml	(revision 6bc9f4879451ee675fd27a660cb9650ed84526dc)
@@ -0,0 +1,354 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!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 unbound-download-http "http://www.unbound.net/downloads/unbound-&unbound-version;.tar.gz">
+  <!ENTITY unbound-download-ftp  " ">
+  <!ENTITY unbound-md5sum        "59728c74fef8783f8bad1d7451eba97f">
+  <!ENTITY unbound-size          "4.6 MB">
+  <!ENTITY unbound-buildsize     "42 MB (additional 70 MB for docs and 5 MB for tests)">
+  <!ENTITY unbound-time          "0.6 SBU (additional less than 0.1 SBU for docs and 0.2 SBU for tests)">
+]>
+
+<sect1 id="unbound" xreflabel="Unbound-&unbound-version;">
+  <?dbhtml filename="unbound.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy: igor $</othername>
+    <date>$Date: 2013-07-21 21:06:50 +0200 (Sun, 21 Jul 2013) $</date>
+  </sect1info>
+
+  <title>Unbound-&unbound-version;</title>
+
+  <indexterm zone="unbound">
+    <primary sortas="a-Unbound">Unbound</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Unbound</title>
+
+    <para>
+      <application>Unbound</application> is a validating, recursive, and caching
+      DNS resolver. It is designed as a set of modular components that
+      incorporate modern features, such as enhanced security (DNSSEC)
+      validation, Internet Protocol Version 6 (IPv6), and a client resolver
+      library API as an integral part of the architecture.
+    </para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&unbound-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&unbound-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &unbound-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &unbound-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &unbound-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &unbound-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Unbound Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="ldns"/> and
+      <xref linkend="openssl"/>
+<!-- broken?
+      or <xref linkend="nss"/>
+-->
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="libevent"/>,
+      <xref linkend="python2"/>,
+      <xref linkend="swig"/> (for Python bindings), and
+      <xref linkend="doxygen"/> (for html documentation)
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/unbound"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Unbound</title>
+
+    <para>
+      There should be a dedicated user and group to take control of the
+      <command>unbound</command> daemon after it is started. Issue the following
+      commands as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>groupadd -g 88 unbound &amp;&amp;
+useradd -c "Unbound DNS resolver" -d /var/lib/unbound -u 88 \
+        -g unbound -s /bin/false unbound</userinput></screen>
+
+    <para>
+      Install <application>Unbound</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr     \
+            --sysconfdir=/etc \
+            --disable-static  \
+            --with-pidfile=/run/unbound.pid &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      If you have <xref linkend="doxygen"/> package installed and want to build 
+      html documentation, run the following command:
+    </para>
+
+<screen><userinput>make doc</userinput></screen>
+
+    <para>To test the results, issue <command>make check</command>.</para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install &amp;&amp;
+mv -v /usr/sbin/unbound-host /usr/bin/</userinput></screen>
+
+    <para>
+      If you built html documentation, install it by running the following
+      commands as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/unbound-&unbound-version; &amp;&amp;
+install -v -m644 doc/html/* /usr/share/doc/unbound-&unbound-version;</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+    <para>
+      <option>--with-libevent</option>: This option enables libevent support
+      allowing use of large outgoing port ranges.
+    </para>
+
+    <para>
+      <option>--with-pyunbound</option>: This option enables building of the Python
+      bindings.
+    </para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring Unbound</title>
+
+    <sect3 id="unbound-config">
+      <title>Config Files</title>
+
+      <para><filename>/etc/unbound/unbound.conf</filename></para>
+
+      <indexterm zone="unbound unbound-config">
+        <primary sortas="e-etc-unbound-unbound.conf">/etc/unbound/unbound.conf</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para>
+        In the default configuration, <command>unbound</command> will bind to
+        localhost (127.0.0.1 IP address) and allow recursive queries only from
+        localhost clients. If you want to use <command>unbound</command> for
+        local DNS resolution, run the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>echo "nameserver 127.0.0.1" > /etc/resolv.conf</userinput></screen>
+
+      <para>
+        If you are using a DHCP client for connecting to a network,
+        <filename>/etc/resolv.conf</filename> gets overwritten with values
+        provided by DHCP server. You can override this, for example in
+        <xref linkend="dhcp"/>, by running the following command:
+      </para>
+
+<screen role="root"><userinput>sed -i '/request /i\supersede domain-name-servers 127.0.0.1;' \
+       /etc/dhcp/dhclient.conf</userinput></screen>
+
+      <para>
+        For advanced configuration see <filename>/etc/unbound/unbound.conf</filename>
+        file and the documentation.
+      </para>
+
+    </sect3>
+
+    <sect3 id="unbound-init">
+      <title>Systemd Units</title>
+
+      <para>
+        To start the <command>unbound</command> daemon at boot,
+        install the systemd unit from the <xref linkend="bootscripts"/>
+        package by running the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+      <indexterm zone="unbound unbound-init">
+        <primary sortas="f-unbound">unbound</primary>
+      </indexterm>
+
+<screen role="root"><userinput>make install-unbound</userinput></screen>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          unbound, unbound-anchor, unbound-checkconf, unbound-control,
+          unbound-control-setup, and unbound-host
+        </seg>
+        <seg>
+          libunbound.so and
+          /usr/lib/python&python2-majorver;/site-packages/_unbound.so
+        </seg>
+        <seg>
+          /etc/unbound and /usr/share/doc/unbound-&unbound-version;
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="unbound-prog">
+        <term><command>unbound</command></term>
+        <listitem>
+          <para>
+            is a DNS resolver daemon.
+          </para>
+          <indexterm zone="unbound unbound-prog">
+            <primary sortas="b-unbound">unbound</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="unbound-anchor">
+        <term><command>unbound-anchor</command></term>
+        <listitem>
+          <para>
+            performs setup or update of the root trust anchor for DNSSEC
+            validation.
+          </para>
+          <indexterm zone="unbound unbound-anchor">
+            <primary sortas="b-unbound-anchor">unbound-anchor</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="unbound-checkconf">
+        <term><command>unbound-checkconf</command></term>
+        <listitem>
+          <para>
+            checks <command>unbound</command> configuration file for syntax
+            and other errors.
+          </para>
+          <indexterm zone="unbound unbound-checkconf">
+            <primary sortas="b-unbound-checkconf">unbound-checkconf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="unbound-control">
+        <term><command>unbound-control</command></term>
+        <listitem>
+          <para>
+            performs remote administration on the <command>unbound</command> DNS
+            resolver.
+          </para>
+          <indexterm zone="unbound unbound-control">
+            <primary sortas="b-unbound-control">unbound-control</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="unbound-control-setup">
+        <term><command>unbound-control-setup</command></term>
+        <listitem>
+          <para>
+            generates self-signed certificate and private keys for the server
+            and client.
+          </para>
+          <indexterm zone="unbound unbound-control-setup">
+            <primary sortas="b-unbound-control-setup">unbound-control-setup</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="unbound-host">
+        <term><command>unbound-host</command></term>
+        <listitem>
+          <para>
+            is a DNS lookup utility similar to <command>host</command> from
+            <xref linkend="bind-utils"/>.
+          </para>
+          <indexterm zone="unbound unbound-host">
+            <primary sortas="b-unbound-host">unbound-host</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libunbound">
+        <term><filename class="libraryfile">libunbound.so</filename></term>
+        <listitem>
+          <para>
+            provides the <application>Unbound</application> API functions to
+            programs.
+          </para>
+          <indexterm zone="unbound libunbound">
+            <primary sortas="c-libunbound">libunbound.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: server/other/unbound.xml
===================================================================
--- server/other/unbound.xml	(revision 30fe7dd079b201be71a15825bd8d8481148a8f18)
+++ 	(revision )
@@ -1,352 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!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 unbound-download-http "http://www.unbound.net/downloads/unbound-&unbound-version;.tar.gz">
-  <!ENTITY unbound-download-ftp  " ">
-  <!ENTITY unbound-md5sum        "59728c74fef8783f8bad1d7451eba97f">
-  <!ENTITY unbound-size          "4.6 MB">
-  <!ENTITY unbound-buildsize     "42 MB (additional 70 MB for docs and 5 MB for tests)">
-  <!ENTITY unbound-time          "0.6 SBU (additional less than 0.1 SBU for docs and 0.2 SBU for tests)">
-]>
-
-<sect1 id="unbound" xreflabel="Unbound-&unbound-version;">
-  <?dbhtml filename="unbound.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy: igor $</othername>
-    <date>$Date: 2013-07-21 21:06:50 +0200 (Sun, 21 Jul 2013) $</date>
-  </sect1info>
-
-  <title>Unbound-&unbound-version;</title>
-
-  <indexterm zone="unbound">
-    <primary sortas="a-Unbound">Unbound</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Unbound</title>
-
-    <para>
-      <application>Unbound</application> is a validating, recursive, and caching
-      DNS resolver. It is designed as a set of modular components that
-      incorporate modern features, such as enhanced security (DNSSEC)
-      validation, Internet Protocol Version 6 (IPv6), and a client resolver
-      library API as an integral part of the architecture.
-    </para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&unbound-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&unbound-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &unbound-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &unbound-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &unbound-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &unbound-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Unbound Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="ldns"/> and
-      <xref linkend="openssl"/>
-<!-- broken?
-      or <xref linkend="nss"/>
--->
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libevent"/>,
-      <xref linkend="python2"/>,
-      <xref linkend="swig"/> (for Python bindings), and
-      <xref linkend="doxygen"/> (for html documentation)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/unbound"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Unbound</title>
-
-    <para>
-      There should be a dedicated user and group to take control of the
-      <command>unbound</command> daemon after it is started. Issue the following
-      commands as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 88 unbound &amp;&amp;
-useradd -c "Unbound DNS resolver" -d /var/lib/unbound -u 88 \
-        -g unbound -s /bin/false unbound</userinput></screen>
-
-    <para>
-      Install <application>Unbound</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr     \
-            --sysconfdir=/etc \
-            --disable-static  \
-            --with-pidfile=/run/unbound.pid &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have <xref linkend="doxygen"/> package installed and want to build 
-      html documentation, run the following command:
-    </para>
-
-<screen><userinput>make doc</userinput></screen>
-
-    <para>To test the results, issue <command>make check</command>.</para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-mv -v /usr/sbin/unbound-host /usr/bin/</userinput></screen>
-
-    <para>
-      If you built html documentation, install it by running the following
-      commands as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/unbound-&unbound-version; &amp;&amp;
-install -v -m644 doc/html/* /usr/share/doc/unbound-&unbound-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <option>--with-libevent</option>: This option enables libevent support
-      allowing use of large outgoing port ranges.
-    </para>
-
-    <para>
-      <option>--with-pyunbound</option>: This option enables building of the Python
-      bindings.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Unbound</title>
-
-    <sect3 id="unbound-config">
-      <title>Config Files</title>
-
-      <para><filename>/etc/unbound/unbound.conf</filename></para>
-
-      <indexterm zone="unbound unbound-config">
-        <primary sortas="e-etc-unbound-unbound.conf">/etc/unbound/unbound.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        In the default configuration, <command>unbound</command> will bind to
-        localhost (127.0.0.1 IP address) and allow recursive queries only from
-        localhost clients. If you want to use <command>unbound</command> for
-        local DNS resolution, run the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>echo "nameserver 127.0.0.1" > /etc/resolv.conf</userinput></screen>
-
-      <para>
-        If you are using a DHCP client for connecting to a network,
-        <filename>/etc/resolv.conf</filename> gets overwritten with values
-        provided by DHCP server. You can override this, for example in
-        <xref linkend="dhcp"/>, by running the following command:
-      </para>
-
-<screen role="root"><userinput>sed -i '/request /i\supersede domain-name-servers 127.0.0.1;' \
-       /etc/dhcp/dhclient.conf</userinput></screen>
-
-      <para>
-        For advanced configuration see <filename>/etc/unbound/unbound.conf</filename>
-        file and the documentation.
-      </para>
-
-    </sect3>
-
-    <sect3 id="unbound-init">
-      <title>Boot Script</title>
-
-      <para>If you want the <application>Unbound</application> server to
-      start automatically when the system is booted, install the
-      <filename>/etc/rc.d/init.d/unbound</filename> init script included
-      in the <xref linkend="bootscripts"/> package.</para>
-
-      <indexterm zone="unbound unbound-init">
-        <primary sortas="f-unbound">unbound</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-unbound</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          unbound, unbound-anchor, unbound-checkconf, unbound-control,
-          unbound-control-setup, and unbound-host
-        </seg>
-        <seg>
-          libunbound.so and
-          /usr/lib/python&python2-majorver;/site-packages/_unbound.so
-        </seg>
-        <seg>
-          /etc/unbound and /usr/share/doc/unbound-&unbound-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="unbound-prog">
-        <term><command>unbound</command></term>
-        <listitem>
-          <para>
-            is a DNS resolver daemon.
-          </para>
-          <indexterm zone="unbound unbound-prog">
-            <primary sortas="b-unbound">unbound</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unbound-anchor">
-        <term><command>unbound-anchor</command></term>
-        <listitem>
-          <para>
-            performs setup or update of the root trust anchor for DNSSEC
-            validation.
-          </para>
-          <indexterm zone="unbound unbound-anchor">
-            <primary sortas="b-unbound-anchor">unbound-anchor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unbound-checkconf">
-        <term><command>unbound-checkconf</command></term>
-        <listitem>
-          <para>
-            checks <command>unbound</command> configuration file for syntax
-            and other errors.
-          </para>
-          <indexterm zone="unbound unbound-checkconf">
-            <primary sortas="b-unbound-checkconf">unbound-checkconf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unbound-control">
-        <term><command>unbound-control</command></term>
-        <listitem>
-          <para>
-            performs remote administration on the <command>unbound</command> DNS
-            resolver.
-          </para>
-          <indexterm zone="unbound unbound-control">
-            <primary sortas="b-unbound-control">unbound-control</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unbound-control-setup">
-        <term><command>unbound-control-setup</command></term>
-        <listitem>
-          <para>
-            generates self-signed certificate and private keys for the server
-            and client.
-          </para>
-          <indexterm zone="unbound unbound-control-setup">
-            <primary sortas="b-unbound-control-setup">unbound-control-setup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unbound-host">
-        <term><command>unbound-host</command></term>
-        <listitem>
-          <para>
-            is a DNS lookup utility similar to <command>host</command> from
-            <xref linkend="bind-utils"/>.
-          </para>
-          <indexterm zone="unbound unbound-host">
-            <primary sortas="b-unbound-host">unbound-host</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libunbound">
-        <term><filename class="libraryfile">libunbound.so</filename></term>
-        <listitem>
-          <para>
-            provides the <application>Unbound</application> API functions to
-            programs.
-          </para>
-          <indexterm zone="unbound libunbound">
-            <primary sortas="c-libunbound">libunbound.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: server/other/xinetd-systemd.xml
===================================================================
--- server/other/xinetd-systemd.xml	(revision 6bc9f4879451ee675fd27a660cb9650ed84526dc)
+++ server/other/xinetd-systemd.xml	(revision 6bc9f4879451ee675fd27a660cb9650ed84526dc)
@@ -0,0 +1,499 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!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;
+
+  <!-- Development seems to be over and the xinetd.og site does not seem to exist any more. -->
+  <!-- <!ENTITY xinetd-download-http "http://www.xinetd.org/xinetd-&xinetd-version;.tar.gz"> -->
+  <!ENTITY xinetd-download-http " ">
+  <!ENTITY xinetd-download-ftp  "&gentoo-ftp-repo;/xinetd-&xinetd-version;.tar.gz">
+  <!ENTITY xinetd-md5sum        "77358478fd58efa6366accae99b8b04c">
+  <!ENTITY xinetd-size          "308 KB">
+  <!ENTITY xinetd-buildsize     "5.0 MB">
+  <!ENTITY xinetd-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="xinetd" xreflabel="xinetd-&xinetd-version;">
+  <?dbhtml filename="xinetd.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>xinetd-&xinetd-version;</title>
+
+  <indexterm zone="xinetd">
+    <primary sortas="a-Xinetd">Xinetd</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to xinetd</title>
+
+    <para><application>xinetd</application> is the eXtended InterNET services
+    daemon, a secure replacement for <command>inetd</command>.</para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&xinetd-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&xinetd-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &xinetd-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &xinetd-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &xinetd-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &xinetd-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">xinetd Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <ulink url="ftp://ftp.porcupine.org/pub/security/">TCP wrappers (deprecated)</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/xinetd"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of xinetd</title>
+
+    <para>Install <application>xinetd</application> by running the following
+    commands:</para>
+
+<screen><userinput>sed -i -e "s/exec_server/child_process/" xinetd/builtins.c        &amp;&amp;
+sed -i -e "/register unsigned count/s/register//" xinetd/itox.c  &amp;&amp;
+./configure --prefix=/usr --mandir=/usr/share/man --with-loadavg &amp;&amp;
+make</userinput></screen>
+
+    <para>This package does not come with a test suite.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+     <title>Command Explanations</title>
+
+     <!-- CVE-2013-4342 https://bugzilla.redhat.com/show_bug.cgi?id=1006100 -->
+     <para><command>sed ... xinetd/builtins.c</command>: This command fixes
+     a security issue.</para>
+
+     <para><command>sed ... xinetd/itox.c</command>: This command fixes some
+     compiler warnings.</para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring xinetd</title>
+
+    <sect3 id="xinetd-config">
+      <title>Config Files</title>
+
+      <para><filename>/etc/xinetd.conf</filename> and
+      <filename class="directory">/etc/xinetd.d/*</filename></para>
+
+      <indexterm zone="xinetd xinetd-config">
+        <primary sortas="e-etc-xinetd.conf">/etc/xinetd.conf</primary>
+      </indexterm>
+
+      <indexterm zone="xinetd xinetd-config">
+        <primary sortas="e-etc-xinetd.d">/etc/xinetd.d/*</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para>Ensure the path to all daemons is
+      <filename class="directory">/usr/sbin</filename>, rather than the default
+      path of <filename class="directory">/usr/bin</filename>, and install the
+      <application>xinetd</application> configuration files by running the
+      following commands as the <systemitem class="username">root</systemitem>
+      user:</para>
+
+<screen role="root"><userinput>cat &gt; /etc/xinetd.conf &lt;&lt; "EOF"
+<literal># Begin /etc/xinetd
+# Configuration file for xinetd
+
+defaults
+{
+      instances       = 60
+      log_type        = SYSLOG daemon
+      log_on_success  = HOST PID USERID
+      log_on_failure  = HOST USERID
+      cps             = 25 30
+}
+
+# All service files are stored in the /etc/xinetd.d directory
+
+includedir /etc/xinetd.d
+
+# End /etc/xinetd</literal>
+EOF</userinput></screen>
+
+      <para>All of the following files have the statement, "disable = yes".
+      To activate any of the services, this statement will need to be changed
+      to "disable = no".</para>
+
+      <note>
+        <para>The following files are listed to demonstrate several
+        <application>xinetd</application> applications. In many cases, these
+        applications are not needed. Some classic applications are
+        considered security risks. For example, <command>telnet</command>,
+        <command>rlogin</command>, <command>rexec</command>, and
+        <command>rsh</command> transmit unencrypted usernames and passwords
+        over the network and can be easily replaced with a more secure
+        alternative: <command>ssh</command>.</para>
+      </note>
+
+<screen role="root"><?dbfo keep-together="auto"?><userinput>install -v -d -m755 /etc/xinetd.d &amp;&amp;
+
+cat &gt; /etc/xinetd.d/systat &lt;&lt; "EOF" &amp;&amp;
+<literal># Begin /etc/xinetd.d/systat
+
+service systat
+{
+   disable           = yes
+   socket_type       = stream
+   wait              = no
+   user              = nobody
+   server            = /bin/ps
+   server_args       = -auwwx
+   only_from         = 128.138.209.0
+   log_on_success    = HOST
+}
+
+# End /etc/xinetd.d/systat</literal>
+EOF
+
+cat &gt; /etc/xinetd.d/echo &lt;&lt; "EOF" &amp;&amp;
+<literal># Begin /etc/xinetd.d/echo
+
+service echo
+{
+   disable     = yes
+   type        = INTERNAL
+   id          = echo-stream
+   socket_type = stream
+   protocol    = tcp
+   user        = root
+   wait        = no
+}
+
+service echo
+{
+   disable     = yes
+   type        = INTERNAL
+   id          = echo-dgram
+   socket_type = dgram
+   protocol    = udp
+   user        = root
+   wait        = yes
+}
+
+# End /etc/xinetd.d/echo</literal>
+EOF
+
+cat &gt; /etc/xinetd.d/chargen &lt;&lt; "EOF" &amp;&amp;
+<literal># Begin /etc/xinetd.d/chargen
+
+service chargen
+{
+   disable        = yes
+   type           = INTERNAL
+   id             = chargen-stream
+   socket_type    = stream
+   protocol       = tcp
+   user           = root
+   wait           = no
+}
+
+service chargen
+{
+   disable        = yes
+   type           = INTERNAL
+   id             = chargen-dgram
+   socket_type    = dgram
+   protocol       = udp
+   user           = root
+   wait           = yes
+}
+
+# End /etc/xinetd.d/chargen</literal>
+EOF
+
+cat &gt; /etc/xinetd.d/daytime &lt;&lt; "EOF" &amp;&amp;
+<literal># Begin /etc/xinetd.d/daytime
+
+service daytime
+{
+   disable        = yes
+   type           = INTERNAL
+   id             = daytime-stream
+   socket_type    = stream
+   protocol       = tcp
+   user           = root
+   wait           = no
+}
+
+service daytime
+{
+   disable        = yes
+   type           = INTERNAL
+   id             = daytime-dgram
+   socket_type    = dgram
+   protocol       = udp
+   user           = root
+   wait           = yes
+}
+
+# End /etc/xinetd.d/daytime</literal>
+EOF
+<!-- The last one without && -->
+cat &gt; /etc/xinetd.d/time &lt;&lt; "EOF"
+<literal># Begin /etc/xinetd.d/time
+
+service time
+{
+   disable        = yes
+   type           = INTERNAL
+   id             = time-stream
+   socket_type    = stream
+   protocol       = tcp
+   user           = root
+   wait           = no
+}
+
+service time
+{
+   disable        = yes
+   type           = INTERNAL
+   id             = time-dgram
+   socket_type    = dgram
+   protocol       = udp
+   user           = root
+   wait           = yes
+}
+
+# End /etc/xinetd.d/time</literal>
+EOF</userinput></screen>
+
+      <indexterm zone="xinetd xinetd-config">
+        <primary sortas="e-etc-xinetd.d-login">/etc/xinetd.d/login</primary>
+      </indexterm>
+
+      <indexterm zone="xinetd xinetd-config">
+        <primary sortas="e-etc-xinetd.d-shell">/etc/xinetd.d/shell</primary>
+      </indexterm>
+
+      <indexterm zone="xinetd xinetd-config">
+        <primary sortas="e-etc-xinetd.d-exec">/etc/xinetd.d/exec</primary>
+      </indexterm>
+
+      <indexterm zone="xinetd xinetd-config">
+        <primary sortas="e-etc-xinetd.d-comsat">/etc/xinetd.d/comsat</primary>
+      </indexterm>
+
+      <indexterm zone="xinetd xinetd-config">
+        <primary sortas="e-etc-xinetd.d-talk">/etc/xinetd.d/talk</primary>
+      </indexterm>
+
+      <indexterm zone="xinetd xinetd-config">
+        <primary sortas="e-etc-xinetd.d-ntalk">/etc/xinetd.d/ntalk</primary>
+      </indexterm>
+
+      <indexterm zone="xinetd xinetd-config">
+        <primary sortas="e-etc-xinetd.d-telnet">/etc/xinetd.d/telnet</primary>
+      </indexterm>
+
+      <indexterm zone="xinetd xinetd-config">
+        <primary sortas="e-etc-xinetd.d-ftp">/etc/xinetd.d/ftp</primary>
+      </indexterm>
+
+      <indexterm zone="xinetd xinetd-config">
+        <primary sortas="e-etc-xinetd.d-tftp">/etc/xinetd.d/tftp</primary>
+      </indexterm>
+
+      <indexterm zone="xinetd xinetd-config">
+        <primary sortas="e-etc-xinetd.d-systat">/etc/xinetd.d/systat</primary>
+      </indexterm>
+
+      <indexterm zone="xinetd xinetd-config">
+        <primary sortas="e-etc-xinetd.d-finger">/etc/xinetd.d/finger</primary>
+      </indexterm>
+
+      <indexterm zone="xinetd xinetd-config">
+        <primary sortas="e-etc-xinetd.d-netstat">/etc/xinetd.d/netstat</primary>
+      </indexterm>
+
+      <indexterm zone="xinetd xinetd-config">
+        <primary sortas="e-etc-xinetd.d-echo">/etc/xinetd.d/echo</primary>
+      </indexterm>
+
+      <indexterm zone="xinetd xinetd-config">
+        <primary sortas="e-etc-xinetd.d-chargen">/etc/xinetd.d/chargen</primary>
+      </indexterm>
+
+      <indexterm zone="xinetd xinetd-config">
+        <primary sortas="e-etc-xinetd.d-daytime">/etc/xinetd.d/daytime</primary>
+      </indexterm>
+
+      <indexterm zone="xinetd xinetd-config">
+        <primary sortas="e-etc-xinetd.d-time">/etc/xinetd.d/time</primary>
+      </indexterm>
+
+      <indexterm zone="xinetd xinetd-config">
+        <primary sortas="e-etc-xinetd.d-rstatd">/etc/xinetd.d/rstatd</primary>
+      </indexterm>
+
+      <indexterm zone="xinetd xinetd-config">
+        <primary sortas="e-etc-xinetd.d-rquotad">/etc/xinetd.d/rquotad</primary>
+      </indexterm>
+
+      <indexterm zone="xinetd xinetd-config">
+        <primary sortas="e-etc-xinetd.d-ruserd">/etc/xinetd.d/ruserd</primary>
+      </indexterm>
+
+      <indexterm zone="xinetd xinetd-config">
+        <primary sortas="e-etc-xinetd.d-sprayd">/etc/xinetd.d/sprayd</primary>
+      </indexterm>
+
+      <indexterm zone="xinetd xinetd-config">
+        <primary sortas="e-etc-xinetd.d-walld">/etc/xinetd.d/walld</primary>
+      </indexterm>
+
+      <indexterm zone="xinetd xinetd-config">
+        <primary sortas="e-etc-xinetd.d-irc">/etc/xinetd.d/irc</primary>
+      </indexterm>
+
+      <para>The format of the <filename>/etc/xinetd.conf</filename> is
+      documented in the <filename>xinetd.conf.5</filename> man page.
+      <!-- 13-12-12 the http://www.xinetd.org is broken 
+      Further
+      information can be found at <ulink url="http://www.xinetd.org"/>.
+      -->
+     </para>
+
+    </sect3>
+
+    <sect3  id="xinetd-init">
+      <title>Systemd Units</title>
+
+      <para>
+        To start the <command>xinetd</command> daemon at boot,
+        install the systemd unit from the <xref linkend="bootscripts"/>
+        package by running the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+      <indexterm zone="xinetd xinetd-init">
+        <primary sortas="f-xinetd">xinetd</primary>
+      </indexterm>
+
+<screen role="root"><userinput>make install-xinetd</userinput></screen>
+
+      <para>As the <systemitem class="username">root</systemitem> user,
+      use the <command>systemctl</command> utility to start
+      <command>xinetd</command>:</para>
+
+<screen role="root"><userinput>systemctl start xinetd</userinput></screen>
+
+      <para>Check the <command>journalctl</command> output to ensure the
+      appropriate services are started. If no services are enabled, the program
+      will not start without the <option>-stayalive</option> option.</para>
+
+<!--
+<screen><literal>Aug 22 21:40:21 dps10 xinetd[2696]: Server /usr/sbin/in.rlogind is not
+executable [line=29]
+Aug 22 21:40:21 dps10 xinetd[2696]: Error parsing attribute server -
+DISABLING SERVICE [line=29]
+Aug 22 21:40:21 dps10 xinetd[2696]: Server /usr/sbin/in.rshd is not
+executable [line=42]</literal></screen>
+
+      <para>These errors are because most of the servers
+      <command>xinetd</command> is trying to control are not
+      installed yet.</para>
+-->
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>itox, xconv.pl, and xinetd</seg>
+        <seg>None</seg>
+        <seg>/etc/xinetd.d/</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="itox">
+        <term><command>itox</command></term>
+        <listitem>
+          <para>is a utility used for converting
+          <filename>inetd.conf</filename> files to
+          <filename>xinetd.conf</filename> format.</para>
+          <indexterm zone="xinetd itox">
+            <primary sortas="b-itox">itox</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xconv.pl">
+        <term><command>xconv.pl</command></term>
+        <listitem>
+          <para>is a <application>Perl</application> script used for
+          converting <filename>inetd.conf</filename> files to
+          <filename>xinetd.conf</filename> format, similar to
+          <command>itox</command>.</para>
+          <indexterm zone="xinetd xconv.pl">
+            <primary sortas="b-xconv.pl">xconv.pl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xinetd-prog">
+        <term><command>xinetd</command></term>
+        <listitem>
+          <para>is the Internet services daemon.</para>
+          <indexterm zone="xinetd xinetd-prog">
+            <primary sortas="b-xinetd">xinetd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: server/other/xinetd.xml
===================================================================
--- server/other/xinetd.xml	(revision 30fe7dd079b201be71a15825bd8d8481148a8f18)
+++ 	(revision )
@@ -1,495 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!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;
-
-  <!-- Development seems to be over and the xinetd.og site does not seem to exist any more. -->
-  <!-- <!ENTITY xinetd-download-http "http://www.xinetd.org/xinetd-&xinetd-version;.tar.gz"> -->
-  <!ENTITY xinetd-download-http " ">
-  <!ENTITY xinetd-download-ftp  "&gentoo-ftp-repo;/xinetd-&xinetd-version;.tar.gz">
-  <!ENTITY xinetd-md5sum        "77358478fd58efa6366accae99b8b04c">
-  <!ENTITY xinetd-size          "308 KB">
-  <!ENTITY xinetd-buildsize     "5.0 MB">
-  <!ENTITY xinetd-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="xinetd" xreflabel="xinetd-&xinetd-version;">
-  <?dbhtml filename="xinetd.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>xinetd-&xinetd-version;</title>
-
-  <indexterm zone="xinetd">
-    <primary sortas="a-Xinetd">Xinetd</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xinetd</title>
-
-    <para><application>xinetd</application> is the eXtended InterNET services
-    daemon, a secure replacement for <command>inetd</command>.</para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&xinetd-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&xinetd-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &xinetd-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &xinetd-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &xinetd-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &xinetd-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">xinetd Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="ftp://ftp.porcupine.org/pub/security/">TCP wrappers (deprecated)</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/xinetd"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xinetd</title>
-
-    <para>Install <application>xinetd</application> by running the following
-    commands:</para>
-
-<screen><userinput>sed -i -e "s/exec_server/child_process/" xinetd/builtins.c        &amp;&amp;
-sed -i -e "/register unsigned count/s/register//" xinetd/itox.c  &amp;&amp;
-./configure --prefix=/usr --mandir=/usr/share/man --with-loadavg &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-     <title>Command Explanations</title>
-
-     <!-- CVE-2013-4342 https://bugzilla.redhat.com/show_bug.cgi?id=1006100 -->
-     <para><command>sed ... xinetd/builtins.c</command>: This command fixes
-     a security issue.</para>
-
-     <para><command>sed ... xinetd/itox.c</command>: This command fixes some
-     compiler warnings.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring xinetd</title>
-
-    <sect3 id="xinetd-config">
-      <title>Config Files</title>
-
-      <para><filename>/etc/xinetd.conf</filename> and
-      <filename class="directory">/etc/xinetd.d/*</filename></para>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.conf">/etc/xinetd.conf</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d">/etc/xinetd.d/*</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>Ensure the path to all daemons is
-      <filename class="directory">/usr/sbin</filename>, rather than the default
-      path of <filename class="directory">/usr/bin</filename>, and install the
-      <application>xinetd</application> configuration files by running the
-      following commands as the <systemitem class="username">root</systemitem>
-      user:</para>
-
-<screen role="root"><userinput>cat &gt; /etc/xinetd.conf &lt;&lt; "EOF"
-<literal># Begin /etc/xinetd
-# Configuration file for xinetd
-
-defaults
-{
-      instances       = 60
-      log_type        = SYSLOG daemon
-      log_on_success  = HOST PID USERID
-      log_on_failure  = HOST USERID
-      cps             = 25 30
-}
-
-# All service files are stored in the /etc/xinetd.d directory
-
-includedir /etc/xinetd.d
-
-# End /etc/xinetd</literal>
-EOF</userinput></screen>
-
-      <para>All of the following files have the statement, "disable = yes".
-      To activate any of the services, this statement will need to be changed
-      to "disable = no".</para>
-
-      <note>
-        <para>The following files are listed to demonstrate several
-        <application>xinetd</application> applications. In many cases, these
-        applications are not needed. Some classic applications are
-        considered security risks. For example, <command>telnet</command>,
-        <command>rlogin</command>, <command>rexec</command>, and
-        <command>rsh</command> transmit unencrypted usernames and passwords
-        over the network and can be easily replaced with a more secure
-        alternative: <command>ssh</command>.</para>
-      </note>
-
-<screen role="root"><?dbfo keep-together="auto"?><userinput>install -v -d -m755 /etc/xinetd.d &amp;&amp;
-
-cat &gt; /etc/xinetd.d/systat &lt;&lt; "EOF" &amp;&amp;
-<literal># Begin /etc/xinetd.d/systat
-
-service systat
-{
-   disable           = yes
-   socket_type       = stream
-   wait              = no
-   user              = nobody
-   server            = /bin/ps
-   server_args       = -auwwx
-   only_from         = 128.138.209.0
-   log_on_success    = HOST
-}
-
-# End /etc/xinetd.d/systat</literal>
-EOF
-
-cat &gt; /etc/xinetd.d/echo &lt;&lt; "EOF" &amp;&amp;
-<literal># Begin /etc/xinetd.d/echo
-
-service echo
-{
-   disable     = yes
-   type        = INTERNAL
-   id          = echo-stream
-   socket_type = stream
-   protocol    = tcp
-   user        = root
-   wait        = no
-}
-
-service echo
-{
-   disable     = yes
-   type        = INTERNAL
-   id          = echo-dgram
-   socket_type = dgram
-   protocol    = udp
-   user        = root
-   wait        = yes
-}
-
-# End /etc/xinetd.d/echo</literal>
-EOF
-
-cat &gt; /etc/xinetd.d/chargen &lt;&lt; "EOF" &amp;&amp;
-<literal># Begin /etc/xinetd.d/chargen
-
-service chargen
-{
-   disable        = yes
-   type           = INTERNAL
-   id             = chargen-stream
-   socket_type    = stream
-   protocol       = tcp
-   user           = root
-   wait           = no
-}
-
-service chargen
-{
-   disable        = yes
-   type           = INTERNAL
-   id             = chargen-dgram
-   socket_type    = dgram
-   protocol       = udp
-   user           = root
-   wait           = yes
-}
-
-# End /etc/xinetd.d/chargen</literal>
-EOF
-
-cat &gt; /etc/xinetd.d/daytime &lt;&lt; "EOF" &amp;&amp;
-<literal># Begin /etc/xinetd.d/daytime
-
-service daytime
-{
-   disable        = yes
-   type           = INTERNAL
-   id             = daytime-stream
-   socket_type    = stream
-   protocol       = tcp
-   user           = root
-   wait           = no
-}
-
-service daytime
-{
-   disable        = yes
-   type           = INTERNAL
-   id             = daytime-dgram
-   socket_type    = dgram
-   protocol       = udp
-   user           = root
-   wait           = yes
-}
-
-# End /etc/xinetd.d/daytime</literal>
-EOF
-<!-- The last one without && -->
-cat &gt; /etc/xinetd.d/time &lt;&lt; "EOF"
-<literal># Begin /etc/xinetd.d/time
-
-service time
-{
-   disable        = yes
-   type           = INTERNAL
-   id             = time-stream
-   socket_type    = stream
-   protocol       = tcp
-   user           = root
-   wait           = no
-}
-
-service time
-{
-   disable        = yes
-   type           = INTERNAL
-   id             = time-dgram
-   socket_type    = dgram
-   protocol       = udp
-   user           = root
-   wait           = yes
-}
-
-# End /etc/xinetd.d/time</literal>
-EOF</userinput></screen>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-login">/etc/xinetd.d/login</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-shell">/etc/xinetd.d/shell</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-exec">/etc/xinetd.d/exec</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-comsat">/etc/xinetd.d/comsat</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-talk">/etc/xinetd.d/talk</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-ntalk">/etc/xinetd.d/ntalk</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-telnet">/etc/xinetd.d/telnet</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-ftp">/etc/xinetd.d/ftp</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-tftp">/etc/xinetd.d/tftp</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-systat">/etc/xinetd.d/systat</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-finger">/etc/xinetd.d/finger</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-netstat">/etc/xinetd.d/netstat</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-echo">/etc/xinetd.d/echo</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-chargen">/etc/xinetd.d/chargen</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-daytime">/etc/xinetd.d/daytime</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-time">/etc/xinetd.d/time</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-rstatd">/etc/xinetd.d/rstatd</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-rquotad">/etc/xinetd.d/rquotad</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-ruserd">/etc/xinetd.d/ruserd</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-sprayd">/etc/xinetd.d/sprayd</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-walld">/etc/xinetd.d/walld</primary>
-      </indexterm>
-
-      <indexterm zone="xinetd xinetd-config">
-        <primary sortas="e-etc-xinetd.d-irc">/etc/xinetd.d/irc</primary>
-      </indexterm>
-
-      <para>The format of the <filename>/etc/xinetd.conf</filename> is
-      documented in the <filename>xinetd.conf.5</filename> man page.
-      <!-- 13-12-12 the http://www.xinetd.org is broken 
-      Further
-      information can be found at <ulink url="http://www.xinetd.org"/>.
-      -->
-     </para>
-
-    </sect3>
-
-    <sect3  id="xinetd-init">
-      <title>Boot Script</title>
-
-      <para>As the <systemitem class="username">root</systemitem> user, install
-      the <filename>/etc/rc.d/init.d/xinetd</filename> init script included in
-      the <xref linkend="bootscripts"/> package.</para>
-
-      <indexterm zone="xinetd xinetd-init">
-        <primary sortas="f-xinetd">xinetd</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-xinetd</userinput></screen>
-
-      <para>As the <systemitem class="username">root</systemitem> user,
-      use the new boot script to start <command>xinetd</command>:</para>
-
-<screen role="root"><userinput>/etc/rc.d/init.d/xinetd start</userinput></screen>
-
-      <para>Check the <filename>/var/log/daemon.log</filename> to ensure the
-      appropriate services are started. If no services are enabled, the program
-      will not start without the <option>-stayalive</option> option.</para>
-
-<!--
-<screen><literal>Aug 22 21:40:21 dps10 xinetd[2696]: Server /usr/sbin/in.rlogind is not
-executable [line=29]
-Aug 22 21:40:21 dps10 xinetd[2696]: Error parsing attribute server -
-DISABLING SERVICE [line=29]
-Aug 22 21:40:21 dps10 xinetd[2696]: Server /usr/sbin/in.rshd is not
-executable [line=42]</literal></screen>
-
-      <para>These errors are because most of the servers
-      <command>xinetd</command> is trying to control are not
-      installed yet.</para>
--->
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>itox, xconv.pl, and xinetd</seg>
-        <seg>None</seg>
-        <seg>/etc/xinetd.d/</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="itox">
-        <term><command>itox</command></term>
-        <listitem>
-          <para>is a utility used for converting
-          <filename>inetd.conf</filename> files to
-          <filename>xinetd.conf</filename> format.</para>
-          <indexterm zone="xinetd itox">
-            <primary sortas="b-itox">itox</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xconv.pl">
-        <term><command>xconv.pl</command></term>
-        <listitem>
-          <para>is a <application>Perl</application> script used for
-          converting <filename>inetd.conf</filename> files to
-          <filename>xinetd.conf</filename> format, similar to
-          <command>itox</command>.</para>
-          <indexterm zone="xinetd xconv.pl">
-            <primary sortas="b-xconv.pl">xconv.pl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xinetd-prog">
-        <term><command>xinetd</command></term>
-        <listitem>
-          <para>is the Internet services daemon.</para>
-          <indexterm zone="xinetd xinetd-prog">
-            <primary sortas="b-xinetd">xinetd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
