Index: general.ent
===================================================================
--- general.ent	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ general.ent	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -160,6 +160,7 @@
 %package-entities;
 
-<!ENTITY % systemd-package-entities SYSTEM      "systemd.ent">
-%systemd-package-entities;
+<!ENTITY % kde5-package-entities SYSTEM      "kde5/kde5.ent">
+%kde5-package-entities;
+
 <!ENTITY parallel_issues "<note><para>This package may occasionally fail when
                           building with multiple processors.  See <xref
Index: de/apps/lxdm-systemd.xml
===================================================================
--- lxde/apps/lxdm-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,306 +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;
-
-  <!-- Place this in the general.ent file
-  <!ENTITY TEMPLATE-version "">
-  -->
-  <!ENTITY lxdm-download-http "http://sourceforge.net/projects/lxdm/files/lxdm 0.5.0/lxdm-0.5.0.tar.xz">
- <!-- <!ENTITY lxdm-download-http "http://distfiles.alpinelinux.org/distfiles/lxdm-&lxdm-version;.tar.xz">-->
-  <!ENTITY lxdm-download-ftp  "">
-  <!ENTITY lxdm-md5sum        "a51686720e606ca456d7f56ae4159d1f">
-  <!ENTITY lxdm-size          "232 KB">
-  <!ENTITY lxdm-buildsize     "4.6 MB">
-  <!ENTITY lxdm-time          "less than 0.1 SBU ">
-]>
-
-<sect1 id="lxdm" xreflabel="LXDM-&lxdm-version;">
-  <?dbhtml filename="lxdm.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy: cjg $</othername>
-    <date>$Date: 2014-08-31 16:03:10 +1200 (Sun, 31 Aug 2014) $</date>
-  </sect1info>
-
-  <title>LXDM-&lxdm-version;</title>
-
-  <indexterm zone="lxdm">
-    <primary sortas="a-LXDM">LXDM</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to LXDM</title>
-
-    <para>
-      The <application>LXDM</application> is a
-      lightweight display manager for the <application>LXDE</application> desktop. It can also be used as an
-      alternative to <application>GNOME's</application> <application>GDM</application> or
-      <application>KDE's</application> <application>KDM</application>.
-    </para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxdm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxdm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxdm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxdm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxdm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxdm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">LXDM Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk2"/>
-      <xref linkend="iso-codes"/> and
-      <xref linkend="librsvg"/> (runtime, for default theme background)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-     <xref linkend="linux-pam"/>
-    </para>
-    
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk3"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/lxdm"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of LXDM</title>
-
-    <para>
-      The following fixes are needed.
-    </para>
-
-<screen><userinput>cat &gt; pam/lxdm &lt;&lt; "EOF" &amp;&amp;
-<literal>#%PAM-1.0
-auth       substack     system-auth
-auth       optional     pam_gnome_keyring.so
-account    include      system-account
-session    optional     pam_systemd.so
-session    optional     pam_keyinit.so force revoke
-session    include      system-auth
-session    optional     pam_gnome_keyring.so auto_start</literal>
-EOF
-
-sed -i 's:sysconfig/i18n:profile.d/i18n.sh:g' data/lxdm.in &amp;&amp;
-sed -i 's:/etc/xprofile:/etc/profile:g' data/Xsession &amp;&amp;
-sed -i 's/^bg/#&amp;/' data/lxdm.conf.in</userinput></screen>
-
-    <para>
-      Install <application>LXDM</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
---sysconfdir=/etc         \
---with-pam                \
---disable-consolekit      \
---with-systemdsystemunitdir=/lib/systemd/system &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>
-
-  <!--Optional section-->
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-    <para>
-      <command>cat &gt; pam/lxdm &lt;&lt; "EOF" ...</command>: Replace default
-      <filename>/etc/pam.d/lxdm</filename> by another one appropriate for BLFS.
-    </para>
-
-    <para>
-      <command>sed -i ... data/lxdm.conf.in</command>: Fix the background to the
-      default one.
-    </para>
-
-    <para>
-      <command>sed -i ... data/Xsession</command>: Source
-      <filename>/etc/profile</filename>, instead of other file, according to
-      BLFS standard.
-    </para>
-
-    <para>
-      <command>sed -i ... data/lxdm.in</command>: Fix greeter's locale for BLFS
-      specification.
-    </para>
-
-    <para>
-      <option>--with-pam</option>: This option enables use of pam authentication.
-    </para>
-
-    <para>
-      <option>--disable-consolekit</option>: This option disables the use of
-      <application>consolekit</application> as it is not used on a
-      <application>systemd</application> system.
-    </para>
-
-    <para>
-      <option>--with-systemdsystemunitdir=/lib/systemd/system</option>: This option
-      ensures that the systemd unit file gets installed in the correct location.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring LXDM</title>
-
-   <sect3 id="lxdm-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/lxdm/lxdm.conf</filename>
-      </para>
-
-      <indexterm zone="lxdm lxdm-config">
-        <primary sortas="e-etc-lxdm-lxdm.conf">/etc/lxdm/lxdm.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        The LXDM daemon is configured using the
-        <filename>/etc/lxdm/lxdm.conf</filename> file.
-        Within this file you can set a default session by uncommenting
-        the line: session=/usr/bin/startlxde and replacing startlxde 
-        with your session of choice. For <application>GNOME</application>
-        session=/usr/bin/gnome-session.  For <application>OPENBOX</application>
-        session=/usr/bin/openbox-session and for <application>XFCE</application>
-        session=/usr/bin/startxfce4.
-      </para>
-
-      <para>
-        It is also possible to set the preferred session on a per-user basis by
-        editing the ~/.dmrc file for each user and adding:
-        <screen><literal>
-        [Desktop]
-        Session=xfce</literal></screen>
-      </para>
-
-      <para>
-        To prevent the possibility of lxdm not cleanly logging out a users session
-        add the following to the <filename>/etc/lxdm/PostLogout</filename> as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/lxdm/PostLogout &lt;&lt; "EOF"
-# Terminate current user session
-/bin/loginctl terminate-session $XDG_SESSION_ID
-
-# Restart lxdm
-/bin/systemctl restart lxdm.service
-EOF</userinput></screen>
-
-    </sect3>
-
-   <sect3 id="lxdm-init">
-      <title>Systemd Units</title>
-
-      <para>
-        To start the <command>LXDM</command> daemon at boot, enable
-        the previously installed systemd unit by running the following command
-        as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-      <indexterm zone="lxdm lxdm-init">
-        <primary sortas="f-lxdm">lxdm</primary>
-      </indexterm>
-
-<screen role="root"><userinput>systemctl enable lxdm</userinput></screen>
-
-    </sect3>
-  
-  </sect2>
-  <!--Required section-->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxdm-config, lxdm and lxdm-binary.
-        </seg>
-        <seg>
-          None.
-        </seg>
-        <seg>
-          /etc/lxdm, /etc/pam.d, and
-          /usr/share/lxdm.
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <!-- If the program or library name conflicts (is the same) as the
-      package name, add -prog or -lib to the varlistentry entity id
-      and the 2nd entry of the indexterm zone entity -->
-
-      <varlistentry id="lxdm-prog">
-        <term><command>lxdm</command></term>
-        <listitem>
-          <para>
-            Is a wrapper script for calling lxdm-binary.
-          </para>
-          <indexterm zone="lxdm lxdm-prog">
-            <primary sortas="b-lxdm">lxdm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: lxde/desktop/desktop.xml
===================================================================
--- lxde/desktop/desktop.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ lxde/desktop/desktop.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -42,5 +42,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxappearance.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxsession.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxde-common-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lxde-common.xml"/>
 
 </chapter>
Index: de/desktop/lxde-common-systemd.xml
===================================================================
--- lxde/desktop/lxde-common-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,223 +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 lxde-common-download-http "&sourceforge-repo;/lxde/lxde-common-&lxde-common-version;.tar.xz">
-  <!ENTITY lxde-common-download-ftp  " ">
-  <!ENTITY lxde-common-md5sum        "5a417f5a0e5b510a0c018b66b0dc4081">
-  <!ENTITY lxde-common-size          "868 KB">
-  <!ENTITY lxde-common-buildsize     "2.8 MB">
-  <!ENTITY lxde-common-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="lxde-common" xreflabel="lxde-common-&lxde-common-version;">
-  <?dbhtml filename="lxde-common.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>lxde-common-&lxde-common-version;</title>
-
-  <indexterm zone="lxde-common">
-    <primary sortas="a-lxde-common">lxde-common</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to LXDE Common</title>
-
-    <para>
-      The <application>LXDE Common</application> package provides
-      a set of default configuration for LXDE.
-    </para>
-
-    &lfs78_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxde-common-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxde-common-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxde-common-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxde-common-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxde-common-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxde-common-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">LXDE Common Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="lxde-icon-theme"/>,
-      <xref linkend="lxpanel"/>,
-      <xref linkend="lxsession"/>,
-      <xref linkend="openbox"/>,
-      <xref linkend="pcmanfm"/> and
-      <xref linkend="systemd"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="desktop-file-utils"/>,
-      <xref linkend="hicolor-icon-theme"/> and
-      <xref linkend="shared-mime-info"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional Runtime Dependencies</bridgehead>
-    <para role="optional">
-      <xref linkend="dbus"/> and
-      a notification daemon such as
-      <xref linkend="notification-daemon"/> or
-      <xref linkend="xfce4-notifyd"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/lxde-common"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of LXDE Common</title>
-
-    <para>
-      Install <application>LXDE Common</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &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>
-
-    <para>
-      If you have installed recommended dependencies, run the following
-      commands as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>update-mime-database /usr/share/mime &amp;&amp;
-gtk-update-icon-cache -qf /usr/share/icons/hicolor &amp;&amp;
-update-desktop-database -q</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="using">
-    <title>Starting LXDE</title>
-
-    <para>
-      To start <application>LXDE</application> using <xref linkend="xinit"/>,
-      run the following commands:
-    </para>
-
-<screen><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
-startlxde
-EOF
-
-startx</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxde-logout, openbox-lxde and startlxde
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /etc/xdg/{lxpanel,lxsession,openbox,pcmanfm}/LXDE and
-          /usr/share/lxde
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxde-logout">
-        <term><command>lxde-logout</command></term>
-        <listitem>
-          <para>
-            is used to quit the desktop session for
-            <application>LXDE</application>.
-          </para>
-          <indexterm zone="lxde-common lxde-logout">
-            <primary sortas="b-lxde-logout">lxde-logout</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="openbox-lxde">
-        <term><command>openbox-lxde</command></term>
-        <listitem>
-          <para>
-            is a wrapper script which runs <application>Openbox</application>
-            with <application>LXDE</application> specific config file.
-          </para>
-          <indexterm zone="lxde-common openbox-lxde">
-            <primary sortas="b-openbox-lxde">openbox-lxde</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="startlxde">
-        <term><command>startlxde</command></term>
-        <listitem>
-          <para>
-            is used to start the desktop session for
-            <application>LXDE</application>.
-          </para>
-          <indexterm zone="lxde-common startlxde">
-            <primary sortas="b-startlxde">startlxde</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: lxde/desktop/lxde-common.xml
===================================================================
--- lxde/desktop/lxde-common.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ lxde/desktop/lxde-common.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -0,0 +1,223 @@
+<?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 lxde-common-download-http "&sourceforge-repo;/lxde/lxde-common-&lxde-common-version;.tar.xz">
+  <!ENTITY lxde-common-download-ftp  " ">
+  <!ENTITY lxde-common-md5sum        "5a417f5a0e5b510a0c018b66b0dc4081">
+  <!ENTITY lxde-common-size          "868 KB">
+  <!ENTITY lxde-common-buildsize     "2.8 MB">
+  <!ENTITY lxde-common-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="lxde-common" xreflabel="lxde-common-&lxde-common-version;">
+  <?dbhtml filename="lxde-common.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>lxde-common-&lxde-common-version;</title>
+
+  <indexterm zone="lxde-common">
+    <primary sortas="a-lxde-common">lxde-common</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to LXDE Common</title>
+
+    <para>
+      The <application>LXDE Common</application> package provides
+      a set of default configuration for LXDE.
+    </para>
+
+    &lfs78_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&lxde-common-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&lxde-common-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &lxde-common-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &lxde-common-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &lxde-common-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &lxde-common-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">LXDE Common Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="lxde-icon-theme"/>,
+      <xref linkend="lxpanel"/>,
+      <xref linkend="lxsession"/>,
+      <xref linkend="openbox"/>,
+      <xref linkend="pcmanfm"/> and
+      <xref linkend="systemd"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="desktop-file-utils"/>,
+      <xref linkend="hicolor-icon-theme"/> and
+      <xref linkend="shared-mime-info"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional Runtime Dependencies</bridgehead>
+    <para role="optional">
+      <xref linkend="dbus"/> and
+      a notification daemon such as
+      <xref linkend="notification-daemon"/> or
+      <xref linkend="xfce4-notifyd"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/lxde-common"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of LXDE Common</title>
+
+    <para>
+      Install <application>LXDE Common</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &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>
+
+    <para>
+      If you have installed recommended dependencies, run the following
+      commands as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>update-mime-database /usr/share/mime &amp;&amp;
+gtk-update-icon-cache -qf /usr/share/icons/hicolor &amp;&amp;
+update-desktop-database -q</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="using">
+    <title>Starting LXDE</title>
+
+    <para>
+      To start <application>LXDE</application> using <xref linkend="xinit"/>,
+      run the following commands:
+    </para>
+
+<screen><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
+startlxde
+EOF
+
+startx</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          lxde-logout, openbox-lxde and startlxde
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /etc/xdg/{lxpanel,lxsession,openbox,pcmanfm}/LXDE and
+          /usr/share/lxde
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="lxde-logout">
+        <term><command>lxde-logout</command></term>
+        <listitem>
+          <para>
+            is used to quit the desktop session for
+            <application>LXDE</application>.
+          </para>
+          <indexterm zone="lxde-common lxde-logout">
+            <primary sortas="b-lxde-logout">lxde-logout</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="openbox-lxde">
+        <term><command>openbox-lxde</command></term>
+        <listitem>
+          <para>
+            is a wrapper script which runs <application>Openbox</application>
+            with <application>LXDE</application> specific config file.
+          </para>
+          <indexterm zone="lxde-common openbox-lxde">
+            <primary sortas="b-openbox-lxde">openbox-lxde</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="startlxde">
+        <term><command>startlxde</command></term>
+        <listitem>
+          <para>
+            is used to start the desktop session for
+            <application>LXDE</application>.
+          </para>
+          <indexterm zone="lxde-common startlxde">
+            <primary sortas="b-startlxde">startlxde</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: de/desktop/lxsession-systemd.xml
===================================================================
--- lxde/desktop/lxsession-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,191 +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 lxsession-download-http "&sourceforge-repo;/lxde/lxsession-&lxsession-version;.tar.gz">
-  <!ENTITY lxsession-download-ftp  " ">
-  <!ENTITY lxsession-md5sum        "2957acccbf9ce37ef8205ec5424f8047">
-  <!ENTITY lxsession-size          "339 KB">
-  <!ENTITY lxsession-buildsize     "10.4 MB">
-  <!ENTITY lxsession-time          "0.1 SBU">
-]>
-
-<sect1 id="lxsession" xreflabel="LXSession-&lxsession-version;">
-  <?dbhtml filename="lxsession.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>LXSession-&lxsession-version;</title>
-
-  <indexterm zone="lxsession">
-    <primary sortas="a-LXSession">LXSession</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to LXSession</title>
-
-    <para>
-      The <application>LXSession</application> package contains the default
-      session manager for <application>LXDE</application>.
-    </para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lxsession-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lxsession-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lxsession-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lxsession-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lxsession-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lxsession-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/lxsession-&lxsession-version;-fix_logind_dbus-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>-->
-
-    <bridgehead renderas="sect3">LXSession Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="gtk2"/>, or
-      <xref linkend="gtk3"/>,
-      <xref linkend="libunique"/>,
-      <xref linkend="lsb-release"/> (runtime),
-      <xref linkend="polkit"/> and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libxslt"/> with
-      <xref linkend="DocBook"/> and
-      <xref linkend="docbook-xsl"/> (to build man pages)
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/lxsession"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of LXSession</title>
-
-    <para>
-      Install <application>LXSession</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-man &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>
-
-    <para>
-      <parameter>--disable-man</parameter>: This switch disables building of
-      the manual pages. Remove it if you have installed optional dependencies
-      and wish to build the manual pages.
-    </para>
-
-    <para>
-      <parameter>--enable-gtk3</parameter>: This switch enables use of
-       gtk-3 instead of gtk-2.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          lxclipboard, lxlock, lxpolkit, lxsession, lxsession-default,
-          lxsession-default-apps, lxsession-default-terminal,
-          lxsession-edit and lxsession-logout
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/lxsession
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lxsession-prog">
-        <term><command>lxsession</command></term>
-        <listitem>
-          <para>
-            is a lightweight X session manager.
-          </para>
-          <indexterm zone="lxsession lxsession-prog">
-            <primary sortas="b-lxsession">lxsession</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/alsa-utils-systemd.xml
===================================================================
--- multimedia/libdriv/alsa-utils-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,435 +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 alsa-utils-download-http "&alsa-download-http;/utils/alsa-utils-&alsa-utils-version;.tar.bz2">
-  <!ENTITY alsa-utils-download-ftp  "&alsa-download-ftp;/utils/alsa-utils-&alsa-utils-version;.tar.bz2">
-  <!ENTITY alsa-utils-md5sum        "6b289bf874c4c9a63f4b3973093dd404">
-  <!ENTITY alsa-utils-size          "1.1 MB">
-  <!ENTITY alsa-utils-buildsize     "12 MB">
-  <!ENTITY alsa-utils-time          "0.1 SBU">
-]>
-
-<sect1 id="alsa-utils" xreflabel="alsa-utils-&alsa-utils-version;">
-  <?dbhtml filename="alsa-utils.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>alsa-utils-&alsa-utils-version;</title>
-
-  <indexterm zone="alsa-utils">
-    <primary sortas="a-alsa-utils">alsa-utils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ALSA Utilities</title>
-
-    <para>
-      The <application>ALSA Utilities</application> package contains
-      various utilities which are useful for controlling your sound
-      card.
-    </para>
-
-    &lfs78_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&alsa-utils-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&alsa-utils-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &alsa-utils-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &alsa-utils-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &alsa-utils-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &alsa-utils-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">ALSA Utilities Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="alsa-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libsamplerate"/>,
-      <xref linkend="xmlto"/> and
-      <ulink url="http://hightek.org/dialog/">Dialog</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/alsa-utils"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ALSA Utilities</title>
-
-    <para>
-      Install <application>ALSA Utilities</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>./configure --disable-alsaconf --disable-xmlto &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>
-
-    <para>
-      <option>--disable-alsaconf</option>: This switch disables building the
-      <command>alsaconf</command> configuration tool which is incompatible with
-      <application>Udev</application>.
-    </para>
-
-    <para>
-      <option>--disable-xmlto</option>: Omit this switch if you have installed
-      <xref linkend="xmlto"/> and don't wish to install pregenerated man pages.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring ALSA Utilities</title>
-
-    <sect3 id="alsa-utils-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/var/lib/alsa/asound.state</filename>
-      </para>
-
-      <indexterm zone="alsa-utils alsa-utils-config">
-        <primary sortas="e-var-lib-alsa-asound.state">/var/lib/alsa/asound.state</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Note that all channels of your sound card are muted by default.
-        You can use the <command>alsamixer</command> program to change
-        this. Use <command>speaker-test</command> to check that your
-        settings have been applied correctly. You should hear
-        <quote>pink noise</quote> on your speakers.
-      </para>
-
-      <para>
-        The <filename>alsactl</filename> program is normally run from a
-        standard <application>udev</application> rule. The first time it
-        is run, it will complain that there is no state in
-        <filename>/var/lib/alsa/asound.state</filename>. You can prevent
-        this by running the following commands as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>alsactl -L store</userinput></screen>
-
-      <para>
-        The volume settings should be restored from the saved state by
-        <application>Udev</application> when the device is detected
-        (during boot or when plugged in for USB devices).
-      </para>
-
-      <para>
-        All sound devices are not accessible for any user except
-        <systemitem class="username">root</systemitem> and members of the
-        <systemitem class="groupname">audio</systemitem> group. Add any
-        users that might use the sound devices to that group:
-      </para>
-
-<screen role="root"><userinput>usermod -a -G audio <replaceable>&lt;username&gt;</replaceable></userinput></screen>
-
-      <note>
-        <para>
-          You may need to log out and back in again to refresh your group
-          memberships. '<command>su <replaceable>&lt;username&gt;</replaceable></command>'
-          should work as well.
-        </para>
-      </note>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          aconnect, alsa-info.sh, alsactl, alsaloop, alsamixer,
-          alsaucm, amidi, amixer, aplay, aplaymidi, arecord (symlink),
-          arecordmidi, aseqdump, aseqnet, iecset and
-          speaker-test
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/sounds/alsa and /var/lib/alsa
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="aconnect">
-        <term><command>aconnect</command></term>
-        <listitem>
-          <para>
-            is a utility for connecting and disconnecting two
-            existing ports in the ALSA sequencer system.
-          </para>
-          <indexterm zone="alsa-utils aconnect">
-            <primary sortas="b-aconnect">aconnect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="alsa-info.sh">
-        <term><command>alsa-info.sh</command></term>
-        <listitem>
-          <para>
-            is used to generate a file containing detailed information
-            about your sound hardware.
-          </para>
-          <indexterm zone="alsa-utils alsa-info.sh">
-            <primary sortas="b-alsa-info.sh">alsa-info.sh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="alsactl">
-        <term><command>alsactl</command></term>
-        <listitem>
-          <para>
-            is used to control advanced settings for the
-            ALSA sound card drivers.
-          </para>
-          <indexterm zone="alsa-utils alsactl">
-            <primary sortas="b-alsactl">alsactl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="alsaloop">
-        <term><command>alsaloop</command></term>
-        <listitem>
-          <para>
-            allows creation of a PCM loopback between a PCM capture
-            device and a PCM playback device.
-          </para>
-          <indexterm zone="alsa-utils alsaloop">
-            <primary sortas="b-alsaloop">alsaloop</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="alsamixer">
-        <term><command>alsamixer</command></term>
-        <listitem>
-          <para>
-            is an Ncurses based mixer program for use with
-            the ALSA sound card drivers.
-          </para>
-          <indexterm zone="alsa-utils alsamixer">
-            <primary sortas="b-alsamixer">alsamixer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="alsaucm">
-        <term><command>alsaucm</command></term>
-        <listitem>
-          <para>
-          allows applications to access the hardware in an abstracted manner
-          </para>
-          <indexterm zone="alsa-utils alsaucm">
-            <primary sortas="b-alsaucm">alsaucm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="amidi">
-        <term><command>amidi</command></term>
-        <listitem>
-          <para>
-            is used to read from and write to ALSA
-            RawMIDI ports.
-          </para>
-          <indexterm zone="alsa-utils amidi">
-            <primary sortas="b-amidi">amidi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="amixer">
-        <term><command>amixer</command></term>
-        <listitem>
-          <para> allows command-line control of the mixers for the
-          ALSA sound card drivers.</para>
-          <indexterm zone="alsa-utils amixer">
-            <primary sortas="b-amixer">amixer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aplay">
-        <term><command>aplay</command></term>
-        <listitem>
-          <para>
-            is a command-line soundfile player for the
-            ALSA sound card drivers.
-          </para>
-          <indexterm zone="alsa-utils aplay">
-            <primary sortas="b-aplay">aplay</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aplaymidi">
-        <term><command>aplaymidi</command></term>
-        <listitem>
-          <para>
-            is a command-line utility that plays the specified
-            MIDI file(s) to one or more ALSA sequencer ports.
-          </para>
-          <indexterm zone="alsa-utils aplaymidi">
-            <primary sortas="b-aplaymidi">aplaymidi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="arecord">
-        <term><command>arecord</command></term>
-        <listitem>
-          <para>
-            is a command-line soundfile recorder for the
-            ALSA sound card drivers.
-          </para>
-          <indexterm zone="alsa-utils arecord">
-            <primary sortas="b-arecord">arecord</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="arecordmidi">
-        <term><command>arecordmidi</command></term>
-        <listitem>
-          <para>
-            is a command-line utility that records a standard
-            MIDI file from one or more ALSA sequencer ports.
-          </para>
-          <indexterm zone="alsa-utils arecordmidi">
-            <primary sortas="b-arecordmidi">arecordmidi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aseqdump">
-        <term><command>aseqdump</command></term>
-        <listitem>
-          <para>
-            is a command-line utility that prints the sequencer events it
-            receives as text.
-          </para>
-          <indexterm zone="alsa-utils aseqdump">
-            <primary sortas="b-aseqdump">aseqdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aseqnet">
-        <term><command>aseqnet</command></term>
-        <listitem>
-          <para>
-            is an ALSA sequencer client which sends and
-            receives event packets over a network.
-          </para>
-          <indexterm zone="alsa-utils aseqnet">
-            <primary sortas="b-aseqnet">aseqnet</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="iecset">
-        <term><command>iecset</command></term>
-        <listitem>
-          <para>
-            is a small utility to set or dump the IEC958 (or so-called
-            <quote>S/PDIF</quote>) status bits of the specified sound
-            card via the ALSA control API.
-          </para>
-          <indexterm zone="alsa-utils iecset">
-            <primary sortas="b-iecset">iecset</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="speaker-test">
-        <term><command>speaker-test</command></term>
-        <listitem>
-          <para>
-            is a command-line speaker test tone generator for ALSA.
-          </para>
-          <indexterm zone="alsa-utils speaker-test">
-            <primary sortas="b-speaker-test">speaker-test</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: multimedia/libdriv/alsa-utils.xml
===================================================================
--- multimedia/libdriv/alsa-utils.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ multimedia/libdriv/alsa-utils.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -0,0 +1,435 @@
+<?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 alsa-utils-download-http "&alsa-download-http;/utils/alsa-utils-&alsa-utils-version;.tar.bz2">
+  <!ENTITY alsa-utils-download-ftp  "&alsa-download-ftp;/utils/alsa-utils-&alsa-utils-version;.tar.bz2">
+  <!ENTITY alsa-utils-md5sum        "6b289bf874c4c9a63f4b3973093dd404">
+  <!ENTITY alsa-utils-size          "1.1 MB">
+  <!ENTITY alsa-utils-buildsize     "12 MB">
+  <!ENTITY alsa-utils-time          "0.1 SBU">
+]>
+
+<sect1 id="alsa-utils" xreflabel="alsa-utils-&alsa-utils-version;">
+  <?dbhtml filename="alsa-utils.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>alsa-utils-&alsa-utils-version;</title>
+
+  <indexterm zone="alsa-utils">
+    <primary sortas="a-alsa-utils">alsa-utils</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to ALSA Utilities</title>
+
+    <para>
+      The <application>ALSA Utilities</application> package contains
+      various utilities which are useful for controlling your sound
+      card.
+    </para>
+
+    &lfs78_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&alsa-utils-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&alsa-utils-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &alsa-utils-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &alsa-utils-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &alsa-utils-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &alsa-utils-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">ALSA Utilities Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="alsa-lib"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="libsamplerate"/>,
+      <xref linkend="xmlto"/> and
+      <ulink url="http://hightek.org/dialog/">Dialog</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/alsa-utils"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of ALSA Utilities</title>
+
+    <para>
+      Install <application>ALSA Utilities</application> by
+      running the following commands:
+    </para>
+
+<screen><userinput>./configure --disable-alsaconf --disable-xmlto &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>
+
+    <para>
+      <option>--disable-alsaconf</option>: This switch disables building the
+      <command>alsaconf</command> configuration tool which is incompatible with
+      <application>Udev</application>.
+    </para>
+
+    <para>
+      <option>--disable-xmlto</option>: Omit this switch if you have installed
+      <xref linkend="xmlto"/> and don't wish to install pregenerated man pages.
+    </para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring ALSA Utilities</title>
+
+    <sect3 id="alsa-utils-config">
+      <title>Config Files</title>
+
+      <para>
+        <filename>/var/lib/alsa/asound.state</filename>
+      </para>
+
+      <indexterm zone="alsa-utils alsa-utils-config">
+        <primary sortas="e-var-lib-alsa-asound.state">/var/lib/alsa/asound.state</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para>
+        Note that all channels of your sound card are muted by default.
+        You can use the <command>alsamixer</command> program to change
+        this. Use <command>speaker-test</command> to check that your
+        settings have been applied correctly. You should hear
+        <quote>pink noise</quote> on your speakers.
+      </para>
+
+      <para>
+        The <filename>alsactl</filename> program is normally run from a
+        standard <application>udev</application> rule. The first time it
+        is run, it will complain that there is no state in
+        <filename>/var/lib/alsa/asound.state</filename>. You can prevent
+        this by running the following commands as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>alsactl -L store</userinput></screen>
+
+      <para>
+        The volume settings should be restored from the saved state by
+        <application>Udev</application> when the device is detected
+        (during boot or when plugged in for USB devices).
+      </para>
+
+      <para>
+        All sound devices are not accessible for any user except
+        <systemitem class="username">root</systemitem> and members of the
+        <systemitem class="groupname">audio</systemitem> group. Add any
+        users that might use the sound devices to that group:
+      </para>
+
+<screen role="root"><userinput>usermod -a -G audio <replaceable>&lt;username&gt;</replaceable></userinput></screen>
+
+      <note>
+        <para>
+          You may need to log out and back in again to refresh your group
+          memberships. '<command>su <replaceable>&lt;username&gt;</replaceable></command>'
+          should work as well.
+        </para>
+      </note>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          aconnect, alsa-info.sh, alsactl, alsaloop, alsamixer,
+          alsaucm, amidi, amixer, aplay, aplaymidi, arecord (symlink),
+          arecordmidi, aseqdump, aseqnet, iecset and
+          speaker-test
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /usr/share/sounds/alsa and /var/lib/alsa
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="aconnect">
+        <term><command>aconnect</command></term>
+        <listitem>
+          <para>
+            is a utility for connecting and disconnecting two
+            existing ports in the ALSA sequencer system.
+          </para>
+          <indexterm zone="alsa-utils aconnect">
+            <primary sortas="b-aconnect">aconnect</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="alsa-info.sh">
+        <term><command>alsa-info.sh</command></term>
+        <listitem>
+          <para>
+            is used to generate a file containing detailed information
+            about your sound hardware.
+          </para>
+          <indexterm zone="alsa-utils alsa-info.sh">
+            <primary sortas="b-alsa-info.sh">alsa-info.sh</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="alsactl">
+        <term><command>alsactl</command></term>
+        <listitem>
+          <para>
+            is used to control advanced settings for the
+            ALSA sound card drivers.
+          </para>
+          <indexterm zone="alsa-utils alsactl">
+            <primary sortas="b-alsactl">alsactl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="alsaloop">
+        <term><command>alsaloop</command></term>
+        <listitem>
+          <para>
+            allows creation of a PCM loopback between a PCM capture
+            device and a PCM playback device.
+          </para>
+          <indexterm zone="alsa-utils alsaloop">
+            <primary sortas="b-alsaloop">alsaloop</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="alsamixer">
+        <term><command>alsamixer</command></term>
+        <listitem>
+          <para>
+            is an Ncurses based mixer program for use with
+            the ALSA sound card drivers.
+          </para>
+          <indexterm zone="alsa-utils alsamixer">
+            <primary sortas="b-alsamixer">alsamixer</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="alsaucm">
+        <term><command>alsaucm</command></term>
+        <listitem>
+          <para>
+          allows applications to access the hardware in an abstracted manner
+          </para>
+          <indexterm zone="alsa-utils alsaucm">
+            <primary sortas="b-alsaucm">alsaucm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="amidi">
+        <term><command>amidi</command></term>
+        <listitem>
+          <para>
+            is used to read from and write to ALSA
+            RawMIDI ports.
+          </para>
+          <indexterm zone="alsa-utils amidi">
+            <primary sortas="b-amidi">amidi</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="amixer">
+        <term><command>amixer</command></term>
+        <listitem>
+          <para> allows command-line control of the mixers for the
+          ALSA sound card drivers.</para>
+          <indexterm zone="alsa-utils amixer">
+            <primary sortas="b-amixer">amixer</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="aplay">
+        <term><command>aplay</command></term>
+        <listitem>
+          <para>
+            is a command-line soundfile player for the
+            ALSA sound card drivers.
+          </para>
+          <indexterm zone="alsa-utils aplay">
+            <primary sortas="b-aplay">aplay</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="aplaymidi">
+        <term><command>aplaymidi</command></term>
+        <listitem>
+          <para>
+            is a command-line utility that plays the specified
+            MIDI file(s) to one or more ALSA sequencer ports.
+          </para>
+          <indexterm zone="alsa-utils aplaymidi">
+            <primary sortas="b-aplaymidi">aplaymidi</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="arecord">
+        <term><command>arecord</command></term>
+        <listitem>
+          <para>
+            is a command-line soundfile recorder for the
+            ALSA sound card drivers.
+          </para>
+          <indexterm zone="alsa-utils arecord">
+            <primary sortas="b-arecord">arecord</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="arecordmidi">
+        <term><command>arecordmidi</command></term>
+        <listitem>
+          <para>
+            is a command-line utility that records a standard
+            MIDI file from one or more ALSA sequencer ports.
+          </para>
+          <indexterm zone="alsa-utils arecordmidi">
+            <primary sortas="b-arecordmidi">arecordmidi</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="aseqdump">
+        <term><command>aseqdump</command></term>
+        <listitem>
+          <para>
+            is a command-line utility that prints the sequencer events it
+            receives as text.
+          </para>
+          <indexterm zone="alsa-utils aseqdump">
+            <primary sortas="b-aseqdump">aseqdump</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="aseqnet">
+        <term><command>aseqnet</command></term>
+        <listitem>
+          <para>
+            is an ALSA sequencer client which sends and
+            receives event packets over a network.
+          </para>
+          <indexterm zone="alsa-utils aseqnet">
+            <primary sortas="b-aseqnet">aseqnet</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="iecset">
+        <term><command>iecset</command></term>
+        <listitem>
+          <para>
+            is a small utility to set or dump the IEC958 (or so-called
+            <quote>S/PDIF</quote>) status bits of the specified sound
+            card via the ALSA control API.
+          </para>
+          <indexterm zone="alsa-utils iecset">
+            <primary sortas="b-iecset">iecset</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="speaker-test">
+        <term><command>speaker-test</command></term>
+        <listitem>
+          <para>
+            is a command-line speaker test tone generator for ALSA.
+          </para>
+          <indexterm zone="alsa-utils speaker-test">
+            <primary sortas="b-speaker-test">speaker-test</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: ltimedia/libdriv/farstream-systemd.xml
===================================================================
--- multimedia/libdriv/farstream-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,181 +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 farstream-download-http
-           "http://freedesktop.org/software/farstream/releases/farstream/farstream-&farstream-version;.tar.gz">
-  <!ENTITY farstream-download-ftp  " ">
-  <!ENTITY farstream-md5sum        "63cecbb912e7a8b96d4470420327e2cc">
-  <!ENTITY farstream-size          "1.2 MB">
-  <!ENTITY farstream-buildsize     "27.3 MB">
-  <!ENTITY farstream-time          "0.5 SBU">
-]>
-
-<sect1 id="farstream" xreflabel="Farstream-&farstream-version;">
-  <?dbhtml filename="farstream.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Farstream-&farstream-version;</title>
-
-  <indexterm zone="farstream">
-    <primary sortas="a-Farstream">Farstream</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Farstream</title>
-
-    <para>
-      The <application>Farstream</application> package contains libraries
-      and a collection of <application>GStreamer</application> modules
-      used for video conferencing.
-    </para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&farstream-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&farstream-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &farstream-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &farstream-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &farstream-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &farstream-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Farstream Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gst10-plugins-base"/> and
-      <xref linkend="libnice"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (Runtime)</bridgehead>
-    <para role="recommended">
-      <xref linkend="gst10-plugins-bad"/> and
-      <xref linkend="gst10-plugins-good"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="valgrind"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/farstream"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Farstream</title>
-
-    <para>
-      Install <application>Farstream</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &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/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libfarstream-0.2.so
-        </seg>
-        <seg>
-          /usr/include/farstream-0.2,
-          /usr/lib/farstream-0.2,
-          /usr/share/farstream,
-          /usr/share/gtk-doc/html/farstream-libs-1.0, and
-          /usr/share/gtk-doc/html/farstream-plugins-0.2
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libfarstream-0.2">
-        <term><filename class="libraryfile">libfarstream-0.2.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Farstream</application> API functions.
-          </para>
-          <indexterm zone="farstream libfarstream-0.2">
-            <primary sortas="c-libfarstream-0.2">libfarstream-0.2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: multimedia/libdriv/farstream.xml
===================================================================
--- multimedia/libdriv/farstream.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ multimedia/libdriv/farstream.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -0,0 +1,181 @@
+<?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 farstream-download-http
+           "http://freedesktop.org/software/farstream/releases/farstream/farstream-&farstream-version;.tar.gz">
+  <!ENTITY farstream-download-ftp  " ">
+  <!ENTITY farstream-md5sum        "63cecbb912e7a8b96d4470420327e2cc">
+  <!ENTITY farstream-size          "1.2 MB">
+  <!ENTITY farstream-buildsize     "27.3 MB">
+  <!ENTITY farstream-time          "0.5 SBU">
+]>
+
+<sect1 id="farstream" xreflabel="Farstream-&farstream-version;">
+  <?dbhtml filename="farstream.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Farstream-&farstream-version;</title>
+
+  <indexterm zone="farstream">
+    <primary sortas="a-Farstream">Farstream</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Farstream</title>
+
+    <para>
+      The <application>Farstream</application> package contains libraries
+      and a collection of <application>GStreamer</application> modules
+      used for video conferencing.
+    </para>
+
+    &lfs76_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&farstream-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&farstream-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &farstream-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &farstream-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &farstream-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &farstream-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Farstream Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="gst10-plugins-base"/> and
+      <xref linkend="libnice"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended (Runtime)</bridgehead>
+    <para role="recommended">
+      <xref linkend="gst10-plugins-bad"/> and
+      <xref linkend="gst10-plugins-good"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk-doc"/> and
+      <xref linkend="valgrind"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/farstream"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Farstream</title>
+
+    <para>
+      Install <application>Farstream</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr &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/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          libfarstream-0.2.so
+        </seg>
+        <seg>
+          /usr/include/farstream-0.2,
+          /usr/lib/farstream-0.2,
+          /usr/share/farstream,
+          /usr/share/gtk-doc/html/farstream-libs-1.0, and
+          /usr/share/gtk-doc/html/farstream-plugins-0.2
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libfarstream-0.2">
+        <term><filename class="libraryfile">libfarstream-0.2.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>Farstream</application> API functions.
+          </para>
+          <indexterm zone="farstream libfarstream-0.2">
+            <primary sortas="c-libfarstream-0.2">libfarstream-0.2.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: ltimedia/libdriv/grilo-plugins-systemd.xml
===================================================================
--- multimedia/libdriv/grilo-plugins-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,149 +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 grilo-plugins-download-http "&gnome-download-http;/grilo-plugins/0.2/grilo-plugins-&grilo-plugins-version;.tar.xz">
-  <!ENTITY grilo-plugins-download-ftp  "&gnome-download-ftp;/grilo-plugins/0.2/grilo-plugins-&grilo-plugins-version;.tar.xz">
-  <!ENTITY grilo-plugins-md5sum        "45030aab3f21b561b1c899ebb7dce54d">
-  <!ENTITY grilo-plugins-size          "980 KB">
-  <!ENTITY grilo-plugins-buildsize     "25 MB (all plugins)">
-  <!ENTITY grilo-plugins-time          "0.3 SBU">
-]>
-
-<sect1 id="grilo-plugins" xreflabel="Grilo-Plugins-&grilo-plugins-version;">
-  <?dbhtml filename="grilo-plugins.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Grilo-Plugins-&grilo-plugins-version;</title>
-
-  <indexterm zone="grilo-plugins">
-    <primary sortas="a-Grilo-Plugins">Grilo-Plugins</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Grilo-Plugins</title>
-
-    <para><application>Grilo-Plugins</application> is a collection of plugins
-    (Apple Trailers, Blip.tv, Bookmarks, Filesystem, Flickr, Jamendo, Magnatune,
-    Rai.tv, Tracker, Youtube, between others) to make media discovery and
-    browsing easy for applications that support <application>Grilo</application>
-    framework, such as <application>Totem</application> (some plugins are
-    disabled in <application>Totem</application>).</para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&grilo-plugins-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&grilo-plugins-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &grilo-plugins-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &grilo-plugins-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &grilo-plugins-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &grilo-plugins-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Grilo-Plugins Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="grilo"/>,
-      <xref linkend="libgcrypt"/> and
-      <xref linkend="sqlite"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libsoup"/>,
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="totem-pl-parser"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="avahi"/>,
-      <xref linkend="gmime"/> (Podcasts),
-      <xref linkend="gnome-online-accounts"/> (Flickr),
-      <xref linkend="json-glib"/> (TMDB),
-      <xref linkend="libgdata"/> (YouTube),
-      <xref linkend="libmediaart"/> (local-art),
-      <xref linkend="liboauth"/> (to configure Flickr personal accounts),
-      <xref linkend="lua"/> (Lua Factory),
-      <xref linkend="tracker"/> (Tracker),
-      <ulink url="&gnome-download-http;/gom/">GOM</ulink>,
-      <ulink url="&gnome-download-http;/gupnp-av/">GuPNP-AV</ulink> (GUPnP),
-      <ulink url="https://www.flyn.org/projects/libdmapsharing/">libdmapsharing</ulink> (DMAP) and
-      <ulink url="http://sourceforge.net/projects/quvi">libquvi (version 0.9)</ulink> (Youtube)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/grilo-plugins"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Grilo-Plugins</title>
-
-    <para>Install <application>Grilo-Plugins</application> by running the
-    following commands:</para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue:
-      <command>make check 2&gt;&amp;1 | tee check.log</command>.
-      A summary can be obtained with
-      <command>egrep '(TEST|PASS)' check.log</command>.
-    </para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      To test which plugins are installed and that <xref linkend="grilo"/> is
-      working, issue  <command>grl-inspect-0.2</command> or 
-      <command>grilo-test-ui-0.2</command> (the latter, from an X terminal).
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>Several under /usr/lib/grilo-0.2, with names related to the
-          respective plugins.</seg>
-        <seg>/usr/lib/grilo-0.2,
-             /usr/share/help/C/grilo-plugins and
-             /usr/share/grilo-plugins</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: multimedia/libdriv/grilo-plugins.xml
===================================================================
--- multimedia/libdriv/grilo-plugins.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ multimedia/libdriv/grilo-plugins.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -0,0 +1,149 @@
+<?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 grilo-plugins-download-http "&gnome-download-http;/grilo-plugins/0.2/grilo-plugins-&grilo-plugins-version;.tar.xz">
+  <!ENTITY grilo-plugins-download-ftp  "&gnome-download-ftp;/grilo-plugins/0.2/grilo-plugins-&grilo-plugins-version;.tar.xz">
+  <!ENTITY grilo-plugins-md5sum        "45030aab3f21b561b1c899ebb7dce54d">
+  <!ENTITY grilo-plugins-size          "980 KB">
+  <!ENTITY grilo-plugins-buildsize     "25 MB (all plugins)">
+  <!ENTITY grilo-plugins-time          "0.3 SBU">
+]>
+
+<sect1 id="grilo-plugins" xreflabel="Grilo-Plugins-&grilo-plugins-version;">
+  <?dbhtml filename="grilo-plugins.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Grilo-Plugins-&grilo-plugins-version;</title>
+
+  <indexterm zone="grilo-plugins">
+    <primary sortas="a-Grilo-Plugins">Grilo-Plugins</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Grilo-Plugins</title>
+
+    <para><application>Grilo-Plugins</application> is a collection of plugins
+    (Apple Trailers, Blip.tv, Bookmarks, Filesystem, Flickr, Jamendo, Magnatune,
+    Rai.tv, Tracker, Youtube, between others) to make media discovery and
+    browsing easy for applications that support <application>Grilo</application>
+    framework, such as <application>Totem</application> (some plugins are
+    disabled in <application>Totem</application>).</para>
+
+    &lfs76_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&grilo-plugins-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&grilo-plugins-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &grilo-plugins-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &grilo-plugins-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &grilo-plugins-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &grilo-plugins-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Grilo-Plugins Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="grilo"/>,
+      <xref linkend="libgcrypt"/> and
+      <xref linkend="sqlite"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="libsoup"/>,
+      <xref linkend="gobject-introspection"/> and
+      <xref linkend="totem-pl-parser"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="avahi"/>,
+      <xref linkend="gmime"/> (Podcasts),
+      <xref linkend="gnome-online-accounts"/> (Flickr),
+      <xref linkend="json-glib"/> (TMDB),
+      <xref linkend="libgdata"/> (YouTube),
+      <xref linkend="libmediaart"/> (local-art),
+      <xref linkend="liboauth"/> (to configure Flickr personal accounts),
+      <xref linkend="lua"/> (Lua Factory),
+      <xref linkend="tracker"/> (Tracker),
+      <ulink url="&gnome-download-http;/gom/">GOM</ulink>,
+      <ulink url="&gnome-download-http;/gupnp-av/">GuPNP-AV</ulink> (GUPnP),
+      <ulink url="https://www.flyn.org/projects/libdmapsharing/">libdmapsharing</ulink> (DMAP) and
+      <ulink url="http://sourceforge.net/projects/quvi">libquvi (version 0.9)</ulink> (Youtube)
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/grilo-plugins"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Grilo-Plugins</title>
+
+    <para>Install <application>Grilo-Plugins</application> by running the
+    following commands:</para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue:
+      <command>make check 2&gt;&amp;1 | tee check.log</command>.
+      A summary can be obtained with
+      <command>egrep '(TEST|PASS)' check.log</command>.
+    </para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+    <para>
+      To test which plugins are installed and that <xref linkend="grilo"/> is
+      working, issue  <command>grl-inspect-0.2</command> or 
+      <command>grilo-test-ui-0.2</command> (the latter, from an X terminal).
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>None</seg>
+        <seg>Several under /usr/lib/grilo-0.2, with names related to the
+          respective plugins.</seg>
+        <seg>/usr/lib/grilo-0.2,
+             /usr/share/help/C/grilo-plugins and
+             /usr/share/grilo-plugins</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+</sect1>
Index: ltimedia/libdriv/gst-plugins-base-systemd.xml
===================================================================
--- multimedia/libdriv/gst-plugins-base-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,237 +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 gst-plugins-base-download-http "&gnome-download-http;/gst-plugins-base/0.10/gst-plugins-base-&gst-plugins-base-version;.tar.xz">
-  <!ENTITY gst-plugins-base-download-ftp  "&gnome-download-ftp;/gst-plugins-base/0.10/gst-plugins-base-&gst-plugins-base-version;.tar.xz">
-  <!ENTITY gst-plugins-base-md5sum        "3d2337841b132fe996e5eb2396ac9438">
-  <!ENTITY gst-plugins-base-size          "2.3 MB">
-  <!ENTITY gst-plugins-base-buildsize     "105 MB">
-  <!ENTITY gst-plugins-base-time          "1.7 SBU">
-]>
-
-<sect1 id="gst-plugins-base"
-       xreflabel="gst-plugins-base-&gst-plugins-base-version;">
-  <?dbhtml filename="gst-plugins-base.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>gst-plugins-base-&gst-plugins-base-version;</title>
-
-  <indexterm zone="gst-plugins-base">
-    <primary sortas="a-GStreamer-Base-Plug-ins">GStreamer Base Plug-ins</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GStreamer Base Plug-ins</title>
-
-    <para>
-      The <application>GStreamer Base Plug-ins</application> is a
-      well-groomed and well-maintained collection of
-      <application>GStreamer</application> plug-ins and elements, spanning the
-      range of possible types of elements one would want to write for
-      <application>GStreamer</application>. It also contains helper libraries
-      and base classes useful for writing elements. A wide range of video and
-      audio decoders, encoders, and filters are included. Also see the
-      <xref linkend="gst-plugins-bad"/>, <xref linkend="gst-plugins-good"/>,
-      <xref linkend="gst-plugins-ugly"/>, and <xref linkend="gst-ffmpeg"/>
-      packages.
-    </para>
-
-    &lfs76_checked;
-
-    &gst-compat;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gst-plugins-base-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gst-plugins-base-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gst-plugins-base-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gst-plugins-base-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gst-plugins-base-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gst-plugins-base-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional patch:
-          <ulink url="&patch-root;/gst-plugins-base-&gst-plugins-base-version;-gcc_4_9_0_i686-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GStreamer Base Plug-ins Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gstreamer"/> and
-      <xref linkend="pango"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="libogg"/>,
-      <xref linkend="libtheora"/>,
-      <xref linkend="libvorbis"/>,
-      <xref linkend="systemd"/> (for GUdev), and
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
-    <para role="optional">
-      <xref linkend="gobject-introspection"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cdparanoia"/>,
-      <xref linkend="gtk3"/> (required to build the examples),
-      <ulink url="http://sourceforge.net/projects/libvisual/">libvisual</ulink>,
-      <ulink url="http://code.entropywave.com/projects/orc/">ORC</ulink>,
-      <xref linkend="check"/> (required to run the unit regression tests), and
-      <xref linkend="valgrind"/>
-      (optionaly used during the unit regression tests)
-    </para>
-
-    <bridgehead renderas="sect4">Optional (Required to Rebuild the API
-    Documentation)</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="python2"/> 
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gst-plugins-base"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GStreamer Base Plug-ins</title>
-
-    <para>
-      First, if you are using i686, fix a compile problem inroduced by
-      <application>&gcc-490;</application>:
-    </para>
-
-<screen role="nodump"><userinput>patch -Np1 -i ../gst-plugins-base-&gst-plugins-base-version;-gcc_4_9_0_i686-1.patch</userinput></screen>
-
-    <para>
-      Install <application>GStreamer Base Plug-ins</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static \
-            --with-package-name="GStreamer Base Plugins &gst-plugins-base-version; BLFS" \
-            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/&blfs-version;/" &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To run the unit regression tests, issue: <command>make check</command>.
-      There are many other <filename>Makefile</filename> targets you can specify
-      for running the tests, issue <command>make -C tests/check help</command>
-      to see the complete list.
-    </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"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gst-visualise-0.10
-        </seg>
-        <seg>
-          libgstapp-0.10.so, libgstaudio-0.10.so, libgstcdda-0.10.so, libgstfft-0.10.so,
-          libgstinterfaces-0.10.so, libgstnetbuffer-0.10.so, libgstpbutils-0.10.so,
-          libgstriff-0.10.so, libgstrtp-0.10.so, libgstrtsp-0.10.so, libgstsdp-0.10.so,
-          libgsttag-0.10.so and libgstvideo-0.10.so
-        </seg>
-        <seg>
-          /usr/include/gstreamer-0.10/gst/{app,audio,cdda,fft,floatcast,interfaces,netbuffer}
-          /usr/include/gstreamer-0.10/gst/{pbutils,riff,rtp,rtsp,sdp,tag,video},
-          /usr/share/gst-plugins-base,
-          /usr/share/gtk-doc/html/gst-plugins-base-libs-0.10 and
-          /usr/share/gtk-doc/html/gst-plugins-base-plugins-0.10
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gst-visualise">
-        <term><command>gst-visualise-0.10</command></term>
-        <listitem>
-          <para>
-            is used to run a basic <application>GStreamer</application>
-            pipeline to display a graphical visualisation of an audio stream.
-          </para>
-          <indexterm zone="gst-plugins-base gst-visualise">
-            <primary sortas="b-gst-visualise">gst-visualise-0.10</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: multimedia/libdriv/gst-plugins-base.xml
===================================================================
--- multimedia/libdriv/gst-plugins-base.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ multimedia/libdriv/gst-plugins-base.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -18,6 +18,6 @@
 
   <sect1info>
-    <othername>$LastChangedBy: krejzi $</othername>
-    <date>$Date: 2014-10-29 23:06:49 +0100 (Wed, 29 Oct 2014) $</date>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
   </sect1info>
 
@@ -44,5 +44,5 @@
     </para>
 
-    &lfs77_checked;
+    &lfs76_checked;
 
     &gst-compat;
@@ -103,8 +103,8 @@
     <para role="recommended">
       <xref linkend="alsa-lib"/>,
-      <xref linkend="libgudev"/>,
       <xref linkend="libogg"/>,
       <xref linkend="libtheora"/>,
-      <xref linkend="libvorbis"/>, and
+      <xref linkend="libvorbis"/>,
+      <xref linkend="systemd"/> (for GUdev), and
       <xref linkend="xorg7-lib"/>
     </para>
Index: ltimedia/libdriv/gst10-plugins-good-systemd.xml
===================================================================
--- multimedia/libdriv/gst10-plugins-good-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,179 +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 gst10-plugins-good-download-http
-           "&gstreamer-dl;/gst-plugins-good/gst-plugins-good-&gst10-plugins-good-version;.tar.xz">
-  <!ENTITY gst10-plugins-good-download-ftp  " ">
-  <!ENTITY gst10-plugins-good-md5sum        "673cf9276952bd3937dafd817c9ead2b">
-  <!ENTITY gst10-plugins-good-size          "2.9 MB">
-  <!ENTITY gst10-plugins-good-buildsize     "107 MB (additional 10 MB to run the test suite)">
-  <!ENTITY gst10-plugins-good-time          "1.3 SBU (additional 1 SBU to run the test suite)">
-]>
-
-<sect1 id="gst10-plugins-good" xreflabel="gst-plugins-good-&gst10-plugins-good-version;">
-  <?dbhtml filename="gst10-plugins-good.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>gst-plugins-good-&gst10-plugins-good-version;</title>
-
-  <indexterm zone="gst10-plugins-good">
-    <primary sortas="a-gst-plugins-good">gst-plugins-good</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GStreamer Good Plug-ins</title>
-
-    <para>
-      The <application>GStreamer Good Plug-ins</application> is a set of plug-ins
-      considered by the <application>GStreamer</application> developers to have
-      good quality code, correct functionality, and the preferred license (LGPL
-      for the plug-in code, LGPL or LGPL-compatible for the supporting library).
-      A wide range of video and audio decoders, encoders, and filters are included.
-    </para>
-
-    &lfs76_checked;
-
-    &gst-compat;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gst10-plugins-good-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gst10-plugins-good-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gst10-plugins-good-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gst10-plugins-good-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gst10-plugins-good-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gst10-plugins-good-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GStreamer Good Plug-ins Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gst10-plugins-base"/>
-    </para>
-
-    <!-- Common formats, output and input codecs and requirements
-    for GNOME apps. What's a multimedia framework useful if it
-    can't be used to play anything (common)? -->
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="cairo"/>,
-      <xref linkend="flac"/>,
-      <xref linkend="gdk-pixbuf"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libsoup"/>,
-      <xref linkend="libvpx"/>, and
-      <xref linkend="xorg7-lib"/> <!-- build time requirements only,
-      you don't need either apps, fonts or xorg server to build this
-      package. You'll need xserver for any X app that wants to play
-      something though, but that should be obvious. -->
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="aalib"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="libdv"/>,
-      <xref linkend="pulseaudio"/>,
-      <xref linkend="speex"/>,
-      <xref linkend="taglib"/>,
-      <xref linkend="systemd"/> (for GUdev),
-      <xref linkend="valgrind"/>,
-      <ulink url="http://jackaudio.org/">JACK</ulink>,
-      <ulink url="http://caca.zoy.org/wiki/libcaca">libcaca</ulink>,
-      <ulink url="http://sourceforge.net/projects/libraw1394/">libiec61883</ulink>,
-      <ulink url="http://sourceforge.net/projects/libraw1394/">libraw1394</ulink>,
-      <ulink url="http://www.icecast.org/download.php">libshout</ulink>,
-      <ulink url="http://code.entropywave.com/orc/">ORC</ulink>,
-      <ulink url="http://linuxtv.org/downloads/v4l-utils/">Video4Linux</ulink>, and
-      <ulink url="http://wavpack.com/">WavPack</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/gst10-plugins-good"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GStreamer Good Plug-ins</title>
-
-    <para>
-      Install <application>GStreamer Good Plug-ins</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --with-package-name="GStreamer Good Plugins &gst10-plugins-good-version; BLFS" \
-            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/&blfs-version;/" &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make -k check</command>. Some tests
-      are known to fail.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          Several plugins under /usr/lib/gstreamer-1.0
-        </seg>
-        <seg>
-          /usr/share/gstreamer-1.0/presets and
-          /usr/share/gtk-doc/html/gst-plugins-good-plugins-1.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/libcanberra-systemd.xml
===================================================================
--- multimedia/libdriv/libcanberra-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,253 +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 libcanberra-download-http
-           "http://0pointer.de/lennart/projects/libcanberra/libcanberra-&libcanberra-version;.tar.xz">
-  <!ENTITY libcanberra-download-ftp  " ">
-  <!ENTITY libcanberra-md5sum        "34cb7e4430afaf6f447c4ebdb9b42072">
-  <!ENTITY libcanberra-size          "312 KB">
-  <!ENTITY libcanberra-buildsize     "7.5 MB">
-  <!ENTITY libcanberra-time          "0.1 SBU">
-]>
-
-<sect1 id="libcanberra" xreflabel="libcanberra-&libcanberra-version;">
-  <?dbhtml filename="libcanberra.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>libcanberra-&libcanberra-version;</title>
-
-  <indexterm zone="libcanberra">
-    <primary sortas="a-libcanberra">libcanberra</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libcanberra</title>
-
-    <para>
-      <application>libcanberra</application> is an implementation of the XDG Sound
-      Theme and Name Specifications, for generating event sounds on free desktops,
-      such as <application>GNOME</application>.
-    </para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libcanberra-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libcanberra-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libcanberra-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libcanberra-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libcanberra-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libcanberra-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libcanberra Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libvorbis"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="gstreamer10"/> and
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk2"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend='pulseaudio'/> and
-      <ulink url="http://tdb.samba.org/">tdb</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/libcanberra"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libcanberra</title>
-
-    <para>
-      Install <application>libcanberra</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-oss &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 docdir=/usr/share/doc/libcanberra-&libcanberra-version; install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Libcanberra</title>
-    
-    <sect3  id="libcanberra-init">
-      <title>Systemd Units</title>
-
-      <para>
-        To start the <command>canberra-boot</command> service at boot,
-        enable the previously installed systemd unit by
-        running the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-      <indexterm zone="libcanberra libcanberra-init">
-        <primary sortas="f-libcanberra">libcanberra</primary>
-      </indexterm>
-
-<screen role="root"><userinput>systemctl enable canberra-system-bootup</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>
-          canberra-boot and canberra-gtk-play
-        </seg>
-        <seg>
-          libcanberra-gtk.so, libcanberra-gtk3.so and
-          libcanberra.so
-        </seg>
-        <seg>
-          /usr/lib/libcanberra-&libcanberra-version;,
-          /usr/share/doc/libcanberra and
-          /usr/share/gtk-doc/html/libcanberra
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-<!--
-      <varlistentry id="canberra-boot">
-        <term><command>canberra-boot</command></term>
-        <listitem>
-          <para>
-
-          </para>
-          <indexterm zone="libcanberra canberra-boot">
-            <primary sortas="b-canberra-boot">canberra-boot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-
-      <varlistentry id="canberra-gtk-play">
-        <term><command>canberra-gtk-play</command></term>
-        <listitem>
-          <para>
-            is an application used for playing sound events.
-          </para>
-          <indexterm zone="libcanberra canberra-gtk-play">
-            <primary sortas="b-canberra-gtk-play">canberra-gtk-play</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcanberra-gtk">
-        <term><filename class="libraryfile">libcanberra-gtk.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libcanberra</application> bindings
-            for <application>GTK+ 2</application>.
-          </para>
-          <indexterm zone="libcanberra libcanberra-gtk">
-            <primary sortas="c-libcanberra-gtk">libcanberra-gtk.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcanberra-gtk3">
-        <term><filename class="libraryfile">libcanberra-gtk3.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libcanberra</application> bindings
-            for <application>GTK+ 3</application>.
-          </para>
-          <indexterm zone="libcanberra libcanberra-gtk3">
-            <primary sortas="c-libcanberra-gtk3">libcanberra-gtk3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcanberra-lib">
-        <term><filename class='libraryfile'>libcanberra.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libcanberra</application> API functions.
-          </para>
-          <indexterm zone="libcanberra libcanberra-lib">
-            <primary sortas="c-libcanberra">libcanberra.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: multimedia/libdriv/libcanberra.xml
===================================================================
--- multimedia/libdriv/libcanberra.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ multimedia/libdriv/libcanberra.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -0,0 +1,253 @@
+<?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 libcanberra-download-http
+           "http://0pointer.de/lennart/projects/libcanberra/libcanberra-&libcanberra-version;.tar.xz">
+  <!ENTITY libcanberra-download-ftp  " ">
+  <!ENTITY libcanberra-md5sum        "34cb7e4430afaf6f447c4ebdb9b42072">
+  <!ENTITY libcanberra-size          "312 KB">
+  <!ENTITY libcanberra-buildsize     "7.5 MB">
+  <!ENTITY libcanberra-time          "0.1 SBU">
+]>
+
+<sect1 id="libcanberra" xreflabel="libcanberra-&libcanberra-version;">
+  <?dbhtml filename="libcanberra.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libcanberra-&libcanberra-version;</title>
+
+  <indexterm zone="libcanberra">
+    <primary sortas="a-libcanberra">libcanberra</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libcanberra</title>
+
+    <para>
+      <application>libcanberra</application> is an implementation of the XDG Sound
+      Theme and Name Specifications, for generating event sounds on free desktops,
+      such as <application>GNOME</application>.
+    </para>
+
+    &lfs77_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libcanberra-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libcanberra-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libcanberra-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libcanberra-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libcanberra-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libcanberra-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libcanberra Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="libvorbis"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="alsa-lib"/>,
+      <xref linkend="gstreamer10"/> and
+      <xref linkend="gtk3"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk2"/>,
+      <xref linkend="gtk-doc"/>,
+      <xref linkend='pulseaudio'/> and
+      <ulink url="http://tdb.samba.org/">tdb</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/libcanberra"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libcanberra</title>
+
+    <para>
+      Install <application>libcanberra</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr --disable-oss &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 docdir=/usr/share/doc/libcanberra-&libcanberra-version; install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring Libcanberra</title>
+    
+    <sect3  id="libcanberra-init">
+      <title>Systemd Units</title>
+
+      <para>
+        To start the <command>canberra-boot</command> service at boot,
+        enable the previously installed systemd unit by
+        running the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+      <indexterm zone="libcanberra libcanberra-init">
+        <primary sortas="f-libcanberra">libcanberra</primary>
+      </indexterm>
+
+<screen role="root"><userinput>systemctl enable canberra-system-bootup</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>
+          canberra-boot and canberra-gtk-play
+        </seg>
+        <seg>
+          libcanberra-gtk.so, libcanberra-gtk3.so and
+          libcanberra.so
+        </seg>
+        <seg>
+          /usr/lib/libcanberra-&libcanberra-version;,
+          /usr/share/doc/libcanberra and
+          /usr/share/gtk-doc/html/libcanberra
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+<!--
+      <varlistentry id="canberra-boot">
+        <term><command>canberra-boot</command></term>
+        <listitem>
+          <para>
+
+          </para>
+          <indexterm zone="libcanberra canberra-boot">
+            <primary sortas="b-canberra-boot">canberra-boot</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+-->
+
+      <varlistentry id="canberra-gtk-play">
+        <term><command>canberra-gtk-play</command></term>
+        <listitem>
+          <para>
+            is an application used for playing sound events.
+          </para>
+          <indexterm zone="libcanberra canberra-gtk-play">
+            <primary sortas="b-canberra-gtk-play">canberra-gtk-play</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libcanberra-gtk">
+        <term><filename class="libraryfile">libcanberra-gtk.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>libcanberra</application> bindings
+            for <application>GTK+ 2</application>.
+          </para>
+          <indexterm zone="libcanberra libcanberra-gtk">
+            <primary sortas="c-libcanberra-gtk">libcanberra-gtk.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libcanberra-gtk3">
+        <term><filename class="libraryfile">libcanberra-gtk3.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>libcanberra</application> bindings
+            for <application>GTK+ 3</application>.
+          </para>
+          <indexterm zone="libcanberra libcanberra-gtk3">
+            <primary sortas="c-libcanberra-gtk3">libcanberra-gtk3.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libcanberra-lib">
+        <term><filename class='libraryfile'>libcanberra.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>libcanberra</application> API functions.
+          </para>
+          <indexterm zone="libcanberra libcanberra-lib">
+            <primary sortas="c-libcanberra">libcanberra.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: multimedia/libdriv/libdriv.xml
===================================================================
--- multimedia/libdriv/libdriv.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ multimedia/libdriv/libdriv.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -25,5 +25,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-lib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-plugins.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-utils-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-utils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-firmware.xml"/>
@@ -50,5 +50,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libao.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libass.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcanberra-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcanberra.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcdio.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdiscid.xml"/>
@@ -66,8 +66,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsndfile.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libtheora.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libva-systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libva-drivers-systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libvdpau-systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libvdpau-va-gl-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libva.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libva-drivers.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libvdpau.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libvdpau-va-gl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libvorbis.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libvpx.xml"/>
@@ -76,5 +76,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sbc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sdl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sound-theme-freedesktop-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sound-theme-freedesktop.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="soundtouch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="speex.xml"/>
Index: ltimedia/libdriv/libva-drivers-systemd.xml
===================================================================
--- multimedia/libdriv/libva-drivers-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,53 +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;
-]>
-
-<sect1 id="libva-drivers" xreflabel="libva drivers">
-  <?dbhtml filename="libva-drivers.html" ?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>libva drivers</title>
-
-  <indexterm zone="libva-drivers">
-    <primary sortas="a-Python-Modules">libva drivers</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libva drivers</title>
-
-    <para>
-      The <application>libva</application> drivers page contains the
-      instructions for building the drivers that are necessary in order
-      for <application>libva</application> to take the advantage of
-      the hardware that it is running on.
-    </para>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          <xref linkend="libva-intel-driver"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="libva-vdpau-driver"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-  </sect2>
-
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="libva-intel-driver-systemd.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="libva-vdpau-driver-systemd.xml"/>
-
-</sect1>
Index: multimedia/libdriv/libva-drivers.xml
===================================================================
--- multimedia/libdriv/libva-drivers.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ multimedia/libdriv/libva-drivers.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -0,0 +1,53 @@
+<?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;
+]>
+
+<sect1 id="libva-drivers" xreflabel="libva drivers">
+  <?dbhtml filename="libva-drivers.html" ?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libva drivers</title>
+
+  <indexterm zone="libva-drivers">
+    <primary sortas="a-Python-Modules">libva drivers</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libva drivers</title>
+
+    <para>
+      The <application>libva</application> drivers page contains the
+      instructions for building the drivers that are necessary in order
+      for <application>libva</application> to take the advantage of
+      the hardware that it is running on.
+    </para>
+
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          <xref linkend="libva-intel-driver"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <xref linkend="libva-vdpau-driver"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+  </sect2>
+
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="libva-intel-driver.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="libva-vdpau-driver.xml"/>
+
+</sect1>
Index: ltimedia/libdriv/libva-intel-driver-systemd.xml
===================================================================
--- multimedia/libdriv/libva-intel-driver-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,148 +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 libva-http "http://www.freedesktop.org/software/vaapi/releases">
-
-  <!ENTITY libva-intel-driver-download-http "&libva-http;/libva-intel-driver/libva-intel-driver-&libva-intel-driver-version;.tar.bz2">
-  <!ENTITY libva-intel-driver-download-ftp  " ">
-  <!ENTITY libva-intel-driver-md5sum        "93ba8b1fbe5322d3c3ef47d187f6951e">
-  <!ENTITY libva-intel-driver-size          "1.0 MB">
-  <!ENTITY libva-intel-driver-buildsize     "31 MB">
-  <!ENTITY libva-intel-driver-time          "0.2 SBU">
-]>
-
-  <!-- Begin libva Intel driver -->
-  <sect2 id="libva-intel-driver" xreflabel="libva Intel driver-&libva-intel-driver-version;">
-
-    <title>libva Intel driver-&libva-intel-driver-version;</title>
-
-    <indexterm zone="libva-intel-driver">
-      <primary sortas="a-libva-intel-driver">libva-intel-driver</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to libva Intel driver</title>
-
-      <para>
-        The <application>libva Intel driver</application> package contains the
-        <application>libva</application> driver for Intel integrated video cards
-        including 8xx, 9xx, Gxx, Qxx, and HD graphics processors (SandyBridge,
-        IvyBridge, Haswell and Broadwell).
-      </para>
-
-      &lfs77_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&libva-intel-driver-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&libva-intel-driver-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &libva-intel-driver-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &libva-intel-driver-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &libva-intel-driver-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &libva-intel-driver-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">libva Intel driver Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="libva"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <xref linkend="wayland"/> (<xref linkend="libva"/> must be built with
-        <application>Wayland</application> support)
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/libva-intel-driver"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of libva Intel driver</title>
-
-      <para>
-        Install <application>libva Intel driver</application> by running the following
-        commands:
-      </para>
-
-<screen><userinput>./configure --prefix=/usr &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>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed libva driver</segtitle>
-
-        <seglistitem>
-          <seg>
-            i965_drv_video.so
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="i965_drv_video">
-          <term><filename class="libraryfile">i965_drv_video.so</filename></term>
-          <listitem>
-            <para>
-              is a libva driver for Intel integrated graphics chipsets.
-            </para>
-            <indexterm zone="libva-intel-driver i965_drv_video">
-              <primary sortas="c-ii965_drv_video">i965_drv_video.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
-  <!-- End libva Intel driver -->
Index: multimedia/libdriv/libva-intel-driver.xml
===================================================================
--- multimedia/libdriv/libva-intel-driver.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ multimedia/libdriv/libva-intel-driver.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -0,0 +1,148 @@
+<?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 libva-http "http://www.freedesktop.org/software/vaapi/releases">
+
+  <!ENTITY libva-intel-driver-download-http "&libva-http;/libva-intel-driver/libva-intel-driver-&libva-intel-driver-version;.tar.bz2">
+  <!ENTITY libva-intel-driver-download-ftp  " ">
+  <!ENTITY libva-intel-driver-md5sum        "93ba8b1fbe5322d3c3ef47d187f6951e">
+  <!ENTITY libva-intel-driver-size          "1.0 MB">
+  <!ENTITY libva-intel-driver-buildsize     "31 MB">
+  <!ENTITY libva-intel-driver-time          "0.2 SBU">
+]>
+
+  <!-- Begin libva Intel driver -->
+  <sect2 id="libva-intel-driver" xreflabel="libva Intel driver-&libva-intel-driver-version;">
+
+    <title>libva Intel driver-&libva-intel-driver-version;</title>
+
+    <indexterm zone="libva-intel-driver">
+      <primary sortas="a-libva-intel-driver">libva-intel-driver</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to libva Intel driver</title>
+
+      <para>
+        The <application>libva Intel driver</application> package contains the
+        <application>libva</application> driver for Intel integrated video cards
+        including 8xx, 9xx, Gxx, Qxx, and HD graphics processors (SandyBridge,
+        IvyBridge, Haswell and Broadwell).
+      </para>
+
+      &lfs77_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&libva-intel-driver-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&libva-intel-driver-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &libva-intel-driver-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &libva-intel-driver-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &libva-intel-driver-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &libva-intel-driver-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">libva Intel driver Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="libva"/>
+      </para>
+
+      <bridgehead renderas="sect5">Optional</bridgehead>
+      <para role="optional">
+        <xref linkend="wayland"/> (<xref linkend="libva"/> must be built with
+        <application>Wayland</application> support)
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/libva-intel-driver"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of libva Intel driver</title>
+
+      <para>
+        Install <application>libva Intel driver</application> by running the following
+        commands:
+      </para>
+
+<screen><userinput>./configure --prefix=/usr &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>
+
+    </sect3>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed libva driver</segtitle>
+
+        <seglistitem>
+          <seg>
+            i965_drv_video.so
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <variablelist>
+        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
+        <?dbfo list-presentation="list"?>
+        <?dbhtml list-presentation="table"?>
+
+        <varlistentry id="i965_drv_video">
+          <term><filename class="libraryfile">i965_drv_video.so</filename></term>
+          <listitem>
+            <para>
+              is a libva driver for Intel integrated graphics chipsets.
+            </para>
+            <indexterm zone="libva-intel-driver i965_drv_video">
+              <primary sortas="c-ii965_drv_video">i965_drv_video.so</primary>
+            </indexterm>
+          </listitem>
+        </varlistentry>
+
+      </variablelist>
+
+    </sect3>
+
+  </sect2>
+  <!-- End libva Intel driver -->
Index: ltimedia/libdriv/libva-systemd.xml
===================================================================
--- multimedia/libdriv/libva-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,201 +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 libva-http "http://www.freedesktop.org/software/vaapi/releases">
-
-  <!ENTITY libva-download-http "&libva-http;/libva/libva-&libva-version;.tar.bz2">
-  <!ENTITY libva-download-ftp  " ">
-  <!ENTITY libva-md5sum        "d6d34cd725a0100a5e476e711838e1b1">
-  <!ENTITY libva-size          "744 KB">
-  <!ENTITY libva-buildsize     "20 MB">
-  <!ENTITY libva-time          "0.2 SBU">
-]>
-
-<sect1 id="libva" xreflabel="libva-&libva-version;">
-  <?dbhtml filename="libva.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>libva-&libva-version;</title>
-
-  <indexterm zone="libva">
-    <primary sortas="a-libva">libva</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libva</title>
-
-    <para>
-      The <application>libva</application> package contains a library which
-      provides access to hardware accelerated video processing, using hardware
-      to accelerate video processing in order to offload the central
-      processing unit (CPU) to decode and encode compressed digital video. VA
-      API video decode/encode interface is platform and window system
-      independent targeted at Direct Rendering Infrastructure (DRI) in the X
-      Window System however it can potentially also be used with direct
-      framebuffer and graphics sub-systems for video output. Accelerated
-      processing includes support for video decoding, video encoding,
-      subpicture blending, and rendering.
-    </para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libva-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libva-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libva-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libva-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libva-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libva-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libva Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libdrm"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="mesalib"/>,
-      <xref linkend="wayland"/> and
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>
-    </para>
-
-    <note>
-      <para>
-        There is a circular dependency between <xref linkend="mesalib"/>
-        and this package. If you need the VAAPI driver provided by
-        <xref linkend="mesalib"/>, build this package without EGL and
-        GLX support, install <application>MesaLib</application>, then
-        reinstall this package with EGL and GLX support.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect4">Runtime Dependency</bridgehead>
-    <para role="optional">
-      At least one of <xref linkend="libva-drivers"/> or the
-      driver shipped within <xref linkend="mesalib"/> for the
-      Radeon hardware.
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/libva"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libva</title>
-
-    <para>
-      Install <application>libva</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &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>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          avcenc, h264encode, jpegenc, loadjpeg, mpeg2vaenc,
-          mpeg2vldemo, putsurface, putsurface_wayland and
-          vainfo
-        </seg>
-        <seg>
-          libva-drm.so, libva-egl.so, libva-glx.so, libva.so,
-          libva-tpi.so, libva-wayland.so and libva-x11.so
-        </seg>
-        <seg>
-          /usr/include/va
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libva-lib">
-        <term><filename class="libraryfile">libva.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions which provide access to hardware
-            accelerated video processing.
-          </para>
-          <indexterm zone="libva libva-lib">
-            <primary sortas="c-libva">libva.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/libva-vdpau-driver-systemd.xml
===================================================================
--- multimedia/libdriv/libva-vdpau-driver-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,153 +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 libva-http "http://www.freedesktop.org/software/vaapi/releases">
-
-  <!ENTITY libva-vdpau-driver-download-http "&libva-http;/libva-vdpau-driver/libva-vdpau-driver-&libva-vdpau-driver-version;.tar.bz2">
-  <!ENTITY libva-vdpau-driver-download-ftp  " ">
-  <!ENTITY libva-vdpau-driver-md5sum        "5ec6d452d2dd307434ea3d32da49c3e5">
-  <!ENTITY libva-vdpau-driver-size          "312 KB">
-  <!ENTITY libva-vdpau-driver-buildsize     "4.9 MB">
-  <!ENTITY libva-vdpau-driver-time          "0.1 SBU">
-]>
-
-  <!-- Begin libva VDPAU driver -->
-  <sect2 id="libva-vdpau-driver" xreflabel="libva VDPAU driver-&libva-vdpau-driver-version;">
-
-    <title>libva VDPAU driver-&libva-vdpau-driver-version;</title>
-
-    <indexterm zone="libva-vdpau-driver">
-      <primary sortas="a-libva-vdpau-driver">libva-vdpau-driver</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to libva VDPAU driver</title>
-
-      <para>
-        The <application>libva VDPAU driver</application> package contains the
-        <application>libva</application> driver for hardware that supports
-        VDPAU.
-      </para>
-
-      &lfs77_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&libva-vdpau-driver-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&libva-vdpau-driver-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &libva-vdpau-driver-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &libva-vdpau-driver-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &libva-vdpau-driver-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &libva-vdpau-driver-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Additional Downloads</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Required patch:
-            <ulink url="&patch-root;/libva-vdpau-driver-&libva-vdpau-driver-version;-build_fixes-1.patch"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">libva VDPAU driver Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="libva"/> and
-        <xref linkend="libvdpau"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/libva-vdpau-driver"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of libva VDPAU driver</title>
-
-      <para>
-        Install <application>libva VDPAU driver</application> by running the following
-        commands:
-      </para>
-
-<screen><userinput>patch -Np1 -i ../libva-vdpau-driver-&libva-vdpau-driver-version;-build_fixes-1.patch &amp;&amp;
-./configure --prefix=/usr &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>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed libva drivers</segtitle>
-
-        <seglistitem>
-          <seg>
-            nvidia_drv_video.so, s3g_drv_video.so and vdpau_drv_video.so
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="vdpau_drv_video">
-          <term><filename class="libraryfile">vdpau_drv_video.so</filename></term>
-          <listitem>
-            <para>
-              is a libva driver for hardware that supports VDPAU.
-            </para>
-            <indexterm zone="libva-vdpau-driver vdpau_drv_video">
-              <primary sortas="c-ivdpau_drv_video">vdpau_drv_video.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
-  <!-- End libva VDPAU driver -->
Index: multimedia/libdriv/libva-vdpau-driver.xml
===================================================================
--- multimedia/libdriv/libva-vdpau-driver.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ multimedia/libdriv/libva-vdpau-driver.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -0,0 +1,153 @@
+<?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 libva-http "http://www.freedesktop.org/software/vaapi/releases">
+
+  <!ENTITY libva-vdpau-driver-download-http "&libva-http;/libva-vdpau-driver/libva-vdpau-driver-&libva-vdpau-driver-version;.tar.bz2">
+  <!ENTITY libva-vdpau-driver-download-ftp  " ">
+  <!ENTITY libva-vdpau-driver-md5sum        "5ec6d452d2dd307434ea3d32da49c3e5">
+  <!ENTITY libva-vdpau-driver-size          "312 KB">
+  <!ENTITY libva-vdpau-driver-buildsize     "4.9 MB">
+  <!ENTITY libva-vdpau-driver-time          "0.1 SBU">
+]>
+
+  <!-- Begin libva VDPAU driver -->
+  <sect2 id="libva-vdpau-driver" xreflabel="libva VDPAU driver-&libva-vdpau-driver-version;">
+
+    <title>libva VDPAU driver-&libva-vdpau-driver-version;</title>
+
+    <indexterm zone="libva-vdpau-driver">
+      <primary sortas="a-libva-vdpau-driver">libva-vdpau-driver</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to libva VDPAU driver</title>
+
+      <para>
+        The <application>libva VDPAU driver</application> package contains the
+        <application>libva</application> driver for hardware that supports
+        VDPAU.
+      </para>
+
+      &lfs77_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&libva-vdpau-driver-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&libva-vdpau-driver-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &libva-vdpau-driver-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &libva-vdpau-driver-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &libva-vdpau-driver-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &libva-vdpau-driver-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">Additional Downloads</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Required patch:
+            <ulink url="&patch-root;/libva-vdpau-driver-&libva-vdpau-driver-version;-build_fixes-1.patch"/>
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">libva VDPAU driver Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="libva"/> and
+        <xref linkend="libvdpau"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/libva-vdpau-driver"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of libva VDPAU driver</title>
+
+      <para>
+        Install <application>libva VDPAU driver</application> by running the following
+        commands:
+      </para>
+
+<screen><userinput>patch -Np1 -i ../libva-vdpau-driver-&libva-vdpau-driver-version;-build_fixes-1.patch &amp;&amp;
+./configure --prefix=/usr &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>
+
+    </sect3>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed libva drivers</segtitle>
+
+        <seglistitem>
+          <seg>
+            nvidia_drv_video.so, s3g_drv_video.so and vdpau_drv_video.so
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <variablelist>
+        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
+        <?dbfo list-presentation="list"?>
+        <?dbhtml list-presentation="table"?>
+
+        <varlistentry id="vdpau_drv_video">
+          <term><filename class="libraryfile">vdpau_drv_video.so</filename></term>
+          <listitem>
+            <para>
+              is a libva driver for hardware that supports VDPAU.
+            </para>
+            <indexterm zone="libva-vdpau-driver vdpau_drv_video">
+              <primary sortas="c-ivdpau_drv_video">vdpau_drv_video.so</primary>
+            </indexterm>
+          </listitem>
+        </varlistentry>
+
+      </variablelist>
+
+    </sect3>
+
+  </sect2>
+  <!-- End libva VDPAU driver -->
Index: multimedia/libdriv/libva.xml
===================================================================
--- multimedia/libdriv/libva.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ multimedia/libdriv/libva.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -0,0 +1,201 @@
+<?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 libva-http "http://www.freedesktop.org/software/vaapi/releases">
+
+  <!ENTITY libva-download-http "&libva-http;/libva/libva-&libva-version;.tar.bz2">
+  <!ENTITY libva-download-ftp  " ">
+  <!ENTITY libva-md5sum        "d6d34cd725a0100a5e476e711838e1b1">
+  <!ENTITY libva-size          "744 KB">
+  <!ENTITY libva-buildsize     "20 MB">
+  <!ENTITY libva-time          "0.2 SBU">
+]>
+
+<sect1 id="libva" xreflabel="libva-&libva-version;">
+  <?dbhtml filename="libva.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libva-&libva-version;</title>
+
+  <indexterm zone="libva">
+    <primary sortas="a-libva">libva</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libva</title>
+
+    <para>
+      The <application>libva</application> package contains a library which
+      provides access to hardware accelerated video processing, using hardware
+      to accelerate video processing in order to offload the central
+      processing unit (CPU) to decode and encode compressed digital video. VA
+      API video decode/encode interface is platform and window system
+      independent targeted at Direct Rendering Infrastructure (DRI) in the X
+      Window System however it can potentially also be used with direct
+      framebuffer and graphics sub-systems for video output. Accelerated
+      processing includes support for video decoding, video encoding,
+      subpicture blending, and rendering.
+    </para>
+
+    &lfs77_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libva-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libva-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libva-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libva-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libva-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libva-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libva Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="libdrm"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="mesalib"/>,
+      <xref linkend="wayland"/> and
+      <xref linkend="xorg7-lib"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="doxygen"/>
+    </para>
+
+    <note>
+      <para>
+        There is a circular dependency between <xref linkend="mesalib"/>
+        and this package. If you need the VAAPI driver provided by
+        <xref linkend="mesalib"/>, build this package without EGL and
+        GLX support, install <application>MesaLib</application>, then
+        reinstall this package with EGL and GLX support.
+      </para>
+    </note>
+
+    <bridgehead renderas="sect4">Runtime Dependency</bridgehead>
+    <para role="optional">
+      At least one of <xref linkend="libva-drivers"/> or the
+      driver shipped within <xref linkend="mesalib"/> for the
+      Radeon hardware.
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/libva"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libva</title>
+
+    <para>
+      Install <application>libva</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr --disable-static &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>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          avcenc, h264encode, jpegenc, loadjpeg, mpeg2vaenc,
+          mpeg2vldemo, putsurface, putsurface_wayland and
+          vainfo
+        </seg>
+        <seg>
+          libva-drm.so, libva-egl.so, libva-glx.so, libva.so,
+          libva-tpi.so, libva-wayland.so and libva-x11.so
+        </seg>
+        <seg>
+          /usr/include/va
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libva-lib">
+        <term><filename class="libraryfile">libva.so</filename></term>
+        <listitem>
+          <para>
+            contains API functions which provide access to hardware
+            accelerated video processing.
+          </para>
+          <indexterm zone="libva libva-lib">
+            <primary sortas="c-libva">libva.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: ltimedia/libdriv/libvdpau-systemd.xml
===================================================================
--- multimedia/libdriv/libvdpau-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,196 +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 libvdpau-download-http "http://people.freedesktop.org/~aplattner/vdpau/libvdpau-&libvdpau-version;.tar.gz">
-  <!ENTITY libvdpau-download-ftp  " ">
-  <!ENTITY libvdpau-md5sum        "11a842df9fbaad0f5f10cf553b8d5690">
-  <!ENTITY libvdpau-size          "416 KB">
-  <!ENTITY libvdpau-buildsize     "9.2 MB">
-  <!ENTITY libvdpau-time          "0.1 SBU">
-]>
-
-<sect1 id="libvdpau" xreflabel="libvdpau-&libvdpau-version;">
-  <?dbhtml filename="libvdpau.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>libvdpau-&libvdpau-version;</title>
-
-  <indexterm zone="libvdpau">
-    <primary sortas="a-libvdpau">libvdpau</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libvdpau</title>
-
-    <para>
-      The <application>libvdpau</application> package contains a library which
-      implements VDPAU.
-    </para>
-
-    <para>
-      VDPAU (Video Decode and Presentation API for Unix) is an open source
-      library (libvdpau) and API originally designed by Nvidia for its
-      GeForce 8 series and later GPU hardware targeted at the X Window System
-      This VDPAU API allows video programs to offload portions of the video
-      decoding process and video post-processing to the GPU video-hardware.
-    </para>
-
-    <para>
-      Currently, the portions capable of being offloaded by VDPAU onto the GPU
-      are motion compensation (mo comp), inverse discrete cosine transform
-      (iDCT), VLD (variable-length decoding) and deblocking for MPEG-1, MPEG-2,
-      MPEG-4 ASP (MPEG-4 Part 2), H.264/MPEG-4 AVC and VC-1, WMV3/WMV9 encoded
-      videos.  Which specific codecs of these that can be offloaded to the
-      GPU depends on the version of the GPU hardware; specifically,
-      to also decode MPEG-4 ASP (MPEG-4 Part 2), Xvid/OpenDivX (DivX 4), and
-      DivX 5 formats, a GeForce 200M (2xxM) Series (the eleventh generation of
-      Nvidia's GeForce graphics processing units) or newer GPU hardware is
-      required.
-    </para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libvdpau-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libvdpau-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libvdpau-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libvdpau-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libvdpau-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libvdpau-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libvdpau Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect5">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>,
-      <xref linkend="graphviz"/>, and
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
-    </para>
-
-    <bridgehead renderas="sect4">Runtime Dependency</bridgehead>
-    <para role="optional">
-      <xref linkend="mesalib"/> (with the corresponding VDPAU driver) or
-      <xref linkend="libvdpau-va-gl"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/libvdpau"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libvdpau</title>
-
-    <para>
-      Install <application>libvdpau</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr     \
-            --sysconfdir=/etc \
-            --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"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libvdpau.so
-        </seg>
-        <seg>
-          /usr/include/libvdpau and
-          /usr/lib/libvdpau
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libvdpau-lib">
-        <term><filename class="libraryfile">libvdpau.so</filename></term>
-        <listitem>
-          <para>
-            contains functions to offload portions of the video decoding
-            process and video post-processing to the GPU video-hardware.
-          </para>
-          <indexterm zone="libvdpau libvdpau-lib">
-            <primary sortas="c-libvdpau">libvdpau.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ltimedia/libdriv/libvdpau-va-gl-systemd.xml
===================================================================
--- multimedia/libdriv/libvdpau-va-gl-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,192 +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 libvdpau-va-gl-download-http "https://github.com/i-rinat/libvdpau-va-gl/releases/download/v&libvdpau-va-gl-version;/libvdpau-va-gl-&libvdpau-va-gl-version;.tar.gz">
-  <!ENTITY libvdpau-va-gl-download-ftp  " ">
-  <!ENTITY libvdpau-va-gl-md5sum        "09ceb2f75eafccc9b002d35ede0de6a5">
-  <!ENTITY libvdpau-va-gl-size          "100 KB">
-  <!ENTITY libvdpau-va-gl-buildsize     "4.0 MB">
-  <!ENTITY libvdpau-va-gl-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libvdpau-va-gl" xreflabel="libvdpau-va-gl-&libvdpau-va-gl-version;">
-  <?dbhtml filename="libvdpau-va-gl.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>libvdpau-va-gl-&libvdpau-va-gl-version;</title>
-
-  <indexterm zone="libvdpau-va-gl">
-    <primary sortas="a-libvdpau-va-gl">libvdpau-va-gl</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libvdpau-va-gl</title>
-
-    <para>
-      The <application>libvdpau-va-gl</application> package contains
-      the VDPAU driver for hardware that supports VAAPI.
-    </para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libvdpau-va-gl-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libvdpau-va-gl-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libvdpau-va-gl-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libvdpau-va-gl-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libvdpau-va-gl-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libvdpau-va-gl-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <!-- It's been fixed upstream.  Lets see if it stays fixed ...
-    <note>
-      <para>
-        The tarball name for libvdpau-va-gl does not include
-        the package name, although it does expand to
-        libvdpau-va-gl-&libvdpau-va-gl-version;.
-        The file should be renamed after downloading:
-      </para>
-
-<screen><command>mv v&libvdpau-va-gl-version;.tar.gz libvdpau-va-gl-&libvdpau-va-gl-version;.tar.gz</command></screen>
-    </note>-->
-
-    <bridgehead renderas="sect3">libvdpau-va-gl Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>,
-      <xref linkend="ffmpeg"/>,
-      <xref linkend="glu"/>,
-      <xref linkend="libva"/>, and
-      <xref linkend="libvdpau"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/libvdpau-va-gl"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libvdpau-va-gl</title>
-
-    <para>
-      Install <application>libvdpau-va-gl</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command> from an X terminal.
-    </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>
-      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used
-      to apply higher level of the compiler optimizations.
-    </para>
-
-  </sect2>
-
-  <sect2 role="using">
-    <title>Using libvdpau-va-gl</title>
-
-    <para>
-      To use this driver with VDPAU apps, you need to set the <envar>VDPAU_DRIVER</envar>
-      environment variable to <parameter>va_gl</parameter>.
-    </para>
-
-    <para>
-      You can permanently set the environment variable by expanding the system
-      wide configuration. Run the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/libvdpau-va-gl.sh &lt;&lt; "EOF"
-<literal># Begin /etc/profile.d/libvdpau-va-gl.sh
-
-export VDPAU_DRIVER=va_gl
-
-# End /etc/profile.d/libvdpau-va-gl.sh</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed VDPAU Driver</segtitle>
-
-      <seglistitem>
-        <seg>
-          libvdpau_va_gl.so
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libvdpau_va_gl">
-        <term><filename class="libraryfile">libvdpau_va_gl.so</filename></term>
-        <listitem>
-          <para>
-            is a VDPAU driver for hardware that supports VAAPI.
-          </para>
-          <indexterm zone="libvdpau-va-gl libvdpau_va_gl">
-            <primary sortas="c-libvdpau_va_gl">libvdpau_va_gl.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: multimedia/libdriv/libvdpau-va-gl.xml
===================================================================
--- multimedia/libdriv/libvdpau-va-gl.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ multimedia/libdriv/libvdpau-va-gl.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -0,0 +1,192 @@
+<?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 libvdpau-va-gl-download-http "https://github.com/i-rinat/libvdpau-va-gl/releases/download/v&libvdpau-va-gl-version;/libvdpau-va-gl-&libvdpau-va-gl-version;.tar.gz">
+  <!ENTITY libvdpau-va-gl-download-ftp  " ">
+  <!ENTITY libvdpau-va-gl-md5sum        "09ceb2f75eafccc9b002d35ede0de6a5">
+  <!ENTITY libvdpau-va-gl-size          "100 KB">
+  <!ENTITY libvdpau-va-gl-buildsize     "4.0 MB">
+  <!ENTITY libvdpau-va-gl-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="libvdpau-va-gl" xreflabel="libvdpau-va-gl-&libvdpau-va-gl-version;">
+  <?dbhtml filename="libvdpau-va-gl.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libvdpau-va-gl-&libvdpau-va-gl-version;</title>
+
+  <indexterm zone="libvdpau-va-gl">
+    <primary sortas="a-libvdpau-va-gl">libvdpau-va-gl</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libvdpau-va-gl</title>
+
+    <para>
+      The <application>libvdpau-va-gl</application> package contains
+      the VDPAU driver for hardware that supports VAAPI.
+    </para>
+
+    &lfs77_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libvdpau-va-gl-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libvdpau-va-gl-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libvdpau-va-gl-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libvdpau-va-gl-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libvdpau-va-gl-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libvdpau-va-gl-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <!-- It's been fixed upstream.  Lets see if it stays fixed ...
+    <note>
+      <para>
+        The tarball name for libvdpau-va-gl does not include
+        the package name, although it does expand to
+        libvdpau-va-gl-&libvdpau-va-gl-version;.
+        The file should be renamed after downloading:
+      </para>
+
+<screen><command>mv v&libvdpau-va-gl-version;.tar.gz libvdpau-va-gl-&libvdpau-va-gl-version;.tar.gz</command></screen>
+    </note>-->
+
+    <bridgehead renderas="sect3">libvdpau-va-gl Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="cmake"/>,
+      <xref linkend="ffmpeg"/>,
+      <xref linkend="glu"/>,
+      <xref linkend="libva"/>, and
+      <xref linkend="libvdpau"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/libvdpau-va-gl"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libvdpau-va-gl</title>
+
+    <para>
+      Install <application>libvdpau-va-gl</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command> from an X terminal.
+    </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>
+      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used
+      to apply higher level of the compiler optimizations.
+    </para>
+
+  </sect2>
+
+  <sect2 role="using">
+    <title>Using libvdpau-va-gl</title>
+
+    <para>
+      To use this driver with VDPAU apps, you need to set the <envar>VDPAU_DRIVER</envar>
+      environment variable to <parameter>va_gl</parameter>.
+    </para>
+
+    <para>
+      You can permanently set the environment variable by expanding the system
+      wide configuration. Run the following command as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>cat &gt; /etc/profile.d/libvdpau-va-gl.sh &lt;&lt; "EOF"
+<literal># Begin /etc/profile.d/libvdpau-va-gl.sh
+
+export VDPAU_DRIVER=va_gl
+
+# End /etc/profile.d/libvdpau-va-gl.sh</literal>
+EOF</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed VDPAU Driver</segtitle>
+
+      <seglistitem>
+        <seg>
+          libvdpau_va_gl.so
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libvdpau_va_gl">
+        <term><filename class="libraryfile">libvdpau_va_gl.so</filename></term>
+        <listitem>
+          <para>
+            is a VDPAU driver for hardware that supports VAAPI.
+          </para>
+          <indexterm zone="libvdpau-va-gl libvdpau_va_gl">
+            <primary sortas="c-libvdpau_va_gl">libvdpau_va_gl.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: multimedia/libdriv/libvdpau.xml
===================================================================
--- multimedia/libdriv/libvdpau.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ multimedia/libdriv/libvdpau.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -0,0 +1,196 @@
+<?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 libvdpau-download-http "http://people.freedesktop.org/~aplattner/vdpau/libvdpau-&libvdpau-version;.tar.gz">
+  <!ENTITY libvdpau-download-ftp  " ">
+  <!ENTITY libvdpau-md5sum        "11a842df9fbaad0f5f10cf553b8d5690">
+  <!ENTITY libvdpau-size          "416 KB">
+  <!ENTITY libvdpau-buildsize     "9.2 MB">
+  <!ENTITY libvdpau-time          "0.1 SBU">
+]>
+
+<sect1 id="libvdpau" xreflabel="libvdpau-&libvdpau-version;">
+  <?dbhtml filename="libvdpau.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libvdpau-&libvdpau-version;</title>
+
+  <indexterm zone="libvdpau">
+    <primary sortas="a-libvdpau">libvdpau</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libvdpau</title>
+
+    <para>
+      The <application>libvdpau</application> package contains a library which
+      implements VDPAU.
+    </para>
+
+    <para>
+      VDPAU (Video Decode and Presentation API for Unix) is an open source
+      library (libvdpau) and API originally designed by Nvidia for its
+      GeForce 8 series and later GPU hardware targeted at the X Window System
+      This VDPAU API allows video programs to offload portions of the video
+      decoding process and video post-processing to the GPU video-hardware.
+    </para>
+
+    <para>
+      Currently, the portions capable of being offloaded by VDPAU onto the GPU
+      are motion compensation (mo comp), inverse discrete cosine transform
+      (iDCT), VLD (variable-length decoding) and deblocking for MPEG-1, MPEG-2,
+      MPEG-4 ASP (MPEG-4 Part 2), H.264/MPEG-4 AVC and VC-1, WMV3/WMV9 encoded
+      videos.  Which specific codecs of these that can be offloaded to the
+      GPU depends on the version of the GPU hardware; specifically,
+      to also decode MPEG-4 ASP (MPEG-4 Part 2), Xvid/OpenDivX (DivX 4), and
+      DivX 5 formats, a GeForce 200M (2xxM) Series (the eleventh generation of
+      Nvidia's GeForce graphics processing units) or newer GPU hardware is
+      required.
+    </para>
+
+    &lfs77_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libvdpau-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libvdpau-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libvdpau-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libvdpau-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libvdpau-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libvdpau-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libvdpau Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="xorg7-lib"/>
+    </para>
+
+    <bridgehead renderas="sect5">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="doxygen"/>,
+      <xref linkend="graphviz"/>, and
+      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
+    </para>
+
+    <bridgehead renderas="sect4">Runtime Dependency</bridgehead>
+    <para role="optional">
+      <xref linkend="mesalib"/> (with the corresponding VDPAU driver) or
+      <xref linkend="libvdpau-va-gl"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/libvdpau"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libvdpau</title>
+
+    <para>
+      Install <application>libvdpau</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr     \
+            --sysconfdir=/etc \
+            --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"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          libvdpau.so
+        </seg>
+        <seg>
+          /usr/include/libvdpau and
+          /usr/lib/libvdpau
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libvdpau-lib">
+        <term><filename class="libraryfile">libvdpau.so</filename></term>
+        <listitem>
+          <para>
+            contains functions to offload portions of the video decoding
+            process and video post-processing to the GPU video-hardware.
+          </para>
+          <indexterm zone="libvdpau libvdpau-lib">
+            <primary sortas="c-libvdpau">libvdpau.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: ltimedia/libdriv/sound-theme-freedesktop-systemd.xml
===================================================================
--- multimedia/libdriv/sound-theme-freedesktop-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,125 +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 sound-theme-freedesktop-download-http
-           "http://people.freedesktop.org/~mccann/dist/sound-theme-freedesktop-&sound-theme-freedesktop-version;.tar.bz2">
-  <!ENTITY sound-theme-freedesktop-download-ftp  " ">
-  <!ENTITY sound-theme-freedesktop-md5sum        "7bcad4fa54570f80c612012bce66f60f">
-  <!ENTITY sound-theme-freedesktop-size          "472 KB">
-  <!ENTITY sound-theme-freedesktop-buildsize     "2 MB">
-  <!ENTITY sound-theme-freedesktop-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="sound-theme-freedesktop" xreflabel="sound-theme-freedesktop-&sound-theme-freedesktop-version;">
-  <?dbhtml filename="sound-theme-freedesktop.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>sound-theme-freedesktop-&sound-theme-freedesktop-version;</title>
-
-  <indexterm zone="sound-theme-freedesktop">
-    <primary sortas="a-sound-theme-freedesktop">sound-theme-freedesktop</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Sound Theme Freedesktop</title>
-
-    <para>
-      The <application>Sound Theme Freedesktop</application> package
-      contains sound themes for the desktop.
-    </para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&sound-theme-freedesktop-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&sound-theme-freedesktop-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &sound-theme-freedesktop-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &sound-theme-freedesktop-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &sound-theme-freedesktop-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &sound-theme-freedesktop-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/sound-theme-freedesktop"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Sound Theme Freedesktop</title>
-
-    <para>
-      Install <application>Sound Theme Freedesktop</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &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="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/sounds/freedesktop
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: multimedia/libdriv/sound-theme-freedesktop.xml
===================================================================
--- multimedia/libdriv/sound-theme-freedesktop.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ multimedia/libdriv/sound-theme-freedesktop.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -0,0 +1,125 @@
+<?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 sound-theme-freedesktop-download-http
+           "http://people.freedesktop.org/~mccann/dist/sound-theme-freedesktop-&sound-theme-freedesktop-version;.tar.bz2">
+  <!ENTITY sound-theme-freedesktop-download-ftp  " ">
+  <!ENTITY sound-theme-freedesktop-md5sum        "7bcad4fa54570f80c612012bce66f60f">
+  <!ENTITY sound-theme-freedesktop-size          "472 KB">
+  <!ENTITY sound-theme-freedesktop-buildsize     "2 MB">
+  <!ENTITY sound-theme-freedesktop-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="sound-theme-freedesktop" xreflabel="sound-theme-freedesktop-&sound-theme-freedesktop-version;">
+  <?dbhtml filename="sound-theme-freedesktop.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>sound-theme-freedesktop-&sound-theme-freedesktop-version;</title>
+
+  <indexterm zone="sound-theme-freedesktop">
+    <primary sortas="a-sound-theme-freedesktop">sound-theme-freedesktop</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Sound Theme Freedesktop</title>
+
+    <para>
+      The <application>Sound Theme Freedesktop</application> package
+      contains sound themes for the desktop.
+    </para>
+
+    &lfs77_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&sound-theme-freedesktop-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&sound-theme-freedesktop-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &sound-theme-freedesktop-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &sound-theme-freedesktop-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &sound-theme-freedesktop-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &sound-theme-freedesktop-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/sound-theme-freedesktop"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Sound Theme Freedesktop</title>
+
+    <para>
+      Install <application>Sound Theme Freedesktop</application> by running
+      the following commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr &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="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /usr/share/sounds/freedesktop
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+</sect1>
Index: packages.ent
===================================================================
--- packages.ent	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ packages.ent	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -87,4 +87,5 @@
 <!ENTITY exempi-version               "2.2.2">
 <!ENTITY expat-version                "2.1.0">
+<!ENTITY gcab-version                 "0.6">
 <!ENTITY glib2-version                "2.46.2">
 <!ENTITY glibmm-version               "2.46.3">
@@ -235,4 +236,5 @@
 <!ENTITY colord-version               "1.2.12">    <!-- Even minors only -->
 <!ENTITY cpio-version                 "2.12">
+<!ENTITY cups-pk-helper-version       "0.2.5">
 <!ENTITY dbus-version                 "1.10.6">   <!-- Even minors only -->
 <!ENTITY eudev-version                "1.7">
@@ -722,4 +724,5 @@
 <!ENTITY pulseaudio-version           "&pulseaudio-major-version;">
 <!ENTITY sdl-version                  "1.2.15">
+<!ENTITY sound-theme-freedesktop-version "0.8">
 <!ENTITY soundtouch-version           "1.9.0">
 <!ENTITY speex-version                "1.2rc2">
@@ -734,4 +737,5 @@
 <!ENTITY libva-version                "1.5.1">
 <!ENTITY libva-intel-driver-version   "1.5.1">
+<!ENTITY libva-vdpau-driver-version   "0.7.4">
 <!ENTITY libvdpau-version             "1.1">
 <!ENTITY libvdpau-va-gl-version       "0.3.4">
Index: postlfs/config/config.xml
===================================================================
--- postlfs/config/config.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ postlfs/config/config.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -48,5 +48,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="users.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="devices.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="profile-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="profile.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vimrc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="logon.xml"/>
Index: stlfs/config/profile-systemd.xml
===================================================================
--- postlfs/config/profile-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,545 +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;
-]>
-
-<sect1 id="postlfs-config-profile" xreflabel="The Bash Shell Startup Files">
-  <?dbhtml filename="profile.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>The Bash Shell Startup Files</title>
-
-  <para>The shell program <filename>/bin/bash</filename> (hereafter
-  referred to as just "the shell") uses a collection of startup files to
-  help create an environment.  Each file has a specific use and
-  may affect login and interactive environments differently.  The files in
-  the <filename class="directory">/etc</filename> directory generally provide
-  global settings. If an equivalent file exists in your home directory it may
-  override the global settings.</para>
-
-  <para>An interactive login shell is started after a successful login, using
-  <filename>/bin/login</filename>, by reading the <filename>/etc/passwd</filename>
-  file.  This shell invocation normally reads <filename>/etc/profile</filename>
-  and its private equivalent <filename>~/.bash_profile</filename> upon
-  startup.</para>
-
-  <para>An interactive non-login shell is normally started at the command-line
-  using a shell program (e.g.,
-  <prompt>[prompt]$</prompt><command>/bin/bash</command>) or by the
-  <command>/bin/su</command> command.  An interactive non-login shell is also
-  started with a terminal program such as <command>xterm</command> or
-  <command>konsole</command> from within a graphical environment. This type of
-  shell invocation normally copies the parent environment and then reads the
-  user's <filename>~/.bashrc</filename> file for additional startup configuration
-  instructions.</para>
-
-  <para>A non-interactive shell is usually present when a shell script is
-  running.  It is non-interactive because it is processing a script and not
-  waiting for user input between commands. For these shell invocations, only
-  the environment inherited from the parent shell is used.</para>
-
-  <para> The file <filename>~/.bash_logout</filename> is not used for an
-  invocation of the shell.  It is read and executed when a user exits from an
-  interactive login shell.</para>
-
-  <para>Many distributions use <filename>/etc/bashrc</filename> for system wide
-  initialization of non-login shells. This file is usually called from the
-  user's <filename>~/.bashrc</filename> file and is not built directly into
-  <command>bash</command> itself.  This convention is followed in this
-  section.</para>
-
-  <para>For more information see <command>info bash</command> --
-  <emphasis role="strong">Nodes: Bash Startup Files and Interactive
-  Shells</emphasis>.</para>
-
-  <note>
-    <para>Most of the instructions below are used to create files located in
-    the <filename class='directory'>/etc</filename> directory structure which
-    requires you to execute the commands as the
-    <systemitem class='username'>root</systemitem> user. If you elect to create
-    the files in user's home directories instead, you should run the commands
-    as an unprivileged user.</para>
-  </note>
-
-  <sect2 id="etc-profile-profile">
-    <title>/etc/profile</title>
-
-    <indexterm zone="postlfs-config-profile etc-profile-profile">
-      <primary sortas="e-etc-profile">/etc/profile</primary>
-    </indexterm>
-
-    <para>Here is a base <filename>/etc/profile</filename>. This file starts by
-    setting up some helper functions and some basic parameters.  It specifies some
-    <command>bash</command> history parameters and, for security purposes,
-    disables keeping a permanent history file for the <systemitem
-    class="username">root</systemitem> user.  It also sets a
-    default user prompt.  It then calls small, single purpose scripts in the
-    <filename class='directory'>/etc/profile.d</filename> directory to provide most
-    of the initialization.</para>
-
-    <para>For more information on the escape sequences you can use for your prompt
-    (i.e., the <envar>PS1</envar> environment variable) see <command>info
-    bash</command> -- <emphasis role="strong">Node: Printing a
-    Prompt</emphasis>.</para>
-
-<screen role="root"><?dbfo keep-together="auto"?><userinput>cat &gt; /etc/profile &lt;&lt; "EOF"
-<literal># Begin /etc/profile
-# Written for Beyond Linux From Scratch
-# by James Robertson &lt;jameswrobertson@earthlink.net&gt;
-# modifications by Dagmar d'Surreal &lt;rivyqntzne@pbzpnfg.arg&gt;
-
-# System wide environment variables and startup programs.
-
-# System wide aliases and functions should go in /etc/bashrc.  Personal
-# environment variables and startup programs should go into
-# ~/.bash_profile.  Personal aliases and functions should go into
-# ~/.bashrc.
-
-# Functions to help us manage paths.  Second argument is the name of the
-# path variable to be modified (default: PATH)
-pathremove () {
-        local IFS=':'
-        local NEWPATH
-        local DIR
-        local PATHVARIABLE=${2:-PATH}
-        for DIR in ${!PATHVARIABLE} ; do
-                if [ "$DIR" != "$1" ] ; then
-                  NEWPATH=${NEWPATH:+$NEWPATH:}$DIR
-                fi
-        done
-        export $PATHVARIABLE="$NEWPATH"
-}
-
-pathprepend () {
-        pathremove $1 $2
-        local PATHVARIABLE=${2:-PATH}
-        export $PATHVARIABLE="$1${!PATHVARIABLE:+:${!PATHVARIABLE}}"
-}
-
-pathappend () {
-        pathremove $1 $2
-        local PATHVARIABLE=${2:-PATH}
-        export $PATHVARIABLE="${!PATHVARIABLE:+${!PATHVARIABLE}:}$1"
-}
-
-export -f pathremove pathprepend pathappend
-
-# Set the initial path
-export PATH=/bin:/usr/bin
-
-if [ $EUID -eq 0 ] ; then
-        pathappend /sbin:/usr/sbin
-        unset HISTFILE
-fi
-
-# Setup some environment variables.
-export HISTSIZE=1000
-export HISTIGNORE="&amp;:[bf]g:exit"
-
-# Set some defaults for graphical systems
-export XDG_DATA_DIRS=/usr/share/
-export XDG_CONFIG_DIRS=/etc/xdg/
-
-# Setup a red prompt for root and a green one for users.
-NORMAL="\[\e[0m\]"
-RED="\[\e[1;31m\]"
-GREEN="\[\e[1;32m\]"
-if [[ $EUID == 0 ]] ; then
-  PS1="$RED\u [ $NORMAL\w$RED ]# $NORMAL"
-else
-  PS1="$GREEN\u [ $NORMAL\w$GREEN ]\$ $NORMAL"
-fi
-
-for script in /etc/profile.d/*.sh ; do
-        if [ -r $script ] ; then
-                . $script
-        fi
-done
-
-unset script RED GREEN NORMAL
-
-# End /etc/profile</literal>
-EOF</userinput></screen>
-
-    <sect3 id="etc-profile.d">
-      <title>The /etc/profile.d Directory</title>
-
-      <indexterm zone="postlfs-config-profile etc-profile.d">
-        <primary sortas="e-etc-profile.d">/etc/profile.d</primary>
-      </indexterm>
-
-      <para>Now create the <filename class='directory'>/etc/profile.d</filename>
-      directory, where the individual initialization scripts are placed:</para>
-
-<screen role="root"><userinput>install --directory --mode=0755 --owner=root --group=root /etc/profile.d</userinput></screen>
-
-    </sect3>
-
-    <sect3 id="etc-profile.d-dircolors.sh">
-      <title>/etc/profile.d/dircolors.sh</title>
-
-      <indexterm zone="postlfs-config-profile etc-profile.d-dircolors.sh">
-        <primary sortas="e-etc-profile.d-dircolors.sh">/etc/profile.d/dircolors.sh</primary>
-      </indexterm>
-
-      <para>This script uses the <filename>~/.dircolors</filename> and
-      <filename>/etc/dircolors</filename> files to control the colors of file names in a
-      directory listing. They control colorized output of things like <command>ls
-      --color</command>.  The explanation of how to initialize these files is at the
-      end of this section.</para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/dircolors.sh &lt;&lt; "EOF"
-<literal># Setup for /bin/ls and /bin/grep to support color, the alias is in /etc/bashrc.
-if [ -f "/etc/dircolors" ] ; then
-        eval $(dircolors -b /etc/dircolors)
-fi
-
-if [ -f "$HOME/.dircolors" ] ; then
-        eval $(dircolors -b $HOME/.dircolors)
-fi
-
-alias ls='ls --color=auto'
-alias grep='grep --color=auto'</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-    <sect3 id="extrapaths.sh">
-      <title>/etc/profile.d/extrapaths.sh</title>
-
-      <indexterm zone="postlfs-config-profile extrapaths.sh">
-        <primary sortas="e-etc-profile.d-extrapaths.sh">/etc/profile.d/extrapaths.sh</primary>
-      </indexterm>
-
-      <para>This script adds some useful paths to the <envar>PATH</envar> and
-      can be used to customize other PATH related environment variables
-      (e.g. LD_LIBRARY_PATH, etc) that may be needed for all users.</para> 
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/extrapaths.sh &lt;&lt; "EOF"
-<literal>if [ -d /usr/local/lib/pkgconfig ] ; then
-        pathappend /usr/local/lib/pkgconfig PKG_CONFIG_PATH
-fi
-if [ -d /usr/local/bin ]; then
-        pathprepend /usr/local/bin
-fi
-if [ -d /usr/local/sbin -a $EUID -eq 0 ]; then
-        pathprepend /usr/local/sbin
-fi
-
-# Set some defaults before other applications add to these paths.
-pathappend /usr/share/man  MANPATH
-pathappend /usr/share/info INFOPATH</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-    <sect3 id="readline.sh">
-      <title>/etc/profile.d/readline.sh</title>
-
-      <indexterm zone="postlfs-config-profile readline.sh">
-        <primary sortas="e-etc-profile.d-readline.sh">/etc/profile.d/readline.sh</primary>
-      </indexterm>
-
-      <para>This script sets up the default <filename>inputrc</filename>
-      configuration file. If the user does not have individual settings, it uses the
-      global file.</para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/readline.sh &lt;&lt; "EOF"
-<literal># Setup the INPUTRC environment variable.
-if [ -z "$INPUTRC" -a ! -f "$HOME/.inputrc" ] ; then
-        INPUTRC=/etc/inputrc
-fi
-export INPUTRC</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-    <sect3 id="umask.sh">
-      <title>/etc/profile.d/umask.sh</title>
-
-      <indexterm zone="postlfs-config-profile umask.sh">
-        <primary sortas="e-etc-profile.d-umask.sh">/etc/profile.d/umask.sh</primary>
-      </indexterm>
-
-      <para>Setting the <command>umask</command> value is important for security.
-      Here the default group write permissions are turned off for system users and when
-      the user name and group name are not the same.</para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/umask.sh &lt;&lt; "EOF"
-<literal># By default, the umask should be set.
-if [ "$(id -gn)" = "$(id -un)" -a $EUID -gt 99 ] ; then
-  umask 002
-else
-  umask 022
-fi</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-<!-- This is handled in the Xorg section of the book
-    <sect3 id="X.sh">
-      <title>/etc/profile.d/X.sh</title>
-
-      <indexterm zone="postlfs-config-profile X.sh">
-        <primary sortas="e-etc-profile.d-X.sh">/etc/profile.d/X.sh</primary>
-      </indexterm>
-
-      <para>If <application>X</application> is installed, the <envar>PATH</envar>
-      and <envar>PKG_CONFIG_PATH</envar> variables are also updated.</para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/X.sh &lt;&lt; "EOF"
-<literal>if [ -x /usr/X11R6/bin/X ]; then
-        pathappend /usr/X11R6/bin
-fi
-if [ -d /usr/X11R6/lib/pkgconfig ] ; then
-        pathappend /usr/X11R6/lib/pkgconfig PKG_CONFIG_PATH
-fi</literal>
-EOF</userinput></screen>
-
-    </sect3>
--->
-    <sect3 id="i18n.sh">
-      <title>/etc/profile.d/i18n.sh</title>
-
-    <indexterm zone="postlfs-config-profile i18n.sh">
-      <primary sortas="e-etc-profile.d-i18n.sh">/etc/profile.d/i18n.sh</primary>
-    </indexterm>
-
-      <para>This script sets environment variables necessary for
-      native language support.</para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/i18n.sh &lt;&lt; "EOF"
-<literal># Begin /etc/profile.d/i18n.sh
-
-unset LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES \
-      LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION
-
-if [ -n "$XDG_CONFIG_HOME" ] &amp;&amp; [ -r "$XDG_CONFIG_HOME/locale.conf" ]; then
-  . "$XDG_CONFIG_HOME/locale.conf"
-elif [ -r /etc/locale.conf ]; then
-  . /etc/locale.conf
-fi
-
-export LANG="${LANG:-C}"
-[ -n "$LC_CTYPE" ]          &amp;&amp; export LC_CTYPE
-[ -n "$LC_NUMERIC" ]        &amp;&amp; export LC_NUMERIC
-[ -n "$LC_TIME" ]           &amp;&amp; export LC_TIME
-[ -n "$LC_COLLATE" ]        &amp;&amp; export LC_COLLATE
-[ -n "$LC_MONETARY" ]       &amp;&amp; export LC_MONETARY
-[ -n "$LC_MESSAGES" ]       &amp;&amp; export LC_MESSAGES
-[ -n "$LC_PAPER" ]          &amp;&amp; export LC_PAPER
-[ -n "$LC_NAME" ]           &amp;&amp; export LC_NAME
-[ -n "$LC_ADDRESS" ]        &amp;&amp; export LC_ADDRESS
-[ -n "$LC_TELEPHONE" ]      &amp;&amp; export LC_TELEPHONE
-[ -n "$LC_MEASUREMENT" ]    &amp;&amp; export LC_MEASUREMENT
-[ -n "$LC_IDENTIFICATION" ] &amp;&amp; export LC_IDENTIFICATION
-
-# End /etc/profile.d/i18n.sh</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-    <sect3>
-      <title>Other Initialization Values</title>
-
-      <para>Other initialization can easily be added to the
-      <filename>profile</filename> by adding additional scripts to the
-      <filename class='directory'>/etc/profile.d</filename> directory.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 id="etc-bashrc-profile">
-    <title>/etc/bashrc</title>
-
-    <indexterm zone="postlfs-config-profile etc-bashrc-profile">
-      <primary sortas="e-etc-bashrc">/etc/bashrc</primary>
-    </indexterm>
-
-    <para>Here is a base <filename>/etc/bashrc</filename>.  Comments in the
-    file should explain everything you need.</para>
-
-<screen role="root"><userinput>cat &gt; /etc/bashrc &lt;&lt; "EOF"
-<literal># Begin /etc/bashrc
-# Written for Beyond Linux From Scratch
-# by James Robertson &lt;jameswrobertson@earthlink.net&gt;
-# updated by Bruce Dubbs &lt;bdubbs@&lfs-domainname;&gt;
-
-# System wide aliases and functions.
-
-# System wide environment variables and startup programs should go into
-# /etc/profile.  Personal environment variables and startup programs
-# should go into ~/.bash_profile.  Personal aliases and functions should
-# go into ~/.bashrc
-
-# Provides colored /bin/ls and /bin/grep commands.  Used in conjunction
-# with code in /etc/profile.
-
-alias ls='ls --color=auto'
-alias grep='grep --color=auto'
-
-# Provides prompt for non-login shells, specifically shells started
-# in the X environment. [Review the LFS archive thread titled
-# PS1 Environment Variable for a great case study behind this script
-# addendum.]
-
-NORMAL="\[\e[0m\]"
-RED="\[\e[1;31m\]"
-GREEN="\[\e[1;32m\]"
-if [[ $EUID == 0 ]] ; then
-  PS1="$RED\u [ $NORMAL\w$RED ]# $NORMAL"
-else
-  PS1="$GREEN\u [ $NORMAL\w$GREEN ]\$ $NORMAL"
-fi
-
-unset RED GREEN NORMAL
-
-# End /etc/bashrc</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="bash_profile-profile">
-    <title>~/.bash_profile</title>
-
-    <indexterm zone="postlfs-config-profile bash_profile-profile">
-      <primary sortas="e-AA.bash_profile">~/.bash_profile</primary>
-    </indexterm>
-
-    <para>Here is a base <filename>~/.bash_profile</filename>.  If you want each
-    new user to have this file automatically, just change the output of
-    the command to <filename>/etc/skel/.bash_profile</filename> and check the
-    permissions after the command is run. You can then copy
-    <filename>/etc/skel/.bash_profile</filename> to the home directories of already
-    existing users, including <systemitem class="username">root</systemitem>,
-    and set the owner and group appropriately.</para>
-
-<screen><userinput>cat &gt; ~/.bash_profile &lt;&lt; "EOF"
-<literal># Begin ~/.bash_profile
-# Written for Beyond Linux From Scratch
-# by James Robertson &lt;jameswrobertson@earthlink.net&gt;
-# updated by Bruce Dubbs &lt;bdubbs@&lfs-domainname;&gt;
-
-# Personal environment variables and startup programs.
-
-# Personal aliases and functions should go in ~/.bashrc.  System wide
-# environment variables and startup programs are in /etc/profile.
-# System wide aliases and functions are in /etc/bashrc.
-
-if [ -f "$HOME/.bashrc" ] ; then
-  source $HOME/.bashrc
-fi
-
-if [ -d "$HOME/bin" ] ; then
-  pathprepend $HOME/bin
-fi
-
-# Having . in the PATH is dangerous
-#if [ $EUID -gt 99 ]; then
-#  pathappend .
-#fi
-
-# End ~/.bash_profile</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="bashrc-profile">
-    <title>~/.bashrc</title>
-
-    <indexterm zone="postlfs-config-profile bashrc-profile">
-      <primary sortas="e-AA.bashrc">~/.bashrc</primary>
-    </indexterm>
-
-    <para>Here is a base <filename>~/.bashrc</filename>.  The comments and
-    instructions for using <filename class="directory">/etc/skel</filename> for
-    <filename>.bash_profile</filename> above also apply here. Only the target file
-    names are different.</para>
-
-<screen><userinput>cat &gt; ~/.bashrc &lt;&lt; "EOF"
-<literal># Begin ~/.bashrc
-# Written for Beyond Linux From Scratch
-# by James Robertson &lt;jameswrobertson@earthlink.net&gt;
-
-# Personal aliases and functions.
-
-# Personal environment variables and startup programs should go in
-# ~/.bash_profile.  System wide environment variables and startup
-# programs are in /etc/profile.  System wide aliases and functions are
-# in /etc/bashrc.
-
-if [ -f "/etc/bashrc" ] ; then
-  source /etc/bashrc
-fi
-
-# End ~/.bashrc</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-
-  <sect2 id="bash_logout-profile">
-    <title>~/.bash_logout</title>
-
-    <indexterm zone="postlfs-config-profile bash_logout-profile">
-      <primary sortas="e-AA.bash_logout">~/.bash_logout</primary>
-    </indexterm>
-
-    <para>This is an empty <filename>~/.bash_logout</filename> that can be used as
-    a template.  You will notice that the base <filename>~/.bash_logout</filename>
-    does not include a <userinput>clear</userinput> command.  This is because the
-    clear is handled in the <filename>/etc/issue</filename> file.</para>
-
-<screen><userinput>cat &gt; ~/.bash_logout &lt;&lt; "EOF"
-<literal># Begin ~/.bash_logout
-# Written for Beyond Linux From Scratch
-# by James Robertson &lt;jameswrobertson@earthlink.net&gt;
-
-# Personal items to perform on logout.
-
-# End ~/.bash_logout</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-
-  <sect2 id="etc-dircolors-profile">
-    <title>/etc/dircolors</title>
-
-    <indexterm zone="postlfs-config-profile etc-dircolors-profile">
-      <primary sortas="e-etc-dircolors">/etc/dircolors</primary>
-    </indexterm>
-
-    <indexterm zone="postlfs-config-profile etc-dircolors-profile">
-      <primary sortas="e-AA.dircolors">~/.dircolors</primary>
-    </indexterm>
-
-    <para> If you want to use the <filename>dircolors</filename> capability, then
-    run the following command. The <filename class="directory">/etc/skel</filename>
-    setup steps shown above also can be used here to provide a
-    <filename>~/.dircolors</filename> file when a new user is set up. As before,
-    just change the output file name on the following command and assure the
-    permissions, owner, and group are correct on the files created and/or
-    copied.</para>
-
-<screen role="root"><userinput>dircolors -p > /etc/dircolors</userinput></screen>
-
-    <para>If you wish to customize the colors used for different file types, you can
-    edit the <filename>/etc/dircolors</filename> file.  The instructions for setting
-    the colors are embedded in the file.</para>
-
-
-    <para>Finally, Ian Macdonald has written an excellent collection of tips and
-    tricks to enhance your shell environment.  You can read it online at
-    <ulink url="http://www.caliban.org/bash/index.shtml"/>.</para>
-
-  </sect2>
-
-</sect1>
Index: postlfs/config/profile.xml
===================================================================
--- postlfs/config/profile.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ postlfs/config/profile.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -0,0 +1,545 @@
+<?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;
+]>
+
+<sect1 id="postlfs-config-profile" xreflabel="The Bash Shell Startup Files">
+  <?dbhtml filename="profile.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>The Bash Shell Startup Files</title>
+
+  <para>The shell program <filename>/bin/bash</filename> (hereafter
+  referred to as just "the shell") uses a collection of startup files to
+  help create an environment.  Each file has a specific use and
+  may affect login and interactive environments differently.  The files in
+  the <filename class="directory">/etc</filename> directory generally provide
+  global settings. If an equivalent file exists in your home directory it may
+  override the global settings.</para>
+
+  <para>An interactive login shell is started after a successful login, using
+  <filename>/bin/login</filename>, by reading the <filename>/etc/passwd</filename>
+  file.  This shell invocation normally reads <filename>/etc/profile</filename>
+  and its private equivalent <filename>~/.bash_profile</filename> upon
+  startup.</para>
+
+  <para>An interactive non-login shell is normally started at the command-line
+  using a shell program (e.g.,
+  <prompt>[prompt]$</prompt><command>/bin/bash</command>) or by the
+  <command>/bin/su</command> command.  An interactive non-login shell is also
+  started with a terminal program such as <command>xterm</command> or
+  <command>konsole</command> from within a graphical environment. This type of
+  shell invocation normally copies the parent environment and then reads the
+  user's <filename>~/.bashrc</filename> file for additional startup configuration
+  instructions.</para>
+
+  <para>A non-interactive shell is usually present when a shell script is
+  running.  It is non-interactive because it is processing a script and not
+  waiting for user input between commands. For these shell invocations, only
+  the environment inherited from the parent shell is used.</para>
+
+  <para> The file <filename>~/.bash_logout</filename> is not used for an
+  invocation of the shell.  It is read and executed when a user exits from an
+  interactive login shell.</para>
+
+  <para>Many distributions use <filename>/etc/bashrc</filename> for system wide
+  initialization of non-login shells. This file is usually called from the
+  user's <filename>~/.bashrc</filename> file and is not built directly into
+  <command>bash</command> itself.  This convention is followed in this
+  section.</para>
+
+  <para>For more information see <command>info bash</command> --
+  <emphasis role="strong">Nodes: Bash Startup Files and Interactive
+  Shells</emphasis>.</para>
+
+  <note>
+    <para>Most of the instructions below are used to create files located in
+    the <filename class='directory'>/etc</filename> directory structure which
+    requires you to execute the commands as the
+    <systemitem class='username'>root</systemitem> user. If you elect to create
+    the files in user's home directories instead, you should run the commands
+    as an unprivileged user.</para>
+  </note>
+
+  <sect2 id="etc-profile-profile">
+    <title>/etc/profile</title>
+
+    <indexterm zone="postlfs-config-profile etc-profile-profile">
+      <primary sortas="e-etc-profile">/etc/profile</primary>
+    </indexterm>
+
+    <para>Here is a base <filename>/etc/profile</filename>. This file starts by
+    setting up some helper functions and some basic parameters.  It specifies some
+    <command>bash</command> history parameters and, for security purposes,
+    disables keeping a permanent history file for the <systemitem
+    class="username">root</systemitem> user.  It also sets a
+    default user prompt.  It then calls small, single purpose scripts in the
+    <filename class='directory'>/etc/profile.d</filename> directory to provide most
+    of the initialization.</para>
+
+    <para>For more information on the escape sequences you can use for your prompt
+    (i.e., the <envar>PS1</envar> environment variable) see <command>info
+    bash</command> -- <emphasis role="strong">Node: Printing a
+    Prompt</emphasis>.</para>
+
+<screen role="root"><?dbfo keep-together="auto"?><userinput>cat &gt; /etc/profile &lt;&lt; "EOF"
+<literal># Begin /etc/profile
+# Written for Beyond Linux From Scratch
+# by James Robertson &lt;jameswrobertson@earthlink.net&gt;
+# modifications by Dagmar d'Surreal &lt;rivyqntzne@pbzpnfg.arg&gt;
+
+# System wide environment variables and startup programs.
+
+# System wide aliases and functions should go in /etc/bashrc.  Personal
+# environment variables and startup programs should go into
+# ~/.bash_profile.  Personal aliases and functions should go into
+# ~/.bashrc.
+
+# Functions to help us manage paths.  Second argument is the name of the
+# path variable to be modified (default: PATH)
+pathremove () {
+        local IFS=':'
+        local NEWPATH
+        local DIR
+        local PATHVARIABLE=${2:-PATH}
+        for DIR in ${!PATHVARIABLE} ; do
+                if [ "$DIR" != "$1" ] ; then
+                  NEWPATH=${NEWPATH:+$NEWPATH:}$DIR
+                fi
+        done
+        export $PATHVARIABLE="$NEWPATH"
+}
+
+pathprepend () {
+        pathremove $1 $2
+        local PATHVARIABLE=${2:-PATH}
+        export $PATHVARIABLE="$1${!PATHVARIABLE:+:${!PATHVARIABLE}}"
+}
+
+pathappend () {
+        pathremove $1 $2
+        local PATHVARIABLE=${2:-PATH}
+        export $PATHVARIABLE="${!PATHVARIABLE:+${!PATHVARIABLE}:}$1"
+}
+
+export -f pathremove pathprepend pathappend
+
+# Set the initial path
+export PATH=/bin:/usr/bin
+
+if [ $EUID -eq 0 ] ; then
+        pathappend /sbin:/usr/sbin
+        unset HISTFILE
+fi
+
+# Setup some environment variables.
+export HISTSIZE=1000
+export HISTIGNORE="&amp;:[bf]g:exit"
+
+# Set some defaults for graphical systems
+export XDG_DATA_DIRS=/usr/share/
+export XDG_CONFIG_DIRS=/etc/xdg/
+
+# Setup a red prompt for root and a green one for users.
+NORMAL="\[\e[0m\]"
+RED="\[\e[1;31m\]"
+GREEN="\[\e[1;32m\]"
+if [[ $EUID == 0 ]] ; then
+  PS1="$RED\u [ $NORMAL\w$RED ]# $NORMAL"
+else
+  PS1="$GREEN\u [ $NORMAL\w$GREEN ]\$ $NORMAL"
+fi
+
+for script in /etc/profile.d/*.sh ; do
+        if [ -r $script ] ; then
+                . $script
+        fi
+done
+
+unset script RED GREEN NORMAL
+
+# End /etc/profile</literal>
+EOF</userinput></screen>
+
+    <sect3 id="etc-profile.d">
+      <title>The /etc/profile.d Directory</title>
+
+      <indexterm zone="postlfs-config-profile etc-profile.d">
+        <primary sortas="e-etc-profile.d">/etc/profile.d</primary>
+      </indexterm>
+
+      <para>Now create the <filename class='directory'>/etc/profile.d</filename>
+      directory, where the individual initialization scripts are placed:</para>
+
+<screen role="root"><userinput>install --directory --mode=0755 --owner=root --group=root /etc/profile.d</userinput></screen>
+
+    </sect3>
+
+    <sect3 id="etc-profile.d-dircolors.sh">
+      <title>/etc/profile.d/dircolors.sh</title>
+
+      <indexterm zone="postlfs-config-profile etc-profile.d-dircolors.sh">
+        <primary sortas="e-etc-profile.d-dircolors.sh">/etc/profile.d/dircolors.sh</primary>
+      </indexterm>
+
+      <para>This script uses the <filename>~/.dircolors</filename> and
+      <filename>/etc/dircolors</filename> files to control the colors of file names in a
+      directory listing. They control colorized output of things like <command>ls
+      --color</command>.  The explanation of how to initialize these files is at the
+      end of this section.</para>
+
+<screen role="root"><userinput>cat &gt; /etc/profile.d/dircolors.sh &lt;&lt; "EOF"
+<literal># Setup for /bin/ls and /bin/grep to support color, the alias is in /etc/bashrc.
+if [ -f "/etc/dircolors" ] ; then
+        eval $(dircolors -b /etc/dircolors)
+fi
+
+if [ -f "$HOME/.dircolors" ] ; then
+        eval $(dircolors -b $HOME/.dircolors)
+fi
+
+alias ls='ls --color=auto'
+alias grep='grep --color=auto'</literal>
+EOF</userinput></screen>
+
+    </sect3>
+
+    <sect3 id="extrapaths.sh">
+      <title>/etc/profile.d/extrapaths.sh</title>
+
+      <indexterm zone="postlfs-config-profile extrapaths.sh">
+        <primary sortas="e-etc-profile.d-extrapaths.sh">/etc/profile.d/extrapaths.sh</primary>
+      </indexterm>
+
+      <para>This script adds some useful paths to the <envar>PATH</envar> and
+      can be used to customize other PATH related environment variables
+      (e.g. LD_LIBRARY_PATH, etc) that may be needed for all users.</para> 
+
+<screen role="root"><userinput>cat &gt; /etc/profile.d/extrapaths.sh &lt;&lt; "EOF"
+<literal>if [ -d /usr/local/lib/pkgconfig ] ; then
+        pathappend /usr/local/lib/pkgconfig PKG_CONFIG_PATH
+fi
+if [ -d /usr/local/bin ]; then
+        pathprepend /usr/local/bin
+fi
+if [ -d /usr/local/sbin -a $EUID -eq 0 ]; then
+        pathprepend /usr/local/sbin
+fi
+
+# Set some defaults before other applications add to these paths.
+pathappend /usr/share/man  MANPATH
+pathappend /usr/share/info INFOPATH</literal>
+EOF</userinput></screen>
+
+    </sect3>
+
+    <sect3 id="readline.sh">
+      <title>/etc/profile.d/readline.sh</title>
+
+      <indexterm zone="postlfs-config-profile readline.sh">
+        <primary sortas="e-etc-profile.d-readline.sh">/etc/profile.d/readline.sh</primary>
+      </indexterm>
+
+      <para>This script sets up the default <filename>inputrc</filename>
+      configuration file. If the user does not have individual settings, it uses the
+      global file.</para>
+
+<screen role="root"><userinput>cat &gt; /etc/profile.d/readline.sh &lt;&lt; "EOF"
+<literal># Setup the INPUTRC environment variable.
+if [ -z "$INPUTRC" -a ! -f "$HOME/.inputrc" ] ; then
+        INPUTRC=/etc/inputrc
+fi
+export INPUTRC</literal>
+EOF</userinput></screen>
+
+    </sect3>
+
+    <sect3 id="umask.sh">
+      <title>/etc/profile.d/umask.sh</title>
+
+      <indexterm zone="postlfs-config-profile umask.sh">
+        <primary sortas="e-etc-profile.d-umask.sh">/etc/profile.d/umask.sh</primary>
+      </indexterm>
+
+      <para>Setting the <command>umask</command> value is important for security.
+      Here the default group write permissions are turned off for system users and when
+      the user name and group name are not the same.</para>
+
+<screen role="root"><userinput>cat &gt; /etc/profile.d/umask.sh &lt;&lt; "EOF"
+<literal># By default, the umask should be set.
+if [ "$(id -gn)" = "$(id -un)" -a $EUID -gt 99 ] ; then
+  umask 002
+else
+  umask 022
+fi</literal>
+EOF</userinput></screen>
+
+    </sect3>
+
+<!-- This is handled in the Xorg section of the book
+    <sect3 id="X.sh">
+      <title>/etc/profile.d/X.sh</title>
+
+      <indexterm zone="postlfs-config-profile X.sh">
+        <primary sortas="e-etc-profile.d-X.sh">/etc/profile.d/X.sh</primary>
+      </indexterm>
+
+      <para>If <application>X</application> is installed, the <envar>PATH</envar>
+      and <envar>PKG_CONFIG_PATH</envar> variables are also updated.</para>
+
+<screen role="root"><userinput>cat &gt; /etc/profile.d/X.sh &lt;&lt; "EOF"
+<literal>if [ -x /usr/X11R6/bin/X ]; then
+        pathappend /usr/X11R6/bin
+fi
+if [ -d /usr/X11R6/lib/pkgconfig ] ; then
+        pathappend /usr/X11R6/lib/pkgconfig PKG_CONFIG_PATH
+fi</literal>
+EOF</userinput></screen>
+
+    </sect3>
+-->
+    <sect3 id="i18n.sh">
+      <title>/etc/profile.d/i18n.sh</title>
+
+    <indexterm zone="postlfs-config-profile i18n.sh">
+      <primary sortas="e-etc-profile.d-i18n.sh">/etc/profile.d/i18n.sh</primary>
+    </indexterm>
+
+      <para>This script sets environment variables necessary for
+      native language support.</para>
+
+<screen role="root"><userinput>cat &gt; /etc/profile.d/i18n.sh &lt;&lt; "EOF"
+<literal># Begin /etc/profile.d/i18n.sh
+
+unset LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES \
+      LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION
+
+if [ -n "$XDG_CONFIG_HOME" ] &amp;&amp; [ -r "$XDG_CONFIG_HOME/locale.conf" ]; then
+  . "$XDG_CONFIG_HOME/locale.conf"
+elif [ -r /etc/locale.conf ]; then
+  . /etc/locale.conf
+fi
+
+export LANG="${LANG:-C}"
+[ -n "$LC_CTYPE" ]          &amp;&amp; export LC_CTYPE
+[ -n "$LC_NUMERIC" ]        &amp;&amp; export LC_NUMERIC
+[ -n "$LC_TIME" ]           &amp;&amp; export LC_TIME
+[ -n "$LC_COLLATE" ]        &amp;&amp; export LC_COLLATE
+[ -n "$LC_MONETARY" ]       &amp;&amp; export LC_MONETARY
+[ -n "$LC_MESSAGES" ]       &amp;&amp; export LC_MESSAGES
+[ -n "$LC_PAPER" ]          &amp;&amp; export LC_PAPER
+[ -n "$LC_NAME" ]           &amp;&amp; export LC_NAME
+[ -n "$LC_ADDRESS" ]        &amp;&amp; export LC_ADDRESS
+[ -n "$LC_TELEPHONE" ]      &amp;&amp; export LC_TELEPHONE
+[ -n "$LC_MEASUREMENT" ]    &amp;&amp; export LC_MEASUREMENT
+[ -n "$LC_IDENTIFICATION" ] &amp;&amp; export LC_IDENTIFICATION
+
+# End /etc/profile.d/i18n.sh</literal>
+EOF</userinput></screen>
+
+    </sect3>
+
+    <sect3>
+      <title>Other Initialization Values</title>
+
+      <para>Other initialization can easily be added to the
+      <filename>profile</filename> by adding additional scripts to the
+      <filename class='directory'>/etc/profile.d</filename> directory.</para>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 id="etc-bashrc-profile">
+    <title>/etc/bashrc</title>
+
+    <indexterm zone="postlfs-config-profile etc-bashrc-profile">
+      <primary sortas="e-etc-bashrc">/etc/bashrc</primary>
+    </indexterm>
+
+    <para>Here is a base <filename>/etc/bashrc</filename>.  Comments in the
+    file should explain everything you need.</para>
+
+<screen role="root"><userinput>cat &gt; /etc/bashrc &lt;&lt; "EOF"
+<literal># Begin /etc/bashrc
+# Written for Beyond Linux From Scratch
+# by James Robertson &lt;jameswrobertson@earthlink.net&gt;
+# updated by Bruce Dubbs &lt;bdubbs@&lfs-domainname;&gt;
+
+# System wide aliases and functions.
+
+# System wide environment variables and startup programs should go into
+# /etc/profile.  Personal environment variables and startup programs
+# should go into ~/.bash_profile.  Personal aliases and functions should
+# go into ~/.bashrc
+
+# Provides colored /bin/ls and /bin/grep commands.  Used in conjunction
+# with code in /etc/profile.
+
+alias ls='ls --color=auto'
+alias grep='grep --color=auto'
+
+# Provides prompt for non-login shells, specifically shells started
+# in the X environment. [Review the LFS archive thread titled
+# PS1 Environment Variable for a great case study behind this script
+# addendum.]
+
+NORMAL="\[\e[0m\]"
+RED="\[\e[1;31m\]"
+GREEN="\[\e[1;32m\]"
+if [[ $EUID == 0 ]] ; then
+  PS1="$RED\u [ $NORMAL\w$RED ]# $NORMAL"
+else
+  PS1="$GREEN\u [ $NORMAL\w$GREEN ]\$ $NORMAL"
+fi
+
+unset RED GREEN NORMAL
+
+# End /etc/bashrc</literal>
+EOF</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="bash_profile-profile">
+    <title>~/.bash_profile</title>
+
+    <indexterm zone="postlfs-config-profile bash_profile-profile">
+      <primary sortas="e-AA.bash_profile">~/.bash_profile</primary>
+    </indexterm>
+
+    <para>Here is a base <filename>~/.bash_profile</filename>.  If you want each
+    new user to have this file automatically, just change the output of
+    the command to <filename>/etc/skel/.bash_profile</filename> and check the
+    permissions after the command is run. You can then copy
+    <filename>/etc/skel/.bash_profile</filename> to the home directories of already
+    existing users, including <systemitem class="username">root</systemitem>,
+    and set the owner and group appropriately.</para>
+
+<screen><userinput>cat &gt; ~/.bash_profile &lt;&lt; "EOF"
+<literal># Begin ~/.bash_profile
+# Written for Beyond Linux From Scratch
+# by James Robertson &lt;jameswrobertson@earthlink.net&gt;
+# updated by Bruce Dubbs &lt;bdubbs@&lfs-domainname;&gt;
+
+# Personal environment variables and startup programs.
+
+# Personal aliases and functions should go in ~/.bashrc.  System wide
+# environment variables and startup programs are in /etc/profile.
+# System wide aliases and functions are in /etc/bashrc.
+
+if [ -f "$HOME/.bashrc" ] ; then
+  source $HOME/.bashrc
+fi
+
+if [ -d "$HOME/bin" ] ; then
+  pathprepend $HOME/bin
+fi
+
+# Having . in the PATH is dangerous
+#if [ $EUID -gt 99 ]; then
+#  pathappend .
+#fi
+
+# End ~/.bash_profile</literal>
+EOF</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="bashrc-profile">
+    <title>~/.bashrc</title>
+
+    <indexterm zone="postlfs-config-profile bashrc-profile">
+      <primary sortas="e-AA.bashrc">~/.bashrc</primary>
+    </indexterm>
+
+    <para>Here is a base <filename>~/.bashrc</filename>.  The comments and
+    instructions for using <filename class="directory">/etc/skel</filename> for
+    <filename>.bash_profile</filename> above also apply here. Only the target file
+    names are different.</para>
+
+<screen><userinput>cat &gt; ~/.bashrc &lt;&lt; "EOF"
+<literal># Begin ~/.bashrc
+# Written for Beyond Linux From Scratch
+# by James Robertson &lt;jameswrobertson@earthlink.net&gt;
+
+# Personal aliases and functions.
+
+# Personal environment variables and startup programs should go in
+# ~/.bash_profile.  System wide environment variables and startup
+# programs are in /etc/profile.  System wide aliases and functions are
+# in /etc/bashrc.
+
+if [ -f "/etc/bashrc" ] ; then
+  source /etc/bashrc
+fi
+
+# End ~/.bashrc</literal>
+EOF</userinput></screen>
+
+  </sect2>
+
+
+  <sect2 id="bash_logout-profile">
+    <title>~/.bash_logout</title>
+
+    <indexterm zone="postlfs-config-profile bash_logout-profile">
+      <primary sortas="e-AA.bash_logout">~/.bash_logout</primary>
+    </indexterm>
+
+    <para>This is an empty <filename>~/.bash_logout</filename> that can be used as
+    a template.  You will notice that the base <filename>~/.bash_logout</filename>
+    does not include a <userinput>clear</userinput> command.  This is because the
+    clear is handled in the <filename>/etc/issue</filename> file.</para>
+
+<screen><userinput>cat &gt; ~/.bash_logout &lt;&lt; "EOF"
+<literal># Begin ~/.bash_logout
+# Written for Beyond Linux From Scratch
+# by James Robertson &lt;jameswrobertson@earthlink.net&gt;
+
+# Personal items to perform on logout.
+
+# End ~/.bash_logout</literal>
+EOF</userinput></screen>
+
+  </sect2>
+
+
+  <sect2 id="etc-dircolors-profile">
+    <title>/etc/dircolors</title>
+
+    <indexterm zone="postlfs-config-profile etc-dircolors-profile">
+      <primary sortas="e-etc-dircolors">/etc/dircolors</primary>
+    </indexterm>
+
+    <indexterm zone="postlfs-config-profile etc-dircolors-profile">
+      <primary sortas="e-AA.dircolors">~/.dircolors</primary>
+    </indexterm>
+
+    <para> If you want to use the <filename>dircolors</filename> capability, then
+    run the following command. The <filename class="directory">/etc/skel</filename>
+    setup steps shown above also can be used here to provide a
+    <filename>~/.dircolors</filename> file when a new user is set up. As before,
+    just change the output file name on the following command and assure the
+    permissions, owner, and group are correct on the files created and/or
+    copied.</para>
+
+<screen role="root"><userinput>dircolors -p > /etc/dircolors</userinput></screen>
+
+    <para>If you wish to customize the colors used for different file types, you can
+    edit the <filename>/etc/dircolors</filename> file.  The instructions for setting
+    the colors are embedded in the file.</para>
+
+
+    <para>Finally, Ian Macdonald has written an excellent collection of tips and
+    tricks to enhance your shell environment.  You can read it online at
+    <ulink url="http://www.caliban.org/bash/index.shtml"/>.</para>
+
+  </sect2>
+
+</sect1>
Index: stlfs/virtualization/qemu-systemd.xml
===================================================================
--- postlfs/virtualization/qemu-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,585 +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 qemu-download-http "http://wiki.qemu.org/download/qemu-&qemu-version;.tar.bz2">
-  <!ENTITY qemu-download-ftp  " ">
-  <!ENTITY qemu-md5sum        "f469f2330bbe76e3e39db10e9ac4f8db">
-  <!ENTITY qemu-size          "25 MB">
-  <!ENTITY qemu-buildsize     "419 MB (with tests)">
-  <!ENTITY qemu-time          "2.4 SBU (with tests)">
-]>
-
-<sect1 id="qemu" xreflabel="qemu-&qemu-version;">
-  <?dbhtml filename="qemu.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>qemu-&qemu-version;</title>
-
-  <indexterm zone="qemu">
-    <primary sortas="a-qemu">qemu</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to qemu</title>
-
-    <para><application>qemu</application> is a full virtualization solution
-    for Linux on x86 hardware containing virtualization extensions (Intel VT or
-    AMD-V).</para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&qemu-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&qemu-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &qemu-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &qemu-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &qemu-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &qemu-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Qemu Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/>,
-      <xref linkend="python2"/>, and
-      <xref linkend="x-window-system"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="sdl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="alsa"/>,
-      <xref linkend="bluez"/>,
-      <xref linkend="check"/>,
-      <xref linkend="curl"/>,
-      <xref linkend="cyrus-sasl"/>,
-      <xref linkend="gnutls"/>,
-      <xref linkend="gtk2"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="libusb"/>,
-      <xref linkend="libgcrypt"/>,
-      <xref linkend="lzo"/>,
-      <xref linkend="nettle"/>,
-      <xref linkend="nss"/> (for libcacard.so),
-      <xref linkend="mesalib"/>, 
-      <xref linkend="sdl"/>, and
-      <xref linkend="vte"/>
-      <ulink url="http://www.libssh2.org">libssh2</ulink>
-    </para>
-
-    <note>
-      <para>
-        This optional dependencies list is not comprehensive. See the output of
-        <command>./configure --help</command> for a more complete list.
-      </para>
-    </note>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/qemu"/></para>
-
-  </sect2>
-
-  <sect2 id='qemu-prereq'>
-    <title>KVM Prerequisites</title>
-
-    <para>Before building <application>qemu</application>, check to see if
-    your processor supports Virtualization Technology (VT):</para>
-
-    <screen><userinput>egrep '^flags.*(vmx|svm)' /proc/cpuinfo</userinput></screen>
-
-    <para>If you get any output, you have VT technology (vmx for Intel
-    processors and svm for AMD processors).  You then need to go into your
-    system BIOS and ensure it is enabled.  After enabing, reboot back to your
-    LFS instance.</para>
-
-  </sect2>
-
-  <sect2 role="kernel" id='qemu-kernel'>
-    <title>Kernel Configuration</title>
-
-    <para>Enable the following options in the kernel configuration and
-    recompile the kernel if necessary:</para>
-
-<screen><literal>[*] Virtualization:  ---&gt;                            [CONFIG_VIRTUALIZATION]
-  &lt;*/M&gt;   Kernel-based Virtual Machine (KVM) support [CONFIG_KVM]
-  &lt;*/M&gt;     KVM for Intel processors support         [CONFIG_KVM_INTEL]
-  &lt;*/M&gt;     KVM for AMD processors support           [CONFIG_KVM_AMD]</literal></screen>
-
-    <indexterm zone="qemu qemu-kernel">
-      <primary sortas="d-qemu">qemu</primary>
-    </indexterm>
-
-    <para>The Intel or AMD settings are not both required, but the one matching
-    your system processor is required.</para>
-
-    <para>For networking, check that <xref linkend='bridgeutils'/> is installed
-    and the following options in the kernel configuration are enabled:</para>
-
-<screen><literal>[*] Networking support  ---&gt;                         [CONFIG_NET]
-  Networking options  ---&gt;
-    &lt;*/M&gt; 802.1d Ethernet Bridging                   [CONFIG_BRIDGE]
-Device Drivers  ---&gt;
-  [*] Network device support  ---&gt;                   [CONFIG_NETDEVICES]
-    &lt;*/M&gt;    Universal TUN/TAP device driver support [CONFIG_TUN]</literal></screen>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of qemu</title>
-
-    <para>Install <application>qemu</application> by running the following
-    commands:</para>
-
-      <note><para>Qemu is capable of running many targets. The build process
-      is also capable of building multiple targets at one time in a
-      comma delimited list assigned to <option>--target-list</option>. Run
-      <command>./configure --help</command> to get a complete list of
-      available targets.</para></note>
-
-<screen><userinput>if [ $(uname -m) = i686 ]; then
-   QEMU_ARCH=i386-softmmu
-else
-   QEMU_ARCH=x86_64-softmmu
-fi
-
-mkdir -vp build &amp;&amp;
-cd        build &amp;&amp;
-
-../configure --prefix=/usr          \
-             --sysconfdir=/etc   \
-             --target-list=$QEMU_ARCH  \
-             --audio-drv-list=alsa     \
-             --docdir=/usr/share/doc/qemu-&qemu-version; &amp;&amp;
-
-unset QEMU_ARCH &amp;&amp;
-
-make</userinput></screen>
-
-    <para>To run the built in tests, run <command>make V=1 check</command>.
-    One test is known to fail.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-[ -e  /usr/lib/libcacard.so ] &amp;&amp;
-chmod -v 755 /usr/lib/libcacard.so</userinput></screen>
-
-    <para>
-      You will need a dedicated group that will contain users (other than root)
-      allowed to access the KVM device.  Create this group by running the following 
-      command as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 61 kvm</userinput></screen>
-
-    <para>
-      Add any users that might use the KVM device to that group:
-    </para>
-
-<screen role="root"><userinput>usermod -a -G kvm <replaceable>&lt;username&gt;</replaceable></userinput></screen>
-
-    <para>
-      You will also need to add a Udev rule so that the KVM device gets correct
-      permissions:
-    </para>
-
-<screen role="root"><userinput>cat > /lib/udev/rules.d/65-kvm.rules &lt;&lt; "EOF"
-<literal>KERNEL=="kvm", GROUP="kvm", MODE="0660"</literal>
-EOF</userinput></screen>
-
-    <note><!--<para>The main program <command>qemu-system-x86_64</command> doesn't
-    make a distinction between i386 and x86_64 so even on an i386 system you
-    should use <emphasis>qemu-system-x86_64</emphasis></para>
-    -->
-
-    <para>For convenience you may want to create a symbolic link to run
-    The installed program. For instance:</para>
-
-<screen role="root"><userinput>ln -sv qemu-system-`uname -m` /usr/bin/qemu</userinput></screen>
-    </note>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--audio-drv-list=alsa</parameter>: This switch sets the audio driver
-      to ALSA. For other drivers see the --audio-drv-list list in
-      <command>configure</command>'s help output. The default audio driver is
-      OSS.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring qemu</title>
-
-    <para>To generate an image, run:</para>
-
-    <screen><userinput>qemu-img create -f qcow2 vdisk.img 10G</userinput></screen>
-
-    <para>Adjust the virtual disk size and image filename as desired.  The
-    actual size of the file will be less than specified, but will expand as it
-    is used.</para>
-
-    <note><para>The following instructions assume you have created the optional
-    symbolic link, <userinput>qemu</userinput>.  Additionally, you must run
-    <userinput>qemu</userinput> from an X Window System based terminal.
-    (either locally or over ssh).</para></note>
-
-    <para>To install an operating system, download an iso of your choice or use
-    a pre-installed cdrom device.  For the purposes of this example, use
-    Fedora 16 that is downloaded as
-    <filename>Fedora-16-x86_64-Live-LXDE.iso</filename> in the current
-    directory.  Run the following:</para>
-
-<screen><userinput>qemu -enable-kvm -hda vdisk.img            \
-     -cdrom Fedora-16-x86_64-Live-LXDE.iso \
-     -boot d                               \
-     -m 384</userinput></screen>
-
-    <para>Follow the normal installation procedures for the chosen
-    distribution.  The -boot option specifies the boot order of drives as a
-    string of drive letters. Valid drive letters are: a, b (floppy 1 and 2), c
-    (first hard disk), d (first CD-ROM).  The -m option is the amount of memory
-    to use for the virtual machine.  If you have sufficient memory (2G or
-    more), 1G is a reasonable value.  For computers with 512MB of RAM it's safe
-    to use -m 192, or even -m 128 (the default).  The -enable-kvm option allows
-    for hardware acceleeration.  Without this switch, the emulation is
-    relatively slow.</para>
-
-    <para>To run the newly installed operating system, run:</para>
-
-<screen><userinput>qemu -enable-kvm vdisk.img -m 384</userinput></screen>
-
-    <para>You may have a problem with <parameter>--enable-kvm</parameter>. Also,
-    you may want to define audio and video drivers, the number of cpu cores, and
-    the number of threads. An alternative command to install the operating system is (see qemu
-    man page for parameters definitions):</para>
-
-<screen><userinput>qemu -enable-kvm             \
-    -cdrom /home/fernando/ISO/linuxmint-17.1-mate-32bit.iso \
-    -boot order=d             \
-    -m 1G,slots=3,maxmem=4G \
-    -machine smm=off        \
-    -soundhw es1370         \
-    -cpu host               \
-    -smp cores=4,threads=2  \
-    -vga std                \
-    vdisk.img</userinput></screen>
-
-    <para>One parameter not appearing in the qemu man page is
-    <parameter>-machine smm=off</parameter>, and it used to allow
-    <parameter>-enable-kvm</parameter> in some systems. In order to run the
-    machine, you can alternatively issue:</para>
-
-<screen><userinput>qemu -enable-kvm          \
-    -machine smm=off             \
-    -boot order=d                \
-    -m 1G,slots=3,maxmem=4G      \
-    -soundhw es1370              \
-    -cpu host                    \
-    -smp cores=4,threads=2       \
-    -vga vmware                  \
-    -hda vdisk.img</userinput></screen>
-
-    <para>Sometimes, you want the machine to have different screen sizes than
-    the ones natively offered by the virtual graphics card. The example below is
-    for the qemu vmware graphics card, which uses
-    <xref linkend="xorg-vmware-driver"/> and is set to give the maximum screen size
-    of 1600x900. As the <systemitem class="username">root</systemitem> user,
-    issue the following:</para>
-
-<screen role="root"><userinput>cat &gt; /usr/share/X11/xorg.conf.d/20-vmware.conf &lt;&lt; "EOF"
-<literal>Section        "Monitor"
-   Identifier     "Monitor0"
-   # cvt 1600 900
-   # 1600x900 59.95 Hz (CVT 1.44M9) hsync:55.99 kHz; pclk: 118.25 MHz
-   Modeline       "1600x900" 118.25 1600 1696 1856 2112  900 903 908 934 -hysnc +vsync
-   Option         "PreferredMode" "1600x900"
-   HorizSync      1-200
-   VertRefresh    1-200
-EndSection
-
-Section           "Device"
-   Identifier     "VMWare SVGA II Adapter"
-   Option         "Monitor" "Default"
-   Driver         "vmware"
-EndSection
-
-Section           "Screen"
-   Identifier     "Default Screen"
-   Device         "VMWare SVGA II Adapter"
-   Monitor        "Monitor0"
-
-   SubSection     "Display"
-      Depth       24
-      Modes       "1600x900" "1440x900" "1366x768" "1280x720" "800x480"
-   EndSubSection
-EndSection </literal>
-EOF </userinput></screen>
-
-    <para>New sizes will be available besides the native ones. You need to
-    restart X in order to have the new sizes available.</para>
-
-    <para><!--To add networking to the instance add "-net nic -net user" to the
-    command above.--> qemu provides a DHCP server for the VM and, depending on
-    the client system, sets up networking though the host.</para>
-
-    <para>One problem with the above networking solution is that it does not
-    provide the ability to connect with the local network.  To do that, there are
-    several additional steps that need to be done, all as the <systemitem
-    class="username">root</systemitem> user:</para>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Set up bridging using <xref linkend="bridgeutils"/>.</para>
-      </listitem>
-
-      <listitem>
-        <para>Allow the host system to forward IP packets.</para>
-
-<screen role="root"><userinput>sysctl -w net.ipv4.ip_forward=1</userinput></screen>
-
-        <para>To make this permanent, add the command to
-        <filename>/etc/sysctl.d/60-net-forward.conf:</filename></para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/sysctl.d/60-net-forward.conf &lt;&lt; "EOF"
-net.ipv4.ip_forward=1
-EOF</userinput></screen>
-
-      </listitem>
-
-      <listitem>
-        <para>Allow the network connection when running as a part of the 
-        kvm group:</para>
-
-<screen role="root"><userinput>chgrp kvm  /usr/libexec/qemu-bridge-helper &amp;&amp;
-chmod 4750 /usr/libexec/qemu-bridge-helper</userinput></screen>
-
-      </listitem>
-
-      <listitem>
-        <para>Set up a required configuration file:</para>
-
-<screen role="root"><userinput>echo 'allow br0' &gt; /etc/qemu/bridge.conf</userinput></screen>
-
-      </listitem>
-
-<!--
-      <listitem>
-        <para>Create scripts for qemu to attach the client network
-        device, usually visible as tap0, to the host bridge.</para>
-
-<screen role="root"><userinput>cat &gt; /etc/qemu-ifup &lt;&lt; "EOF"
-#!/bin/bash
-
-switch=br0
-
-if [ -n "$1" ]; then
-  # Add new tap0 interface to bridge
-  /usr/sbin/brctl addif $switch $1
-else
-  echo "Error: no interface specified"
-  exit 1
-fi
-
-exit 0
-EOF
-
-chmod +x /etc/qemu-ifup</userinput></screen>
-
-<screen role="root"><userinput>cat &gt; /etc/qemu-ifdown &lt;&lt; "EOF"
-#!/bin/bash
-
-switch=br0
-
-if [ -n "$1" ]; then
-  # Remove tap0 interface from bridge
-  /usr/sbin/brctl delif $switch $1
-else
-  echo "Error: no interface specified"
-  exit 1
-fi
-
-exit 0
-EOF
-
-chmod +x /etc/qemu-ifdown</userinput></screen>
-
-      </listitem>
-    </itemizedlist>
-
-      <note><para>The backslashes in the above script are for convenience
-      for cut/paste operations.  The backslashes should <emphasis>not</emphasis>
-      appear in the final scripts.</para></note>
-
-    <itemizedlist spacing="compact"> -->
-      <listitem>
-        <!--<para>Start qemu with "-net nic -net tap" options.  </para>-->
-        <para>Start qemu with "-net nic -net bridge" options.  </para>
-      </listitem>
-
-      <listitem>
-        <para>If a connection, such as ssh, from the local network to the
-        client VM is desired, the client should be configured
-        with a static IP address.</para>
-      </listitem>
-
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          ivshmem-client,
-          ivshmem-server,
-          qemu (symlink),
-          qemu-ga,
-          qemu-img,
-          qemu-io,
-          qemu-nbd,
-          qemu-system-&lt;arch&gt;,
-          virtfs-proxy-helper, and
-          vscclient
-        </seg>
-        <seg>libcacard.so</seg>
-        <seg>
-          /etc/qemu, and
-          /usr/share/doc/qemu-&qemu-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Description</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="qemu-ga">
-        <term><command>qemu-ga</command></term>
-        <listitem>
-          <para>implements support for QMP (QEMU Monitor Protocol) commands and
-          events that terminate and originate respectively within the guest
-          using an agent built as part of QEMU.</para>
-          <indexterm zone="qemu qemu-ga">
-            <primary sortas="b-qemu-ga">qemu-ga</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qemu-img">
-        <term><command>qemu-img</command></term>
-        <listitem>
-          <para>provides commands to manage QEMU disk images.</para>
-          <indexterm zone="qemu qemu-img">
-            <primary sortas="b-qemu-img">qemu-img</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qemu-io">
-        <term><command>qemu-io</command></term>
-        <listitem>
-          <para>is a diagnostic and manipulation program for (virtual) memory
-          media.  It is still at an early stage of development.</para>
-          <indexterm zone="qemu qemu-io">
-            <primary sortas="b-qemu-io">qemu-io</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qemu-nbd">
-        <term><command>qemu-nbd</command></term>
-        <listitem>
-          <para>exports Qemu disk images using the QEMU Disk Network Block
-          Device (NBD) protocol.</para>
-          <indexterm zone="qemu qemu-nbd">
-            <primary sortas="b-qemu-nbd">qemu-nbd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qemu-system">
-        <term><command>qemu-system-x86_64</command></term>
-        <listitem>
-          <para>is the QEMU PC System emulator.</para>
-          <indexterm zone="qemu qemu-system">
-            <primary sortas="b-qemu-system">qemu-system-x86_64</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="virtfs-proxy-helper">
-        <term><command>virtfs-proxy-helper</command></term>
-        <listitem>
-          <para>creates a socket pair or a named socket. QEMU and proxy helper
-           communicate using this socket. QEMU proxy fs driver sends
-           filesystem request to proxy helper and receives the response
-           from it.</para>
-          <indexterm zone="qemu virtfs-proxy-helper">
-            <primary sortas="b-virtfs-proxy-helper">virtfs-proxy-helper</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vscclient">
-        <term><command>vscclient</command></term>
-        <listitem>
-          <para>implements a sockets interface to the virtual CCID reader
-           on the guest.</para>
-          <indexterm zone="qemu vscclient">
-            <primary sortas="b-vscclient">vscclient</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcacard">
-        <term><filename class="libraryfile">libcacard.so</filename></term>
-        <listitem>
-          <para>is the Virtual Smart Card Emulator library.</para>
-          <indexterm zone="qemu libcacard">
-            <primary sortas="c-libcacard">libcacard.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: postlfs/virtualization/qemu.xml
===================================================================
--- postlfs/virtualization/qemu.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ postlfs/virtualization/qemu.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -0,0 +1,585 @@
+<?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 qemu-download-http "http://wiki.qemu.org/download/qemu-&qemu-version;.tar.bz2">
+  <!ENTITY qemu-download-ftp  " ">
+  <!ENTITY qemu-md5sum        "f469f2330bbe76e3e39db10e9ac4f8db">
+  <!ENTITY qemu-size          "25 MB">
+  <!ENTITY qemu-buildsize     "419 MB (with tests)">
+  <!ENTITY qemu-time          "2.4 SBU (with tests)">
+]>
+
+<sect1 id="qemu" xreflabel="qemu-&qemu-version;">
+  <?dbhtml filename="qemu.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>qemu-&qemu-version;</title>
+
+  <indexterm zone="qemu">
+    <primary sortas="a-qemu">qemu</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to qemu</title>
+
+    <para><application>qemu</application> is a full virtualization solution
+    for Linux on x86 hardware containing virtualization extensions (Intel VT or
+    AMD-V).</para>
+
+    &lfs77_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&qemu-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&qemu-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &qemu-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &qemu-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &qemu-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &qemu-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Qemu Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="glib2"/>,
+      <xref linkend="python2"/>, and
+      <xref linkend="x-window-system"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="sdl"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="alsa"/>,
+      <xref linkend="bluez"/>,
+      <xref linkend="check"/>,
+      <xref linkend="curl"/>,
+      <xref linkend="cyrus-sasl"/>,
+      <xref linkend="gnutls"/>,
+      <xref linkend="gtk2"/>,
+      <xref linkend="gtk3"/>,
+      <xref linkend="libusb"/>,
+      <xref linkend="libgcrypt"/>,
+      <xref linkend="lzo"/>,
+      <xref linkend="nettle"/>,
+      <xref linkend="nss"/> (for libcacard.so),
+      <xref linkend="mesalib"/>, 
+      <xref linkend="sdl"/>, and
+      <xref linkend="vte"/>
+      <ulink url="http://www.libssh2.org">libssh2</ulink>
+    </para>
+
+    <note>
+      <para>
+        This optional dependencies list is not comprehensive. See the output of
+        <command>./configure --help</command> for a more complete list.
+      </para>
+    </note>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/qemu"/></para>
+
+  </sect2>
+
+  <sect2 id='qemu-prereq'>
+    <title>KVM Prerequisites</title>
+
+    <para>Before building <application>qemu</application>, check to see if
+    your processor supports Virtualization Technology (VT):</para>
+
+    <screen><userinput>egrep '^flags.*(vmx|svm)' /proc/cpuinfo</userinput></screen>
+
+    <para>If you get any output, you have VT technology (vmx for Intel
+    processors and svm for AMD processors).  You then need to go into your
+    system BIOS and ensure it is enabled.  After enabing, reboot back to your
+    LFS instance.</para>
+
+  </sect2>
+
+  <sect2 role="kernel" id='qemu-kernel'>
+    <title>Kernel Configuration</title>
+
+    <para>Enable the following options in the kernel configuration and
+    recompile the kernel if necessary:</para>
+
+<screen><literal>[*] Virtualization:  ---&gt;                            [CONFIG_VIRTUALIZATION]
+  &lt;*/M&gt;   Kernel-based Virtual Machine (KVM) support [CONFIG_KVM]
+  &lt;*/M&gt;     KVM for Intel processors support         [CONFIG_KVM_INTEL]
+  &lt;*/M&gt;     KVM for AMD processors support           [CONFIG_KVM_AMD]</literal></screen>
+
+    <indexterm zone="qemu qemu-kernel">
+      <primary sortas="d-qemu">qemu</primary>
+    </indexterm>
+
+    <para>The Intel or AMD settings are not both required, but the one matching
+    your system processor is required.</para>
+
+    <para>For networking, check that <xref linkend='bridgeutils'/> is installed
+    and the following options in the kernel configuration are enabled:</para>
+
+<screen><literal>[*] Networking support  ---&gt;                         [CONFIG_NET]
+  Networking options  ---&gt;
+    &lt;*/M&gt; 802.1d Ethernet Bridging                   [CONFIG_BRIDGE]
+Device Drivers  ---&gt;
+  [*] Network device support  ---&gt;                   [CONFIG_NETDEVICES]
+    &lt;*/M&gt;    Universal TUN/TAP device driver support [CONFIG_TUN]</literal></screen>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of qemu</title>
+
+    <para>Install <application>qemu</application> by running the following
+    commands:</para>
+
+      <note><para>Qemu is capable of running many targets. The build process
+      is also capable of building multiple targets at one time in a
+      comma delimited list assigned to <option>--target-list</option>. Run
+      <command>./configure --help</command> to get a complete list of
+      available targets.</para></note>
+
+<screen><userinput>if [ $(uname -m) = i686 ]; then
+   QEMU_ARCH=i386-softmmu
+else
+   QEMU_ARCH=x86_64-softmmu
+fi
+
+mkdir -vp build &amp;&amp;
+cd        build &amp;&amp;
+
+../configure --prefix=/usr          \
+             --sysconfdir=/etc   \
+             --target-list=$QEMU_ARCH  \
+             --audio-drv-list=alsa     \
+             --docdir=/usr/share/doc/qemu-&qemu-version; &amp;&amp;
+
+unset QEMU_ARCH &amp;&amp;
+
+make</userinput></screen>
+
+    <para>To run the built in tests, run <command>make V=1 check</command>.
+    One test is known to fail.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install &amp;&amp;
+[ -e  /usr/lib/libcacard.so ] &amp;&amp;
+chmod -v 755 /usr/lib/libcacard.so</userinput></screen>
+
+    <para>
+      You will need a dedicated group that will contain users (other than root)
+      allowed to access the KVM device.  Create this group by running the following 
+      command as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>groupadd -g 61 kvm</userinput></screen>
+
+    <para>
+      Add any users that might use the KVM device to that group:
+    </para>
+
+<screen role="root"><userinput>usermod -a -G kvm <replaceable>&lt;username&gt;</replaceable></userinput></screen>
+
+    <para>
+      You will also need to add a Udev rule so that the KVM device gets correct
+      permissions:
+    </para>
+
+<screen role="root"><userinput>cat > /lib/udev/rules.d/65-kvm.rules &lt;&lt; "EOF"
+<literal>KERNEL=="kvm", GROUP="kvm", MODE="0660"</literal>
+EOF</userinput></screen>
+
+    <note><!--<para>The main program <command>qemu-system-x86_64</command> doesn't
+    make a distinction between i386 and x86_64 so even on an i386 system you
+    should use <emphasis>qemu-system-x86_64</emphasis></para>
+    -->
+
+    <para>For convenience you may want to create a symbolic link to run
+    The installed program. For instance:</para>
+
+<screen role="root"><userinput>ln -sv qemu-system-`uname -m` /usr/bin/qemu</userinput></screen>
+    </note>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>--audio-drv-list=alsa</parameter>: This switch sets the audio driver
+      to ALSA. For other drivers see the --audio-drv-list list in
+      <command>configure</command>'s help output. The default audio driver is
+      OSS.
+    </para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring qemu</title>
+
+    <para>To generate an image, run:</para>
+
+    <screen><userinput>qemu-img create -f qcow2 vdisk.img 10G</userinput></screen>
+
+    <para>Adjust the virtual disk size and image filename as desired.  The
+    actual size of the file will be less than specified, but will expand as it
+    is used.</para>
+
+    <note><para>The following instructions assume you have created the optional
+    symbolic link, <userinput>qemu</userinput>.  Additionally, you must run
+    <userinput>qemu</userinput> from an X Window System based terminal.
+    (either locally or over ssh).</para></note>
+
+    <para>To install an operating system, download an iso of your choice or use
+    a pre-installed cdrom device.  For the purposes of this example, use
+    Fedora 16 that is downloaded as
+    <filename>Fedora-16-x86_64-Live-LXDE.iso</filename> in the current
+    directory.  Run the following:</para>
+
+<screen><userinput>qemu -enable-kvm -hda vdisk.img            \
+     -cdrom Fedora-16-x86_64-Live-LXDE.iso \
+     -boot d                               \
+     -m 384</userinput></screen>
+
+    <para>Follow the normal installation procedures for the chosen
+    distribution.  The -boot option specifies the boot order of drives as a
+    string of drive letters. Valid drive letters are: a, b (floppy 1 and 2), c
+    (first hard disk), d (first CD-ROM).  The -m option is the amount of memory
+    to use for the virtual machine.  If you have sufficient memory (2G or
+    more), 1G is a reasonable value.  For computers with 512MB of RAM it's safe
+    to use -m 192, or even -m 128 (the default).  The -enable-kvm option allows
+    for hardware acceleeration.  Without this switch, the emulation is
+    relatively slow.</para>
+
+    <para>To run the newly installed operating system, run:</para>
+
+<screen><userinput>qemu -enable-kvm vdisk.img -m 384</userinput></screen>
+
+    <para>You may have a problem with <parameter>--enable-kvm</parameter>. Also,
+    you may want to define audio and video drivers, the number of cpu cores, and
+    the number of threads. An alternative command to install the operating system is (see qemu
+    man page for parameters definitions):</para>
+
+<screen><userinput>qemu -enable-kvm             \
+    -cdrom /home/fernando/ISO/linuxmint-17.1-mate-32bit.iso \
+    -boot order=d             \
+    -m 1G,slots=3,maxmem=4G \
+    -machine smm=off        \
+    -soundhw es1370         \
+    -cpu host               \
+    -smp cores=4,threads=2  \
+    -vga std                \
+    vdisk.img</userinput></screen>
+
+    <para>One parameter not appearing in the qemu man page is
+    <parameter>-machine smm=off</parameter>, and it used to allow
+    <parameter>-enable-kvm</parameter> in some systems. In order to run the
+    machine, you can alternatively issue:</para>
+
+<screen><userinput>qemu -enable-kvm          \
+    -machine smm=off             \
+    -boot order=d                \
+    -m 1G,slots=3,maxmem=4G      \
+    -soundhw es1370              \
+    -cpu host                    \
+    -smp cores=4,threads=2       \
+    -vga vmware                  \
+    -hda vdisk.img</userinput></screen>
+
+    <para>Sometimes, you want the machine to have different screen sizes than
+    the ones natively offered by the virtual graphics card. The example below is
+    for the qemu vmware graphics card, which uses
+    <xref linkend="xorg-vmware-driver"/> and is set to give the maximum screen size
+    of 1600x900. As the <systemitem class="username">root</systemitem> user,
+    issue the following:</para>
+
+<screen role="root"><userinput>cat &gt; /usr/share/X11/xorg.conf.d/20-vmware.conf &lt;&lt; "EOF"
+<literal>Section        "Monitor"
+   Identifier     "Monitor0"
+   # cvt 1600 900
+   # 1600x900 59.95 Hz (CVT 1.44M9) hsync:55.99 kHz; pclk: 118.25 MHz
+   Modeline       "1600x900" 118.25 1600 1696 1856 2112  900 903 908 934 -hysnc +vsync
+   Option         "PreferredMode" "1600x900"
+   HorizSync      1-200
+   VertRefresh    1-200
+EndSection
+
+Section           "Device"
+   Identifier     "VMWare SVGA II Adapter"
+   Option         "Monitor" "Default"
+   Driver         "vmware"
+EndSection
+
+Section           "Screen"
+   Identifier     "Default Screen"
+   Device         "VMWare SVGA II Adapter"
+   Monitor        "Monitor0"
+
+   SubSection     "Display"
+      Depth       24
+      Modes       "1600x900" "1440x900" "1366x768" "1280x720" "800x480"
+   EndSubSection
+EndSection </literal>
+EOF </userinput></screen>
+
+    <para>New sizes will be available besides the native ones. You need to
+    restart X in order to have the new sizes available.</para>
+
+    <para><!--To add networking to the instance add "-net nic -net user" to the
+    command above.--> qemu provides a DHCP server for the VM and, depending on
+    the client system, sets up networking though the host.</para>
+
+    <para>One problem with the above networking solution is that it does not
+    provide the ability to connect with the local network.  To do that, there are
+    several additional steps that need to be done, all as the <systemitem
+    class="username">root</systemitem> user:</para>
+
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Set up bridging using <xref linkend="bridgeutils"/>.</para>
+      </listitem>
+
+      <listitem>
+        <para>Allow the host system to forward IP packets.</para>
+
+<screen role="root"><userinput>sysctl -w net.ipv4.ip_forward=1</userinput></screen>
+
+        <para>To make this permanent, add the command to
+        <filename>/etc/sysctl.d/60-net-forward.conf:</filename></para>
+
+<screen role="root"><userinput>cat &gt;&gt; /etc/sysctl.d/60-net-forward.conf &lt;&lt; "EOF"
+net.ipv4.ip_forward=1
+EOF</userinput></screen>
+
+      </listitem>
+
+      <listitem>
+        <para>Allow the network connection when running as a part of the 
+        kvm group:</para>
+
+<screen role="root"><userinput>chgrp kvm  /usr/libexec/qemu-bridge-helper &amp;&amp;
+chmod 4750 /usr/libexec/qemu-bridge-helper</userinput></screen>
+
+      </listitem>
+
+      <listitem>
+        <para>Set up a required configuration file:</para>
+
+<screen role="root"><userinput>echo 'allow br0' &gt; /etc/qemu/bridge.conf</userinput></screen>
+
+      </listitem>
+
+<!--
+      <listitem>
+        <para>Create scripts for qemu to attach the client network
+        device, usually visible as tap0, to the host bridge.</para>
+
+<screen role="root"><userinput>cat &gt; /etc/qemu-ifup &lt;&lt; "EOF"
+#!/bin/bash
+
+switch=br0
+
+if [ -n "$1" ]; then
+  # Add new tap0 interface to bridge
+  /usr/sbin/brctl addif $switch $1
+else
+  echo "Error: no interface specified"
+  exit 1
+fi
+
+exit 0
+EOF
+
+chmod +x /etc/qemu-ifup</userinput></screen>
+
+<screen role="root"><userinput>cat &gt; /etc/qemu-ifdown &lt;&lt; "EOF"
+#!/bin/bash
+
+switch=br0
+
+if [ -n "$1" ]; then
+  # Remove tap0 interface from bridge
+  /usr/sbin/brctl delif $switch $1
+else
+  echo "Error: no interface specified"
+  exit 1
+fi
+
+exit 0
+EOF
+
+chmod +x /etc/qemu-ifdown</userinput></screen>
+
+      </listitem>
+    </itemizedlist>
+
+      <note><para>The backslashes in the above script are for convenience
+      for cut/paste operations.  The backslashes should <emphasis>not</emphasis>
+      appear in the final scripts.</para></note>
+
+    <itemizedlist spacing="compact"> -->
+      <listitem>
+        <!--<para>Start qemu with "-net nic -net tap" options.  </para>-->
+        <para>Start qemu with "-net nic -net bridge" options.  </para>
+      </listitem>
+
+      <listitem>
+        <para>If a connection, such as ssh, from the local network to the
+        client VM is desired, the client should be configured
+        with a static IP address.</para>
+      </listitem>
+
+    </itemizedlist>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          ivshmem-client,
+          ivshmem-server,
+          qemu (symlink),
+          qemu-ga,
+          qemu-img,
+          qemu-io,
+          qemu-nbd,
+          qemu-system-&lt;arch&gt;,
+          virtfs-proxy-helper, and
+          vscclient
+        </seg>
+        <seg>libcacard.so</seg>
+        <seg>
+          /etc/qemu, and
+          /usr/share/doc/qemu-&qemu-version;
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Description</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="qemu-ga">
+        <term><command>qemu-ga</command></term>
+        <listitem>
+          <para>implements support for QMP (QEMU Monitor Protocol) commands and
+          events that terminate and originate respectively within the guest
+          using an agent built as part of QEMU.</para>
+          <indexterm zone="qemu qemu-ga">
+            <primary sortas="b-qemu-ga">qemu-ga</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qemu-img">
+        <term><command>qemu-img</command></term>
+        <listitem>
+          <para>provides commands to manage QEMU disk images.</para>
+          <indexterm zone="qemu qemu-img">
+            <primary sortas="b-qemu-img">qemu-img</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qemu-io">
+        <term><command>qemu-io</command></term>
+        <listitem>
+          <para>is a diagnostic and manipulation program for (virtual) memory
+          media.  It is still at an early stage of development.</para>
+          <indexterm zone="qemu qemu-io">
+            <primary sortas="b-qemu-io">qemu-io</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qemu-nbd">
+        <term><command>qemu-nbd</command></term>
+        <listitem>
+          <para>exports Qemu disk images using the QEMU Disk Network Block
+          Device (NBD) protocol.</para>
+          <indexterm zone="qemu qemu-nbd">
+            <primary sortas="b-qemu-nbd">qemu-nbd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="qemu-system">
+        <term><command>qemu-system-x86_64</command></term>
+        <listitem>
+          <para>is the QEMU PC System emulator.</para>
+          <indexterm zone="qemu qemu-system">
+            <primary sortas="b-qemu-system">qemu-system-x86_64</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="virtfs-proxy-helper">
+        <term><command>virtfs-proxy-helper</command></term>
+        <listitem>
+          <para>creates a socket pair or a named socket. QEMU and proxy helper
+           communicate using this socket. QEMU proxy fs driver sends
+           filesystem request to proxy helper and receives the response
+           from it.</para>
+          <indexterm zone="qemu virtfs-proxy-helper">
+            <primary sortas="b-virtfs-proxy-helper">virtfs-proxy-helper</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="vscclient">
+        <term><command>vscclient</command></term>
+        <listitem>
+          <para>implements a sockets interface to the virtual CCID reader
+           on the guest.</para>
+          <indexterm zone="qemu vscclient">
+            <primary sortas="b-vscclient">vscclient</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libcacard">
+        <term><filename class="libraryfile">libcacard.so</filename></term>
+        <listitem>
+          <para>is the Virtual Smart Card Emulator library.</para>
+          <indexterm zone="qemu libcacard">
+            <primary sortas="c-libcacard">libcacard.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: postlfs/virtualization/virtualization.xml
===================================================================
--- postlfs/virtualization/virtualization.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ postlfs/virtualization/virtualization.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -22,5 +22,5 @@
   processor.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qemu-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qemu.xml"/>
 
 </chapter>
Index: t/printing/cups-filters-systemd.xml
===================================================================
--- pst/printing/cups-filters-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,277 +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 cups-filters-download-http
-           "https://www.openprinting.org/download/cups-filters/cups-filters-&cups-filters-version;.tar.xz">
-  <!ENTITY cups-filters-download-ftp  " ">
-  <!ENTITY cups-filters-md5sum        "14862048b4a9a87abfeeae07531dd020">
-  <!ENTITY cups-filters-size          "1.3 MB">
-  <!ENTITY cups-filters-buildsize     "51 MB">
-  <!ENTITY cups-filters-time          "0.4 SBU">
-]>
-
-<sect1 id="cups-filters" xreflabel="cups-filters-&cups-filters-version;">
-  <?dbhtml filename="cups-filters.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>cups-filters-&cups-filters-version;</title>
-
-  <indexterm zone="cups-filters">
-    <primary sortas="a-cups-filters">cups-filters</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to CUPS Filters</title>
-
-    <para>
-      The <application>CUPS Filters</application> package contains backends,
-      filters and other software that was once part of the core
-      <application>CUPS</application> distribution but is no longer
-      maintained by Apple Inc.
-    </para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&cups-filters-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&cups-filters-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cups-filters-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cups-filters-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &cups-filters-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &cups-filters-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">CUPS Filters Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cups"/>,
-      <xref linkend="glib2"/>,
-      <xref linkend="ijs"/>,
-      <xref linkend="lcms2"/>,
-      <xref linkend="poppler"/> and
-      <xref linkend="qpdf"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libpng"/> and
-      <xref linkend="libtiff"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="avahi"/> and
-      <xref linkend="php"/> (use of this might be broken)
-    </para>
-
-    <bridgehead renderas="sect4">Required (Runtime)</bridgehead>
-    <para role="required runtime">
-      <xref linkend="gs"/> (Needed for PostScript printers), or
-      <xref linkend="gutenprint"/> (for supported printers),
-      or other printer drivers
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/cups-filters"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of CUPS Filters</title>
-
-    <para>
-      First, fix the systemd unit file to work with
-      <application>CUPS</application> 2.0 and later:
-    </para>
-
-<screen><userinput>sed -i "s:cups.service:org.cups.cupsd.service:g" utils/cups-browsed.service</userinput></screen>
-
-    <para>
-      Install <application>CUPS Filters</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr                   \
-            --sysconfdir=/etc               \
-            --localstatedir=/var            \
-            --without-rcdir                 \
-            --disable-static                \
-            --with-gs-path=/usr/bin/gs      \
-            --with-pdftops-path=/usr/bin/gs \
-            --docdir=/usr/share/doc/cups-filters-&cups-filters-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make -k check</command>. Note that many tests fail for unknown reasons.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      Install the systemd unit by running the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -m644 utils/cups-browsed.service /lib/systemd/system/cups-browsed.service</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--without-rcdir</parameter>: This switch disables
-      installation of the bundled bootscript which is not compatible
-      with BLFS.
-    </para>
-
-    <para>
-      <parameter>--with-gs-path=/usr/bin/gs</parameter>: This switch
-      defines the path to the <application>GhostScript</application>
-      binary in case <xref linkend="gs"/> is not installed at build time.
-    </para>
-
-    <para>
-      <parameter>--with-pdftops-path=/usr/bin/gs</parameter>: This switch
-      defines the path to the <application>GhostScript</application>
-      binary in case <xref linkend="gs"/> is not installed at build time.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Cups Filters</title>
-
-    <sect3 id="cups-filters-init">
-      <title>Systemd Units</title>
-
-      <para>
-        To start the <command>cups-browsed</command> daemon at boot, enable
-        the previously installed systemd unit by running the following command
-        as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-      <indexterm zone="cups-filters cups-filters-init">
-        <primary sortas="f-cups-browsed">cups-browsed</primary>
-      </indexterm>
-
-<screen role="root"><userinput>systemctl enable cups-browsed</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>
-          cups-browsed, foomatic-rip and ttfread
-        </seg>
-        <seg>
-          libcupsfilters.so and libfontembed.so
-        </seg>
-        <seg>
-          /usr/include/{cupsfilters,fontembed},
-          /usr/lib/cups/{backend,filter},
-          /usr/share/cups/{banners,charsets,data},
-          /usr/share/doc/cups-filters-&cups-filters-version; and
-          /usr/share/ppd/cupsfilters
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cups-browsed">
-        <term><command>cups-browsed</command></term>
-        <listitem>
-          <para>
-            is a daemon for browsing the Bonjour and CUPS broadcasts of shared,
-            remote CUPS printers.
-          </para>
-          <indexterm zone="cups-filters cups-browsed">
-            <primary sortas="b-cups-browsed">cups-browsed</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="foomatic-rip">
-        <term><command>foomatic-rip</command></term>
-        <listitem>
-          <para>
-            is a universal print filter/RIP wrapper which can be used as CUPS
-            filter or stand-alone for spooler-less, direct printing.
-          </para>
-          <indexterm zone="cups-filters foomatic-rip">
-            <primary sortas="b-foomatic-rip">foomatic-rip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcupsfilters">
-        <term><filename class="libraryfile">libcupsfilters.so</filename></term>
-        <listitem>
-          <para>
-            contains <application>CUPS Filters</application> API functions.
-          </para>
-          <indexterm zone="cups-filters libcupsfilters">
-            <primary sortas="c-libcupsfilters">libcupsfilters.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: pst/printing/cups-filters.xml
===================================================================
--- pst/printing/cups-filters.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ pst/printing/cups-filters.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -0,0 +1,277 @@
+<?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 cups-filters-download-http
+           "https://www.openprinting.org/download/cups-filters/cups-filters-&cups-filters-version;.tar.xz">
+  <!ENTITY cups-filters-download-ftp  " ">
+  <!ENTITY cups-filters-md5sum        "14862048b4a9a87abfeeae07531dd020">
+  <!ENTITY cups-filters-size          "1.3 MB">
+  <!ENTITY cups-filters-buildsize     "51 MB">
+  <!ENTITY cups-filters-time          "0.4 SBU">
+]>
+
+<sect1 id="cups-filters" xreflabel="cups-filters-&cups-filters-version;">
+  <?dbhtml filename="cups-filters.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>cups-filters-&cups-filters-version;</title>
+
+  <indexterm zone="cups-filters">
+    <primary sortas="a-cups-filters">cups-filters</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to CUPS Filters</title>
+
+    <para>
+      The <application>CUPS Filters</application> package contains backends,
+      filters and other software that was once part of the core
+      <application>CUPS</application> distribution but is no longer
+      maintained by Apple Inc.
+    </para>
+
+    &lfs77_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&cups-filters-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&cups-filters-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &cups-filters-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &cups-filters-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &cups-filters-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &cups-filters-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">CUPS Filters Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="cups"/>,
+      <xref linkend="glib2"/>,
+      <xref linkend="ijs"/>,
+      <xref linkend="lcms2"/>,
+      <xref linkend="poppler"/> and
+      <xref linkend="qpdf"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="libjpeg"/>,
+      <xref linkend="libpng"/> and
+      <xref linkend="libtiff"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="avahi"/> and
+      <xref linkend="php"/> (use of this might be broken)
+    </para>
+
+    <bridgehead renderas="sect4">Required (Runtime)</bridgehead>
+    <para role="required runtime">
+      <xref linkend="gs"/> (Needed for PostScript printers), or
+      <xref linkend="gutenprint"/> (for supported printers),
+      or other printer drivers
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/cups-filters"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of CUPS Filters</title>
+
+    <para>
+      First, fix the systemd unit file to work with
+      <application>CUPS</application> 2.0 and later:
+    </para>
+
+<screen><userinput>sed -i "s:cups.service:org.cups.cupsd.service:g" utils/cups-browsed.service</userinput></screen>
+
+    <para>
+      Install <application>CUPS Filters</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr                   \
+            --sysconfdir=/etc               \
+            --localstatedir=/var            \
+            --without-rcdir                 \
+            --disable-static                \
+            --with-gs-path=/usr/bin/gs      \
+            --with-pdftops-path=/usr/bin/gs \
+            --docdir=/usr/share/doc/cups-filters-&cups-filters-version; &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make -k check</command>. Note that many tests fail for unknown reasons.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+    <para>
+      Install the systemd unit by running the following command as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>install -v -m644 utils/cups-browsed.service /lib/systemd/system/cups-browsed.service</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>--without-rcdir</parameter>: This switch disables
+      installation of the bundled bootscript which is not compatible
+      with BLFS.
+    </para>
+
+    <para>
+      <parameter>--with-gs-path=/usr/bin/gs</parameter>: This switch
+      defines the path to the <application>GhostScript</application>
+      binary in case <xref linkend="gs"/> is not installed at build time.
+    </para>
+
+    <para>
+      <parameter>--with-pdftops-path=/usr/bin/gs</parameter>: This switch
+      defines the path to the <application>GhostScript</application>
+      binary in case <xref linkend="gs"/> is not installed at build time.
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring Cups Filters</title>
+
+    <sect3 id="cups-filters-init">
+      <title>Systemd Units</title>
+
+      <para>
+        To start the <command>cups-browsed</command> daemon at boot, enable
+        the previously installed systemd unit by running the following command
+        as the <systemitem class="username">root</systemitem> user:
+      </para>
+
+      <indexterm zone="cups-filters cups-filters-init">
+        <primary sortas="f-cups-browsed">cups-browsed</primary>
+      </indexterm>
+
+<screen role="root"><userinput>systemctl enable cups-browsed</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>
+          cups-browsed, foomatic-rip and ttfread
+        </seg>
+        <seg>
+          libcupsfilters.so and libfontembed.so
+        </seg>
+        <seg>
+          /usr/include/{cupsfilters,fontembed},
+          /usr/lib/cups/{backend,filter},
+          /usr/share/cups/{banners,charsets,data},
+          /usr/share/doc/cups-filters-&cups-filters-version; and
+          /usr/share/ppd/cupsfilters
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="cups-browsed">
+        <term><command>cups-browsed</command></term>
+        <listitem>
+          <para>
+            is a daemon for browsing the Bonjour and CUPS broadcasts of shared,
+            remote CUPS printers.
+          </para>
+          <indexterm zone="cups-filters cups-browsed">
+            <primary sortas="b-cups-browsed">cups-browsed</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="foomatic-rip">
+        <term><command>foomatic-rip</command></term>
+        <listitem>
+          <para>
+            is a universal print filter/RIP wrapper which can be used as CUPS
+            filter or stand-alone for spooler-less, direct printing.
+          </para>
+          <indexterm zone="cups-filters foomatic-rip">
+            <primary sortas="b-foomatic-rip">foomatic-rip</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libcupsfilters">
+        <term><filename class="libraryfile">libcupsfilters.so</filename></term>
+        <listitem>
+          <para>
+            contains <application>CUPS Filters</application> API functions.
+          </para>
+          <indexterm zone="cups-filters libcupsfilters">
+            <primary sortas="c-libcupsfilters">libcupsfilters.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: t/printing/cups-systemd.xml
===================================================================
--- pst/printing/cups-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,863 +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 cups-download-http "http://www.cups.org/software/&cups-version;/cups-&cups-version;-source.tar.bz2">
-  <!ENTITY cups-download-ftp  " ">
-  <!ENTITY cups-md5sum        "c4e57a66298bfsba66bb3d5bedd317a4">
-  <!ENTITY cups-size          "8.4 MB">
-  <!ENTITY cups-buildsize     "92 MB">
-  <!ENTITY cups-time          "0.8 SBU">
-]>
-
-<sect1 id="cups" xreflabel="Cups-&cups-version;">
-  <?dbhtml filename="cups.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Cups-&cups-version;</title>
-
-  <indexterm zone="cups">
-    <primary sortas="a-Cups">Cups</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Cups</title>
-
-    <para>
-      The Common Unix Printing System (CUPS) is a print spooler and
-      associated utilities. It is based on the "Internet Printing
-      Protocol" and provides printing services to most PostScript
-      and raster printers.
-    </para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&cups-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&cups-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cups-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cups-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &cups-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &cups-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Cups Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gnutls"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="colord"/>,
-      <xref linkend="dbus"/> and
-      <xref linkend="libusb"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="avahi"/>,
-      <xref linkend="libpaper"/>,
-      <xref linkend="linux-pam"/>,
-      <xref linkend="llvm"/> (with Clang),
-      <xref linkend="mitkrb"/>,
-      <xref linkend="openjdk"/>,
-      <xref linkend="php"/>,
-      <xref linkend="python2"/> and
-      <xref linkend="xdg-utils"/>
-    </para>
-
-    <bridgehead renderas="sect4">Required (Runtime)</bridgehead>
-    <para role="optional">
-      <xref linkend="cups-filters"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (Runtime)</bridgehead>
-    <para role="optional">
-      <ulink url="https://www.openprinting.org/download/foomatic/">Foomatic</ulink>,
-      <xref linkend="gutenprint"/> and
-      <ulink url="http://hplipopensource.com/hplip-web/index.html">HPLIP</ulink> (HP printers)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/cups"/>
-    </para>
-  </sect2>
-
-  <sect2 role="kernel" id="cups-kernel">
-    <title>Kernel Configuration</title>
-
-    <note>
-      <para>
-        There used to be a conflict between the <application>Cups</application>
-        <application>libusb</application> backend and the usblp kernel driver.
-        This is no longer the case and Cups will work with both of these
-        enabled.
-      </para>
-    </note>
-
-    <para>
-      If you want to use the kernel usblp driver (for example, if you wish to
-      use <application>escputil</application> from <xref
-      linkend="gutenprint"/>) enable the following options in your kernel
-      configuration and recompile the kernel:
-    </para>
-
-<screen><literal>Device Drivers  ---&gt;
-  [*] USB support  ---&gt;                          [CONFIG_USB_SUPPORT]
-    &lt;*/M&gt;  OHCI HCD (USB 1.1) support            [CONFIG_USB_OHCI_HCD]
-    &lt;*/M&gt;  UHCI HCD (most Intel and VIA) support [CONFIG_USB_UHCI_HCD]
-    &lt;*/M&gt;  USB Printer support                   [CONFIG_USB_PRINTER]</literal></screen>
-
-    <para>
-      If you have a parallel printer, enable the following options in your
-      kernel configuration and recompile the kernel:
-    </para>
-
-<screen><literal>Device Drivers  ---&gt;
-  &lt;*/M&gt; Parallel port support  ---&gt;    [CONFIG_PARPORT]
-    &lt;*/M&gt; PC-style hardware            [CONFIG_PARPORT_PC]
-  Character devices  ---&gt;
-    &lt;*/M&gt; Parallel printer support     [CONFIG_PRINTER]</literal></screen>
-
-    <indexterm zone="cups cups-kernel">
-      <primary sortas="d-cups">cups</primary>
-    </indexterm>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Cups</title>
-
-    <para>
-      You will need to add an <systemitem class="username">lp</systemitem>
-      user, as <application>Cups</application> will create some files owned
-      by this user. (The <systemitem class="username">lp</systemitem> user
-      is the default used by <application>Cups</application>, but may be
-      changed to a different user by passing a parameter to the
-      <command>configure</command> script.) Use the following command as
-      the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>useradd -c "Print Service User" -d /var/spool/cups -g lp -s /bin/false -u 9 lp</userinput></screen>
-
-    <para>
-      You will also need a dedicated group that will contain users allowed to
-      do <application>Cups</application> administrative tasks. Add the group
-      by running the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 19 lpadmin</userinput></screen>
-
-    <para>
-      If you want to add a user to the <application>Cups</application>
-      administrative group, run the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>usermod -a -G lpadmin <replaceable>&lt;username&gt;</replaceable></userinput></screen>
-
-    <para>
-      If you didn't install <xref linkend="xdg-utils"/>, use the following
-      <command>sed</command> to change the default browser that will be used
-      to access the <application>Cups</application> web interface:
-    </para>
-
-<screen><userinput>sed -i 's#@CUPS_HTMLVIEW@#firefox#' desktop/cups.desktop.in</userinput></screen>
-
-    <para>
-      Replace <command>firefox</command> with the web browser of your
-      choice.
-    </para>
-
-    <!-- docdir is also document root for cups administration interface, so
-    let's just put it in /usr/share/cups/doc-&cups-version; and create symlink
-    in /usr/share/doc/cups-&cups-version;
-
-    When not using libdir switch, CUPS will install libraries into /usr/lib64
-    on a 64 bit system, and since /usr/lib64 is symlink to /usr/lib it might
-    introduce some difficulties with packaging -->
-
-    <para>
-      Build <application>Cups</application> by running the following commands:
-    </para>
-
-<screen><userinput>sed -i "s:555:755:g;s:444:644:g" Makedefs.in                 &amp;&amp;
-sed -i "/MAN.*.EXT/s:.gz::g" config-scripts/cups-manpages.m4 &amp;&amp;
-sed -i "/LIBGCRYPTCONFIG/d" config-scripts/cups-ssl.m4       &amp;&amp;
-sed -i 's@else /\* HAVE_AVAHI \*/@elif defined (HAVE_AVAHI)@' test/ippserver.c &amp;&amp;
-
-aclocal  -I config-scripts &amp;&amp;
-autoconf -I config-scripts &amp;&amp;
-
-./configure --libdir=/usr/lib            \
-            --with-rcdir=/tmp/cupsinit   \
-            --with-system-groups=lpadmin \
-            --with-docdir=/usr/share/cups/doc-&cups-version; &amp;&amp;
-make</userinput></screen>
-
-   <para>
-     To test the results, issue: <command>make -k check</command> from
-     an X terminal emulator.
-   </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<!-- dev note: make BUILDROOT=<DESTDIR> install -->
-
-<screen role="root"><userinput>make install &amp;&amp;
-rm -rf /tmp/cupsinit &amp;&amp;
-ln -sfnv ../cups/doc-&cups-version; /usr/share/doc/cups-&cups-version;</userinput></screen>
-
-    <para>
-      Create a basic <application>Cups</application> client configuration file
-      by running the following command as the <systemitem
-      class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>echo "ServerName /var/run/cups/cups.sock" > /etc/cups/client.conf</userinput></screen>
-
-    <para>
-      Remove filters that are now part of the <application>Cups
-      Filters</application> package by running the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>rm -rf /usr/share/cups/banners &amp;&amp;
-rm -rf /usr/share/cups/data/testprint</userinput></screen>
-
-    <note>
-      <para>
-        If you reinstall or update <application>Cups</application>, commands
-        above will break <xref linkend="cups-filters"/>, so it needs to be
-        reinstalled.
-      </para>
-    </note>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-update-icon-cache.xml"/>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i ... Makedefs.in</command>: This sed fixes
-      permissions of the installed files and directories.
-    </para>
-
-    <para>
-      <command>sed -i ... cups-manpages.m4</command>: This sed
-      prevents compression of the man pages by default.
-    </para>
-
-    <para>
-      <command>sed -i ... cups-ssl.m4</command>: This sed prevents
-      <command>configure</command> from looking for
-      <command>libgcrypt-config</command> because
-      <application>libgcrypt</application> is not required by the
-      package.
-    </para>
-
-    <para>
-      <command>sed -i ... test/ippserver.c</command>: This sed fixes a bug that
-      shows up when <xref linkend="avahi"/> is not present.
-    </para>
-    <para>
-      <parameter>--with-rcdir=/tmp/cupsinit</parameter>: This switch tells the
-      build process to install the shipped bootscript into <filename
-      class="directory">/tmp</filename> instead of <filename
-      class="directory">/etc/rc.d</filename>.
-    </para>
-
-    <para>
-      <parameter>--with-system-groups=lpadmin</parameter>: This switch ensures
-      that only <systemitem class="groupname">lpadmin</systemitem> will be used
-      as the <application>Cups</application> administrative group.
-    </para>
-
-    <para>
-      <option>--enable-libpaper</option>: Use this switch if you have installed
-      <application>libpaper</application> and wish to use it with
-      <application>Cups</application>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Cups</title>
-
-    <sect3 id="cups-config">
-      <title>Config Files</title>
-
-      <para><filename>/etc/cups/*</filename></para>
-
-      <indexterm zone="cups cups-config">
-        <primary sortas="e-etc-cups">/etc/cups/*</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        The <application>Cups</application> web interface can be accessed
-        via <ulink url="http://localhost:631"/>. From there, printers
-        and print jobs can be managed, and the server configuration
-        can be changed. Configuration can also be done from the command
-        line using the  <command>lpadmin</command>,
-        <command>lpoptions</command> and <command>lpstat</command>
-        commands.
-      </para>
-
-      <para>
-        Configuration of <application>Cups</application> is dependent on
-        the type of printer and can be complex. Generally, PostScript printers
-        are easier. For detailed instructions on configuration and use of
-        <application>Cups</application>, see <ulink
-        url="http://www.cups.org/documentation.php"/>. 
-      </para>
-
-      <para>
-        For non-PostScript printers to print with
-        <application>Cups</application>, you need to install <xref
-        linkend="gs"/> to convert PostScript to raster images and a driver
-        (e.g. from <xref linkend="gutenprint"/>) to convert the resulting
-        raster images to a form that the printer understands.  <ulink
-        url="http://www.linuxprinting.org/foomatic.html">Foomatic</ulink>
-        drivers use <xref linkend="gs"/> to convert PostScript to a printable
-        form directly, but this is considered suboptimal by
-        <application>Cups</application> developers.
-      </para>
-
-    </sect3>
-
-    <sect3>
-      <title>Linux PAM Configuration</title>
-
-      <para>
-        If <application>CUPS</application> has been built with
-        <application>Linux PAM</application> support, you need to create a
-        <application>PAM</application> configuration file to get it working
-        correctly with BLFS.
-      </para>
-
-      <para>
-        Issue the following command as the <systemitem
-        class="username">root</systemitem> user to create the configuration
-        file for <application>Linux PAM</application>:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/pam.d/cups &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/cups
-
-auth    include system-auth
-account include system-account
-session include system-session
-
-# End /etc/pam.d/cups</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-    <sect3 id="cups-init">
-      <title>Systemd Units</title>
-
-      <para>
-        To start the <command>cupsd</command> daemon when something tries to
-        access it, enable the previously installed systemd units by running
-        the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-      <indexterm zone="cups cups-init">
-        <primary sortas="f-cups">cups</primary>
-      </indexterm>
-
-<screen role="root"><userinput>systemctl enable org.cups.cupsd</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>
-          accept, cancel, cupsaccept, cupsaddsmb, cups-config, cupsctl, cupsd,
-          cupsdisable, cupsenable, cupsfilter, cupsreject, cupstestdsc,
-          cupstestppd, ippfind, ipptool, lp, lpadmin, lpc, lpinfo, lpmove,
-          lpoptions, lpq, lpr, lprm, lpstat, ppdc, ppdhtml, ppdi, ppdmerge,
-          ppdpo and reject
-        </seg>
-        <seg>
-          libcupscgi.so, libcupsimage.so, libcupsmime.so,
-          libcupsppdc.so and libcups.so
-        </seg>
-        <seg>
-          /etc/cups,
-          /usr/include/cups,
-          /usr/lib/cups,
-          /usr/share/cups,
-          /usr/share/doc/cups-&cups-version;,
-          /var/cache/cups,
-          /var/log/cups,
-          /var/run/cups and
-          /var/spool/cups
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="accept">
-        <term><command>accept</command></term>
-        <listitem>
-          <para>
-            instructs the printing system to accept print jobs to the
-            specified destinations.
-          </para>
-          <indexterm zone="cups accept">
-            <primary sortas="b-accept">accept</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cancel-cups">
-        <term><command>cancel</command></term>
-        <listitem>
-          <para>
-            cancels existing print jobs from the print queues.
-          </para>
-          <indexterm zone="cups cancel-cups">
-            <primary sortas="b-cancel">cancel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="cupsaccept">
-        <term><command>cupsaccept</command></term>
-        <listitem>
-          <para>
-            accept jobs sent to a destination.
-          </para>
-          <indexterm zone="cups cupsaccept">
-            <primary sortas="b-cupsaccept">cupsaccept</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cupsaddsmb">
-        <term><command>cupsaddsmb</command></term>
-        <listitem>
-          <para>
-            exports printers to the <application>Samba</application>
-            software for use with Windows clients.
-          </para>
-          <indexterm zone="cups cupsaddsmb">
-            <primary sortas="b-cupsaddsmb">cupsaddsmb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cups-config-prog">
-        <term><command>cups-config</command></term>
-        <listitem>
-          <para>
-            is a <application>Cups</application>
-            program configuration utility.
-          </para>
-          <indexterm zone="cups cups-config-prog">
-            <primary sortas="b-cups-config">cups-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cupsctl">
-        <term><command>cupsctl</command></term>
-        <listitem>
-          <para>
-            updates or queries the cupsd.conf file for a server.
-          </para>
-          <indexterm zone="cups cupsctl">
-            <primary sortas="b-cupsctl">cupsctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cupsd">
-        <term><command>cupsd</command></term>
-        <listitem>
-          <para>
-            is the scheduler for the Common Unix Printing System.
-          </para>
-          <indexterm zone="cups cupsd">
-            <primary sortas="b-cupsd">cupsd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cupsdisable">
-        <term><command>cupsdisable</command></term>
-        <listitem>
-          <para>
-            stop printers and classes.
-          </para>
-          <indexterm zone="cups cupsdisable">
-            <primary sortas="b-cupsdisable">cupsdisable</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cupsenable">
-        <term><command>cupsenable</command></term>
-        <listitem>
-          <para>
-            start printers and classes.
-          </para>
-          <indexterm zone="cups cupsenable">
-            <primary sortas="b-cupsenable">cupsenable</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cupsfilter">
-        <term><command>cupsfilter</command></term>
-        <listitem>
-          <para>
-            is a front-end to the <application>Cups</application>
-            filter subsystem which allows you to convert a file
-            to a specific format.
-          </para>
-          <indexterm zone="cups cupsfilter">
-            <primary sortas="b-cupsfilter">cupsfilter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cupsreject">
-        <term><command>cupsreject</command></term>
-        <listitem>
-          <para>
-            reject jobs sent to a destination.
-          </para>
-          <indexterm zone="cups cupsreject">
-            <primary sortas="b-cupsreject">cupsreject</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cupstestdsc">
-        <term><command>cupstestdsc</command></term>
-        <listitem>
-          <para>
-            tests the conformance of PostScript files.
-          </para>
-          <indexterm zone="cups cupstestdsc">
-            <primary sortas="b-cupstestdsc">cupstestdsc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cupstestppd">
-        <term><command>cupstestppd</command></term>
-        <listitem>
-          <para>
-            tests the conformance of PPD files.
-          </para>
-          <indexterm zone="cups cupstestppd">
-            <primary sortas="b-cupstestppd">cupstestppd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ippfind">
-        <term><command>ippfind</command></term>
-        <listitem>
-          <para>
-            finds internet printing protocol printers.
-          </para>
-          <indexterm zone="cups ippfind">
-            <primary sortas="b-ippfind">ippfind</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ipptool">
-        <term><command>ipptool</command></term>
-        <listitem>
-          <para>
-            sends IPP requests to the specified URI and tests
-            and/or displays the results.
-          </para>
-          <indexterm zone="cups ipptool">
-            <primary sortas="b-ipptool">ipptool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lp-cups">
-        <term><command>lp</command></term>
-        <listitem>
-          <para>
-            submits files for printing or alters a pending job.
-          </para>
-          <indexterm zone="cups lp-cups">
-            <primary sortas="b-lp">lp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lpadmin">
-        <term><command>lpadmin</command></term>
-        <listitem>
-          <para>
-            configures printer and class queues provided by
-            <application>Cups</application>.
-          </para>
-          <indexterm zone="cups lpadmin">
-            <primary sortas="b-lpadmin">lpadmin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lpc-cups">
-        <term><command>lpc</command></term>
-        <listitem>
-          <para>
-            provides limited control over printer and class queues
-            provided by <application>Cups</application>.
-          </para>
-          <indexterm zone="cups lpc-cups">
-            <primary sortas="b-lpc">lpc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lpinfo">
-        <term><command>lpinfo</command></term>
-        <listitem>
-          <para>
-            lists the available devices or drivers known to the
-            <application>Cups</application> server.
-          </para>
-          <indexterm zone="cups lpinfo">
-            <primary sortas="b-lpinfo">lpinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lpmove">
-        <term><command>lpmove</command></term>
-        <listitem>
-          <para>
-            moves the specified job to a new destination.
-          </para>
-          <indexterm zone="cups lpmove">
-            <primary sortas="b-lpmove">lpmove</primary>
-          </indexterm>
-      </listitem>
-      </varlistentry>
-
-      <varlistentry id="lpoptions">
-        <term><command>lpoptions</command></term>
-        <listitem>
-          <para>
-            displays or sets printer options and defaults.
-          </para>
-          <indexterm zone="cups lpoptions">
-            <primary sortas="b-lpoptions">lpoptions</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lpq-cups">
-        <term><command>lpq</command></term>
-        <listitem>
-          <para>
-            shows the current print queue status on the named printer.
-          </para>
-          <indexterm zone="cups lpq-cups">
-            <primary sortas="b-lpq">lpq</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lpr-cups">
-        <term><command>lpr</command></term>
-        <listitem>
-          <para>
-            submits files for printing.
-          </para>
-          <indexterm zone="cups lpr-cups">
-            <primary sortas="b-lpr">lpr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lprm-cups">
-        <term><command>lprm</command></term>
-        <listitem>
-          <para>
-            cancels print jobs that have been queued for printing.
-          </para>
-          <indexterm zone="cups lprm-cups">
-            <primary sortas="b-lprm">lprm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lpstat-cups">
-        <term><command>lpstat</command></term>
-        <listitem>
-          <para>
-            displays status information about the current classes, jobs,
-            and printers.
-          </para>
-          <indexterm zone="cups lpstat-cups">
-            <primary sortas="b-lpstat">lpstat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ppdc">
-        <term><command>ppdc</command></term>
-        <listitem>
-          <para>
-            compiles PPDC source files into one or more PPD files.
-          </para>
-          <indexterm zone="cups ppdc">
-            <primary sortas="b-ppdc">ppdc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ppdhtml">
-        <term><command>ppdhtml</command></term>
-        <listitem>
-          <para>
-            reads a driver information file and produces a HTML summary
-            page that lists all of the drivers in a file and the
-            supported options.
-          </para>
-          <indexterm zone="cups ppdhtml">
-            <primary sortas="b-ppdhtml">ppdhtml</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ppdi">
-        <term><command>ppdi</command></term>
-        <listitem>
-          <para>
-            imports one or more PPD files into a PPD compiler source file.
-          </para>
-          <indexterm zone="cups ppdi">
-            <primary sortas="b-ppdi">ppdi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ppdmerge">
-        <term><command>ppdmerge</command></term>
-        <listitem>
-          <para>
-            merges two or more PPD files into a single, multi-language
-            PPD file.
-          </para>
-          <indexterm zone="cups ppdmerge">
-            <primary sortas="b-ppdmerge">ppdmerge</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ppdpo">
-        <term><command>ppdpo</command></term>
-        <listitem>
-          <para>
-            extracts UI strings from PPDC source files and
-            updates either a GNU gettext or Mac OS X strings
-            format message catalog source file for translation.
-          </para>
-          <indexterm zone="cups ppdpo">
-            <primary sortas="b-ppdpo">ppdpo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="reject">
-        <term><command>reject</command></term>
-        <listitem>
-          <para>
-            instructs the printing system to reject print jobs to the
-            specified destinations.
-          </para>
-          <indexterm zone="cups reject">
-            <primary sortas="b-reject">reject</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcups">
-        <term><filename class="libraryfile">libcups.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Cups</application> API functions.
-          </para>
-          <indexterm zone="cups libcups">
-            <primary sortas="c-libcups">libcups.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: pst/printing/cups.xml
===================================================================
--- pst/printing/cups.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ pst/printing/cups.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -0,0 +1,863 @@
+<?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 cups-download-http "http://www.cups.org/software/&cups-version;/cups-&cups-version;-source.tar.bz2">
+  <!ENTITY cups-download-ftp  " ">
+  <!ENTITY cups-md5sum        "c4e57a66298bfsba66bb3d5bedd317a4">
+  <!ENTITY cups-size          "8.4 MB">
+  <!ENTITY cups-buildsize     "92 MB">
+  <!ENTITY cups-time          "0.8 SBU">
+]>
+
+<sect1 id="cups" xreflabel="Cups-&cups-version;">
+  <?dbhtml filename="cups.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Cups-&cups-version;</title>
+
+  <indexterm zone="cups">
+    <primary sortas="a-Cups">Cups</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Cups</title>
+
+    <para>
+      The Common Unix Printing System (CUPS) is a print spooler and
+      associated utilities. It is based on the "Internet Printing
+      Protocol" and provides printing services to most PostScript
+      and raster printers.
+    </para>
+
+    &lfs77_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&cups-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&cups-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &cups-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &cups-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &cups-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &cups-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Cups Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="gnutls"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="colord"/>,
+      <xref linkend="dbus"/> and
+      <xref linkend="libusb"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="avahi"/>,
+      <xref linkend="libpaper"/>,
+      <xref linkend="linux-pam"/>,
+      <xref linkend="llvm"/> (with Clang),
+      <xref linkend="mitkrb"/>,
+      <xref linkend="openjdk"/>,
+      <xref linkend="php"/>,
+      <xref linkend="python2"/> and
+      <xref linkend="xdg-utils"/>
+    </para>
+
+    <bridgehead renderas="sect4">Required (Runtime)</bridgehead>
+    <para role="optional">
+      <xref linkend="cups-filters"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional (Runtime)</bridgehead>
+    <para role="optional">
+      <ulink url="https://www.openprinting.org/download/foomatic/">Foomatic</ulink>,
+      <xref linkend="gutenprint"/> and
+      <ulink url="http://hplipopensource.com/hplip-web/index.html">HPLIP</ulink> (HP printers)
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/cups"/>
+    </para>
+  </sect2>
+
+  <sect2 role="kernel" id="cups-kernel">
+    <title>Kernel Configuration</title>
+
+    <note>
+      <para>
+        There used to be a conflict between the <application>Cups</application>
+        <application>libusb</application> backend and the usblp kernel driver.
+        This is no longer the case and Cups will work with both of these
+        enabled.
+      </para>
+    </note>
+
+    <para>
+      If you want to use the kernel usblp driver (for example, if you wish to
+      use <application>escputil</application> from <xref
+      linkend="gutenprint"/>) enable the following options in your kernel
+      configuration and recompile the kernel:
+    </para>
+
+<screen><literal>Device Drivers  ---&gt;
+  [*] USB support  ---&gt;                          [CONFIG_USB_SUPPORT]
+    &lt;*/M&gt;  OHCI HCD (USB 1.1) support            [CONFIG_USB_OHCI_HCD]
+    &lt;*/M&gt;  UHCI HCD (most Intel and VIA) support [CONFIG_USB_UHCI_HCD]
+    &lt;*/M&gt;  USB Printer support                   [CONFIG_USB_PRINTER]</literal></screen>
+
+    <para>
+      If you have a parallel printer, enable the following options in your
+      kernel configuration and recompile the kernel:
+    </para>
+
+<screen><literal>Device Drivers  ---&gt;
+  &lt;*/M&gt; Parallel port support  ---&gt;    [CONFIG_PARPORT]
+    &lt;*/M&gt; PC-style hardware            [CONFIG_PARPORT_PC]
+  Character devices  ---&gt;
+    &lt;*/M&gt; Parallel printer support     [CONFIG_PRINTER]</literal></screen>
+
+    <indexterm zone="cups cups-kernel">
+      <primary sortas="d-cups">cups</primary>
+    </indexterm>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Cups</title>
+
+    <para>
+      You will need to add an <systemitem class="username">lp</systemitem>
+      user, as <application>Cups</application> will create some files owned
+      by this user. (The <systemitem class="username">lp</systemitem> user
+      is the default used by <application>Cups</application>, but may be
+      changed to a different user by passing a parameter to the
+      <command>configure</command> script.) Use the following command as
+      the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>useradd -c "Print Service User" -d /var/spool/cups -g lp -s /bin/false -u 9 lp</userinput></screen>
+
+    <para>
+      You will also need a dedicated group that will contain users allowed to
+      do <application>Cups</application> administrative tasks. Add the group
+      by running the following command as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>groupadd -g 19 lpadmin</userinput></screen>
+
+    <para>
+      If you want to add a user to the <application>Cups</application>
+      administrative group, run the following command as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>usermod -a -G lpadmin <replaceable>&lt;username&gt;</replaceable></userinput></screen>
+
+    <para>
+      If you didn't install <xref linkend="xdg-utils"/>, use the following
+      <command>sed</command> to change the default browser that will be used
+      to access the <application>Cups</application> web interface:
+    </para>
+
+<screen><userinput>sed -i 's#@CUPS_HTMLVIEW@#firefox#' desktop/cups.desktop.in</userinput></screen>
+
+    <para>
+      Replace <command>firefox</command> with the web browser of your
+      choice.
+    </para>
+
+    <!-- docdir is also document root for cups administration interface, so
+    let's just put it in /usr/share/cups/doc-&cups-version; and create symlink
+    in /usr/share/doc/cups-&cups-version;
+
+    When not using libdir switch, CUPS will install libraries into /usr/lib64
+    on a 64 bit system, and since /usr/lib64 is symlink to /usr/lib it might
+    introduce some difficulties with packaging -->
+
+    <para>
+      Build <application>Cups</application> by running the following commands:
+    </para>
+
+<screen><userinput>sed -i "s:555:755:g;s:444:644:g" Makedefs.in                 &amp;&amp;
+sed -i "/MAN.*.EXT/s:.gz::g" config-scripts/cups-manpages.m4 &amp;&amp;
+sed -i "/LIBGCRYPTCONFIG/d" config-scripts/cups-ssl.m4       &amp;&amp;
+sed -i 's@else /\* HAVE_AVAHI \*/@elif defined (HAVE_AVAHI)@' test/ippserver.c &amp;&amp;
+
+aclocal  -I config-scripts &amp;&amp;
+autoconf -I config-scripts &amp;&amp;
+
+./configure --libdir=/usr/lib            \
+            --with-rcdir=/tmp/cupsinit   \
+            --with-system-groups=lpadmin \
+            --with-docdir=/usr/share/cups/doc-&cups-version; &amp;&amp;
+make</userinput></screen>
+
+   <para>
+     To test the results, issue: <command>make -k check</command> from
+     an X terminal emulator.
+   </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<!-- dev note: make BUILDROOT=<DESTDIR> install -->
+
+<screen role="root"><userinput>make install &amp;&amp;
+rm -rf /tmp/cupsinit &amp;&amp;
+ln -sfnv ../cups/doc-&cups-version; /usr/share/doc/cups-&cups-version;</userinput></screen>
+
+    <para>
+      Create a basic <application>Cups</application> client configuration file
+      by running the following command as the <systemitem
+      class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>echo "ServerName /var/run/cups/cups.sock" > /etc/cups/client.conf</userinput></screen>
+
+    <para>
+      Remove filters that are now part of the <application>Cups
+      Filters</application> package by running the following commands as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>rm -rf /usr/share/cups/banners &amp;&amp;
+rm -rf /usr/share/cups/data/testprint</userinput></screen>
+
+    <note>
+      <para>
+        If you reinstall or update <application>Cups</application>, commands
+        above will break <xref linkend="cups-filters"/>, so it needs to be
+        reinstalled.
+      </para>
+    </note>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-update-icon-cache.xml"/>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <command>sed -i ... Makedefs.in</command>: This sed fixes
+      permissions of the installed files and directories.
+    </para>
+
+    <para>
+      <command>sed -i ... cups-manpages.m4</command>: This sed
+      prevents compression of the man pages by default.
+    </para>
+
+    <para>
+      <command>sed -i ... cups-ssl.m4</command>: This sed prevents
+      <command>configure</command> from looking for
+      <command>libgcrypt-config</command> because
+      <application>libgcrypt</application> is not required by the
+      package.
+    </para>
+
+    <para>
+      <command>sed -i ... test/ippserver.c</command>: This sed fixes a bug that
+      shows up when <xref linkend="avahi"/> is not present.
+    </para>
+    <para>
+      <parameter>--with-rcdir=/tmp/cupsinit</parameter>: This switch tells the
+      build process to install the shipped bootscript into <filename
+      class="directory">/tmp</filename> instead of <filename
+      class="directory">/etc/rc.d</filename>.
+    </para>
+
+    <para>
+      <parameter>--with-system-groups=lpadmin</parameter>: This switch ensures
+      that only <systemitem class="groupname">lpadmin</systemitem> will be used
+      as the <application>Cups</application> administrative group.
+    </para>
+
+    <para>
+      <option>--enable-libpaper</option>: Use this switch if you have installed
+      <application>libpaper</application> and wish to use it with
+      <application>Cups</application>.
+    </para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring Cups</title>
+
+    <sect3 id="cups-config">
+      <title>Config Files</title>
+
+      <para><filename>/etc/cups/*</filename></para>
+
+      <indexterm zone="cups cups-config">
+        <primary sortas="e-etc-cups">/etc/cups/*</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para>
+        The <application>Cups</application> web interface can be accessed
+        via <ulink url="http://localhost:631"/>. From there, printers
+        and print jobs can be managed, and the server configuration
+        can be changed. Configuration can also be done from the command
+        line using the  <command>lpadmin</command>,
+        <command>lpoptions</command> and <command>lpstat</command>
+        commands.
+      </para>
+
+      <para>
+        Configuration of <application>Cups</application> is dependent on
+        the type of printer and can be complex. Generally, PostScript printers
+        are easier. For detailed instructions on configuration and use of
+        <application>Cups</application>, see <ulink
+        url="http://www.cups.org/documentation.php"/>. 
+      </para>
+
+      <para>
+        For non-PostScript printers to print with
+        <application>Cups</application>, you need to install <xref
+        linkend="gs"/> to convert PostScript to raster images and a driver
+        (e.g. from <xref linkend="gutenprint"/>) to convert the resulting
+        raster images to a form that the printer understands.  <ulink
+        url="http://www.linuxprinting.org/foomatic.html">Foomatic</ulink>
+        drivers use <xref linkend="gs"/> to convert PostScript to a printable
+        form directly, but this is considered suboptimal by
+        <application>Cups</application> developers.
+      </para>
+
+    </sect3>
+
+    <sect3>
+      <title>Linux PAM Configuration</title>
+
+      <para>
+        If <application>CUPS</application> has been built with
+        <application>Linux PAM</application> support, you need to create a
+        <application>PAM</application> configuration file to get it working
+        correctly with BLFS.
+      </para>
+
+      <para>
+        Issue the following command as the <systemitem
+        class="username">root</systemitem> user to create the configuration
+        file for <application>Linux PAM</application>:
+      </para>
+
+<screen role="root"><userinput>cat &gt; /etc/pam.d/cups &lt;&lt; "EOF"
+<literal># Begin /etc/pam.d/cups
+
+auth    include system-auth
+account include system-account
+session include system-session
+
+# End /etc/pam.d/cups</literal>
+EOF</userinput></screen>
+
+    </sect3>
+
+    <sect3 id="cups-init">
+      <title>Systemd Units</title>
+
+      <para>
+        To start the <command>cupsd</command> daemon when something tries to
+        access it, enable the previously installed systemd units by running
+        the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+      <indexterm zone="cups cups-init">
+        <primary sortas="f-cups">cups</primary>
+      </indexterm>
+
+<screen role="root"><userinput>systemctl enable org.cups.cupsd</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>
+          accept, cancel, cupsaccept, cupsaddsmb, cups-config, cupsctl, cupsd,
+          cupsdisable, cupsenable, cupsfilter, cupsreject, cupstestdsc,
+          cupstestppd, ippfind, ipptool, lp, lpadmin, lpc, lpinfo, lpmove,
+          lpoptions, lpq, lpr, lprm, lpstat, ppdc, ppdhtml, ppdi, ppdmerge,
+          ppdpo and reject
+        </seg>
+        <seg>
+          libcupscgi.so, libcupsimage.so, libcupsmime.so,
+          libcupsppdc.so and libcups.so
+        </seg>
+        <seg>
+          /etc/cups,
+          /usr/include/cups,
+          /usr/lib/cups,
+          /usr/share/cups,
+          /usr/share/doc/cups-&cups-version;,
+          /var/cache/cups,
+          /var/log/cups,
+          /var/run/cups and
+          /var/spool/cups
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="accept">
+        <term><command>accept</command></term>
+        <listitem>
+          <para>
+            instructs the printing system to accept print jobs to the
+            specified destinations.
+          </para>
+          <indexterm zone="cups accept">
+            <primary sortas="b-accept">accept</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cancel-cups">
+        <term><command>cancel</command></term>
+        <listitem>
+          <para>
+            cancels existing print jobs from the print queues.
+          </para>
+          <indexterm zone="cups cancel-cups">
+            <primary sortas="b-cancel">cancel</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="cupsaccept">
+        <term><command>cupsaccept</command></term>
+        <listitem>
+          <para>
+            accept jobs sent to a destination.
+          </para>
+          <indexterm zone="cups cupsaccept">
+            <primary sortas="b-cupsaccept">cupsaccept</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cupsaddsmb">
+        <term><command>cupsaddsmb</command></term>
+        <listitem>
+          <para>
+            exports printers to the <application>Samba</application>
+            software for use with Windows clients.
+          </para>
+          <indexterm zone="cups cupsaddsmb">
+            <primary sortas="b-cupsaddsmb">cupsaddsmb</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cups-config-prog">
+        <term><command>cups-config</command></term>
+        <listitem>
+          <para>
+            is a <application>Cups</application>
+            program configuration utility.
+          </para>
+          <indexterm zone="cups cups-config-prog">
+            <primary sortas="b-cups-config">cups-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cupsctl">
+        <term><command>cupsctl</command></term>
+        <listitem>
+          <para>
+            updates or queries the cupsd.conf file for a server.
+          </para>
+          <indexterm zone="cups cupsctl">
+            <primary sortas="b-cupsctl">cupsctl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cupsd">
+        <term><command>cupsd</command></term>
+        <listitem>
+          <para>
+            is the scheduler for the Common Unix Printing System.
+          </para>
+          <indexterm zone="cups cupsd">
+            <primary sortas="b-cupsd">cupsd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cupsdisable">
+        <term><command>cupsdisable</command></term>
+        <listitem>
+          <para>
+            stop printers and classes.
+          </para>
+          <indexterm zone="cups cupsdisable">
+            <primary sortas="b-cupsdisable">cupsdisable</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cupsenable">
+        <term><command>cupsenable</command></term>
+        <listitem>
+          <para>
+            start printers and classes.
+          </para>
+          <indexterm zone="cups cupsenable">
+            <primary sortas="b-cupsenable">cupsenable</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cupsfilter">
+        <term><command>cupsfilter</command></term>
+        <listitem>
+          <para>
+            is a front-end to the <application>Cups</application>
+            filter subsystem which allows you to convert a file
+            to a specific format.
+          </para>
+          <indexterm zone="cups cupsfilter">
+            <primary sortas="b-cupsfilter">cupsfilter</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cupsreject">
+        <term><command>cupsreject</command></term>
+        <listitem>
+          <para>
+            reject jobs sent to a destination.
+          </para>
+          <indexterm zone="cups cupsreject">
+            <primary sortas="b-cupsreject">cupsreject</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cupstestdsc">
+        <term><command>cupstestdsc</command></term>
+        <listitem>
+          <para>
+            tests the conformance of PostScript files.
+          </para>
+          <indexterm zone="cups cupstestdsc">
+            <primary sortas="b-cupstestdsc">cupstestdsc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cupstestppd">
+        <term><command>cupstestppd</command></term>
+        <listitem>
+          <para>
+            tests the conformance of PPD files.
+          </para>
+          <indexterm zone="cups cupstestppd">
+            <primary sortas="b-cupstestppd">cupstestppd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ippfind">
+        <term><command>ippfind</command></term>
+        <listitem>
+          <para>
+            finds internet printing protocol printers.
+          </para>
+          <indexterm zone="cups ippfind">
+            <primary sortas="b-ippfind">ippfind</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ipptool">
+        <term><command>ipptool</command></term>
+        <listitem>
+          <para>
+            sends IPP requests to the specified URI and tests
+            and/or displays the results.
+          </para>
+          <indexterm zone="cups ipptool">
+            <primary sortas="b-ipptool">ipptool</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="lp-cups">
+        <term><command>lp</command></term>
+        <listitem>
+          <para>
+            submits files for printing or alters a pending job.
+          </para>
+          <indexterm zone="cups lp-cups">
+            <primary sortas="b-lp">lp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="lpadmin">
+        <term><command>lpadmin</command></term>
+        <listitem>
+          <para>
+            configures printer and class queues provided by
+            <application>Cups</application>.
+          </para>
+          <indexterm zone="cups lpadmin">
+            <primary sortas="b-lpadmin">lpadmin</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="lpc-cups">
+        <term><command>lpc</command></term>
+        <listitem>
+          <para>
+            provides limited control over printer and class queues
+            provided by <application>Cups</application>.
+          </para>
+          <indexterm zone="cups lpc-cups">
+            <primary sortas="b-lpc">lpc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="lpinfo">
+        <term><command>lpinfo</command></term>
+        <listitem>
+          <para>
+            lists the available devices or drivers known to the
+            <application>Cups</application> server.
+          </para>
+          <indexterm zone="cups lpinfo">
+            <primary sortas="b-lpinfo">lpinfo</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="lpmove">
+        <term><command>lpmove</command></term>
+        <listitem>
+          <para>
+            moves the specified job to a new destination.
+          </para>
+          <indexterm zone="cups lpmove">
+            <primary sortas="b-lpmove">lpmove</primary>
+          </indexterm>
+      </listitem>
+      </varlistentry>
+
+      <varlistentry id="lpoptions">
+        <term><command>lpoptions</command></term>
+        <listitem>
+          <para>
+            displays or sets printer options and defaults.
+          </para>
+          <indexterm zone="cups lpoptions">
+            <primary sortas="b-lpoptions">lpoptions</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="lpq-cups">
+        <term><command>lpq</command></term>
+        <listitem>
+          <para>
+            shows the current print queue status on the named printer.
+          </para>
+          <indexterm zone="cups lpq-cups">
+            <primary sortas="b-lpq">lpq</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="lpr-cups">
+        <term><command>lpr</command></term>
+        <listitem>
+          <para>
+            submits files for printing.
+          </para>
+          <indexterm zone="cups lpr-cups">
+            <primary sortas="b-lpr">lpr</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="lprm-cups">
+        <term><command>lprm</command></term>
+        <listitem>
+          <para>
+            cancels print jobs that have been queued for printing.
+          </para>
+          <indexterm zone="cups lprm-cups">
+            <primary sortas="b-lprm">lprm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="lpstat-cups">
+        <term><command>lpstat</command></term>
+        <listitem>
+          <para>
+            displays status information about the current classes, jobs,
+            and printers.
+          </para>
+          <indexterm zone="cups lpstat-cups">
+            <primary sortas="b-lpstat">lpstat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ppdc">
+        <term><command>ppdc</command></term>
+        <listitem>
+          <para>
+            compiles PPDC source files into one or more PPD files.
+          </para>
+          <indexterm zone="cups ppdc">
+            <primary sortas="b-ppdc">ppdc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ppdhtml">
+        <term><command>ppdhtml</command></term>
+        <listitem>
+          <para>
+            reads a driver information file and produces a HTML summary
+            page that lists all of the drivers in a file and the
+            supported options.
+          </para>
+          <indexterm zone="cups ppdhtml">
+            <primary sortas="b-ppdhtml">ppdhtml</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ppdi">
+        <term><command>ppdi</command></term>
+        <listitem>
+          <para>
+            imports one or more PPD files into a PPD compiler source file.
+          </para>
+          <indexterm zone="cups ppdi">
+            <primary sortas="b-ppdi">ppdi</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ppdmerge">
+        <term><command>ppdmerge</command></term>
+        <listitem>
+          <para>
+            merges two or more PPD files into a single, multi-language
+            PPD file.
+          </para>
+          <indexterm zone="cups ppdmerge">
+            <primary sortas="b-ppdmerge">ppdmerge</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ppdpo">
+        <term><command>ppdpo</command></term>
+        <listitem>
+          <para>
+            extracts UI strings from PPDC source files and
+            updates either a GNU gettext or Mac OS X strings
+            format message catalog source file for translation.
+          </para>
+          <indexterm zone="cups ppdpo">
+            <primary sortas="b-ppdpo">ppdpo</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="reject">
+        <term><command>reject</command></term>
+        <listitem>
+          <para>
+            instructs the printing system to reject print jobs to the
+            specified destinations.
+          </para>
+          <indexterm zone="cups reject">
+            <primary sortas="b-reject">reject</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libcups">
+        <term><filename class="libraryfile">libcups.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>Cups</application> API functions.
+          </para>
+          <indexterm zone="cups libcups">
+            <primary sortas="c-libcups">libcups.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: t/printing/gutenprint-systemd.xml
===================================================================
--- pst/printing/gutenprint-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,292 +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 gutenprint-download-http "&sourceforge-repo;/gimp-print/gutenprint-&gutenprint-version;.tar.bz2">
-  <!ENTITY gutenprint-download-ftp  " ">
-  <!ENTITY gutenprint-md5sum        "9ff027103bafac419c37e19da75163ae">
-  <!ENTITY gutenprint-size          "6.0 MB">
-  <!ENTITY gutenprint-buildsize     "73 MB">
-  <!ENTITY gutenprint-time          "0.5 SBU">
-]>
-
-<sect1 id="gutenprint" xreflabel="Gutenprint-&gutenprint-version;">
-  <?dbhtml filename="gutenprint.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Gutenprint-&gutenprint-version;</title>
-
-  <indexterm zone="gutenprint">
-    <primary sortas="a-Gutenprint">Gutenprint</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gutenprint</title>
-
-    <para>The <application>Gutenprint</application> (formerly
-    <application>Gimp-Print</application>) package contains high
-    quality drivers for many brands and models of printers for use with
-    <xref linkend="gs"/>, <xref linkend="cups"/>,
-    <ulink url="http://www.linuxprinting.org/foomatic.html">Foomatic</ulink>,
-    and the
-    <application>GIMP-2.0</application>. See a list of supported printers at
-    <ulink url="http://gutenprint.sourceforge.net/p_Supported_Printers.php"/>.
-    </para>
-
-    &lfs77_built;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gutenprint-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gutenprint-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gutenprint-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gutenprint-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gutenprint-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gutenprint-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gutenprint Dependencies</bridgehead>
-
-    <!-- recommend cups since we describe how to use it, and the gimp
-    so that we can use gutenprint's driver to print photos there -->
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="cups"/> and
-    <xref linkend="gimp"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-    <ulink url="http://www.linuxprinting.org/foomatic.html">Foomatic</ulink>,
-    <xref linkend="ijs"/></para>
-
-    <bridgehead renderas="sect4">Optional (to Regenerate Documentation)</bridgehead>
-    <para role="optional"><xref linkend="imagemagick"/>,
-    <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
-    <xref linkend="doxygen"/> and
-    <xref linkend="docbook-utils"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gutenprint"/></para>
-
-  </sect2>
-
-  <sect2 role="kernel" id="gutenprint-escputil">
-    <title>Kernel Configuration</title>
-
-    <para>
-      If you intend to use <application>escputil</application> with a USB-connected
-      Epson Stylus printer for commands such as <command>--ink-level</command>
-      which need to access the raw device, you must enable the kernel's usblp
-      driver. Enable the following options in your kernel configuration and
-      recompile the kernel:
-    </para>
-
-<screen><literal>Device Drivers  ---&gt;
-  [*] USB support  ---&gt;                          [CONFIG_USB_SUPPORT]
-    &lt;*/M&gt;  OHCI HCD (USB 1.1) support            [CONFIG_USB_OHCI_HCD]
-    &lt;*/M&gt;  UHCI HCD (most Intel and VIA) support [CONFIG_USB_UHCI_HCD]
-    &lt;*/M&gt;  USB Printer support                   [CONFIG_USB_PRINTER]</literal></screen>
-
-    <indexterm zone="gutenprint escputil">
-      <primary sortas="d-escputil">escputil for usb printers</primary>
-    </indexterm>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gutenprint</title>
-
-    <para>Install <application>Gutenprint</application> by running the
-    following commands:</para>
-
-<screen><userinput>sed -i 's|$(PACKAGE)/doc|doc/$(PACKAGE)-$(VERSION)|' \
-       {,doc/,doc/developer/}Makefile.in &amp;&amp;
-./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <!-- this is supposed to discourage you from running the tests if you upgrade
-    the package - I suppose you could sed the tests/Makefile to only run 'curve',
-    and perhaps 'run-testdither', it's 'run-weavetest' which takes most of the time -->
-    <para>To test the results, issue: <command>make check</command>. When last
-    tested (version 5.2.7, LFS-7.1, on a uniprocessor box which is admittedly short of
-    memory) this took more than 800 SBUs (more than two days for that box) and used an
-    extra 678 MB of disk space.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -dm755 /usr/share/doc/gutenprint-&gutenprint-version;/api/gutenprint{,ui2} &amp;&amp;
-install -v -m644  doc/gutenprint/html/* \
-                  /usr/share/doc/gutenprint-&gutenprint-version;/api/gutenprint &amp;&amp;
-install -v -m644  doc/gutenprintui2/html/* \
-                  /usr/share/doc/gutenprint-&gutenprint-version;/api/gutenprintui2</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed -i '...' ...Makefile.in</command>: This
-    command is used so that the package documentation is installed in the
-    conventional <filename class='directory'>/usr/share/doc</filename>
-    directory structure instead of
-    <filename class='directory'>/usr/share/gutenprint/doc</filename>.</para>
-
-    <para><option>--disable-static</option>: This switch prevents the static
-    libraries being installed.</para>
-
-    <!-- redundant, only applies to cups < 1.2.0 : cups-5.0 gives a version of 1.5.0
-    FIXME - delete this on next version upgrade
-    <para><option>\-\-with-translated-ppds=no</option>: When this parameter is
-    given, only US English PPD files for <application>CUPS</application>
-    will be built. Useful if the PPD files are not yet translated into your
-    native language and you want to save some space by not installing unneeded
-    translations.</para>-->
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Gutenprint</title>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>For <application>CUPS</application> to see newly installed print
-      drivers, it has to be restarted (as the <systemitem
-      class="username">root</systemitem> user):</para>
-
-<screen role="root"><userinput>systemctl restart org.cups.cupsd</userinput></screen>
-
-      <!-- <para>This command may take a long time (up to 10 minutes)
-      to complete. Don't panic while <application>CUPS</application>
-      is rescanning the list of PPD files. The long delay will happen
-      only once.</para> -->
-
-      <para>Then point your web browser to <ulink url="http://localhost:631/"/>
-      to add a new printer to <application>CUPS</application>.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>cups-calibrate, cups-genppd.5.2, cups-genppdupdate, escputil,
-        ijsgutenprint.5.2 (if compiled using ijs), and
-        testpattern</seg>
-        <seg>libgutenprint.so, libgutenprintui2.so
-        and optionally, various
-        <application>CUPS</application> filters and backend
-        drivers under /usr/lib/gutenprint/5.2/modules/</seg>
-        <seg>/usr/include/gutenprint,
-        /usr/include/gutenprintui2,
-        /usr/lib/gutenprint,
-        /usr/share/doc/gutenprint-&gutenprint-version; and
-        /usr/share/gutenprint</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cups-calibrate">
-        <term><command>cups-calibrate</command></term>
-        <listitem>
-          <para>calibrates the color output of printers using the
-          <application>Gutenprint</application>,
-          <application>CUPS</application> or
-          <application>ESP Print Pro</application> drivers.</para>
-          <indexterm zone="gutenprint cups-calibrate">
-            <primary sortas="b-cups-calibrate">cups-calibrate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cups-genppd.5.2">
-        <term><command>cups-genppd.5.2</command></term>
-        <listitem>
-          <para>
-            generate Gutenprint PPD files for use with CUPS.
-          </para>
-          <indexterm zone="gutenprint cups-genppd.5.2">
-            <primary sortas="b-cups-genppd.5.2">cups-genppd.5.2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cups-genppdupdate">
-        <term><command>cups-genppdupdate</command></term>
-        <listitem>
-          <para>
-            regenerates the Gutenprint PPD files in use by CUPS.
-          </para>
-          <indexterm zone="gutenprint cups-genppdupdate">
-            <primary sortas="b-cups-genppdupdate">cups-genppdupdate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="escputil">
-        <term><command>escputil</command></term>
-        <listitem>
-          <para>is a command line utility to perform various maintenance
-          tasks on Epson Stylus inkjet printers.</para>
-          <indexterm zone="gutenprint escputil">
-            <primary sortas="b-escputil">escputil</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ijsgutenprint.5.2">
-        <term><command>ijsgutenprint.5.2</command></term>
-        <listitem>
-          <para>is a Ghostscript driver for HP inkjet and laserjet printers.</para>
-          <indexterm zone="gutenprint ijsgutenprint.5.2">
-            <primary sortas="b-ijsgutenprint.5.2">ijsgutenprint.5.2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="testpattern">
-        <term><command>testpattern</command></term>
-        <listitem>
-          <para>
-            is a test programm to learn how to use libgutenprint. 
-          </para>
-          <indexterm zone="gutenprint testpattern">
-            <primary sortas="b-testpattern">testpattern</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
- 
-   </variablelist>
-
-  </sect2>
-
-</sect1>
Index: pst/printing/gutenprint.xml
===================================================================
--- pst/printing/gutenprint.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ pst/printing/gutenprint.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -0,0 +1,292 @@
+<?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 gutenprint-download-http "&sourceforge-repo;/gimp-print/gutenprint-&gutenprint-version;.tar.bz2">
+  <!ENTITY gutenprint-download-ftp  " ">
+  <!ENTITY gutenprint-md5sum        "9ff027103bafac419c37e19da75163ae">
+  <!ENTITY gutenprint-size          "6.0 MB">
+  <!ENTITY gutenprint-buildsize     "73 MB">
+  <!ENTITY gutenprint-time          "0.5 SBU">
+]>
+
+<sect1 id="gutenprint" xreflabel="Gutenprint-&gutenprint-version;">
+  <?dbhtml filename="gutenprint.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Gutenprint-&gutenprint-version;</title>
+
+  <indexterm zone="gutenprint">
+    <primary sortas="a-Gutenprint">Gutenprint</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Gutenprint</title>
+
+    <para>The <application>Gutenprint</application> (formerly
+    <application>Gimp-Print</application>) package contains high
+    quality drivers for many brands and models of printers for use with
+    <xref linkend="gs"/>, <xref linkend="cups"/>,
+    <ulink url="http://www.linuxprinting.org/foomatic.html">Foomatic</ulink>,
+    and the
+    <application>GIMP-2.0</application>. See a list of supported printers at
+    <ulink url="http://gutenprint.sourceforge.net/p_Supported_Printers.php"/>.
+    </para>
+
+    &lfs77_built;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&gutenprint-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&gutenprint-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &gutenprint-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &gutenprint-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &gutenprint-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &gutenprint-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Gutenprint Dependencies</bridgehead>
+
+    <!-- recommend cups since we describe how to use it, and the gimp
+    so that we can use gutenprint's driver to print photos there -->
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended"><xref linkend="cups"/> and
+    <xref linkend="gimp"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+    <ulink url="http://www.linuxprinting.org/foomatic.html">Foomatic</ulink>,
+    <xref linkend="ijs"/></para>
+
+    <bridgehead renderas="sect4">Optional (to Regenerate Documentation)</bridgehead>
+    <para role="optional"><xref linkend="imagemagick"/>,
+    <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
+    <xref linkend="doxygen"/> and
+    <xref linkend="docbook-utils"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gutenprint"/></para>
+
+  </sect2>
+
+  <sect2 role="kernel" id="gutenprint-escputil">
+    <title>Kernel Configuration</title>
+
+    <para>
+      If you intend to use <application>escputil</application> with a USB-connected
+      Epson Stylus printer for commands such as <command>--ink-level</command>
+      which need to access the raw device, you must enable the kernel's usblp
+      driver. Enable the following options in your kernel configuration and
+      recompile the kernel:
+    </para>
+
+<screen><literal>Device Drivers  ---&gt;
+  [*] USB support  ---&gt;                          [CONFIG_USB_SUPPORT]
+    &lt;*/M&gt;  OHCI HCD (USB 1.1) support            [CONFIG_USB_OHCI_HCD]
+    &lt;*/M&gt;  UHCI HCD (most Intel and VIA) support [CONFIG_USB_UHCI_HCD]
+    &lt;*/M&gt;  USB Printer support                   [CONFIG_USB_PRINTER]</literal></screen>
+
+    <indexterm zone="gutenprint escputil">
+      <primary sortas="d-escputil">escputil for usb printers</primary>
+    </indexterm>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Gutenprint</title>
+
+    <para>Install <application>Gutenprint</application> by running the
+    following commands:</para>
+
+<screen><userinput>sed -i 's|$(PACKAGE)/doc|doc/$(PACKAGE)-$(VERSION)|' \
+       {,doc/,doc/developer/}Makefile.in &amp;&amp;
+./configure --prefix=/usr --disable-static &amp;&amp;
+make</userinput></screen>
+
+    <!-- this is supposed to discourage you from running the tests if you upgrade
+    the package - I suppose you could sed the tests/Makefile to only run 'curve',
+    and perhaps 'run-testdither', it's 'run-weavetest' which takes most of the time -->
+    <para>To test the results, issue: <command>make check</command>. When last
+    tested (version 5.2.7, LFS-7.1, on a uniprocessor box which is admittedly short of
+    memory) this took more than 800 SBUs (more than two days for that box) and used an
+    extra 678 MB of disk space.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install &amp;&amp;
+install -v -dm755 /usr/share/doc/gutenprint-&gutenprint-version;/api/gutenprint{,ui2} &amp;&amp;
+install -v -m644  doc/gutenprint/html/* \
+                  /usr/share/doc/gutenprint-&gutenprint-version;/api/gutenprint &amp;&amp;
+install -v -m644  doc/gutenprintui2/html/* \
+                  /usr/share/doc/gutenprint-&gutenprint-version;/api/gutenprintui2</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><command>sed -i '...' ...Makefile.in</command>: This
+    command is used so that the package documentation is installed in the
+    conventional <filename class='directory'>/usr/share/doc</filename>
+    directory structure instead of
+    <filename class='directory'>/usr/share/gutenprint/doc</filename>.</para>
+
+    <para><option>--disable-static</option>: This switch prevents the static
+    libraries being installed.</para>
+
+    <!-- redundant, only applies to cups < 1.2.0 : cups-5.0 gives a version of 1.5.0
+    FIXME - delete this on next version upgrade
+    <para><option>\-\-with-translated-ppds=no</option>: When this parameter is
+    given, only US English PPD files for <application>CUPS</application>
+    will be built. Useful if the PPD files are not yet translated into your
+    native language and you want to save some space by not installing unneeded
+    translations.</para>-->
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring Gutenprint</title>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para>For <application>CUPS</application> to see newly installed print
+      drivers, it has to be restarted (as the <systemitem
+      class="username">root</systemitem> user):</para>
+
+<screen role="root"><userinput>systemctl restart org.cups.cupsd</userinput></screen>
+
+      <!-- <para>This command may take a long time (up to 10 minutes)
+      to complete. Don't panic while <application>CUPS</application>
+      is rescanning the list of PPD files. The long delay will happen
+      only once.</para> -->
+
+      <para>Then point your web browser to <ulink url="http://localhost:631/"/>
+      to add a new printer to <application>CUPS</application>.</para>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>cups-calibrate, cups-genppd.5.2, cups-genppdupdate, escputil,
+        ijsgutenprint.5.2 (if compiled using ijs), and
+        testpattern</seg>
+        <seg>libgutenprint.so, libgutenprintui2.so
+        and optionally, various
+        <application>CUPS</application> filters and backend
+        drivers under /usr/lib/gutenprint/5.2/modules/</seg>
+        <seg>/usr/include/gutenprint,
+        /usr/include/gutenprintui2,
+        /usr/lib/gutenprint,
+        /usr/share/doc/gutenprint-&gutenprint-version; and
+        /usr/share/gutenprint</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="cups-calibrate">
+        <term><command>cups-calibrate</command></term>
+        <listitem>
+          <para>calibrates the color output of printers using the
+          <application>Gutenprint</application>,
+          <application>CUPS</application> or
+          <application>ESP Print Pro</application> drivers.</para>
+          <indexterm zone="gutenprint cups-calibrate">
+            <primary sortas="b-cups-calibrate">cups-calibrate</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cups-genppd.5.2">
+        <term><command>cups-genppd.5.2</command></term>
+        <listitem>
+          <para>
+            generate Gutenprint PPD files for use with CUPS.
+          </para>
+          <indexterm zone="gutenprint cups-genppd.5.2">
+            <primary sortas="b-cups-genppd.5.2">cups-genppd.5.2</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cups-genppdupdate">
+        <term><command>cups-genppdupdate</command></term>
+        <listitem>
+          <para>
+            regenerates the Gutenprint PPD files in use by CUPS.
+          </para>
+          <indexterm zone="gutenprint cups-genppdupdate">
+            <primary sortas="b-cups-genppdupdate">cups-genppdupdate</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="escputil">
+        <term><command>escputil</command></term>
+        <listitem>
+          <para>is a command line utility to perform various maintenance
+          tasks on Epson Stylus inkjet printers.</para>
+          <indexterm zone="gutenprint escputil">
+            <primary sortas="b-escputil">escputil</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ijsgutenprint.5.2">
+        <term><command>ijsgutenprint.5.2</command></term>
+        <listitem>
+          <para>is a Ghostscript driver for HP inkjet and laserjet printers.</para>
+          <indexterm zone="gutenprint ijsgutenprint.5.2">
+            <primary sortas="b-ijsgutenprint.5.2">ijsgutenprint.5.2</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="testpattern">
+        <term><command>testpattern</command></term>
+        <listitem>
+          <para>
+            is a test programm to learn how to use libgutenprint. 
+          </para>
+          <indexterm zone="gutenprint testpattern">
+            <primary sortas="b-testpattern">testpattern</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+ 
+   </variablelist>
+
+  </sect2>
+
+</sect1>
Index: pst/printing/printing.xml
===================================================================
--- pst/printing/printing.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ pst/printing/printing.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -20,8 +20,8 @@
   or paper.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cups-systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cups-filters-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cups.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cups-filters.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gutenprint-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gutenprint.xml"/>
 
 </chapter>
Index: server/databases/databases.xml
===================================================================
--- server/databases/databases.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ server/databases/databases.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -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-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="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="sqlite.xml"/>
 
Index: rver/databases/mariadb-systemd.xml
===================================================================
--- server/databases/mariadb-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,437 +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        "956561f3798d1fe8dfbe4b665287a87a">
-  <!ENTITY mariadb-size          "54 MB">
-  <!ENTITY mariadb-buildsize     "1.4 GB">
-  <!ENTITY mariadb-time          "10 SBU (with 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>
-
-    &lfs77_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 388 MB, but this can be
-    reduced by about 168 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="ruby"/>,
-      <xref linkend="unixodbc"/>,
-      <xref linkend="valgrind"/>,
-      <ulink url="http://groonga.org/">Groonga</ulink>,
-      <ulink url="http://www.phontron.com/kytea/">KyTea</ulink>,
-      <ulink url="http://sourceforge.net/projects/judy/">Judy</ulink>,
-      <ulink url="http://packages.debian.org/source/sid/libaio">libaio</ulink>,
-      <ulink url="https://github.com/Cyan4973/lz4">lz4</ulink>,
-      <ulink url="http://sourceforge.net/projects/mecab/">MeCab</ulink>,
-      <ulink url="https://github.com/msgpack/">MessagePack</ulink>,
-      <ulink url="http://www.mruby.org/">mruby</ulink>,
-      <ulink url="http://sphinxsearch.com/downloads/">Sphinx</ulink>,
-      <ulink url="https://mariadb.com/kb/en/mariadb/tokudb/">TokuDB</ulink>, and
-      <ulink url="http://zeromq.org/">ZeroMQ</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;
-
-mkdir build &amp;&amp;
-cd build    &amp;&amp;
-
-cmake -DCMAKE_BUILD_TYPE=Release                       \
-      -DCMAKE_INSTALL_PREFIX=/usr                      \
-      -DINSTALL_DOCDIR=share/doc/mariadb-&mariadb-version;       \
-      -DINSTALL_DOCREADMEDIR=share/doc/mariadb-&mariadb-version; \
-      -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>: This command sets correct installation
-      directory for some components.
-    </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.
-      </para>
-
-<screen role="root"><userinput>mysqladmin -u root password</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},
-          libmysqld.{so,a} and libmysqlservices.a
-        </seg>
-        <seg>
-          /etc/mysql,
-          /srv/mysql,
-          /usr/include/mysql,
-          /usr/lib/mysql,
-          /usr/share/doc/mariadb-&mariadb-version; 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 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ server/databases/mariadb.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -0,0 +1,437 @@
+<?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        "956561f3798d1fe8dfbe4b665287a87a">
+  <!ENTITY mariadb-size          "54 MB">
+  <!ENTITY mariadb-buildsize     "1.4 GB">
+  <!ENTITY mariadb-time          "10 SBU (with 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>
+
+    &lfs77_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 388 MB, but this can be
+    reduced by about 168 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="ruby"/>,
+      <xref linkend="unixodbc"/>,
+      <xref linkend="valgrind"/>,
+      <ulink url="http://groonga.org/">Groonga</ulink>,
+      <ulink url="http://www.phontron.com/kytea/">KyTea</ulink>,
+      <ulink url="http://sourceforge.net/projects/judy/">Judy</ulink>,
+      <ulink url="http://packages.debian.org/source/sid/libaio">libaio</ulink>,
+      <ulink url="https://github.com/Cyan4973/lz4">lz4</ulink>,
+      <ulink url="http://sourceforge.net/projects/mecab/">MeCab</ulink>,
+      <ulink url="https://github.com/msgpack/">MessagePack</ulink>,
+      <ulink url="http://www.mruby.org/">mruby</ulink>,
+      <ulink url="http://sphinxsearch.com/downloads/">Sphinx</ulink>,
+      <ulink url="https://mariadb.com/kb/en/mariadb/tokudb/">TokuDB</ulink>, and
+      <ulink url="http://zeromq.org/">ZeroMQ</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;
+
+mkdir build &amp;&amp;
+cd build    &amp;&amp;
+
+cmake -DCMAKE_BUILD_TYPE=Release                       \
+      -DCMAKE_INSTALL_PREFIX=/usr                      \
+      -DINSTALL_DOCDIR=share/doc/mariadb-&mariadb-version;       \
+      -DINSTALL_DOCREADMEDIR=share/doc/mariadb-&mariadb-version; \
+      -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>: This command sets correct installation
+      directory for some components.
+    </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.
+      </para>
+
+<screen role="root"><userinput>mysqladmin -u root password</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},
+          libmysqld.{so,a} and libmysqlservices.a
+        </seg>
+        <seg>
+          /etc/mysql,
+          /srv/mysql,
+          /usr/include/mysql,
+          /usr/lib/mysql,
+          /usr/share/doc/mariadb-&mariadb-version; 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: rver/databases/postgresql-systemd.xml
===================================================================
--- server/databases/postgresql-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,764 +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        "1fe952c44ed26d7e6a335cf991a9c1c6">
-  <!ENTITY postgresql-size          "17 MB">
-  <!ENTITY postgresql-buildsize     "194 MB">
-  <!ENTITY postgresql-time          "1.3 SBU">
-]>
-
-<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>
-
-    &lfs77_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>
-
-<!--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;-->
-<screen><userinput>sed -i '/DEFAULT_PGSOCKET_DIR/s@/tmp@/run/postgresql@' src/include/pg_config_manual.h &amp;&amp;
-./configure --prefix=/usr          \
-            --enable-thread-safety \
-            --docdir=/usr/share/doc/postgresql-&postgresql-version; &amp;&amp;
-make</userinput></screen>
-
-    <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>
-
-    <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. Tests must be run after
-      install, with postgresql server down, as unprivileged user.</para>
-    </warning>
-
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <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 -->
- <!-- Obsolete: only if upgrading for versions prior to 9   <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/postgres -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>: This sed changes 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_recvlogical, pg_resetxlog, pg_restore, pltcl_delmod,
-          pltcl_listmod, pltcl_loadmod, postgres, postmaster (deprecated),
-          psql, reindexdb, vacuumdb, and optionally (in contrib/) oid2name,
-          pg_archivecleanup, pgbench, pg_standby, pg_test_fsync,
-          pg_test_timing, pg_upgrade, pg_xlogdump, vacuumlo, and many others
-        </seg>
-        <seg>
-          libecpg.{so,a}, libecpg_compat.{so,a}, libpgcommon.a, libpgport.a,
-          libpgtypes.{so,a}, and libpq.{so,a}
-        </seg>
-        <seg>
-          /usr/include/{libpq,postgresql},
-          /usr/lib/postgresql,
-          /usr/share/doc/postgresql-&postgresql-version;,
-          /usr/share/postgresql, and
-          /srv/pgsql
-        </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_receivexlog">
-        <term><command>pg_receivexlog</command></term>
-        <listitem>
-          <para>
-            is used to stream transaction log from a running
-            PostgreSQL cluster.
-          </para>
-          <indexterm zone="postgresql pg_receivexlog">
-            <primary sortas="b-pg_receivexlog">pg_receivexlog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg_recvlogical">
-        <term><command>pg_recvlogical</command></term>
-        <listitem>
-          <para>controls PostgreSQL logical decoding streams.</para>
-          <indexterm zone="postgresql pg_recvlogical">
-            <primary sortas="b-pg_recvlogical">pg_recvlogical</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 the PostgreSQL database server.</para>
-          <indexterm zone="postgresql postgres">
-            <primary sortas="b-postgres">postgres</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="postmaster">
-        <term><command>postmaster</command></term>
-        <listitem>
-          <para>(deprecated, 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 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ server/databases/postgresql.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -0,0 +1,764 @@
+<?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        "1fe952c44ed26d7e6a335cf991a9c1c6">
+  <!ENTITY postgresql-size          "17 MB">
+  <!ENTITY postgresql-buildsize     "194 MB">
+  <!ENTITY postgresql-time          "1.3 SBU">
+]>
+
+<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>
+
+    &lfs77_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>
+
+<!--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;-->
+<screen><userinput>sed -i '/DEFAULT_PGSOCKET_DIR/s@/tmp@/run/postgresql@' src/include/pg_config_manual.h &amp;&amp;
+./configure --prefix=/usr          \
+            --enable-thread-safety \
+            --docdir=/usr/share/doc/postgresql-&postgresql-version; &amp;&amp;
+make</userinput></screen>
+
+    <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>
+
+    <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. Tests must be run after
+      install, with postgresql server down, as unprivileged user.</para>
+    </warning>
+
+    <para>To test the results, issue: <command>make check</command>.</para>
+
+    <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 -->
+ <!-- Obsolete: only if upgrading for versions prior to 9   <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/postgres -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>: This sed changes 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_recvlogical, pg_resetxlog, pg_restore, pltcl_delmod,
+          pltcl_listmod, pltcl_loadmod, postgres, postmaster (deprecated),
+          psql, reindexdb, vacuumdb, and optionally (in contrib/) oid2name,
+          pg_archivecleanup, pgbench, pg_standby, pg_test_fsync,
+          pg_test_timing, pg_upgrade, pg_xlogdump, vacuumlo, and many others
+        </seg>
+        <seg>
+          libecpg.{so,a}, libecpg_compat.{so,a}, libpgcommon.a, libpgport.a,
+          libpgtypes.{so,a}, and libpq.{so,a}
+        </seg>
+        <seg>
+          /usr/include/{libpq,postgresql},
+          /usr/lib/postgresql,
+          /usr/share/doc/postgresql-&postgresql-version;,
+          /usr/share/postgresql, and
+          /srv/pgsql
+        </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_receivexlog">
+        <term><command>pg_receivexlog</command></term>
+        <listitem>
+          <para>
+            is used to stream transaction log from a running
+            PostgreSQL cluster.
+          </para>
+          <indexterm zone="postgresql pg_receivexlog">
+            <primary sortas="b-pg_receivexlog">pg_receivexlog</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pg_recvlogical">
+        <term><command>pg_recvlogical</command></term>
+        <listitem>
+          <para>controls PostgreSQL logical decoding streams.</para>
+          <indexterm zone="postgresql pg_recvlogical">
+            <primary sortas="b-pg_recvlogical">pg_recvlogical</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 the PostgreSQL database server.</para>
+          <indexterm zone="postgresql postgres">
+            <primary sortas="b-postgres">postgres</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="postmaster">
+        <term><command>postmaster</command></term>
+        <listitem>
+          <para>(deprecated, 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: rver/mail/dovecot-systemd.xml
===================================================================
--- server/mail/dovecot-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,350 +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        "1e42eb3b69544c447ad882d7858f3630">
-  <!ENTITY dovecot-size          "4.9 MB">
-  <!ENTITY dovecot-buildsize     "257 MB (additional 14 MB for the tests)">
-  <!ENTITY dovecot-time          "1.3 SBU (additional 0.4 SBU for the tests)">
-]>
-
-<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>
-
-    &lfs77_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="clucene"/>,
-      <xref linkend="icu"/>,
-      <xref linkend="linux-pam"/>,
-      <xref linkend="mariadb"/>,
-      <xref linkend="openldap"/>,
-      <xref linkend="openssl"/>,
-      <xref linkend="postgresql"/>,
-      <xref linkend="sqlite"/>,
-      <xref linkend="valgrind"/>,
-      <ulink url="https://cassandra.apache.org/">Cassandra</ulink>,
-      <ulink url="https://github.com/Cyan4973/lz4">lz4</ulink>, and
-      <ulink url="https://github.com/shibukawa/snowball_py">stemmer</ulink>
-    </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 -k check</command>. One test
-    fails for unknown reason</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>
-
-  </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 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ server/mail/dovecot.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -0,0 +1,350 @@
+<?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        "1e42eb3b69544c447ad882d7858f3630">
+  <!ENTITY dovecot-size          "4.9 MB">
+  <!ENTITY dovecot-buildsize     "257 MB (additional 14 MB for the tests)">
+  <!ENTITY dovecot-time          "1.3 SBU (additional 0.4 SBU for the tests)">
+]>
+
+<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>
+
+    &lfs77_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="clucene"/>,
+      <xref linkend="icu"/>,
+      <xref linkend="linux-pam"/>,
+      <xref linkend="mariadb"/>,
+      <xref linkend="openldap"/>,
+      <xref linkend="openssl"/>,
+      <xref linkend="postgresql"/>,
+      <xref linkend="sqlite"/>,
+      <xref linkend="valgrind"/>,
+      <ulink url="https://cassandra.apache.org/">Cassandra</ulink>,
+      <ulink url="https://github.com/Cyan4973/lz4">lz4</ulink>, and
+      <ulink url="https://github.com/shibukawa/snowball_py">stemmer</ulink>
+    </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 -k check</command>. One test
+    fails for unknown reason</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>
+
+  </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: rver/mail/exim-systemd.xml
===================================================================
--- server/mail/exim-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,535 +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;
-
-  <!-- This URL frequently becomes broken. Please, do not "fix' it back,
-       unless you decided to take care of and monitor it.
-  <!ENTITY exim-download-http   "http://ftp.exim.org/pub/exim/exim4/exim-&exim-version;.tar.bz2"> -->
-
-  <!ENTITY exim-download-http   "http://mirrors-uk.go-parts.com/eximftp/exim/exim4/exim-&exim-version;.tar.bz2">
-  <!ENTITY exim-download-ftp    "ftp://ftp.exim.org/pub/exim/exim4/exim-&exim-version;.tar.bz2">
-  <!-- if above don't work, please use one of the official mirrors at
-       http://www.exim.org/mirmon/ftp_mirrors.html -->
-  <!ENTITY exim-md5sum          "797f248ef3e0c0e2f178e915f88fc4e9">
-  <!ENTITY exim-size            "1.8 MB">
-  <!ENTITY exim-buildsize       "17 MB">
-  <!ENTITY exim-time            "0.2 SBU">
-
-
-
-  <!ENTITY exim-daemon-version  "&exim-version;-3">
-]>
-
-<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>
-
-    &lfs77_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>
-      (alternatives to GDBM, built in LFS),
-      <xref linkend="cyrus-sasl"/>,
-      <xref linkend="libidn"/>,
-      <xref linkend="linux-pam"/>,
-      <xref linkend="mariadb"/> or
-      <ulink url="http://www.mysql.com/">MySQL</ulink>,
-      <xref linkend="openldap"/>,
-      <xref linkend="openssl"/> or <xref linkend="gnutls"/>,
-      <xref linkend="postgresql"/>,
-      <xref linkend="sqlite"/>,
-      <xref linkend="x-window-system"/>, 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;
-printf "USE_GDBM = yes\nDBMLIB = -lgdbm\n" >> 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>printf ... > 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-&exim-daemon-version;, exim_checkaccess,
-        exim_dbmbuild, exim_dumpdb, exim_fixdb, exim_lock, exim_tidydb,
-        eximstats, exinext, exipick, exiqgrep, exiqsumm, exiwhat, and
-        optionally, eximon, eximon.bin, and sendmail (symlink)</seg>
-        <seg>None</seg>
-        <seg>/usr/share/doc/exim-&exim-version; and /var/spool/exim</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="exicyclog">
-        <term><command>exicyclog</command></term>
-        <listitem>
-          <para>cycles <application>Exim</application> log files.</para>
-          <indexterm zone="exim exicyclog">
-            <primary sortas="b-exicyclog">exicyclog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exigrep">
-        <term><command>exigrep</command></term>
-        <listitem>
-          <para>searches <application>Exim</application> log files.</para>
-          <indexterm zone="exim exigrep">
-            <primary sortas="b-exigrep">exigrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exim-prog">
-        <term><command>exim</command></term>
-        <listitem>
-          <para>is a symlink to the <command>exim-&exim-daemon-version;</command>
-          MTA daemon.</para>
-          <indexterm zone="exim exim-prog">
-            <primary sortas="b-exim">exim</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exim-current_version">
-        <term><command>exim-&exim-daemon-version;</command></term>
-        <listitem>
-          <para>is the <application>Exim</application> mail transport
-          agent daemon.</para>
-          <indexterm zone="exim exim-current_version">
-            <primary sortas="b-exim-&exim-daemon-version;">exim-&exim-daemon-version;</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exim_checkaccess">
-        <term><command>exim_checkaccess</command></term>
-        <listitem>
-          <para>states whether a given recipient address from a given host is
-          acceptable or not.</para>
-          <indexterm zone="exim exim_checkaccess">
-            <primary sortas="b-exim_checkaccess">exim_checkaccess</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exim_dbmbuild">
-        <term><command>exim_dbmbuild</command></term>
-        <listitem>
-          <para> creates and rebuilds <application>Exim</application>
-          databases.</para>
-          <indexterm zone="exim exim_dbmbuild">
-            <primary sortas="b-exim_dbmbuild">exim_dbmbuild</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exim_dumpdb">
-        <term><command>exim_dumpdb</command></term>
-        <listitem>
-          <para> writes the contents of <application>Exim</application>
-          databases to the standard output.</para>
-          <indexterm zone="exim exim_dumpdb">
-            <primary sortas="b-exim_dumpdb">exim_dumpdb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exim_fixdb">
-        <term><command>exim_fixdb</command></term>
-        <listitem>
-          <para>modifies data in <application>Exim</application>
-          databases.</para>
-          <indexterm zone="exim exim_fixdb">
-            <primary sortas="b-exim_fixdb">exim_fixdb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exim_lock">
-        <term><command>exim_lock</command></term>
-        <listitem>
-          <para>locks a mailbox file.</para>
-          <indexterm zone="exim exim_lock">
-            <primary sortas="b-exim_lock">exim_lock</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exim_tidydb">
-        <term><command>exim_tidydb</command></term>
-        <listitem>
-          <para>removes old records from <application>Exim</application>
-          databases.</para>
-          <indexterm zone="exim exim_tidydb">
-            <primary sortas="b-exim_tidydb">exim_tidydb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="eximstats">
-        <term><command>eximstats</command></term>
-        <listitem>
-          <para>generates mail statistics from <application>Exim</application>
-          log files.</para>
-          <indexterm zone="exim eximstats">
-            <primary sortas="b-eximstats">eximstats</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exinext">
-        <term><command>exinext</command></term>
-        <listitem>
-          <para>queries remote host retry times.</para>
-          <indexterm zone="exim exinext">
-            <primary sortas="b-exinext">exinext</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exipick">
-        <term><command>exipick</command></term>
-        <listitem>
-          <para>selects messages based on various criteria.</para>
-          <indexterm zone="exim exipick">
-            <primary sortas="b-exipick">exipick</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exiqgrep">
-        <term><command>exiqgrep</command></term>
-        <listitem>
-          <para>is a utility for selective queue listing.</para>
-          <indexterm zone="exim exiqgrep">
-            <primary sortas="b-exiqgrep">exiqgrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exiqsumm">
-        <term><command>exiqsumm</command></term>
-        <listitem>
-          <para>produces a summary of the messages in the mail queue.</para>
-          <indexterm zone="exim exiqsumm">
-            <primary sortas="b-exiqsumm">exiqsumm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="exiwhat">
-        <term><command>exiwhat</command></term>
-        <listitem>
-          <para>queries running <application>Exim</application>
-          processes.</para>
-          <indexterm zone="exim exiwhat">
-            <primary sortas="b-exiwhat">exiwhat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="eximon">
-        <term><command>eximon</command></term>
-        <listitem>
-          <para>is a start-up shell script for <command>eximon.bin</command>
-          used to set the required environment variables before running the
-          program.</para>
-          <indexterm zone="exim eximon">
-            <primary sortas="b-eximon">eximon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="eximon.bin">
-        <term><command>eximon.bin</command></term>
-        <listitem>
-          <para>is a monitor program which displays current information in an
-          <application>X</application> window, and also contains a menu interface
-          to <application>Exim</application>'s command line administration
-          options.</para>
-          <indexterm zone="exim eximon.bin">
-            <primary sortas="b-eximon.bin">eximon.bin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: server/mail/exim.xml
===================================================================
--- server/mail/exim.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ server/mail/exim.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -0,0 +1,535 @@
+<?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;
+
+  <!-- This URL frequently becomes broken. Please, do not "fix' it back,
+       unless you decided to take care of and monitor it.
+  <!ENTITY exim-download-http   "http://ftp.exim.org/pub/exim/exim4/exim-&exim-version;.tar.bz2"> -->
+
+  <!ENTITY exim-download-http   "http://mirrors-uk.go-parts.com/eximftp/exim/exim4/exim-&exim-version;.tar.bz2">
+  <!ENTITY exim-download-ftp    "ftp://ftp.exim.org/pub/exim/exim4/exim-&exim-version;.tar.bz2">
+  <!-- if above don't work, please use one of the official mirrors at
+       http://www.exim.org/mirmon/ftp_mirrors.html -->
+  <!ENTITY exim-md5sum          "797f248ef3e0c0e2f178e915f88fc4e9">
+  <!ENTITY exim-size            "1.8 MB">
+  <!ENTITY exim-buildsize       "17 MB">
+  <!ENTITY exim-time            "0.2 SBU">
+
+
+
+  <!ENTITY exim-daemon-version  "&exim-version;-3">
+]>
+
+<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>
+
+    &lfs77_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>
+      (alternatives to GDBM, built in LFS),
+      <xref linkend="cyrus-sasl"/>,
+      <xref linkend="libidn"/>,
+      <xref linkend="linux-pam"/>,
+      <xref linkend="mariadb"/> or
+      <ulink url="http://www.mysql.com/">MySQL</ulink>,
+      <xref linkend="openldap"/>,
+      <xref linkend="openssl"/> or <xref linkend="gnutls"/>,
+      <xref linkend="postgresql"/>,
+      <xref linkend="sqlite"/>,
+      <xref linkend="x-window-system"/>, 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;
+printf "USE_GDBM = yes\nDBMLIB = -lgdbm\n" >> 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>printf ... > 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-&exim-daemon-version;, exim_checkaccess,
+        exim_dbmbuild, exim_dumpdb, exim_fixdb, exim_lock, exim_tidydb,
+        eximstats, exinext, exipick, exiqgrep, exiqsumm, exiwhat, and
+        optionally, eximon, eximon.bin, and sendmail (symlink)</seg>
+        <seg>None</seg>
+        <seg>/usr/share/doc/exim-&exim-version; and /var/spool/exim</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="exicyclog">
+        <term><command>exicyclog</command></term>
+        <listitem>
+          <para>cycles <application>Exim</application> log files.</para>
+          <indexterm zone="exim exicyclog">
+            <primary sortas="b-exicyclog">exicyclog</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="exigrep">
+        <term><command>exigrep</command></term>
+        <listitem>
+          <para>searches <application>Exim</application> log files.</para>
+          <indexterm zone="exim exigrep">
+            <primary sortas="b-exigrep">exigrep</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="exim-prog">
+        <term><command>exim</command></term>
+        <listitem>
+          <para>is a symlink to the <command>exim-&exim-daemon-version;</command>
+          MTA daemon.</para>
+          <indexterm zone="exim exim-prog">
+            <primary sortas="b-exim">exim</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="exim-current_version">
+        <term><command>exim-&exim-daemon-version;</command></term>
+        <listitem>
+          <para>is the <application>Exim</application> mail transport
+          agent daemon.</para>
+          <indexterm zone="exim exim-current_version">
+            <primary sortas="b-exim-&exim-daemon-version;">exim-&exim-daemon-version;</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="exim_checkaccess">
+        <term><command>exim_checkaccess</command></term>
+        <listitem>
+          <para>states whether a given recipient address from a given host is
+          acceptable or not.</para>
+          <indexterm zone="exim exim_checkaccess">
+            <primary sortas="b-exim_checkaccess">exim_checkaccess</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="exim_dbmbuild">
+        <term><command>exim_dbmbuild</command></term>
+        <listitem>
+          <para> creates and rebuilds <application>Exim</application>
+          databases.</para>
+          <indexterm zone="exim exim_dbmbuild">
+            <primary sortas="b-exim_dbmbuild">exim_dbmbuild</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="exim_dumpdb">
+        <term><command>exim_dumpdb</command></term>
+        <listitem>
+          <para> writes the contents of <application>Exim</application>
+          databases to the standard output.</para>
+          <indexterm zone="exim exim_dumpdb">
+            <primary sortas="b-exim_dumpdb">exim_dumpdb</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="exim_fixdb">
+        <term><command>exim_fixdb</command></term>
+        <listitem>
+          <para>modifies data in <application>Exim</application>
+          databases.</para>
+          <indexterm zone="exim exim_fixdb">
+            <primary sortas="b-exim_fixdb">exim_fixdb</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="exim_lock">
+        <term><command>exim_lock</command></term>
+        <listitem>
+          <para>locks a mailbox file.</para>
+          <indexterm zone="exim exim_lock">
+            <primary sortas="b-exim_lock">exim_lock</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="exim_tidydb">
+        <term><command>exim_tidydb</command></term>
+        <listitem>
+          <para>removes old records from <application>Exim</application>
+          databases.</para>
+          <indexterm zone="exim exim_tidydb">
+            <primary sortas="b-exim_tidydb">exim_tidydb</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="eximstats">
+        <term><command>eximstats</command></term>
+        <listitem>
+          <para>generates mail statistics from <application>Exim</application>
+          log files.</para>
+          <indexterm zone="exim eximstats">
+            <primary sortas="b-eximstats">eximstats</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="exinext">
+        <term><command>exinext</command></term>
+        <listitem>
+          <para>queries remote host retry times.</para>
+          <indexterm zone="exim exinext">
+            <primary sortas="b-exinext">exinext</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="exipick">
+        <term><command>exipick</command></term>
+        <listitem>
+          <para>selects messages based on various criteria.</para>
+          <indexterm zone="exim exipick">
+            <primary sortas="b-exipick">exipick</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="exiqgrep">
+        <term><command>exiqgrep</command></term>
+        <listitem>
+          <para>is a utility for selective queue listing.</para>
+          <indexterm zone="exim exiqgrep">
+            <primary sortas="b-exiqgrep">exiqgrep</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="exiqsumm">
+        <term><command>exiqsumm</command></term>
+        <listitem>
+          <para>produces a summary of the messages in the mail queue.</para>
+          <indexterm zone="exim exiqsumm">
+            <primary sortas="b-exiqsumm">exiqsumm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="exiwhat">
+        <term><command>exiwhat</command></term>
+        <listitem>
+          <para>queries running <application>Exim</application>
+          processes.</para>
+          <indexterm zone="exim exiwhat">
+            <primary sortas="b-exiwhat">exiwhat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="eximon">
+        <term><command>eximon</command></term>
+        <listitem>
+          <para>is a start-up shell script for <command>eximon.bin</command>
+          used to set the required environment variables before running the
+          program.</para>
+          <indexterm zone="exim eximon">
+            <primary sortas="b-eximon">eximon</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="eximon.bin">
+        <term><command>eximon.bin</command></term>
+        <listitem>
+          <para>is a monitor program which displays current information in an
+          <application>X</application> window, and also contains a menu interface
+          to <application>Exim</application>'s command line administration
+          options.</para>
+          <indexterm zone="exim eximon.bin">
+            <primary sortas="b-eximon.bin">eximon.bin</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: server/mail/mail.xml
===================================================================
--- server/mail/mail.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ server/mail/mail.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -23,8 +23,8 @@
   server (Courier-IMAP).</para>
 
-  <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-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dovecot.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="exim.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="postfix.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sendmail.xml"/>
 
 </chapter>
Index: rver/mail/postfix-systemd.xml
===================================================================
--- server/mail/postfix-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,658 +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        "d1dc2c23011c222129db3d91aa4f312a">
-  <!ENTITY postfix-size          "4.1 MB">
-  <!ENTITY postfix-buildsize     "198 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>
-
-    &lfs77_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">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="db"/>,
-      <xref linkend="cyrus-sasl"/> and
-      <xref linkend="openssl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="icu"/> (for Email Address Internationalization (SMTPUTF8) support),
-      <xref linkend="mariadb"/>,
-      <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>
-        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>
-        If you are running a Linux-4.x kernel, apply the following sed to
-        allow the <command>makedefs</command> script to recognize it:
-      </para>
-
-<screen><userinput>sed -i 's/Linux.3\*/Linux.[34]\*/' makedefs</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>
-
-    <para>
-      <option>CCARGS="-DNO_EAI ..."</option>: This will turn off SMTPUTF8
-      support, for example if the rest of your email address infrastructure
-      cannot handle UTF-8 email addresses and message header values.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Postfix</title>
-
-    <sect3 id="postfix-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/aliases</filename>,
-        <filename>/etc/postfix/main.cf</filename>, and
-        <filename>/etc/postfix/master.cf</filename>
-      </para>
-
-      <indexterm zone="postfix postfix-config">
-        <primary sortas="e-etc-aliases">/etc/aliases</primary>
-      </indexterm>
-
-      <indexterm zone="postfix postfix-config">
-        <primary sortas="e-etc-postfix-star">/etc/postfix/*</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Create (or append to an existing) <filename>/etc/aliases</filename>
-        with the following command. Change
-        <replaceable>&lt;LOGIN&gt;</replaceable> 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 Units</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 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ server/mail/postfix.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -0,0 +1,658 @@
+<?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        "d1dc2c23011c222129db3d91aa4f312a">
+  <!ENTITY postfix-size          "4.1 MB">
+  <!ENTITY postfix-buildsize     "198 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>
+
+    &lfs77_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">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="db"/>,
+      <xref linkend="cyrus-sasl"/> and
+      <xref linkend="openssl"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="icu"/> (for Email Address Internationalization (SMTPUTF8) support),
+      <xref linkend="mariadb"/>,
+      <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>
+        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>
+        If you are running a Linux-4.x kernel, apply the following sed to
+        allow the <command>makedefs</command> script to recognize it:
+      </para>
+
+<screen><userinput>sed -i 's/Linux.3\*/Linux.[34]\*/' makedefs</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>
+
+    <para>
+      <option>CCARGS="-DNO_EAI ..."</option>: This will turn off SMTPUTF8
+      support, for example if the rest of your email address infrastructure
+      cannot handle UTF-8 email addresses and message header values.
+    </para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring Postfix</title>
+
+    <sect3 id="postfix-config">
+      <title>Config Files</title>
+
+      <para>
+        <filename>/etc/aliases</filename>,
+        <filename>/etc/postfix/main.cf</filename>, and
+        <filename>/etc/postfix/master.cf</filename>
+      </para>
+
+      <indexterm zone="postfix postfix-config">
+        <primary sortas="e-etc-aliases">/etc/aliases</primary>
+      </indexterm>
+
+      <indexterm zone="postfix postfix-config">
+        <primary sortas="e-etc-postfix-star">/etc/postfix/*</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para>
+        Create (or append to an existing) <filename>/etc/aliases</filename>
+        with the following command. Change
+        <replaceable>&lt;LOGIN&gt;</replaceable> 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 Units</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: rver/mail/sendmail-systemd.xml
===================================================================
--- server/mail/sendmail-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,436 +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;
-
-  <!-- Downloads a web page
-  <!ENTITY sendmail-download-http "http://www.sendmail.org/ftp/sendmail.&sendmail-version;.tar.gz"> -->
-  <!ENTITY sendmail-download-http " ">
-  <!ENTITY sendmail-download-ftp  "ftp://ftp.sendmail.org/pub/sendmail/sendmail.&sendmail-version;.tar.gz">
-  <!ENTITY sendmail-md5sum        "a824fa7dea4d3341efb6462ccd816f00">
-  <!ENTITY sendmail-size          "2.1 MB">
-  <!ENTITY sendmail-buildsize     "14 MB">
-  <!ENTITY sendmail-time          "0.2 SBU">
-]>
-
-<sect1 id="sendmail" xreflabel="sendmail-&sendmail-version;">
-  <?dbhtml filename="sendmail.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>sendmail-&sendmail-version;</title>
-
-  <indexterm zone="sendmail">
-    <primary sortas="a-sendmail">sendmail</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to sendmail</title>
-
-    <para>The <application>sendmail</application> package contains a Mail
-    Transport Agent (MTA).</para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&sendmail-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&sendmail-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &sendmail-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &sendmail-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &sendmail-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &sendmail-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">sendmail Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="openldap"/> (client)
-    </para>
-
-    <bridgehead renderas="sect4">Recommanded</bridgehead>
-    <para role="recommanded">
-      <xref linkend="openssl"/> and
-      <xref linkend="cyrus-sasl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="procmail"/>,
-      <ulink url="http://www.feep.net/nph/">nph</ulink>, and
-      <xref linkend="gs"/> (for creating PDF documentation)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/sendmail"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of sendmail</title>
-
-    <para>Before building <application>sendmail</application>, create the
-    required user, group and directory with the following commands issued as
-    the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>groupadd -g 26 smmsp                               &amp;&amp;
-useradd -c "Sendmail Daemon" -g smmsp -d /dev/null \
-        -s /bin/false -u 26 smmsp                  &amp;&amp;
-chmod -v 1777 /var/mail                            &amp;&amp;
-install -v -m700 -d /var/spool/mqueue</userinput></screen>
-
-    <note><para>See the source tree <filename>sendmail/README</filename> file
-    for information on linking optional packages into the build. Use the
-    example below, which adds support for SASL, StartTLS
-    (<application>OpenSSL</application>) and
-    <application>OpenLDAP</application>, as a starting point.  Of course,
-    modify it to suit your particular needs.</para></note>
-
-<screen><userinput>cat &gt;&gt; devtools/Site/site.config.m4 &lt;&lt; "EOF"
-<literal>APPENDDEF(`confENVDEF',`-DSTARTTLS -DSASL -DLDAPMAP')
-APPENDDEF(`confLIBS', `-lssl -lcrypto -lsasl2 -lldap -llber -ldb')
-APPENDDEF(`confINCDIRS', `-I/usr/include/sasl')</literal>
-EOF</userinput></screen>
-
-    <para>Install <application>sendmail</application> with the following
-    commands:</para>
-
-<screen><userinput>cat &gt;&gt; devtools/Site/site.config.m4 &lt;&lt; "EOF"
-<literal>define(`confMANGRP',`root')
-define(`confMANOWN',`root')
-define(`confSBINGRP',`root')
-define(`confUBINGRP',`root')
-define(`confUBINOWN',`root')</literal>
-EOF
-
-sed -i 's|/usr/man/man|/usr/share/man/man|' \
-    devtools/OS/Linux           &amp;&amp;
-
-cd sendmail                     &amp;&amp;
-sh Build                        &amp;&amp;
-cd ../cf/cf                     &amp;&amp;
-cp generic-linux.mc sendmail.mc &amp;&amp;
-sh Build sendmail.cf</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>install -v -d -m755 /etc/mail &amp;&amp;
-sh Build install-cf &amp;&amp;
-
-cd ../..            &amp;&amp;
-sh Build install    &amp;&amp;
-
-install -v -m644 cf/cf/{submit,sendmail}.mc /etc/mail &amp;&amp;
-cp -v -R cf/* /etc/mail                               &amp;&amp;
-
-install -v -m755 -d /usr/share/doc/sendmail-&sendmail-version;/{cf,sendmail} &amp;&amp;
-
-install -v -m644 CACerts FAQ KNOWNBUGS LICENSE PGPKEYS README RELEASE_NOTES \
-        /usr/share/doc/sendmail-&sendmail-version; &amp;&amp;
-
-install -v -m644 sendmail/{README,SECURITY,TRACEFLAGS,TUNING} \
-        /usr/share/doc/sendmail-&sendmail-version;/sendmail &amp;&amp;
-
-install -v -m644 cf/README /usr/share/doc/sendmail-&sendmail-version;/cf &amp;&amp;
-
-for manpage in sendmail editmap mailstats makemap praliases smrsh
-do
-    install -v -m644 $manpage/$manpage.8 /usr/share/man/man8
-done &amp;&amp;
-
-install -v -m644 sendmail/aliases.5    /usr/share/man/man5 &amp;&amp;
-install -v -m644 sendmail/mailq.1      /usr/share/man/man1 &amp;&amp;
-install -v -m644 sendmail/newaliases.1 /usr/share/man/man1 &amp;&amp;
-install -v -m644 vacation/vacation.1   /usr/share/man/man1</userinput></screen>
-
-    <para>Install the <application>sendmail</application> Installation and
-    Operations Guide with the following commands:</para>
-
-    <note><para>Remove <filename>op.pdf</filename> from the
-    <command>make</command> and <command>install</command> commands below if
-    you don't have <application>Ghostscript</application>
-    installed.</para></note>
-
-<screen><userinput>cd doc/op                                       &amp;&amp;
-sed -i 's/groff/GROFF_NO_SGR=1 groff/' Makefile &amp;&amp;
-make op.txt op.pdf</userinput></screen>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>install -v -d -m755 /usr/share/doc/sendmail-&sendmail-version; &amp;&amp;
-install -v -m644 op.ps op.txt op.pdf /usr/share/doc/sendmail-&sendmail-version; &amp;&amp;
-cd ../..</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>cat &gt; devtools/Site/site.config.m4 &lt;&lt; "EOF"</command>:
-    This creates a configuration file changing some of the default settings.</para>
-
-    <para><command>sed ... devtools/OS/Linux</command>: The site.config.m4
-    does not honor a change to the man directory, so fix it in the OS 
-    definitions.</para>
-
-    <para><command>sed ... include/sm/bdb.h</command>: This allows sendmail to
-    build properly with <xref linkend='db'/> versions 5 and above.</para>
-
-    <para><command>sh Build; sh Build sendmail.cf; sh Build install-cf;
-    sh Build install</command>: <application>sendmail</application> uses an
-    <application>m4</application> based build script to create the various
-    <filename>Makefile</filename>s. These commands build and install the
-    package.</para>
-
-    <para><command>for manpage in...;do...;done; install ...</command>: The man
-    pages are installed already formatted and <command>man</command> displays
-    them somewhat garbled. These commands replace the formatted pages with
-    pages <command>man</command> can display properly.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring sendmail</title>
-
-    <sect3 id="sendmail-config">
-      <title>Config Files</title>
-
-      <para><filename>/etc/mail/*</filename></para>
-
-      <indexterm zone="sendmail sendmail-config">
-        <primary sortas="e-etc-mail">/etc/mail/*</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <note><para>Ensure you have a fully qualified domain name defined
-      in <filename>/etc/hosts</filename> for your system before proceeding.
-      </para></note>
-
-      <para>Create the <filename>/etc/mail/local-host-names</filename> and
-      <filename>/etc/mail/aliases</filename> files using the following
-      commands as the <systemitem class="username">root</systemitem>
-      user:</para>
-
-<screen role="root"><userinput>echo $(hostname) > /etc/mail/local-host-names
-cat &gt; /etc/mail/aliases &lt;&lt; "EOF"
-<literal>postmaster: root
-MAILER-DAEMON: root</literal>
-
-EOF
-newaliases</userinput></screen>
-
-      <para><application>sendmail</application>'s primary configuration file,
-      <filename>/etc/mail/sendmail.cf</filename>, is complex and not meant to be
-      directly edited. The recommended method for changing it is to modify
-      <filename>/etc/mail/sendmail.mc</filename> and various
-      <application>m4</application> files, then run the <command>m4</command>
-      macro processor from within
-      <filename class='directory'>/etc/mail</filename> as follows:</para>
-
-<screen role="root"><userinput>cd /etc/mail &amp;&amp;
-m4 m4/cf.m4 sendmail.mc > sendmail.cf</userinput></screen>
-
-      <para>A full explanation of the files to modify, and the available
-      parameters can be found in <filename>/etc/mail/README</filename>.</para>
-
-    </sect3>
-
-    <sect3  id="sendmail-init">
-      <title>Systemd Units</title>
-
-      <para>
-        To start the <command>sendmail</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="sendmail sendmail-init">
-        <primary sortas="f-sendmail-init">sendmail</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-sendmail</userinput></screen>
-
-      <note>
-        <para>The -qNm option to <command>sendmail</command>, where N is number
-        of minutes, controls how often <application>sendmail</application> will
-        process the mail queue. A default of 5 minutes is used in the systemd
-        units. Individual workstation users may want to set this as low as 1
-        minute, large installations handling more mail may want to set it
-        higher. The value can be changed in
-        <filename>/etc/default/sendmail</filename> file.</para>
-      </note>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>editmap, mailstats, makemap, praliases, sendmail, smrsh,
-        and vacation; symlinks to /usr/sbin/sendmail: hoststat, mailq,
-        newaliases, and purgestat</seg>
-        <seg>None</seg>
-        <seg>/etc/mail, /usr/share/doc/sendmail-&sendmail-version;,
-        /var/spool/mqueue, and /var/spool/clientmqueue</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="editmap">
-        <term><command>editmap</command></term>
-        <listitem>
-          <para>queries and edits <application>sendmail</application> map
-          files.</para>
-          <indexterm zone="sendmail editmap">
-            <primary sortas="b-editmap">editmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hoststat">
-        <term><command>hoststat</command></term>
-        <listitem>
-          <para>prints <application>sendmail</application>'s persistent host
-          status.</para>
-          <indexterm zone="sendmail hoststat">
-            <primary sortas="b-hoststat">hoststat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mailstats">
-        <term><command>mailstats</command></term>
-        <listitem>
-          <para>displays <application>sendmail</application> statistics.</para>
-          <indexterm zone="sendmail mailstats">
-            <primary sortas="b-mailstats">mailstats</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mailq-sendmail">
-        <term><command>mailq</command></term>
-        <listitem>
-          <para>prints a summary of outbound mail messages waiting for
-          delivery.</para>
-          <indexterm zone="sendmail mailq-sendmail">
-            <primary sortas="b-mailq">mailq</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="makemap">
-        <term><command>makemap</command></term>
-        <listitem>
-          <para>creates <application>sendmail</application> map files.</para>
-          <indexterm zone="sendmail makemap">
-            <primary sortas="b-makemap">makemap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="newaliases-sendmail">
-        <term><command>newaliases</command></term>
-        <listitem>
-          <para>rebuilds <filename>/etc/mail/aliases.db</filename> from the
-          contents of <filename>/etc/mail/aliases</filename>.</para>
-          <indexterm zone="sendmail newaliases-sendmail">
-            <primary sortas="b-newaliases">newaliases</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="praliases">
-        <term><command>praliases</command></term>
-        <listitem>
-          <para>displays current <application>sendmail</application>
-          aliases.</para>
-          <indexterm zone="sendmail praliases">
-            <primary sortas="b-praliases">praliases</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="purgestat">
-        <term><command>purgestat</command></term>
-        <listitem>
-          <para> causes <application>sendmail</application> to clear (purge)
-          all its host-status information.</para>
-          <indexterm zone="sendmail purgestat">
-            <primary sortas="b-purgestat">purgestat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sendmail-prog-sendmail">
-        <term><command>sendmail</command></term>
-        <listitem>
-          <para>is the <application>sendmail</application> mail transport
-          agent.</para>
-          <indexterm zone="sendmail sendmail-prog-sendmail">
-            <primary sortas="b-sendmail">sendmail</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="smrsh">
-        <term><command>smrsh</command></term>
-        <listitem>
-          <para>is a restricted shell for
-          <application>sendmail</application>.</para>
-          <indexterm zone="sendmail smrsh">
-            <primary sortas="b-smrsh">smrsh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vacation-sendmail">
-        <term><command>vacation</command></term>
-        <listitem>
-          <para>is an email auto responder.</para>
-          <indexterm zone="sendmail vacation-sendmail">
-            <primary sortas="b-vacation">vacation</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: server/mail/sendmail.xml
===================================================================
--- server/mail/sendmail.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ server/mail/sendmail.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -0,0 +1,436 @@
+<?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;
+
+  <!-- Downloads a web page
+  <!ENTITY sendmail-download-http "http://www.sendmail.org/ftp/sendmail.&sendmail-version;.tar.gz"> -->
+  <!ENTITY sendmail-download-http " ">
+  <!ENTITY sendmail-download-ftp  "ftp://ftp.sendmail.org/pub/sendmail/sendmail.&sendmail-version;.tar.gz">
+  <!ENTITY sendmail-md5sum        "a824fa7dea4d3341efb6462ccd816f00">
+  <!ENTITY sendmail-size          "2.1 MB">
+  <!ENTITY sendmail-buildsize     "14 MB">
+  <!ENTITY sendmail-time          "0.2 SBU">
+]>
+
+<sect1 id="sendmail" xreflabel="sendmail-&sendmail-version;">
+  <?dbhtml filename="sendmail.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>sendmail-&sendmail-version;</title>
+
+  <indexterm zone="sendmail">
+    <primary sortas="a-sendmail">sendmail</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to sendmail</title>
+
+    <para>The <application>sendmail</application> package contains a Mail
+    Transport Agent (MTA).</para>
+
+    &lfs77_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&sendmail-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&sendmail-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &sendmail-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &sendmail-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &sendmail-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &sendmail-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">sendmail Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="openldap"/> (client)
+    </para>
+
+    <bridgehead renderas="sect4">Recommanded</bridgehead>
+    <para role="recommanded">
+      <xref linkend="openssl"/> and
+      <xref linkend="cyrus-sasl"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="procmail"/>,
+      <ulink url="http://www.feep.net/nph/">nph</ulink>, and
+      <xref linkend="gs"/> (for creating PDF documentation)
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/sendmail"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of sendmail</title>
+
+    <para>Before building <application>sendmail</application>, create the
+    required user, group and directory with the following commands issued as
+    the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>groupadd -g 26 smmsp                               &amp;&amp;
+useradd -c "Sendmail Daemon" -g smmsp -d /dev/null \
+        -s /bin/false -u 26 smmsp                  &amp;&amp;
+chmod -v 1777 /var/mail                            &amp;&amp;
+install -v -m700 -d /var/spool/mqueue</userinput></screen>
+
+    <note><para>See the source tree <filename>sendmail/README</filename> file
+    for information on linking optional packages into the build. Use the
+    example below, which adds support for SASL, StartTLS
+    (<application>OpenSSL</application>) and
+    <application>OpenLDAP</application>, as a starting point.  Of course,
+    modify it to suit your particular needs.</para></note>
+
+<screen><userinput>cat &gt;&gt; devtools/Site/site.config.m4 &lt;&lt; "EOF"
+<literal>APPENDDEF(`confENVDEF',`-DSTARTTLS -DSASL -DLDAPMAP')
+APPENDDEF(`confLIBS', `-lssl -lcrypto -lsasl2 -lldap -llber -ldb')
+APPENDDEF(`confINCDIRS', `-I/usr/include/sasl')</literal>
+EOF</userinput></screen>
+
+    <para>Install <application>sendmail</application> with the following
+    commands:</para>
+
+<screen><userinput>cat &gt;&gt; devtools/Site/site.config.m4 &lt;&lt; "EOF"
+<literal>define(`confMANGRP',`root')
+define(`confMANOWN',`root')
+define(`confSBINGRP',`root')
+define(`confUBINGRP',`root')
+define(`confUBINOWN',`root')</literal>
+EOF
+
+sed -i 's|/usr/man/man|/usr/share/man/man|' \
+    devtools/OS/Linux           &amp;&amp;
+
+cd sendmail                     &amp;&amp;
+sh Build                        &amp;&amp;
+cd ../cf/cf                     &amp;&amp;
+cp generic-linux.mc sendmail.mc &amp;&amp;
+sh Build sendmail.cf</userinput></screen>
+
+    <para>This package does not come with a test suite.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>install -v -d -m755 /etc/mail &amp;&amp;
+sh Build install-cf &amp;&amp;
+
+cd ../..            &amp;&amp;
+sh Build install    &amp;&amp;
+
+install -v -m644 cf/cf/{submit,sendmail}.mc /etc/mail &amp;&amp;
+cp -v -R cf/* /etc/mail                               &amp;&amp;
+
+install -v -m755 -d /usr/share/doc/sendmail-&sendmail-version;/{cf,sendmail} &amp;&amp;
+
+install -v -m644 CACerts FAQ KNOWNBUGS LICENSE PGPKEYS README RELEASE_NOTES \
+        /usr/share/doc/sendmail-&sendmail-version; &amp;&amp;
+
+install -v -m644 sendmail/{README,SECURITY,TRACEFLAGS,TUNING} \
+        /usr/share/doc/sendmail-&sendmail-version;/sendmail &amp;&amp;
+
+install -v -m644 cf/README /usr/share/doc/sendmail-&sendmail-version;/cf &amp;&amp;
+
+for manpage in sendmail editmap mailstats makemap praliases smrsh
+do
+    install -v -m644 $manpage/$manpage.8 /usr/share/man/man8
+done &amp;&amp;
+
+install -v -m644 sendmail/aliases.5    /usr/share/man/man5 &amp;&amp;
+install -v -m644 sendmail/mailq.1      /usr/share/man/man1 &amp;&amp;
+install -v -m644 sendmail/newaliases.1 /usr/share/man/man1 &amp;&amp;
+install -v -m644 vacation/vacation.1   /usr/share/man/man1</userinput></screen>
+
+    <para>Install the <application>sendmail</application> Installation and
+    Operations Guide with the following commands:</para>
+
+    <note><para>Remove <filename>op.pdf</filename> from the
+    <command>make</command> and <command>install</command> commands below if
+    you don't have <application>Ghostscript</application>
+    installed.</para></note>
+
+<screen><userinput>cd doc/op                                       &amp;&amp;
+sed -i 's/groff/GROFF_NO_SGR=1 groff/' Makefile &amp;&amp;
+make op.txt op.pdf</userinput></screen>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>install -v -d -m755 /usr/share/doc/sendmail-&sendmail-version; &amp;&amp;
+install -v -m644 op.ps op.txt op.pdf /usr/share/doc/sendmail-&sendmail-version; &amp;&amp;
+cd ../..</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><command>cat &gt; devtools/Site/site.config.m4 &lt;&lt; "EOF"</command>:
+    This creates a configuration file changing some of the default settings.</para>
+
+    <para><command>sed ... devtools/OS/Linux</command>: The site.config.m4
+    does not honor a change to the man directory, so fix it in the OS 
+    definitions.</para>
+
+    <para><command>sed ... include/sm/bdb.h</command>: This allows sendmail to
+    build properly with <xref linkend='db'/> versions 5 and above.</para>
+
+    <para><command>sh Build; sh Build sendmail.cf; sh Build install-cf;
+    sh Build install</command>: <application>sendmail</application> uses an
+    <application>m4</application> based build script to create the various
+    <filename>Makefile</filename>s. These commands build and install the
+    package.</para>
+
+    <para><command>for manpage in...;do...;done; install ...</command>: The man
+    pages are installed already formatted and <command>man</command> displays
+    them somewhat garbled. These commands replace the formatted pages with
+    pages <command>man</command> can display properly.</para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring sendmail</title>
+
+    <sect3 id="sendmail-config">
+      <title>Config Files</title>
+
+      <para><filename>/etc/mail/*</filename></para>
+
+      <indexterm zone="sendmail sendmail-config">
+        <primary sortas="e-etc-mail">/etc/mail/*</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <note><para>Ensure you have a fully qualified domain name defined
+      in <filename>/etc/hosts</filename> for your system before proceeding.
+      </para></note>
+
+      <para>Create the <filename>/etc/mail/local-host-names</filename> and
+      <filename>/etc/mail/aliases</filename> files using the following
+      commands as the <systemitem class="username">root</systemitem>
+      user:</para>
+
+<screen role="root"><userinput>echo $(hostname) > /etc/mail/local-host-names
+cat &gt; /etc/mail/aliases &lt;&lt; "EOF"
+<literal>postmaster: root
+MAILER-DAEMON: root</literal>
+
+EOF
+newaliases</userinput></screen>
+
+      <para><application>sendmail</application>'s primary configuration file,
+      <filename>/etc/mail/sendmail.cf</filename>, is complex and not meant to be
+      directly edited. The recommended method for changing it is to modify
+      <filename>/etc/mail/sendmail.mc</filename> and various
+      <application>m4</application> files, then run the <command>m4</command>
+      macro processor from within
+      <filename class='directory'>/etc/mail</filename> as follows:</para>
+
+<screen role="root"><userinput>cd /etc/mail &amp;&amp;
+m4 m4/cf.m4 sendmail.mc > sendmail.cf</userinput></screen>
+
+      <para>A full explanation of the files to modify, and the available
+      parameters can be found in <filename>/etc/mail/README</filename>.</para>
+
+    </sect3>
+
+    <sect3  id="sendmail-init">
+      <title>Systemd Units</title>
+
+      <para>
+        To start the <command>sendmail</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="sendmail sendmail-init">
+        <primary sortas="f-sendmail-init">sendmail</primary>
+      </indexterm>
+
+<screen role="root"><userinput>make install-sendmail</userinput></screen>
+
+      <note>
+        <para>The -qNm option to <command>sendmail</command>, where N is number
+        of minutes, controls how often <application>sendmail</application> will
+        process the mail queue. A default of 5 minutes is used in the systemd
+        units. Individual workstation users may want to set this as low as 1
+        minute, large installations handling more mail may want to set it
+        higher. The value can be changed in
+        <filename>/etc/default/sendmail</filename> file.</para>
+      </note>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>editmap, mailstats, makemap, praliases, sendmail, smrsh,
+        and vacation; symlinks to /usr/sbin/sendmail: hoststat, mailq,
+        newaliases, and purgestat</seg>
+        <seg>None</seg>
+        <seg>/etc/mail, /usr/share/doc/sendmail-&sendmail-version;,
+        /var/spool/mqueue, and /var/spool/clientmqueue</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="editmap">
+        <term><command>editmap</command></term>
+        <listitem>
+          <para>queries and edits <application>sendmail</application> map
+          files.</para>
+          <indexterm zone="sendmail editmap">
+            <primary sortas="b-editmap">editmap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="hoststat">
+        <term><command>hoststat</command></term>
+        <listitem>
+          <para>prints <application>sendmail</application>'s persistent host
+          status.</para>
+          <indexterm zone="sendmail hoststat">
+            <primary sortas="b-hoststat">hoststat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mailstats">
+        <term><command>mailstats</command></term>
+        <listitem>
+          <para>displays <application>sendmail</application> statistics.</para>
+          <indexterm zone="sendmail mailstats">
+            <primary sortas="b-mailstats">mailstats</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mailq-sendmail">
+        <term><command>mailq</command></term>
+        <listitem>
+          <para>prints a summary of outbound mail messages waiting for
+          delivery.</para>
+          <indexterm zone="sendmail mailq-sendmail">
+            <primary sortas="b-mailq">mailq</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="makemap">
+        <term><command>makemap</command></term>
+        <listitem>
+          <para>creates <application>sendmail</application> map files.</para>
+          <indexterm zone="sendmail makemap">
+            <primary sortas="b-makemap">makemap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="newaliases-sendmail">
+        <term><command>newaliases</command></term>
+        <listitem>
+          <para>rebuilds <filename>/etc/mail/aliases.db</filename> from the
+          contents of <filename>/etc/mail/aliases</filename>.</para>
+          <indexterm zone="sendmail newaliases-sendmail">
+            <primary sortas="b-newaliases">newaliases</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="praliases">
+        <term><command>praliases</command></term>
+        <listitem>
+          <para>displays current <application>sendmail</application>
+          aliases.</para>
+          <indexterm zone="sendmail praliases">
+            <primary sortas="b-praliases">praliases</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="purgestat">
+        <term><command>purgestat</command></term>
+        <listitem>
+          <para> causes <application>sendmail</application> to clear (purge)
+          all its host-status information.</para>
+          <indexterm zone="sendmail purgestat">
+            <primary sortas="b-purgestat">purgestat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="sendmail-prog-sendmail">
+        <term><command>sendmail</command></term>
+        <listitem>
+          <para>is the <application>sendmail</application> mail transport
+          agent.</para>
+          <indexterm zone="sendmail sendmail-prog-sendmail">
+            <primary sortas="b-sendmail">sendmail</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="smrsh">
+        <term><command>smrsh</command></term>
+        <listitem>
+          <para>is a restricted shell for
+          <application>sendmail</application>.</para>
+          <indexterm zone="sendmail smrsh">
+            <primary sortas="b-smrsh">smrsh</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="vacation-sendmail">
+        <term><command>vacation</command></term>
+        <listitem>
+          <para>is an email auto responder.</para>
+          <indexterm zone="sendmail vacation-sendmail">
+            <primary sortas="b-vacation">vacation</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: rver/major/apache-systemd.xml
===================================================================
--- server/major/apache-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,516 +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 apache-download-http
-           "https://archive.apache.org/dist/httpd/httpd-&apache-version;.tar.bz2">
-  <!ENTITY apache-download-ftp  " ">
-  <!ENTITY apache-md5sum        "2b19cd338fd526dd5a63c57b1e9bfee2">
-  <!ENTITY apache-size          "4.9 MB">
-  <!ENTITY apache-buildsize     "73 MB">
-  <!ENTITY apache-time          "0.6 SBU">
-]>
-
-<sect1 id="apache" xreflabel="Apache-&apache-version;">
-  <?dbhtml filename="apache.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Apache-&apache-version;</title>
-
-  <indexterm zone="apache">
-    <primary sortas="a-Apache">Apache</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Apache HTTPD</title>
-
-    <para>
-      The <application>Apache HTTPD</application> package contains an open-source HTTP
-      server. It is useful for creating local intranet web sites or running huge
-      web serving operations.
-    </para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&apache-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&apache-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &apache-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &apache-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &apache-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &apache-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/httpd-&apache-version;-blfs_layout-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Apache HTTPD Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="apr-util"/> and
-      <xref linkend="pcre"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="openssl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="db"/>,
-      <xref linkend="doxygen"/>,
-      <xref linkend="libxml2"/>,
-      <xref linkend="lynx"/> or
-      <xref linkend="Links"/> or
-      <ulink url="http://elinks.or.cz/">ELinks</ulink>,
-      <xref linkend="openldap"/> (<xref linkend="apr-util"/> needs to be
-      compiled with LDAP suport),
-      <xref linkend="rsync"/>,
-      <ulink url="http://www.distcache.org/">Distcache</ulink>, and
-      <xref linkend="lua"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/apache"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Apache HTTPD</title>
-
-    <para>
-      For security reasons, running the server as an unprivileged user and group
-      is strongly encouraged. Create the following group and user using the
-      following commands as <systemitem class="username">root</systemitem>:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 25 apache &amp;&amp;
-useradd -c "Apache Server" -d /srv/www -g apache \
-        -s /bin/false -u 25 apache</userinput></screen>
-
-    <para>
-      Build and install <application>Apache HTTPD</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../httpd-&apache-version;-blfs_layout-1.patch &amp;&amp;
-sed '/dir.*CFG_PREFIX/s@^@#@' -i support/apxs.in &amp;&amp;
-./configure --enable-authnz-fcgi                            \
-            --enable-layout=BLFS                            \
-            --enable-mods-shared="all cgi"                  \
-            --enable-mpms-shared=all                        \
-            --enable-suexec=shared                          \
-            --with-apr=/usr/bin/apr-1-config                \
-            --with-apr-util=/usr/bin/apu-1-config           \
-            --with-suexec-bin=/usr/lib/httpd/suexec         \
-            --with-suexec-caller=apache                     \
-            --with-suexec-docroot=/srv/www                  \
-            --with-suexec-logfile=/var/log/httpd/suexec.log \
-            --with-suexec-uidmin=100                        \
-            --with-suexec-userdir=public_html               &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                                 &amp;&amp;
-
-mv -v /usr/sbin/suexec /usr/lib/httpd/suexec &amp;&amp;
-chgrp -v apache        /usr/lib/httpd/suexec &amp;&amp;
-chmod -v 4754          /usr/lib/httpd/suexec &amp;&amp;
-
-chown -v -R apache:apache /srv/www</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed '/dir.*CFG_PREFIX/s@^@#@'...</command>: Forces the
-      <application>apxs</application> utility to use absolute pathnames for
-      modules, when instructed to do so.
-    </para>
-
-    <para>
-      <parameter>--enable-authnz-fcgi</parameter>: Build FastCGI
-      authorizer-based authentication and authorization (mod_authnz_fcgi.so
-      fast CGI module).
-    </para>
-
-    <para>
-      <parameter>--enable-mods-shared="all cgi"</parameter>: The modules should be
-      compiled and used as Dynamic Shared Objects (DSOs) so they can be included
-      and excluded from the server using the run-time configuration directives.
-    </para>
-
-    <para>
-      <parameter>--enable-mpm-shared=all</parameter>: This switch ensures that all
-      MPM (Multi Processing Modules) are built as Dynamic Shared Objects (DSOs),
-      so the user can choose which one to use at runtime.
-    </para>
-
-    <para>
-      <parameter>--enable-suexec</parameter>: This switch enables building of the
-      <application>Apache</application> suEXEC module which can be used to allow
-      users to run CGI and SSI scripts under user IDs different from the user ID
-      of the calling web server.
-    </para>
-
-    <para>
-      <parameter>--with-suexec-*</parameter>: These switches control suEXEC module
-      behavior, such as default document root, minimal UID that can be used to
-      run the script under the suEXEC. Please note that with minimal UID 100, you
-      can't run CGI or SSI scripts under suEXEC as the
-      <systemitem class="username">apache</systemitem> user.
-    </para>
-
-    <para>
-      <command>... /usr/lib/httpd/suexec</command>: These commands put
-      <command>suexec</command> wrapper into proper location, since it
-      is not meant to be run directly. They also adjust proper
-      permissions of the binary, making it setgid
-      <systemitem class="username">apache</systemitem>.
-    </para>
-
-    <para>
-      <command>chown -R apache:apache /srv/www</command>: By default, the
-      installation process installs files (documentation, error messages,
-      default icons, etc.) with the ownership of the user that extracted the
-      files from the tar file. If you want to change the ownership to another
-      user, you should do so at this point. The only requirement is that the
-      document directories need to be accessible by the <command>httpd</command>
-      process with (r-x) permissions and files need to be readable (r--) by the
-      <systemitem class="username">apache</systemitem> user.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Apache</title>
-
-    <sect3 id="apache-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/httpd/httpd.conf</filename> and
-        <filename>/etc/httpd/extra/*</filename>
-      </para>
-
-      <indexterm zone="apache apache-config">
-        <primary sortas="e-etc-httpd-httpd.conf">/etc/httpd/httpd.conf</primary>
-      </indexterm>
-
-      <indexterm zone="apache apache-config">
-        <primary sortas="e-etc-httpd-extra-star">/etc/httpd/extra/*</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        See <ulink url="file:///usr/share/httpd/manual/configuring.html"/>
-        for detailed instructions on customising your
-        <application>Apache</application> HTTP server configuration file.
-      </para>
-
-    </sect3>
-
-    <sect3  id="httpd-init">
-      <title>Systemd Units</title>
-
-      <para>
-        To start the <command>httpd</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="apache httpd-init">
-        <primary sortas="f-httpd">httpd</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-httpd</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>
-          ab,           apachectl, apxs,     checkgid, dbmmanage, fcgistarter,
-          htcacheclean, htdbm,     htdigest, htpasswd, httpd,
-          httxt2dbm,    logresolve,      rotatelogs, and suexec
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /etc/httpd,
-          /srv/www,
-          /usr/include/httpd,
-          /usr/lib/httpd,
-          /usr/share/httpd,
-          /var/log/httpd, and
-          /var/run/httpd
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ab">
-        <term><command>ab</command></term>
-        <listitem>
-          <para>
-            is a tool for benchmarking your <application>Apache</application>
-            HTTP server.
-          </para>
-          <indexterm zone="apache ab">
-            <primary sortas="b-ab">ab</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="apachectl">
-        <term><command>apachectl</command></term>
-        <listitem>
-          <para>
-            is a front end to the <application>Apache</application> HTTP server
-            which is designed to help the administrator control the functioning
-            of the <application>Apache</application> httpd daemon.
-          </para>
-          <indexterm zone="apache apachectl">
-            <primary sortas="b-apachectl">apachectl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="apxs">
-        <term><command>apxs</command></term>
-        <listitem>
-          <para>
-            is a tool for building and installing extension modules for the
-            <application>Apache</application> HTTP server.
-          </para>
-          <indexterm zone="apache apxs">
-            <primary sortas="b-apxs">apxs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="checkgid">
-        <term><command>checkgid</command></term>
-        <listitem>
-          <para>
-            is a program that checks whether it can setgid to the group
-            specified. This is to see if it is a valid group for Apache2 to use
-            at runtime. If the user (should be run as superuser) is in that
-            group, or can setgid to it, it will return 0.
-          </para>
-          <indexterm zone="apache checkgid">
-            <primary sortas="b-checkgid">checkgid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dbmmanage">
-        <term><command>dbmmanage</command></term>
-        <listitem>
-          <para>
-            is used to create and update the DBM format files used to store
-            usernames and passwords for basic authentication of HTTP users.
-          </para>
-          <indexterm zone="apache dbmmanage">
-            <primary sortas="b-dbmmanage">dbmmanage</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fcgistarter">
-        <term><command>fcgistarter</command></term>
-        <listitem>
-          <para>
-            is a tool to start a FastCGI program.
-          </para>
-          <indexterm zone="apache fcgistarter">
-            <primary sortas="b-fcgistarter">fcgistarter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="htcacheclean">
-        <term><command>htcacheclean</command></term>
-        <listitem>
-          <para>
-            is used to clean up the disk cache.
-          </para>
-          <indexterm zone="apache htcacheclean">
-            <primary sortas="b-htcacheclean">htcacheclean</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="htdbm">
-        <term><command>htdbm</command></term>
-        <listitem>
-          <para>
-            is used to manipulate the DBM password databases.
-          </para>
-          <indexterm zone="apache htdbm">
-            <primary sortas="b-htdbm">htdbm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="htdigest">
-        <term><command>htdigest</command></term>
-        <listitem>
-          <para>
-            is used to create and update the flat-files used to store usernames,
-            realms and passwords for digest authentication of HTTP users.
-          </para>
-          <indexterm zone="apache htdigest">
-            <primary sortas="b-htdigest">htdigest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="htpasswd">
-        <term><command>htpasswd</command></term>
-        <listitem>
-          <para>
-            is used to create and update the flat-files used to store usernames
-            and passwords for basic authentication of HTTP users.
-          </para>
-          <indexterm zone="apache htpasswd">
-            <primary sortas="b-htpasswd">htpasswd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="httpd">
-        <term><command>httpd</command></term>
-        <listitem>
-          <para>
-            is the <application>Apache</application> HTTP server program.
-          </para>
-          <indexterm zone="apache httpd">
-            <primary sortas="b-httpd">httpd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="httxt2dbm">
-        <term><command>httxt2dbm</command></term>
-        <listitem>
-          <para>
-            is used to generate DBM files from text, for use in RewriteMap.
-          </para>
-          <indexterm zone="apache httxt2dbm">
-            <primary sortas="b-httxt2dbm">httxt2dbm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="logresolve">
-        <term><command>logresolve</command></term>
-        <listitem>
-          <para>
-            is a post-processing program to resolve IP-addresses in
-            <application>Apache</application>'s access log files.
-          </para>
-          <indexterm zone="apache logresolve">
-            <primary sortas="b-logresolve">logresolve</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rotatelogs">
-        <term><command>rotatelogs</command></term>
-        <listitem>
-          <para>
-            is a simple program for use in conjunction with
-            <application>Apache</application>'s piped log file feature.
-          </para>
-          <indexterm zone="apache rotatelogs">
-            <primary sortas="b-rotatelogs">rotatelogs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="suexec">
-        <term><command>suexec</command></term>
-        <listitem>
-          <para>
-            allows users to run CGI and SSI applications as a different user.
-          </para>
-          <indexterm zone="apache suexec">
-            <primary sortas="b-suexec">suexec</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: server/major/apache.xml
===================================================================
--- server/major/apache.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ server/major/apache.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -0,0 +1,516 @@
+<?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 apache-download-http
+           "https://archive.apache.org/dist/httpd/httpd-&apache-version;.tar.bz2">
+  <!ENTITY apache-download-ftp  " ">
+  <!ENTITY apache-md5sum        "2b19cd338fd526dd5a63c57b1e9bfee2">
+  <!ENTITY apache-size          "4.9 MB">
+  <!ENTITY apache-buildsize     "73 MB">
+  <!ENTITY apache-time          "0.6 SBU">
+]>
+
+<sect1 id="apache" xreflabel="Apache-&apache-version;">
+  <?dbhtml filename="apache.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Apache-&apache-version;</title>
+
+  <indexterm zone="apache">
+    <primary sortas="a-Apache">Apache</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Apache HTTPD</title>
+
+    <para>
+      The <application>Apache HTTPD</application> package contains an open-source HTTP
+      server. It is useful for creating local intranet web sites or running huge
+      web serving operations.
+    </para>
+
+    &lfs77_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&apache-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&apache-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &apache-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &apache-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &apache-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &apache-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/httpd-&apache-version;-blfs_layout-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Apache HTTPD Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="apr-util"/> and
+      <xref linkend="pcre"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="openssl"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="db"/>,
+      <xref linkend="doxygen"/>,
+      <xref linkend="libxml2"/>,
+      <xref linkend="lynx"/> or
+      <xref linkend="Links"/> or
+      <ulink url="http://elinks.or.cz/">ELinks</ulink>,
+      <xref linkend="openldap"/> (<xref linkend="apr-util"/> needs to be
+      compiled with LDAP suport),
+      <xref linkend="rsync"/>,
+      <ulink url="http://www.distcache.org/">Distcache</ulink>, and
+      <xref linkend="lua"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/apache"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Apache HTTPD</title>
+
+    <para>
+      For security reasons, running the server as an unprivileged user and group
+      is strongly encouraged. Create the following group and user using the
+      following commands as <systemitem class="username">root</systemitem>:
+    </para>
+
+<screen role="root"><userinput>groupadd -g 25 apache &amp;&amp;
+useradd -c "Apache Server" -d /srv/www -g apache \
+        -s /bin/false -u 25 apache</userinput></screen>
+
+    <para>
+      Build and install <application>Apache HTTPD</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../httpd-&apache-version;-blfs_layout-1.patch &amp;&amp;
+sed '/dir.*CFG_PREFIX/s@^@#@' -i support/apxs.in &amp;&amp;
+./configure --enable-authnz-fcgi                            \
+            --enable-layout=BLFS                            \
+            --enable-mods-shared="all cgi"                  \
+            --enable-mpms-shared=all                        \
+            --enable-suexec=shared                          \
+            --with-apr=/usr/bin/apr-1-config                \
+            --with-apr-util=/usr/bin/apu-1-config           \
+            --with-suexec-bin=/usr/lib/httpd/suexec         \
+            --with-suexec-caller=apache                     \
+            --with-suexec-docroot=/srv/www                  \
+            --with-suexec-logfile=/var/log/httpd/suexec.log \
+            --with-suexec-uidmin=100                        \
+            --with-suexec-userdir=public_html               &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                                 &amp;&amp;
+
+mv -v /usr/sbin/suexec /usr/lib/httpd/suexec &amp;&amp;
+chgrp -v apache        /usr/lib/httpd/suexec &amp;&amp;
+chmod -v 4754          /usr/lib/httpd/suexec &amp;&amp;
+
+chown -v -R apache:apache /srv/www</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <command>sed '/dir.*CFG_PREFIX/s@^@#@'...</command>: Forces the
+      <application>apxs</application> utility to use absolute pathnames for
+      modules, when instructed to do so.
+    </para>
+
+    <para>
+      <parameter>--enable-authnz-fcgi</parameter>: Build FastCGI
+      authorizer-based authentication and authorization (mod_authnz_fcgi.so
+      fast CGI module).
+    </para>
+
+    <para>
+      <parameter>--enable-mods-shared="all cgi"</parameter>: The modules should be
+      compiled and used as Dynamic Shared Objects (DSOs) so they can be included
+      and excluded from the server using the run-time configuration directives.
+    </para>
+
+    <para>
+      <parameter>--enable-mpm-shared=all</parameter>: This switch ensures that all
+      MPM (Multi Processing Modules) are built as Dynamic Shared Objects (DSOs),
+      so the user can choose which one to use at runtime.
+    </para>
+
+    <para>
+      <parameter>--enable-suexec</parameter>: This switch enables building of the
+      <application>Apache</application> suEXEC module which can be used to allow
+      users to run CGI and SSI scripts under user IDs different from the user ID
+      of the calling web server.
+    </para>
+
+    <para>
+      <parameter>--with-suexec-*</parameter>: These switches control suEXEC module
+      behavior, such as default document root, minimal UID that can be used to
+      run the script under the suEXEC. Please note that with minimal UID 100, you
+      can't run CGI or SSI scripts under suEXEC as the
+      <systemitem class="username">apache</systemitem> user.
+    </para>
+
+    <para>
+      <command>... /usr/lib/httpd/suexec</command>: These commands put
+      <command>suexec</command> wrapper into proper location, since it
+      is not meant to be run directly. They also adjust proper
+      permissions of the binary, making it setgid
+      <systemitem class="username">apache</systemitem>.
+    </para>
+
+    <para>
+      <command>chown -R apache:apache /srv/www</command>: By default, the
+      installation process installs files (documentation, error messages,
+      default icons, etc.) with the ownership of the user that extracted the
+      files from the tar file. If you want to change the ownership to another
+      user, you should do so at this point. The only requirement is that the
+      document directories need to be accessible by the <command>httpd</command>
+      process with (r-x) permissions and files need to be readable (r--) by the
+      <systemitem class="username">apache</systemitem> user.
+    </para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring Apache</title>
+
+    <sect3 id="apache-config">
+      <title>Config Files</title>
+
+      <para>
+        <filename>/etc/httpd/httpd.conf</filename> and
+        <filename>/etc/httpd/extra/*</filename>
+      </para>
+
+      <indexterm zone="apache apache-config">
+        <primary sortas="e-etc-httpd-httpd.conf">/etc/httpd/httpd.conf</primary>
+      </indexterm>
+
+      <indexterm zone="apache apache-config">
+        <primary sortas="e-etc-httpd-extra-star">/etc/httpd/extra/*</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para>
+        See <ulink url="file:///usr/share/httpd/manual/configuring.html"/>
+        for detailed instructions on customising your
+        <application>Apache</application> HTTP server configuration file.
+      </para>
+
+    </sect3>
+
+    <sect3  id="httpd-init">
+      <title>Systemd Units</title>
+
+      <para>
+        To start the <command>httpd</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="apache httpd-init">
+        <primary sortas="f-httpd">httpd</primary>
+      </indexterm>
+
+<screen role="root"><userinput>make install-httpd</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>
+          ab,           apachectl, apxs,     checkgid, dbmmanage, fcgistarter,
+          htcacheclean, htdbm,     htdigest, htpasswd, httpd,
+          httxt2dbm,    logresolve,      rotatelogs, and suexec
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /etc/httpd,
+          /srv/www,
+          /usr/include/httpd,
+          /usr/lib/httpd,
+          /usr/share/httpd,
+          /var/log/httpd, and
+          /var/run/httpd
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="ab">
+        <term><command>ab</command></term>
+        <listitem>
+          <para>
+            is a tool for benchmarking your <application>Apache</application>
+            HTTP server.
+          </para>
+          <indexterm zone="apache ab">
+            <primary sortas="b-ab">ab</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="apachectl">
+        <term><command>apachectl</command></term>
+        <listitem>
+          <para>
+            is a front end to the <application>Apache</application> HTTP server
+            which is designed to help the administrator control the functioning
+            of the <application>Apache</application> httpd daemon.
+          </para>
+          <indexterm zone="apache apachectl">
+            <primary sortas="b-apachectl">apachectl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="apxs">
+        <term><command>apxs</command></term>
+        <listitem>
+          <para>
+            is a tool for building and installing extension modules for the
+            <application>Apache</application> HTTP server.
+          </para>
+          <indexterm zone="apache apxs">
+            <primary sortas="b-apxs">apxs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="checkgid">
+        <term><command>checkgid</command></term>
+        <listitem>
+          <para>
+            is a program that checks whether it can setgid to the group
+            specified. This is to see if it is a valid group for Apache2 to use
+            at runtime. If the user (should be run as superuser) is in that
+            group, or can setgid to it, it will return 0.
+          </para>
+          <indexterm zone="apache checkgid">
+            <primary sortas="b-checkgid">checkgid</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="dbmmanage">
+        <term><command>dbmmanage</command></term>
+        <listitem>
+          <para>
+            is used to create and update the DBM format files used to store
+            usernames and passwords for basic authentication of HTTP users.
+          </para>
+          <indexterm zone="apache dbmmanage">
+            <primary sortas="b-dbmmanage">dbmmanage</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="fcgistarter">
+        <term><command>fcgistarter</command></term>
+        <listitem>
+          <para>
+            is a tool to start a FastCGI program.
+          </para>
+          <indexterm zone="apache fcgistarter">
+            <primary sortas="b-fcgistarter">fcgistarter</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="htcacheclean">
+        <term><command>htcacheclean</command></term>
+        <listitem>
+          <para>
+            is used to clean up the disk cache.
+          </para>
+          <indexterm zone="apache htcacheclean">
+            <primary sortas="b-htcacheclean">htcacheclean</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="htdbm">
+        <term><command>htdbm</command></term>
+        <listitem>
+          <para>
+            is used to manipulate the DBM password databases.
+          </para>
+          <indexterm zone="apache htdbm">
+            <primary sortas="b-htdbm">htdbm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="htdigest">
+        <term><command>htdigest</command></term>
+        <listitem>
+          <para>
+            is used to create and update the flat-files used to store usernames,
+            realms and passwords for digest authentication of HTTP users.
+          </para>
+          <indexterm zone="apache htdigest">
+            <primary sortas="b-htdigest">htdigest</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="htpasswd">
+        <term><command>htpasswd</command></term>
+        <listitem>
+          <para>
+            is used to create and update the flat-files used to store usernames
+            and passwords for basic authentication of HTTP users.
+          </para>
+          <indexterm zone="apache htpasswd">
+            <primary sortas="b-htpasswd">htpasswd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="httpd">
+        <term><command>httpd</command></term>
+        <listitem>
+          <para>
+            is the <application>Apache</application> HTTP server program.
+          </para>
+          <indexterm zone="apache httpd">
+            <primary sortas="b-httpd">httpd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="httxt2dbm">
+        <term><command>httxt2dbm</command></term>
+        <listitem>
+          <para>
+            is used to generate DBM files from text, for use in RewriteMap.
+          </para>
+          <indexterm zone="apache httxt2dbm">
+            <primary sortas="b-httxt2dbm">httxt2dbm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="logresolve">
+        <term><command>logresolve</command></term>
+        <listitem>
+          <para>
+            is a post-processing program to resolve IP-addresses in
+            <application>Apache</application>'s access log files.
+          </para>
+          <indexterm zone="apache logresolve">
+            <primary sortas="b-logresolve">logresolve</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rotatelogs">
+        <term><command>rotatelogs</command></term>
+        <listitem>
+          <para>
+            is a simple program for use in conjunction with
+            <application>Apache</application>'s piped log file feature.
+          </para>
+          <indexterm zone="apache rotatelogs">
+            <primary sortas="b-rotatelogs">rotatelogs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="suexec">
+        <term><command>suexec</command></term>
+        <listitem>
+          <para>
+            allows users to run CGI and SSI applications as a different user.
+          </para>
+          <indexterm zone="apache suexec">
+            <primary sortas="b-suexec">suexec</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: rver/major/bind-systemd.xml
===================================================================
--- server/major/bind-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,870 +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 bind-download-http " ">
-  <!ENTITY bind-download-ftp  "ftp://ftp.isc.org/isc/bind9/&bind-version;/bind-&bind-version;.tar.gz">
-  <!ENTITY bind-md5sum        "8b1f5064837756c938eadc1537dec5c7">
-  <!ENTITY bind-size          "8.1 MB">
-  <!ENTITY bind-buildsize     "137 MB (additional 44 MB to run the test suite)">
-  <!ENTITY bind-time          "0.9 SBU (additional 20+ minutes, processor independent, to run the complete test suite)">
-]>
-
-<sect1 id="bind" xreflabel="BIND-&bind-version;">
-  <?dbhtml filename="bind.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>BIND-&bind-version;</title>
-
-  <indexterm zone="bind">
-    <primary sortas="a-BIND">BIND</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to BIND</title>
-
-    <para>The <application>BIND</application> package provides a DNS server
-    and client utilities. If you are only interested in the utilities, refer
-    to the <xref linkend="bind-utils"/>.</para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&bind-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&bind-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &bind-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &bind-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &bind-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &bind-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Optional patch (if net-tools is not installed):
-        <ulink
-        url="&patch-root;/bind-&bind-version;-use_iproute2-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">BIND Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libxml2"/>,
-      <xref linkend="mitkrb"/>,
-      <xref linkend="openssl"/>, and
-      <ulink url="https://github.com/cjheath/geoip">GeoIP</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional database backends</bridgehead>
-    <para role="optional">
-      <xref linkend="db"/>,
-      <xref linkend="openldap"/>,
-      <xref linkend="mariadb"/>,
-      <xref linkend="postgresql"/>, and
-      <xref linkend="unixodbc"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (to run the test suite)</bridgehead>
-    <para role="optional">
-      <xref linkend="perl-net-dns"/> and
-      <xref linkend="net-tools"/> (you may omit net-tools by using the optional
-      patch to utilize iproute2, but the IPv6 tests will fail)
-    </para>
-
-    <bridgehead renderas="sect4">Optional (to rebuild the documentation)</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>,
-      <xref linkend="libxslt"/>, and
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/bind"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of BIND</title>
-
-    <para>If you have chosen not to install net-tools, apply the iproute2
-    patch with the following command:</para>
-
-<screen><userinput>patch -Np1 -i ../bind-&bind-version;-use_iproute2-1.patch</userinput></screen>
-
-    <para>Install <application>BIND</application> by running the
-    following commands:</para>
-
-<screen><userinput>./configure --prefix=/usr           \
-            --sysconfdir=/etc       \
-            --localstatedir=/var    \
-            --mandir=/usr/share/man \
-            --enable-threads        \
-            --with-libtool          \
-            --disable-static        \
-            --with-randomdev=/dev/urandom &amp;&amp;
-make</userinput></screen>
-
-    <para>Issue the following commands to run the complete suite of tests.
-    First, as the <systemitem class="username">root</systemitem> user, set up
-    some test interfaces:</para>
-
-    <note><para>If IPv6 is not enabled in the kernel, there will be several
-    error messages: "RTNETLINK answers: Operation not permitted".  These
-    messages do not afffect the tests.</para></note>
-
-<screen role="root"><userinput>bin/tests/system/ifconfig.sh up</userinput></screen>
-
-<!--   <para>As an unprivileged user, remove some tests that fail:</para>
-
-<screen><userinput>
-sed -e 's/ecdsa //'   \
-    -e 's/masterformat //' \
-    -e 's/reclimit //' \
-    -e 's/tsiggss //' \
-    -i bin/tests/system/conf.sh</userinput></screen>
-
-    <para>Now run the test suite as an unprivileged user:</para>-->
-    <para>The test suite may indicate some failures depending on installed
-    optional dependencies and what configuration options are used.
-    To run the tests, as an unprivileged user, issue:</para>
-
-<screen><userinput>make -k check</userinput></screen>
-
-    <para>Again as <systemitem class="username">root</systemitem>, clean up the
-    test interfaces:</para>
-
-<screen role="root"><userinput>bin/tests/system/ifconfig.sh down</userinput></screen>
-
-    <para>Finally, install the package as the <systemitem
-    class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-chmod -v 755 /usr/lib/lib{bind9,dns,isc{,cc,cfg},lwres}.so &amp;&amp;
-
-install -v -dm755 /usr/share/doc/bind-&bind-version;/{arm,misc} &amp;&amp;
-install -v -m644  doc/arm/*.html \
-                  /usr/share/doc/bind-&bind-version;/arm &amp;&amp;
-install -v -m644 \
-    doc/misc/{dnssec,ipv6,migrat*,options,rfc-compliance,roadmap,sdb} \
-    /usr/share/doc/bind-&bind-version;/misc</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-<!--
-    <para><command>sed ... bin/tests/system/conf.sh</command>: This command
-    removes tests that fail (some for unknown reasons).</para>-->
-
-    <para><parameter>--sysconfdir=/etc</parameter>: This parameter forces
-    <application>BIND</application> to look for configuration
-    files in <filename class='directory'>/etc</filename> instead of
-    <filename class='directory'>/usr/etc</filename>.</para>
-
-    <para><parameter>--enable-threads</parameter>: This parameter enables
-    multi-threading capability.</para>
-
-    <para><parameter>--with-libtool</parameter>: This parameter forces the
-    building of dynamic libraries and links the installed binaries to these
-    libraries.</para>
-
-    <para><parameter>--with-randomdev=/dev/urandom</parameter>: This parameter 
-    specifes a non-blocking random device for use with digital signatures.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para><command>chmod 0755
-    /usr/lib/{lib{bind9,dns,isc{,cc,cfg},lwres}.so</command>:
-    Enable the execute bit to prevent a warning when using
-    <command>ldd</command> to check library dependencies.</para>
-
-    <para><command>cd doc; install ...</command>: These commands install
-    additional package documentation. Omit any or all of these commands if
-    desired.</para>
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring BIND</title>
-
-    <sect3 id="bind-config">
-      <title>Config files</title>
-
-      <para><filename>named.conf</filename>,
-      <filename>root.hints</filename>,
-      <filename>127.0.0</filename>,
-      <filename>rndc.conf</filename> and
-      <filename>resolv.conf</filename></para>
-
-      <indexterm zone="bind bind-config">
-        <primary sortas="e-etc-named.conf">/etc/named.conf</primary>
-      </indexterm>
-
-      <indexterm zone="bind bind-config">
-      <primary sortas="e-etc-rndc.conf">/etc/rndc.conf</primary>
-      </indexterm>
-
-      <indexterm zone="bind bind-config">
-        <primary sortas="e-etc-resolv.conf">/etc/resolv.conf</primary>
-      </indexterm>
-
-      <indexterm zone="bind bind-config">
-        <primary
-        sortas="e-etc-namedb-root.hints">/etc/namedb/root.hints</primary>
-      </indexterm>
-
-      <indexterm zone="bind bind-config">
-        <primary
-        sortas="e-etc-namedb-pz-127.0.0.0">/etc/namedb/pz/127.0.0.0</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para><application>BIND</application> will be configured to run in a
-      <command>chroot</command> jail as an unprivileged user (<systemitem
-      class="username">named</systemitem>). This configuration is more secure
-      in that a DNS compromise can only affect a few files in the <systemitem
-      class="username">named</systemitem> user's <envar>HOME</envar>
-      directory.</para>
-
-      <para>Create the unprivileged user and group <systemitem
-      class="username">named</systemitem>:</para>
-
-<screen role="root"><userinput>groupadd -g 20 named &amp;&amp;
-useradd -c "BIND Owner" -g named -s /bin/false -u 20 named &amp;&amp;
-install -d -m770 -o named -g named /srv/named</userinput></screen>
-
-      <para>Set up some files, directories and devices needed by
-      <application>BIND</application>:</para>
-
-<screen role="root"><userinput>cd /srv/named &amp;&amp;
-mkdir -pv dev etc/namedb/{slave,pz} usr/lib/engines var/run/named &amp;&amp;
-mknod /srv/named/dev/null c 1 3 &amp;&amp;
-mknod /srv/named/dev/urandom c 1 9 &amp;&amp;
-chmod -v 666 /srv/named/dev/{null,urandom} &amp;&amp;
-cp -Lv /etc/localtime etc &amp;&amp;
-touch /srv/named/managed-keys.bind &amp;&amp;
-cp -v /usr/lib/engines/libgost.so usr/lib/engines &amp;&amp;
-[ $(uname -m) = x86_64 ] &amp;&amp; ln -sfv lib usr/lib64</userinput></screen>
-
-      <para>The <filename>rndc.conf</filename> file contains information for
-      controlling <command>named</command> operations with the
-      <command>rndc</command> utility. Generate a key for use in the <filename>named.conf</filename> and <filename>rdnc.conf</filename> with the
-      <command>rndc-confgen</command> command:</para>
-
-<screen role="root"><userinput>rndc-confgen -r /dev/urandom -b 512 > /etc/rndc.conf &amp;&amp;
-sed '/conf/d;/^#/!d;s:^# ::' /etc/rndc.conf > /srv/named/etc/named.conf</userinput></screen>
-
-      <para>Complete the <filename>named.conf</filename> file from which
-      <command>named</command> will read the location of zone files, root
-      name servers and secure DNS keys:</para>
-
-<screen role="root"><?dbfo keep-together="auto"?><userinput>cat &gt;&gt; /srv/named/etc/named.conf &lt;&lt; "EOF"
-<literal>options {
-    directory "/etc/namedb";
-    pid-file "/var/run/named.pid";
-    statistics-file "/var/run/named.stats";
-
-};
-zone "." {
-    type hint;
-    file "root.hints";
-};
-zone "0.0.127.in-addr.arpa" {
-    type master;
-    file "pz/127.0.0";
-};
-
-// Bind 9 now logs by default through syslog (except debug).
-// These are the default logging rules.
-
-logging {
-    category default { default_syslog; default_debug; };
-    category unmatched { null; };
-
-  channel default_syslog {
-      syslog daemon;                      // send to syslog's daemon
-                                          // facility
-      severity info;                      // only send priority info
-                                          // and higher
-  };
-
-  channel default_debug {
-      file "named.run";                   // write to named.run in
-                                          // the working directory
-                                          // Note: stderr is used instead
-                                          // of "named.run"
-                                          // if the server is started
-                                          // with the '-f' option.
-      severity dynamic;                   // log at the server's
-                                          // current debug level
-  };
-
-  channel default_stderr {
-      stderr;                             // writes to stderr
-      severity info;                      // only send priority info
-                                          // and higher
-  };
-
-  channel null {
-      null;                               // toss anything sent to
-                                          // this channel
-  };
-};</literal>
-EOF</userinput></screen>
-
-      <para>Create a zone file with the following contents:</para>
-
-<screen role="root"><userinput>cat &gt; /srv/named/etc/namedb/pz/127.0.0 &lt;&lt; "EOF"
-<literal>$TTL 3D
-@      IN      SOA     ns.local.domain. hostmaster.local.domain. (
-                        1       ; Serial
-                        8H      ; Refresh
-                        2H      ; Retry
-                        4W      ; Expire
-                        1D)     ; Minimum TTL
-                NS      ns.local.domain.
-1               PTR     localhost.</literal>
-EOF</userinput></screen>
-
-      <para>Create the <filename>root.hints</filename> file with the following
-      commands:</para>
-
-      <note>
-        <para>Caution must be used to ensure there are no leading spaces in
-        this file.</para>
-      </note>
-
-<screen role="root"><userinput>cat &gt; /srv/named/etc/namedb/root.hints &lt;&lt; "EOF"
-<literal>.                       6D  IN      NS      A.ROOT-SERVERS.NET.
-.                       6D  IN      NS      B.ROOT-SERVERS.NET.
-.                       6D  IN      NS      C.ROOT-SERVERS.NET.
-.                       6D  IN      NS      D.ROOT-SERVERS.NET.
-.                       6D  IN      NS      E.ROOT-SERVERS.NET.
-.                       6D  IN      NS      F.ROOT-SERVERS.NET.
-.                       6D  IN      NS      G.ROOT-SERVERS.NET.
-.                       6D  IN      NS      H.ROOT-SERVERS.NET.
-.                       6D  IN      NS      I.ROOT-SERVERS.NET.
-.                       6D  IN      NS      J.ROOT-SERVERS.NET.
-.                       6D  IN      NS      K.ROOT-SERVERS.NET.
-.                       6D  IN      NS      L.ROOT-SERVERS.NET.
-.                       6D  IN      NS      M.ROOT-SERVERS.NET.
-A.ROOT-SERVERS.NET.     6D  IN      A       198.41.0.4
-B.ROOT-SERVERS.NET.     6D  IN      A       192.228.79.201
-C.ROOT-SERVERS.NET.     6D  IN      A       192.33.4.12
-D.ROOT-SERVERS.NET.     6D  IN      A       199.7.91.13
-E.ROOT-SERVERS.NET.     6D  IN      A       192.203.230.10
-F.ROOT-SERVERS.NET.     6D  IN      A       192.5.5.241
-G.ROOT-SERVERS.NET.     6D  IN      A       192.112.36.4
-H.ROOT-SERVERS.NET.     6D  IN      A       128.63.2.53
-I.ROOT-SERVERS.NET.     6D  IN      A       192.36.148.17
-J.ROOT-SERVERS.NET.     6D  IN      A       192.58.128.30
-K.ROOT-SERVERS.NET.     6D  IN      A       193.0.14.129
-L.ROOT-SERVERS.NET.     6D  IN      A       199.7.83.42
-M.ROOT-SERVERS.NET.     6D  IN      A       202.12.27.33</literal>
-EOF</userinput></screen>
-
-      <para>The <filename>root.hints</filename> file is a list of root
-      name servers. This file must be updated periodically with the
-      <command>dig</command> utility. A current copy of root.hints can be
-      obtained from <ulink url="ftp://rs.internic.net/domain/named.root" />.
-      Consult the <ulink url="http://www.bind9.net/Bv9ARM.html">BIND 9
-      Administrator Reference Manual</ulink> for details.</para>
-
-      <para>Create or modify <filename>resolv.conf</filename> to use the new
-      name server with the following commands:</para>
-
-      <note>
-        <para>Replace <replaceable>&lt;yourdomain.com&gt;</replaceable> with
-        your own valid domain name.</para>
-      </note>
-
-<screen role="root"><userinput>cp /etc/resolv.conf /etc/resolv.conf.bak &amp;&amp;
-cat &gt; /etc/resolv.conf &lt;&lt; "EOF"
-<literal>search <replaceable>&lt;yourdomain.com&gt;</replaceable>
-nameserver 127.0.0.1</literal>
-EOF</userinput></screen>
-
-      <para>Set permissions on the <command>chroot</command> jail with the
-      following command:</para>
-
-<screen role="root"><userinput>chown -R named:named /srv/named</userinput></screen>
-
-    </sect3>
-
-    <sect3  id="bind-init">
-      <title>Systemd Units</title>
-
-      <para>
-        To start the <command>named</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="bind bind-init">
-        <primary sortas="f-bind">bind</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-named</userinput></screen>
-
-      <para>Now start <application>BIND</application> using
-      the <command>systemctl</command> utility:</para>
-
-<screen role="root"><userinput>systemctl start named</userinput></screen>
-
-    </sect3>
-
-    <sect3>
-      <title>Testing BIND</title>
-
-      <para>Test out the new <application>BIND</application> 9 installation.
-      First query the local host address with <command>dig</command>:</para>
-
-<screen><userinput>dig -x 127.0.0.1</userinput></screen>
-
-      <para>Now try an external name lookup, taking note of the speed
-      difference in repeated lookups due to the caching. Run the
-      <command>dig</command> command twice on the same address:</para>
-
-<screen><userinput>dig www.&lfs-domainname; &amp;&amp;
-dig www.&lfs-domainname;</userinput></screen>
-
-      <para>You can see almost instantaneous results with the named caching
-      lookups. Consult the <application>BIND</application> Administrator
-      Reference Manual located at <filename>doc/arm/Bv9ARM.html</filename>
-      in the package source tree, for further configuration options.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-
-        <seg>arpaname, bind9-config hardlinked to isc-config.sh, ddns-confgen,
-        delv, dig, dnssec-checkds, dnssec-coverage, dnssec-dsfromkey,
-        dnssec-importkey, dnssec-keyfromlabel, dnssec-keygen, dnssec-revoke,
-        dnssec-settime, dnssec-signzone, dnssec-verify, genrandom, host,
-        isc-hmac-fixup, lwresd hardlinked to named, named-checkconf,
-        named-checkzone, named-compilezone (symlink), named-journalprint,
-        named-rrchecker, nsec3hash, nslookup, nsupdate, rndc, rndc-confgen,
-        and tsig-keygen (symlink)</seg>
-      
-        <seg>libbind9.so, libdns.so, libirs.so, libisc.so, libisccc.so, 
-        libisccfg.so, and liblwres.so</seg>
-
-        <seg>/usr/include/{bind9,dns,dst,irs,isc,isccc,isccfg,lwres,pk11,pkcs11},
-        /usr/share/doc/bind-&bind-version; and /srv/named</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="arpaname">
-        <term><command>arpaname</command></term>
-        <listitem>
-          <para>
-            translate IP addresses to the corresponding ARPA names.
-          </para>
-          <indexterm zone="bind arpaname">
-            <primary sortas="b-arpaname">arpaname</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bind9-config">
-        <term><command>bind9-config</command></term>
-        <listitem>
-          <para>
-            hardlinked to <command>isc-config.sh</command>.
-          </para>
-          <indexterm zone="bind bind9-config">
-            <primary sortas="b-bind9-config">bind9-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ddns-confgen">
-        <term><command>ddns-confgen</command></term>
-        <listitem>
-          <para>
-            generates a key for use by nsupdate and named.
-          </para>
-          <indexterm zone="bind ddns-confgen">
-            <primary sortas="b-ddns-confgen">ddns-confgen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="delv">
-        <term><command>delv</command></term>
-        <listitem>
-          <para>
-            is a new debugging tool that is a successor to 
-            <command>dig</command>.
-          </para>
-          <indexterm zone="bind delv">
-            <primary sortas="b-delv">delv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dig">
-        <term><command>dig</command></term>
-        <listitem>
-          <para>interrogates DNS servers.</para>
-          <indexterm zone="bind dig">
-            <primary sortas="b-dig">dig</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dnssec-checkds">
-        <term><command>dnssec-checkds</command></term>
-        <listitem>
-          <para>
-            is a DNSSEC delegation consistency checking tool.
-          </para>
-          <indexterm zone="bind dnssec-checkds">
-            <primary sortas="b-dnssec-checkds">dnssec-checkds</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="dnssec-coverage">
-        <term><command>dnssec-coverage</command></term>
-        <listitem>
-          <para>
-            verifies that the DNSSEC keys for a given zone or a set of zones 
-            have timing metadata set properly to ensure no future lapses
-            in DNSSEC coverage.
-          </para>
-          <indexterm zone="bind dnssec-coverage">
-            <primary sortas="b-dnssec-coverage">dnssec-coverage</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
- 
-      <varlistentry id="dnssec-dsfromkey">
-        <term><command>dnssec-dsfromkey</command></term>
-        <listitem>
-          <para>
-            outputs the Delegation Signer (DS) resource record (RR).
-          </para>
-          <indexterm zone="bind dnssec-dsfromkey">
-            <primary sortas="b-dnssec-dsfromkey">dnssec-dsfromkey</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dnssec-importkey">
-        <term><command>dnssec-importkey</command></term>
-        <listitem>
-          <para>
-             reads a public DNSKEY record and generates a pair of 
-             .key/.private files.
-          </para>
-          <indexterm zone="bind dnssec-importkey">
-            <primary sortas="b-dnssec-importkey">dnssec-importkey</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dnssec-keyfromlabel">
-        <term><command>dnssec-keyfromlabel</command></term>
-        <listitem>
-          <para>
-            gets keys with the given label from a crypto hardware and builds 
-            key files for DNSSEC.
-          </para>
-          <indexterm zone="bind dnssec-keyfromlabel">
-            <primary sortas="b-dnssec-keyfromlabel">dnssec-keyfromlabel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dnssec-keygen">
-        <term><command>dnssec-keygen</command></term>
-        <listitem>
-          <para>is a key generator for secure DNS.</para>
-          <indexterm zone="bind dnssec-keygen">
-            <primary sortas="b-dnssec-keygen">dnssec-keygen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dnssec-revoke">
-        <term><command>dnssec-revoke</command></term>
-        <listitem>
-          <para>
-            Set the REVOKED bit on a DNSSEC key.
-          </para>
-          <indexterm zone="bind dnssec-revoke">
-            <primary sortas="b-dnssec-revoke">dnssec-revoke</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dnssec-settime">
-        <term><command>dnssec-settime</command></term>
-        <listitem>
-          <para>
-            set the key timing metadata for a DNSSEC key.
-          </para>
-          <indexterm zone="bind dnssec-settime">
-            <primary sortas="b-dnssec-settime">dnssec-settime</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dnssec-signzone">
-        <term><command>dnssec-signzone</command></term>
-        <listitem>
-          <para>generates signed versions of zone files.</para>
-          <indexterm zone="bind dnssec-signzone">
-            <primary sortas="b-dnssec-signzone">dnssec-signzone</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dnssec-verify">
-        <term><command>dnssec-verify</command></term>
-        <listitem>
-          <para>
-            verifies that a zone is fully signed for each algorithm found 
-            in the DNSKEY RRset for the zone, and that the NSEC / NSEC3 
-            chains are complete.
-          </para>
-          <indexterm zone="bind dnssec-verify">
-            <primary sortas="b-dnssec-verify">dnssec-verify</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="genrandom">
-        <term><command>genrandom</command></term>
-        <listitem>
-          <para>
-            generate a file containing random data.
-          </para>
-          <indexterm zone="bind genrandom">
-            <primary sortas="b-genrandom">genrandom</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="host">
-        <term><command>host</command></term>
-        <listitem>
-          <para>is a utility for DNS lookups.</para>
-          <indexterm zone="bind host">
-            <primary sortas="b-host">host</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="isc-config.sh">
-        <term><command>isc-config.sh</command></term>
-        <listitem>
-          <para>
-            prints information related to the installed version of ISC BIND.
-          </para>
-          <indexterm zone="bind isc-config.sh">
-            <primary sortas="b-isc-config.sh">isc-config.sh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="isc-hmac-fixup">
-        <term><command>isc-hmac-fixup</command></term>
-        <listitem>
-          <para>
-            fixes HMAC keys generated by older versions of BIND.
-          </para>
-          <indexterm zone="bind isc-hmac-fixup">
-            <primary sortas="b-isc-hmac-fixup">isc-hmac-fixup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lwresd">
-        <term><command>lwresd</command></term>
-        <listitem>
-          <para>is a caching-only name server for local process use.</para>
-          <indexterm zone="bind lwresd">
-            <primary sortas="b-lwresd">lwresd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="named">
-        <term><command>named</command></term>
-        <listitem>
-          <para>is the name server daemon.</para>
-          <indexterm zone="bind named">
-            <primary sortas="b-named">named</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="named-checkconf">
-        <term><command>named-checkconf</command></term>
-        <listitem>
-          <para>checks the syntax of <filename>named.conf</filename>
-          files.</para>
-          <indexterm zone="bind named-checkconf">
-            <primary sortas="b-named-checkconf">named-checkconf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="named-checkzone">
-        <term><command>named-checkzone</command></term>
-        <listitem>
-          <para>checks zone file validity.</para>
-          <indexterm zone="bind named-checkzone">
-            <primary sortas="b-named-checkzone">named-checkzone</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="named-compilezone">
-        <term><command>named-compilezone</command></term>
-        <listitem>
-          <para>
-            is similar to <command>named-checkzone</command>, but it always 
-            dumps the zone contents to a specified file in a specified format.
-          </para>
-          <indexterm zone="bind named-compilezone">
-            <primary sortas="b-named-compilezone">named-compilezone</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="named-journalprint">
-        <term><command>named-journalprint</command></term>
-        <listitem>
-          <para>
-            print zone journal in human-readable form.
-          </para>
-          <indexterm zone="bind named-journalprint">
-            <primary sortas="b-named-journalprint">named-journalprint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="named-rrchecker">
-        <term><command>named-rrchecker</command></term>
-        <listitem>
-          <para>
-            read a individual DNS resource record from standard input and 
-            checks if it is syntactically correct.
-          </para>
-          <indexterm zone="bind named-rrchecker">
-            <primary sortas="b-named-rrchecker">named-rrchecker</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nsec3hash">
-        <term><command>nsec3hash</command></term>
-        <listitem>
-          <para>
-            generates an NSEC3 hash based on a set of NSEC3 parameters.
-          </para>
-          <indexterm zone="bind nsec3hash">
-            <primary sortas="b-nsec3hash">nsec3hash</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nslookup">
-        <term><command>nslookup</command></term>
-        <listitem>
-          <para>is a program used to query Internet domain nameservers.</para>
-          <indexterm zone="bind nslookup">
-            <primary sortas="b-nslookup">nslookup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nsupdate">
-        <term><command>nsupdate</command></term>
-        <listitem>
-          <para>is used to submit DNS update requests.</para>
-          <indexterm zone="bind nsupdate">
-            <primary sortas="b-nsupdate">nsupdate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rndc">
-        <term><command>rndc</command></term>
-        <listitem>
-          <para>controls the operation of <application>BIND</application>.</para>
-          <indexterm zone="bind rndc">
-            <primary sortas="b-rndc">rndc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rndc-confgen">
-        <term><command>rndc-confgen</command></term>
-        <listitem>
-          <para>generates <filename>rndc.conf</filename> files.</para>
-          <indexterm zone="bind rndc-confgen">
-            <primary sortas="b-rndc-confgen">rndc-confgen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tsig-keygen">
-        <term><command>tsig-keygen</command></term>
-        <listitem>
-          <para>
-            is a symlink to <command>ddns-confgen</command>. 
-          </para>
-          <indexterm zone="bind tsig-keygen">
-            <primary sortas="b-tsig-keygen">tsig-keygen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: server/major/bind.xml
===================================================================
--- server/major/bind.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ server/major/bind.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -0,0 +1,870 @@
+<?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 bind-download-http " ">
+  <!ENTITY bind-download-ftp  "ftp://ftp.isc.org/isc/bind9/&bind-version;/bind-&bind-version;.tar.gz">
+  <!ENTITY bind-md5sum        "8b1f5064837756c938eadc1537dec5c7">
+  <!ENTITY bind-size          "8.1 MB">
+  <!ENTITY bind-buildsize     "137 MB (additional 44 MB to run the test suite)">
+  <!ENTITY bind-time          "0.9 SBU (additional 20+ minutes, processor independent, to run the complete test suite)">
+]>
+
+<sect1 id="bind" xreflabel="BIND-&bind-version;">
+  <?dbhtml filename="bind.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>BIND-&bind-version;</title>
+
+  <indexterm zone="bind">
+    <primary sortas="a-BIND">BIND</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to BIND</title>
+
+    <para>The <application>BIND</application> package provides a DNS server
+    and client utilities. If you are only interested in the utilities, refer
+    to the <xref linkend="bind-utils"/>.</para>
+
+    &lfs77_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&bind-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&bind-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &bind-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &bind-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &bind-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &bind-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Optional patch (if net-tools is not installed):
+        <ulink
+        url="&patch-root;/bind-&bind-version;-use_iproute2-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">BIND Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="libxml2"/>,
+      <xref linkend="mitkrb"/>,
+      <xref linkend="openssl"/>, and
+      <ulink url="https://github.com/cjheath/geoip">GeoIP</ulink>
+    </para>
+
+    <bridgehead renderas="sect4">Optional database backends</bridgehead>
+    <para role="optional">
+      <xref linkend="db"/>,
+      <xref linkend="openldap"/>,
+      <xref linkend="mariadb"/>,
+      <xref linkend="postgresql"/>, and
+      <xref linkend="unixodbc"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional (to run the test suite)</bridgehead>
+    <para role="optional">
+      <xref linkend="perl-net-dns"/> and
+      <xref linkend="net-tools"/> (you may omit net-tools by using the optional
+      patch to utilize iproute2, but the IPv6 tests will fail)
+    </para>
+
+    <bridgehead renderas="sect4">Optional (to rebuild the documentation)</bridgehead>
+    <para role="optional">
+      <xref linkend="doxygen"/>,
+      <xref linkend="libxslt"/>, and
+      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/bind"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of BIND</title>
+
+    <para>If you have chosen not to install net-tools, apply the iproute2
+    patch with the following command:</para>
+
+<screen><userinput>patch -Np1 -i ../bind-&bind-version;-use_iproute2-1.patch</userinput></screen>
+
+    <para>Install <application>BIND</application> by running the
+    following commands:</para>
+
+<screen><userinput>./configure --prefix=/usr           \
+            --sysconfdir=/etc       \
+            --localstatedir=/var    \
+            --mandir=/usr/share/man \
+            --enable-threads        \
+            --with-libtool          \
+            --disable-static        \
+            --with-randomdev=/dev/urandom &amp;&amp;
+make</userinput></screen>
+
+    <para>Issue the following commands to run the complete suite of tests.
+    First, as the <systemitem class="username">root</systemitem> user, set up
+    some test interfaces:</para>
+
+    <note><para>If IPv6 is not enabled in the kernel, there will be several
+    error messages: "RTNETLINK answers: Operation not permitted".  These
+    messages do not afffect the tests.</para></note>
+
+<screen role="root"><userinput>bin/tests/system/ifconfig.sh up</userinput></screen>
+
+<!--   <para>As an unprivileged user, remove some tests that fail:</para>
+
+<screen><userinput>
+sed -e 's/ecdsa //'   \
+    -e 's/masterformat //' \
+    -e 's/reclimit //' \
+    -e 's/tsiggss //' \
+    -i bin/tests/system/conf.sh</userinput></screen>
+
+    <para>Now run the test suite as an unprivileged user:</para>-->
+    <para>The test suite may indicate some failures depending on installed
+    optional dependencies and what configuration options are used.
+    To run the tests, as an unprivileged user, issue:</para>
+
+<screen><userinput>make -k check</userinput></screen>
+
+    <para>Again as <systemitem class="username">root</systemitem>, clean up the
+    test interfaces:</para>
+
+<screen role="root"><userinput>bin/tests/system/ifconfig.sh down</userinput></screen>
+
+    <para>Finally, install the package as the <systemitem
+    class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install &amp;&amp;
+chmod -v 755 /usr/lib/lib{bind9,dns,isc{,cc,cfg},lwres}.so &amp;&amp;
+
+install -v -dm755 /usr/share/doc/bind-&bind-version;/{arm,misc} &amp;&amp;
+install -v -m644  doc/arm/*.html \
+                  /usr/share/doc/bind-&bind-version;/arm &amp;&amp;
+install -v -m644 \
+    doc/misc/{dnssec,ipv6,migrat*,options,rfc-compliance,roadmap,sdb} \
+    /usr/share/doc/bind-&bind-version;/misc</userinput></screen>
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+<!--
+    <para><command>sed ... bin/tests/system/conf.sh</command>: This command
+    removes tests that fail (some for unknown reasons).</para>-->
+
+    <para><parameter>--sysconfdir=/etc</parameter>: This parameter forces
+    <application>BIND</application> to look for configuration
+    files in <filename class='directory'>/etc</filename> instead of
+    <filename class='directory'>/usr/etc</filename>.</para>
+
+    <para><parameter>--enable-threads</parameter>: This parameter enables
+    multi-threading capability.</para>
+
+    <para><parameter>--with-libtool</parameter>: This parameter forces the
+    building of dynamic libraries and links the installed binaries to these
+    libraries.</para>
+
+    <para><parameter>--with-randomdev=/dev/urandom</parameter>: This parameter 
+    specifes a non-blocking random device for use with digital signatures.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+    <para><command>chmod 0755
+    /usr/lib/{lib{bind9,dns,isc{,cc,cfg},lwres}.so</command>:
+    Enable the execute bit to prevent a warning when using
+    <command>ldd</command> to check library dependencies.</para>
+
+    <para><command>cd doc; install ...</command>: These commands install
+    additional package documentation. Omit any or all of these commands if
+    desired.</para>
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring BIND</title>
+
+    <sect3 id="bind-config">
+      <title>Config files</title>
+
+      <para><filename>named.conf</filename>,
+      <filename>root.hints</filename>,
+      <filename>127.0.0</filename>,
+      <filename>rndc.conf</filename> and
+      <filename>resolv.conf</filename></para>
+
+      <indexterm zone="bind bind-config">
+        <primary sortas="e-etc-named.conf">/etc/named.conf</primary>
+      </indexterm>
+
+      <indexterm zone="bind bind-config">
+      <primary sortas="e-etc-rndc.conf">/etc/rndc.conf</primary>
+      </indexterm>
+
+      <indexterm zone="bind bind-config">
+        <primary sortas="e-etc-resolv.conf">/etc/resolv.conf</primary>
+      </indexterm>
+
+      <indexterm zone="bind bind-config">
+        <primary
+        sortas="e-etc-namedb-root.hints">/etc/namedb/root.hints</primary>
+      </indexterm>
+
+      <indexterm zone="bind bind-config">
+        <primary
+        sortas="e-etc-namedb-pz-127.0.0.0">/etc/namedb/pz/127.0.0.0</primary>
+      </indexterm>
+    </sect3>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para><application>BIND</application> will be configured to run in a
+      <command>chroot</command> jail as an unprivileged user (<systemitem
+      class="username">named</systemitem>). This configuration is more secure
+      in that a DNS compromise can only affect a few files in the <systemitem
+      class="username">named</systemitem> user's <envar>HOME</envar>
+      directory.</para>
+
+      <para>Create the unprivileged user and group <systemitem
+      class="username">named</systemitem>:</para>
+
+<screen role="root"><userinput>groupadd -g 20 named &amp;&amp;
+useradd -c "BIND Owner" -g named -s /bin/false -u 20 named &amp;&amp;
+install -d -m770 -o named -g named /srv/named</userinput></screen>
+
+      <para>Set up some files, directories and devices needed by
+      <application>BIND</application>:</para>
+
+<screen role="root"><userinput>cd /srv/named &amp;&amp;
+mkdir -pv dev etc/namedb/{slave,pz} usr/lib/engines var/run/named &amp;&amp;
+mknod /srv/named/dev/null c 1 3 &amp;&amp;
+mknod /srv/named/dev/urandom c 1 9 &amp;&amp;
+chmod -v 666 /srv/named/dev/{null,urandom} &amp;&amp;
+cp -Lv /etc/localtime etc &amp;&amp;
+touch /srv/named/managed-keys.bind &amp;&amp;
+cp -v /usr/lib/engines/libgost.so usr/lib/engines &amp;&amp;
+[ $(uname -m) = x86_64 ] &amp;&amp; ln -sfv lib usr/lib64</userinput></screen>
+
+      <para>The <filename>rndc.conf</filename> file contains information for
+      controlling <command>named</command> operations with the
+      <command>rndc</command> utility. Generate a key for use in the <filename>named.conf</filename> and <filename>rdnc.conf</filename> with the
+      <command>rndc-confgen</command> command:</para>
+
+<screen role="root"><userinput>rndc-confgen -r /dev/urandom -b 512 > /etc/rndc.conf &amp;&amp;
+sed '/conf/d;/^#/!d;s:^# ::' /etc/rndc.conf > /srv/named/etc/named.conf</userinput></screen>
+
+      <para>Complete the <filename>named.conf</filename> file from which
+      <command>named</command> will read the location of zone files, root
+      name servers and secure DNS keys:</para>
+
+<screen role="root"><?dbfo keep-together="auto"?><userinput>cat &gt;&gt; /srv/named/etc/named.conf &lt;&lt; "EOF"
+<literal>options {
+    directory "/etc/namedb";
+    pid-file "/var/run/named.pid";
+    statistics-file "/var/run/named.stats";
+
+};
+zone "." {
+    type hint;
+    file "root.hints";
+};
+zone "0.0.127.in-addr.arpa" {
+    type master;
+    file "pz/127.0.0";
+};
+
+// Bind 9 now logs by default through syslog (except debug).
+// These are the default logging rules.
+
+logging {
+    category default { default_syslog; default_debug; };
+    category unmatched { null; };
+
+  channel default_syslog {
+      syslog daemon;                      // send to syslog's daemon
+                                          // facility
+      severity info;                      // only send priority info
+                                          // and higher
+  };
+
+  channel default_debug {
+      file "named.run";                   // write to named.run in
+                                          // the working directory
+                                          // Note: stderr is used instead
+                                          // of "named.run"
+                                          // if the server is started
+                                          // with the '-f' option.
+      severity dynamic;                   // log at the server's
+                                          // current debug level
+  };
+
+  channel default_stderr {
+      stderr;                             // writes to stderr
+      severity info;                      // only send priority info
+                                          // and higher
+  };
+
+  channel null {
+      null;                               // toss anything sent to
+                                          // this channel
+  };
+};</literal>
+EOF</userinput></screen>
+
+      <para>Create a zone file with the following contents:</para>
+
+<screen role="root"><userinput>cat &gt; /srv/named/etc/namedb/pz/127.0.0 &lt;&lt; "EOF"
+<literal>$TTL 3D
+@      IN      SOA     ns.local.domain. hostmaster.local.domain. (
+                        1       ; Serial
+                        8H      ; Refresh
+                        2H      ; Retry
+                        4W      ; Expire
+                        1D)     ; Minimum TTL
+                NS      ns.local.domain.
+1               PTR     localhost.</literal>
+EOF</userinput></screen>
+
+      <para>Create the <filename>root.hints</filename> file with the following
+      commands:</para>
+
+      <note>
+        <para>Caution must be used to ensure there are no leading spaces in
+        this file.</para>
+      </note>
+
+<screen role="root"><userinput>cat &gt; /srv/named/etc/namedb/root.hints &lt;&lt; "EOF"
+<literal>.                       6D  IN      NS      A.ROOT-SERVERS.NET.
+.                       6D  IN      NS      B.ROOT-SERVERS.NET.
+.                       6D  IN      NS      C.ROOT-SERVERS.NET.
+.                       6D  IN      NS      D.ROOT-SERVERS.NET.
+.                       6D  IN      NS      E.ROOT-SERVERS.NET.
+.                       6D  IN      NS      F.ROOT-SERVERS.NET.
+.                       6D  IN      NS      G.ROOT-SERVERS.NET.
+.                       6D  IN      NS      H.ROOT-SERVERS.NET.
+.                       6D  IN      NS      I.ROOT-SERVERS.NET.
+.                       6D  IN      NS      J.ROOT-SERVERS.NET.
+.                       6D  IN      NS      K.ROOT-SERVERS.NET.
+.                       6D  IN      NS      L.ROOT-SERVERS.NET.
+.                       6D  IN      NS      M.ROOT-SERVERS.NET.
+A.ROOT-SERVERS.NET.     6D  IN      A       198.41.0.4
+B.ROOT-SERVERS.NET.     6D  IN      A       192.228.79.201
+C.ROOT-SERVERS.NET.     6D  IN      A       192.33.4.12
+D.ROOT-SERVERS.NET.     6D  IN      A       199.7.91.13
+E.ROOT-SERVERS.NET.     6D  IN      A       192.203.230.10
+F.ROOT-SERVERS.NET.     6D  IN      A       192.5.5.241
+G.ROOT-SERVERS.NET.     6D  IN      A       192.112.36.4
+H.ROOT-SERVERS.NET.     6D  IN      A       128.63.2.53
+I.ROOT-SERVERS.NET.     6D  IN      A       192.36.148.17
+J.ROOT-SERVERS.NET.     6D  IN      A       192.58.128.30
+K.ROOT-SERVERS.NET.     6D  IN      A       193.0.14.129
+L.ROOT-SERVERS.NET.     6D  IN      A       199.7.83.42
+M.ROOT-SERVERS.NET.     6D  IN      A       202.12.27.33</literal>
+EOF</userinput></screen>
+
+      <para>The <filename>root.hints</filename> file is a list of root
+      name servers. This file must be updated periodically with the
+      <command>dig</command> utility. A current copy of root.hints can be
+      obtained from <ulink url="ftp://rs.internic.net/domain/named.root" />.
+      Consult the <ulink url="http://www.bind9.net/Bv9ARM.html">BIND 9
+      Administrator Reference Manual</ulink> for details.</para>
+
+      <para>Create or modify <filename>resolv.conf</filename> to use the new
+      name server with the following commands:</para>
+
+      <note>
+        <para>Replace <replaceable>&lt;yourdomain.com&gt;</replaceable> with
+        your own valid domain name.</para>
+      </note>
+
+<screen role="root"><userinput>cp /etc/resolv.conf /etc/resolv.conf.bak &amp;&amp;
+cat &gt; /etc/resolv.conf &lt;&lt; "EOF"
+<literal>search <replaceable>&lt;yourdomain.com&gt;</replaceable>
+nameserver 127.0.0.1</literal>
+EOF</userinput></screen>
+
+      <para>Set permissions on the <command>chroot</command> jail with the
+      following command:</para>
+
+<screen role="root"><userinput>chown -R named:named /srv/named</userinput></screen>
+
+    </sect3>
+
+    <sect3  id="bind-init">
+      <title>Systemd Units</title>
+
+      <para>
+        To start the <command>named</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="bind bind-init">
+        <primary sortas="f-bind">bind</primary>
+      </indexterm>
+
+<screen role="root"><userinput>make install-named</userinput></screen>
+
+      <para>Now start <application>BIND</application> using
+      the <command>systemctl</command> utility:</para>
+
+<screen role="root"><userinput>systemctl start named</userinput></screen>
+
+    </sect3>
+
+    <sect3>
+      <title>Testing BIND</title>
+
+      <para>Test out the new <application>BIND</application> 9 installation.
+      First query the local host address with <command>dig</command>:</para>
+
+<screen><userinput>dig -x 127.0.0.1</userinput></screen>
+
+      <para>Now try an external name lookup, taking note of the speed
+      difference in repeated lookups due to the caching. Run the
+      <command>dig</command> command twice on the same address:</para>
+
+<screen><userinput>dig www.&lfs-domainname; &amp;&amp;
+dig www.&lfs-domainname;</userinput></screen>
+
+      <para>You can see almost instantaneous results with the named caching
+      lookups. Consult the <application>BIND</application> Administrator
+      Reference Manual located at <filename>doc/arm/Bv9ARM.html</filename>
+      in the package source tree, for further configuration options.</para>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+
+        <seg>arpaname, bind9-config hardlinked to isc-config.sh, ddns-confgen,
+        delv, dig, dnssec-checkds, dnssec-coverage, dnssec-dsfromkey,
+        dnssec-importkey, dnssec-keyfromlabel, dnssec-keygen, dnssec-revoke,
+        dnssec-settime, dnssec-signzone, dnssec-verify, genrandom, host,
+        isc-hmac-fixup, lwresd hardlinked to named, named-checkconf,
+        named-checkzone, named-compilezone (symlink), named-journalprint,
+        named-rrchecker, nsec3hash, nslookup, nsupdate, rndc, rndc-confgen,
+        and tsig-keygen (symlink)</seg>
+      
+        <seg>libbind9.so, libdns.so, libirs.so, libisc.so, libisccc.so, 
+        libisccfg.so, and liblwres.so</seg>
+
+        <seg>/usr/include/{bind9,dns,dst,irs,isc,isccc,isccfg,lwres,pk11,pkcs11},
+        /usr/share/doc/bind-&bind-version; and /srv/named</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="arpaname">
+        <term><command>arpaname</command></term>
+        <listitem>
+          <para>
+            translate IP addresses to the corresponding ARPA names.
+          </para>
+          <indexterm zone="bind arpaname">
+            <primary sortas="b-arpaname">arpaname</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="bind9-config">
+        <term><command>bind9-config</command></term>
+        <listitem>
+          <para>
+            hardlinked to <command>isc-config.sh</command>.
+          </para>
+          <indexterm zone="bind bind9-config">
+            <primary sortas="b-bind9-config">bind9-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ddns-confgen">
+        <term><command>ddns-confgen</command></term>
+        <listitem>
+          <para>
+            generates a key for use by nsupdate and named.
+          </para>
+          <indexterm zone="bind ddns-confgen">
+            <primary sortas="b-ddns-confgen">ddns-confgen</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="delv">
+        <term><command>delv</command></term>
+        <listitem>
+          <para>
+            is a new debugging tool that is a successor to 
+            <command>dig</command>.
+          </para>
+          <indexterm zone="bind delv">
+            <primary sortas="b-delv">delv</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="dig">
+        <term><command>dig</command></term>
+        <listitem>
+          <para>interrogates DNS servers.</para>
+          <indexterm zone="bind dig">
+            <primary sortas="b-dig">dig</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="dnssec-checkds">
+        <term><command>dnssec-checkds</command></term>
+        <listitem>
+          <para>
+            is a DNSSEC delegation consistency checking tool.
+          </para>
+          <indexterm zone="bind dnssec-checkds">
+            <primary sortas="b-dnssec-checkds">dnssec-checkds</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="dnssec-coverage">
+        <term><command>dnssec-coverage</command></term>
+        <listitem>
+          <para>
+            verifies that the DNSSEC keys for a given zone or a set of zones 
+            have timing metadata set properly to ensure no future lapses
+            in DNSSEC coverage.
+          </para>
+          <indexterm zone="bind dnssec-coverage">
+            <primary sortas="b-dnssec-coverage">dnssec-coverage</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+ 
+      <varlistentry id="dnssec-dsfromkey">
+        <term><command>dnssec-dsfromkey</command></term>
+        <listitem>
+          <para>
+            outputs the Delegation Signer (DS) resource record (RR).
+          </para>
+          <indexterm zone="bind dnssec-dsfromkey">
+            <primary sortas="b-dnssec-dsfromkey">dnssec-dsfromkey</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="dnssec-importkey">
+        <term><command>dnssec-importkey</command></term>
+        <listitem>
+          <para>
+             reads a public DNSKEY record and generates a pair of 
+             .key/.private files.
+          </para>
+          <indexterm zone="bind dnssec-importkey">
+            <primary sortas="b-dnssec-importkey">dnssec-importkey</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="dnssec-keyfromlabel">
+        <term><command>dnssec-keyfromlabel</command></term>
+        <listitem>
+          <para>
+            gets keys with the given label from a crypto hardware and builds 
+            key files for DNSSEC.
+          </para>
+          <indexterm zone="bind dnssec-keyfromlabel">
+            <primary sortas="b-dnssec-keyfromlabel">dnssec-keyfromlabel</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="dnssec-keygen">
+        <term><command>dnssec-keygen</command></term>
+        <listitem>
+          <para>is a key generator for secure DNS.</para>
+          <indexterm zone="bind dnssec-keygen">
+            <primary sortas="b-dnssec-keygen">dnssec-keygen</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="dnssec-revoke">
+        <term><command>dnssec-revoke</command></term>
+        <listitem>
+          <para>
+            Set the REVOKED bit on a DNSSEC key.
+          </para>
+          <indexterm zone="bind dnssec-revoke">
+            <primary sortas="b-dnssec-revoke">dnssec-revoke</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="dnssec-settime">
+        <term><command>dnssec-settime</command></term>
+        <listitem>
+          <para>
+            set the key timing metadata for a DNSSEC key.
+          </para>
+          <indexterm zone="bind dnssec-settime">
+            <primary sortas="b-dnssec-settime">dnssec-settime</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="dnssec-signzone">
+        <term><command>dnssec-signzone</command></term>
+        <listitem>
+          <para>generates signed versions of zone files.</para>
+          <indexterm zone="bind dnssec-signzone">
+            <primary sortas="b-dnssec-signzone">dnssec-signzone</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="dnssec-verify">
+        <term><command>dnssec-verify</command></term>
+        <listitem>
+          <para>
+            verifies that a zone is fully signed for each algorithm found 
+            in the DNSKEY RRset for the zone, and that the NSEC / NSEC3 
+            chains are complete.
+          </para>
+          <indexterm zone="bind dnssec-verify">
+            <primary sortas="b-dnssec-verify">dnssec-verify</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="genrandom">
+        <term><command>genrandom</command></term>
+        <listitem>
+          <para>
+            generate a file containing random data.
+          </para>
+          <indexterm zone="bind genrandom">
+            <primary sortas="b-genrandom">genrandom</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="host">
+        <term><command>host</command></term>
+        <listitem>
+          <para>is a utility for DNS lookups.</para>
+          <indexterm zone="bind host">
+            <primary sortas="b-host">host</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="isc-config.sh">
+        <term><command>isc-config.sh</command></term>
+        <listitem>
+          <para>
+            prints information related to the installed version of ISC BIND.
+          </para>
+          <indexterm zone="bind isc-config.sh">
+            <primary sortas="b-isc-config.sh">isc-config.sh</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="isc-hmac-fixup">
+        <term><command>isc-hmac-fixup</command></term>
+        <listitem>
+          <para>
+            fixes HMAC keys generated by older versions of BIND.
+          </para>
+          <indexterm zone="bind isc-hmac-fixup">
+            <primary sortas="b-isc-hmac-fixup">isc-hmac-fixup</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="lwresd">
+        <term><command>lwresd</command></term>
+        <listitem>
+          <para>is a caching-only name server for local process use.</para>
+          <indexterm zone="bind lwresd">
+            <primary sortas="b-lwresd">lwresd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="named">
+        <term><command>named</command></term>
+        <listitem>
+          <para>is the name server daemon.</para>
+          <indexterm zone="bind named">
+            <primary sortas="b-named">named</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="named-checkconf">
+        <term><command>named-checkconf</command></term>
+        <listitem>
+          <para>checks the syntax of <filename>named.conf</filename>
+          files.</para>
+          <indexterm zone="bind named-checkconf">
+            <primary sortas="b-named-checkconf">named-checkconf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="named-checkzone">
+        <term><command>named-checkzone</command></term>
+        <listitem>
+          <para>checks zone file validity.</para>
+          <indexterm zone="bind named-checkzone">
+            <primary sortas="b-named-checkzone">named-checkzone</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="named-compilezone">
+        <term><command>named-compilezone</command></term>
+        <listitem>
+          <para>
+            is similar to <command>named-checkzone</command>, but it always 
+            dumps the zone contents to a specified file in a specified format.
+          </para>
+          <indexterm zone="bind named-compilezone">
+            <primary sortas="b-named-compilezone">named-compilezone</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="named-journalprint">
+        <term><command>named-journalprint</command></term>
+        <listitem>
+          <para>
+            print zone journal in human-readable form.
+          </para>
+          <indexterm zone="bind named-journalprint">
+            <primary sortas="b-named-journalprint">named-journalprint</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="named-rrchecker">
+        <term><command>named-rrchecker</command></term>
+        <listitem>
+          <para>
+            read a individual DNS resource record from standard input and 
+            checks if it is syntactically correct.
+          </para>
+          <indexterm zone="bind named-rrchecker">
+            <primary sortas="b-named-rrchecker">named-rrchecker</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="nsec3hash">
+        <term><command>nsec3hash</command></term>
+        <listitem>
+          <para>
+            generates an NSEC3 hash based on a set of NSEC3 parameters.
+          </para>
+          <indexterm zone="bind nsec3hash">
+            <primary sortas="b-nsec3hash">nsec3hash</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="nslookup">
+        <term><command>nslookup</command></term>
+        <listitem>
+          <para>is a program used to query Internet domain nameservers.</para>
+          <indexterm zone="bind nslookup">
+            <primary sortas="b-nslookup">nslookup</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="nsupdate">
+        <term><command>nsupdate</command></term>
+        <listitem>
+          <para>is used to submit DNS update requests.</para>
+          <indexterm zone="bind nsupdate">
+            <primary sortas="b-nsupdate">nsupdate</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rndc">
+        <term><command>rndc</command></term>
+        <listitem>
+          <para>controls the operation of <application>BIND</application>.</para>
+          <indexterm zone="bind rndc">
+            <primary sortas="b-rndc">rndc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rndc-confgen">
+        <term><command>rndc-confgen</command></term>
+        <listitem>
+          <para>generates <filename>rndc.conf</filename> files.</para>
+          <indexterm zone="bind rndc-confgen">
+            <primary sortas="b-rndc-confgen">rndc-confgen</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="tsig-keygen">
+        <term><command>tsig-keygen</command></term>
+        <listitem>
+          <para>
+            is a symlink to <command>ddns-confgen</command>. 
+          </para>
+          <indexterm zone="bind tsig-keygen">
+            <primary sortas="b-tsig-keygen">tsig-keygen</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: server/major/major.xml
===================================================================
--- server/major/major.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ server/major/major.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -19,8 +19,8 @@
   to users or other programs.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apache-systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bind-systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="proftpd-systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vsftpd-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apache.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bind.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="proftpd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vsftpd.xml"/>
 
 </chapter>
Index: rver/major/proftpd-systemd.xml
===================================================================
--- server/major/proftpd-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,402 +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 proftpd-download-http " ">
-  <!ENTITY proftpd-download-ftp  "ftp://ftp.proftpd.org/distrib/source/proftpd-&proftpd-version;.tar.gz">
-  <!ENTITY proftpd-md5sum        "b9d3092411478415b31d435f8e26d173">
-  <!ENTITY proftpd-size          "29 MB">
-  <!ENTITY proftpd-buildsize     "69 MB">
-  <!ENTITY proftpd-time          "0.2 SBU">
-]>
-
-<sect1 id="proftpd" xreflabel="ProFTPD-&proftpd-version;">
-  <?dbhtml filename="proftpd.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>ProFTPD-&proftpd-version;</title>
-
-  <indexterm zone="proftpd">
-    <primary sortas="a-proftpd">Proftpd</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ProFTPD</title>
-
-    <para>The <application>ProFTPD</application> package contains a secure
-    and highly configurable FTP daemon. This is useful for serving large
-    file archives over a network.</para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&proftpd-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&proftpd-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &proftpd-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &proftpd-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &proftpd-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &proftpd-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">ProFTPD Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="linux-pam"/>,
-      <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
-      <xref linkend="openssl"/>,
-      <xref linkend="pcre"/>,
-      <xref linkend="postgresql"/> and to run tests:
-      <xref linkend="check"/> and
-      <ulink url='http://search.cpan.org/~clemburg/Test-Unit-0.14/'>Test::Unit-0.14</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/proftpd"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ProFTPD</title>
-
-    <para>For security reasons, you should install
-    <application>ProFTPD</application> using an unprivileged user and group.
-    As the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>groupadd -g 46 proftpd                             &amp;&amp;
-useradd -c proftpd -d /srv/ftp -g proftpd \
-        -s /usr/bin/proftpdshell -u 46 proftpd     &amp;&amp;
-
-install -v -d -m775 -o proftpd -g proftpd /srv/ftp &amp;&amp;
-ln -sfv /bin/false /usr/bin/proftpdshell           &amp;&amp;
-echo /usr/bin/proftpdshell &gt;&gt; /etc/shells</userinput></screen>
-
-    <para>Install <application>ProFTPD</application> as an unprivileged user by
-    running the following commands:</para>
-
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/run &amp;&amp;
-make</userinput></screen>
-
-    <para>The tests for this package require a very old (2001) version of the
-    Perl Module Test::Unit. Even when using that version of Test::Unit, there
-    are many failures (41/1397) although the program appears to run
-    well.  The tests take a long time (45 minutes, not CPU dependent) and are
-    not recommended.  To test the results anyway, add the switch: <parameter>
-    --enable-tests</parameter> to the <command>configure</command>, and
-    issue: <command>make check</command>. If the tests are run with root
-    privileges, more tests are run, but there are more failures.</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>install -v -d -m775 -o proftpd -g proftpd
-    /srv/ftp</command>: Create the home directory for
-    <application>ProFTPD</application>.</para>
-
-    <para><command>ln -v -s /bin/false /usr/bin/proftpdshell</command>:
-    Set the default shell as a link to an invalid shell.</para>
-
-    <para><command>echo /usr/bin/proftpdshell &gt;&gt;
-    /etc/shells</command>: Fake a valid shell for compatibility purposes.</para>
-
-    <note>
-      <para>The above two commands can be omitted if the following directive is
-      placed in the configuration file:</para>
-
-<screen><literal>RequireValidShell off</literal></screen>
-
-      <para>By default, proftpd will require that users logging in have valid
-      shells. The RequireValidShell directive turns off this requirement. This
-      is only recommended if you are setting up your FTP server exclusively
-      for anonymous downloads.</para>
-    </note>
-
-    <note>
-      <para>
-        Support for most of the dependency packages requires using options
-        passed to the <command>configure</command> script. View the output
-        from <command>./configure --help</command> for complete information
-        about enabling dependency packages.
-      </para>
-    </note>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring ProFTPD</title>
-
-    <sect3 id='proftpd-config'>
-      <title>Config Files</title>
-
-      <para><filename>/etc/proftpd.conf</filename></para>
-
-      <indexterm zone="proftpd proftpd-config">
-        <primary sortas="e-etc-proftpd">/etc/proftpd.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>This is a simple, download-only sample configuration. See the
-      <application>ProFTPD</application> documentation in
-      <filename class="directory">/usr/share/doc/proftpd</filename> and
-      consult the website at <ulink url="http://www.proftpd.org/"/> for
-      example configurations.</para>
-
-<screen role="root"><?dbfo keep-together="auto"?><userinput>cat &gt; /etc/proftpd.conf &lt;&lt; "EOF"
-<literal># This is a basic ProFTPD configuration file
-# It establishes a single server and a single anonymous login.
-
-ServerName                      "ProFTPD Default Installation"
-ServerType                      standalone
-DefaultServer                   on
-
-# Port 21 is the standard FTP port.
-Port                            21
-# Umask 022 is a good standard umask to prevent new dirs and files
-# from being group and world writable.
-Umask                           022
-
-# To prevent DoS attacks, set the maximum number of child processes
-# to 30.  If you need to allow more than 30 concurrent connections
-# at once, simply increase this value.  Note that this ONLY works
-# in standalone mode, in inetd mode you should use an inetd server
-# that allows you to limit maximum number of processes per service
-<!--# (such as xinetd)-->
-MaxInstances                    30
-
-# Set the user and group that the server normally runs at.
-User                            proftpd
-Group                           proftpd
-
-# To cause every FTP user to be "jailed" (chrooted) into their home
-# directory, uncomment this line.
-#DefaultRoot ~
-
-
-# Normally, files should be overwritable.
-&lt;Directory /*&gt;
-  AllowOverwrite                on
-&lt;/Directory&gt;
-
-# A basic anonymous configuration, no upload directories.
-&lt;Anonymous ~proftpd&gt;
-  User                          proftpd
-  Group                         proftpd
-  # Clients should be able to login with "anonymous" as well as "proftpd"
-  UserAlias                     anonymous proftpd
-
-  # Limit the maximum number of anonymous logins
-  MaxClients                    10
-
-  # 'welcome.msg' should be displayed at login, and '.message' displayed
-  # in each newly chdired directory.
-  DisplayLogin                  welcome.msg
-  DisplayChdir                  .message
-
-  # Limit WRITE everywhere in the anonymous chroot
-  &lt;Limit WRITE&gt;
-    DenyAll
-  &lt;/Limit&gt;
-&lt;/Anonymous&gt;</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-    <sect3  id="proftpd-init">
-      <title>Systemd Units</title>
-
-      <para>
-        To start the <command>proftpd</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="proftpd proftpd-init">
-        <primary sortas="f-proftpd">proftpd</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-proftpd</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          ftpasswd, ftpcount, ftpdctl, ftpmail, ftpquota, ftpscrub, ftpshut,
-          ftptop, ftpwho, in.proftpd (symlink to proftpd), proftpd, and prxs
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/include and
-          /usr/lib/proftpd
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="proftpd-prog">
-        <term><command>proftpd</command></term>
-        <listitem>
-          <para>is the FTP daemon.</para>
-          <indexterm zone="proftpd proftpd-prog">
-            <primary sortas="b-proftpd">proftpd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ftpcount">
-        <term><command>ftpcount</command></term>
-        <listitem>
-          <para>shows the current number of connections.</para>
-          <indexterm zone="proftpd ftpcount">
-            <primary sortas="b-ftpcount">ftpcount</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ftpdctl">
-        <term><command>ftpdctl</command></term>
-        <listitem>
-          <para>is used to control the  proftpd daemon while it is running.</para>
-          <indexterm zone="proftpd ftpdctl">
-            <primary sortas="b-ftpdctl">ftpdctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ftpasswd">
-        <term><command>ftpasswd</command></term>
-        <listitem>
-          <para>is a Perl script designed to create and manage
-          AuthUserFiles and AuthGroupFiles of the correct format for proftpd.</para>
-          <indexterm zone="proftpd ftpasswd">
-            <primary sortas="b-ftpasswd">ftpasswd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ftpmail">
-        <term><command>ftpmail</command></term>
-        <listitem>
-          <para>is a Perl script for sending email based on the proftpd TransferLog.
-          </para>
-          <indexterm zone="proftpd ftpmail">
-            <primary sortas="b-ftpmail">ftpmail</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ftpquota">
-        <term><command>ftpquota</command></term>
-        <listitem>
-          <para>is a Perl script designed to create and manage limits and tally
-          files for the mod_quotatab + mod_quotatab_file module combination
-          for proftpd.</para>
-          <indexterm zone="proftpd ftpquota">
-            <primary sortas="b-ftpquota">ftpquota</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ftpscrub">
-        <term><command>ftpscrub</command></term>
-        <listitem>
-          <para>provides a way to scrub the scoreboard file on demand.</para>
-          <indexterm zone="proftpd ftpscrub">
-            <primary sortas="b-ftpscrub">ftpscrub</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ftpshut">
-        <term><command>ftpshut</command></term>
-        <listitem>
-          <para>shuts down all <application>proftpd</application> servers
-          at a given time.</para>
-          <indexterm zone="proftpd ftpshut">
-            <primary sortas="b-ftpshut">ftpshut</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ftptop">
-        <term><command>ftptop</command></term>
-        <listitem>
-          <para>displays running status on connections.</para>
-          <indexterm zone="proftpd ftptop">
-            <primary sortas="b-ftptop">ftptop</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ftpwho">
-        <term><command>ftpwho</command></term>
-        <listitem>
-          <para>shows current process information for each session.</para>
-          <indexterm zone="proftpd ftpwho">
-            <primary sortas="b-ftpwho">ftpwho</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="prxs">
-        <term><command>prxs</command></term>
-        <listitem>
-          <para>is a Perl script designed to compile and install third-party
-          modules, from source code, as DSO modules for the installed
-          proftpd.</para>
-          <indexterm zone="proftpd prxs">
-            <primary sortas="b-prxs">prxs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: server/major/proftpd.xml
===================================================================
--- server/major/proftpd.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ server/major/proftpd.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -0,0 +1,402 @@
+<?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 proftpd-download-http " ">
+  <!ENTITY proftpd-download-ftp  "ftp://ftp.proftpd.org/distrib/source/proftpd-&proftpd-version;.tar.gz">
+  <!ENTITY proftpd-md5sum        "b9d3092411478415b31d435f8e26d173">
+  <!ENTITY proftpd-size          "29 MB">
+  <!ENTITY proftpd-buildsize     "69 MB">
+  <!ENTITY proftpd-time          "0.2 SBU">
+]>
+
+<sect1 id="proftpd" xreflabel="ProFTPD-&proftpd-version;">
+  <?dbhtml filename="proftpd.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>ProFTPD-&proftpd-version;</title>
+
+  <indexterm zone="proftpd">
+    <primary sortas="a-proftpd">Proftpd</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to ProFTPD</title>
+
+    <para>The <application>ProFTPD</application> package contains a secure
+    and highly configurable FTP daemon. This is useful for serving large
+    file archives over a network.</para>
+
+    &lfs77_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&proftpd-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&proftpd-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &proftpd-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &proftpd-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &proftpd-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &proftpd-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">ProFTPD Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="linux-pam"/>,
+      <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
+      <xref linkend="openssl"/>,
+      <xref linkend="pcre"/>,
+      <xref linkend="postgresql"/> and to run tests:
+      <xref linkend="check"/> and
+      <ulink url='http://search.cpan.org/~clemburg/Test-Unit-0.14/'>Test::Unit-0.14</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/proftpd"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of ProFTPD</title>
+
+    <para>For security reasons, you should install
+    <application>ProFTPD</application> using an unprivileged user and group.
+    As the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>groupadd -g 46 proftpd                             &amp;&amp;
+useradd -c proftpd -d /srv/ftp -g proftpd \
+        -s /usr/bin/proftpdshell -u 46 proftpd     &amp;&amp;
+
+install -v -d -m775 -o proftpd -g proftpd /srv/ftp &amp;&amp;
+ln -sfv /bin/false /usr/bin/proftpdshell           &amp;&amp;
+echo /usr/bin/proftpdshell &gt;&gt; /etc/shells</userinput></screen>
+
+    <para>Install <application>ProFTPD</application> as an unprivileged user by
+    running the following commands:</para>
+
+<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/run &amp;&amp;
+make</userinput></screen>
+
+    <para>The tests for this package require a very old (2001) version of the
+    Perl Module Test::Unit. Even when using that version of Test::Unit, there
+    are many failures (41/1397) although the program appears to run
+    well.  The tests take a long time (45 minutes, not CPU dependent) and are
+    not recommended.  To test the results anyway, add the switch: <parameter>
+    --enable-tests</parameter> to the <command>configure</command>, and
+    issue: <command>make check</command>. If the tests are run with root
+    privileges, more tests are run, but there are more failures.</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>install -v -d -m775 -o proftpd -g proftpd
+    /srv/ftp</command>: Create the home directory for
+    <application>ProFTPD</application>.</para>
+
+    <para><command>ln -v -s /bin/false /usr/bin/proftpdshell</command>:
+    Set the default shell as a link to an invalid shell.</para>
+
+    <para><command>echo /usr/bin/proftpdshell &gt;&gt;
+    /etc/shells</command>: Fake a valid shell for compatibility purposes.</para>
+
+    <note>
+      <para>The above two commands can be omitted if the following directive is
+      placed in the configuration file:</para>
+
+<screen><literal>RequireValidShell off</literal></screen>
+
+      <para>By default, proftpd will require that users logging in have valid
+      shells. The RequireValidShell directive turns off this requirement. This
+      is only recommended if you are setting up your FTP server exclusively
+      for anonymous downloads.</para>
+    </note>
+
+    <note>
+      <para>
+        Support for most of the dependency packages requires using options
+        passed to the <command>configure</command> script. View the output
+        from <command>./configure --help</command> for complete information
+        about enabling dependency packages.
+      </para>
+    </note>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring ProFTPD</title>
+
+    <sect3 id='proftpd-config'>
+      <title>Config Files</title>
+
+      <para><filename>/etc/proftpd.conf</filename></para>
+
+      <indexterm zone="proftpd proftpd-config">
+        <primary sortas="e-etc-proftpd">/etc/proftpd.conf</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para>This is a simple, download-only sample configuration. See the
+      <application>ProFTPD</application> documentation in
+      <filename class="directory">/usr/share/doc/proftpd</filename> and
+      consult the website at <ulink url="http://www.proftpd.org/"/> for
+      example configurations.</para>
+
+<screen role="root"><?dbfo keep-together="auto"?><userinput>cat &gt; /etc/proftpd.conf &lt;&lt; "EOF"
+<literal># This is a basic ProFTPD configuration file
+# It establishes a single server and a single anonymous login.
+
+ServerName                      "ProFTPD Default Installation"
+ServerType                      standalone
+DefaultServer                   on
+
+# Port 21 is the standard FTP port.
+Port                            21
+# Umask 022 is a good standard umask to prevent new dirs and files
+# from being group and world writable.
+Umask                           022
+
+# To prevent DoS attacks, set the maximum number of child processes
+# to 30.  If you need to allow more than 30 concurrent connections
+# at once, simply increase this value.  Note that this ONLY works
+# in standalone mode, in inetd mode you should use an inetd server
+# that allows you to limit maximum number of processes per service
+<!--# (such as xinetd)-->
+MaxInstances                    30
+
+# Set the user and group that the server normally runs at.
+User                            proftpd
+Group                           proftpd
+
+# To cause every FTP user to be "jailed" (chrooted) into their home
+# directory, uncomment this line.
+#DefaultRoot ~
+
+
+# Normally, files should be overwritable.
+&lt;Directory /*&gt;
+  AllowOverwrite                on
+&lt;/Directory&gt;
+
+# A basic anonymous configuration, no upload directories.
+&lt;Anonymous ~proftpd&gt;
+  User                          proftpd
+  Group                         proftpd
+  # Clients should be able to login with "anonymous" as well as "proftpd"
+  UserAlias                     anonymous proftpd
+
+  # Limit the maximum number of anonymous logins
+  MaxClients                    10
+
+  # 'welcome.msg' should be displayed at login, and '.message' displayed
+  # in each newly chdired directory.
+  DisplayLogin                  welcome.msg
+  DisplayChdir                  .message
+
+  # Limit WRITE everywhere in the anonymous chroot
+  &lt;Limit WRITE&gt;
+    DenyAll
+  &lt;/Limit&gt;
+&lt;/Anonymous&gt;</literal>
+EOF</userinput></screen>
+
+    </sect3>
+
+    <sect3  id="proftpd-init">
+      <title>Systemd Units</title>
+
+      <para>
+        To start the <command>proftpd</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="proftpd proftpd-init">
+        <primary sortas="f-proftpd">proftpd</primary>
+      </indexterm>
+
+<screen role="root"><userinput>make install-proftpd</userinput></screen>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>
+          ftpasswd, ftpcount, ftpdctl, ftpmail, ftpquota, ftpscrub, ftpshut,
+          ftptop, ftpwho, in.proftpd (symlink to proftpd), proftpd, and prxs
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /usr/include and
+          /usr/lib/proftpd
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="proftpd-prog">
+        <term><command>proftpd</command></term>
+        <listitem>
+          <para>is the FTP daemon.</para>
+          <indexterm zone="proftpd proftpd-prog">
+            <primary sortas="b-proftpd">proftpd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ftpcount">
+        <term><command>ftpcount</command></term>
+        <listitem>
+          <para>shows the current number of connections.</para>
+          <indexterm zone="proftpd ftpcount">
+            <primary sortas="b-ftpcount">ftpcount</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ftpdctl">
+        <term><command>ftpdctl</command></term>
+        <listitem>
+          <para>is used to control the  proftpd daemon while it is running.</para>
+          <indexterm zone="proftpd ftpdctl">
+            <primary sortas="b-ftpdctl">ftpdctl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ftpasswd">
+        <term><command>ftpasswd</command></term>
+        <listitem>
+          <para>is a Perl script designed to create and manage
+          AuthUserFiles and AuthGroupFiles of the correct format for proftpd.</para>
+          <indexterm zone="proftpd ftpasswd">
+            <primary sortas="b-ftpasswd">ftpasswd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ftpmail">
+        <term><command>ftpmail</command></term>
+        <listitem>
+          <para>is a Perl script for sending email based on the proftpd TransferLog.
+          </para>
+          <indexterm zone="proftpd ftpmail">
+            <primary sortas="b-ftpmail">ftpmail</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ftpquota">
+        <term><command>ftpquota</command></term>
+        <listitem>
+          <para>is a Perl script designed to create and manage limits and tally
+          files for the mod_quotatab + mod_quotatab_file module combination
+          for proftpd.</para>
+          <indexterm zone="proftpd ftpquota">
+            <primary sortas="b-ftpquota">ftpquota</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ftpscrub">
+        <term><command>ftpscrub</command></term>
+        <listitem>
+          <para>provides a way to scrub the scoreboard file on demand.</para>
+          <indexterm zone="proftpd ftpscrub">
+            <primary sortas="b-ftpscrub">ftpscrub</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ftpshut">
+        <term><command>ftpshut</command></term>
+        <listitem>
+          <para>shuts down all <application>proftpd</application> servers
+          at a given time.</para>
+          <indexterm zone="proftpd ftpshut">
+            <primary sortas="b-ftpshut">ftpshut</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ftptop">
+        <term><command>ftptop</command></term>
+        <listitem>
+          <para>displays running status on connections.</para>
+          <indexterm zone="proftpd ftptop">
+            <primary sortas="b-ftptop">ftptop</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ftpwho">
+        <term><command>ftpwho</command></term>
+        <listitem>
+          <para>shows current process information for each session.</para>
+          <indexterm zone="proftpd ftpwho">
+            <primary sortas="b-ftpwho">ftpwho</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="prxs">
+        <term><command>prxs</command></term>
+        <listitem>
+          <para>is a Perl script designed to compile and install third-party
+          modules, from source code, as DSO modules for the installed
+          proftpd.</para>
+          <indexterm zone="proftpd prxs">
+            <primary sortas="b-prxs">prxs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: rver/major/vsftpd-systemd.xml
===================================================================
--- server/major/vsftpd-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,231 +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 vsftpd-download-http "https://security.appspot.com/downloads/vsftpd-&vsftpd-version;.tar.gz">
-  <!ENTITY vsftpd-download-ftp  " ">
-  <!ENTITY vsftpd-md5sum        "da119d084bd3f98664636ea05b5bb398">
-  <!ENTITY vsftpd-size          "196 KB">
-  <!ENTITY vsftpd-buildsize     "2 MB">
-  <!ENTITY vsftpd-time          "less than 0.1 SBU">
-  <!ENTITY vsftpd-empty         "/usr/share/vsftpd/empty">
-]>
-
-<sect1 id="vsftpd" xreflabel="vsftpd-&vsftpd-version;">
-  <?dbhtml filename="vsftpd.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>vsftpd-&vsftpd-version;</title>
-
-  <indexterm zone="vsftpd">
-    <primary sortas="a-vsftpd">vsftpd</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to vsftpd</title>
-
-    <para>The <application>vsftpd</application> package contains a very
-    secure and very small FTP daemon. This is useful for serving files
-    over a network.</para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&vsftpd-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&vsftpd-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &vsftpd-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &vsftpd-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &vsftpd-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &vsftpd-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">vsftpd Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="linux-pam"/> and
-      <xref linkend="openssl"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/vsftpd"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of vsftpd</title>
-
-    <para>For security reasons, running <application>vsftpd</application>
-    as an unprivileged user and group is encouraged. Also, a user should be
-    created to map anonymous users. As the <systemitem
-    class="username">root</systemitem> user, create the needed directories,
-    users, and groups with the following commands:</para>
-
-<screen role="root"><userinput>install -v -dm755 &vsftpd-empty; &amp;&amp;
-install -v -dm755 /home/ftp               &amp;&amp;
-groupadd -g 47 vsftpd                     &amp;&amp;
-groupadd -g 45 ftp                        &amp;&amp;
-
-useradd -c "vsftpd User"  -d /dev/null -g vsftpd -s /bin/false -u 47 vsftpd &amp;&amp;
-useradd -c anonymous_user -d /home/ftp -g ftp    -s /bin/false -u 45 ftp</userinput></screen>
-
-<!--    <para>If you did not install the optional <application>libcap2</application> package,
-    run the following to avoid a build error:</para>
-
-<screen><userinput>sed -i -e 's|#define VSF_SYSDEP_HAVE_LIBCAP|//&amp;|' sysdeputil.c</userinput></screen> -->
-
-    <para>Build <application>vsftpd</application> as an unprivileged user
-    using the following command:</para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Once again, become the <systemitem class="username">root</systemitem>
-    user and install <application>vsftpd</application> with the following
-    commands:</para>
-
-<screen><userinput>install -v -m 755 vsftpd        /usr/sbin/vsftpd    &amp;&amp;
-install -v -m 644 vsftpd.8      /usr/share/man/man8 &amp;&amp;
-install -v -m 644 vsftpd.conf.5 /usr/share/man/man5 &amp;&amp;
-install -v -m 644 vsftpd.conf   /etc</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>install -v -d ...</command>: This creates the
-    directory that anonymous users will use (<filename
-    class='directory'>/home/ftp</filename>)
-    and the directory the daemon will chroot into
-    (<filename class='directory'>&vsftpd-empty;</filename>).</para>
-
-    <note>
-      <para><filename class="directory">/home/ftp</filename> should not be
-      owned by the user <systemitem class="username">vsftpd</systemitem>,
-      or the user <systemitem class="username">ftp</systemitem>.</para>
-    </note>
-
-    <para><command>echo "#define VSF_BUILD_TCPWRAPPERS" >>builddefs.h</command>:
-    Use this prior to <command>make</command> to add support for
-    <application>tcpwrappers</application>.</para>
-
-    <para><command>echo "#define VSF_BUILD_SSL" >>builddefs.h</command>:
-    Use this prior to <command>make</command> to add support for SSL.</para>
-
-    <para><command>install -v -m ...</command>:
-    The <filename>Makefile</filename> uses non-standard installation paths.
-    These commands install the files in
-    <filename class='directory'>/usr</filename> and
-    <filename class='directory'>/etc</filename>.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring vsftpd</title>
-
-    <sect3 id="vsftpd-config">
-      <title>Config Files</title>
-
-      <para><filename>/etc/vsftpd.conf</filename></para>
-
-      <indexterm zone="vsftpd vsftpd-config">
-        <primary sortas="e-etc-vsftpd.conf">/etc/vsftpd.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para><application>vsftpd</application> comes with a basic
-      anonymous-only configuration file that was copied to
-      <filename class='directory'>/etc</filename> above. While still as
-      <systemitem class="username">root</systemitem>, this file should be
-      modified because it is now recommended to run <command>vsftpd</command>
-      in standalone mode. <!-- as opposed to
-      <command>inetd</command>/<command>xinetd</command> mode. -->Also, you
-      should specify the privilege separation user created above. Finally,
-      you should specify the <command>chroot</command> directory.
-      <command>man vsftpd.conf</command> will give you all the details.</para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/vsftpd.conf &lt;&lt; "EOF"
-<literal>background=YES
-listen=YES
-nopriv_user=vsftpd
-secure_chroot_dir=&vsftpd-empty;</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-    <sect3  id="vsftpd-init">
-      <title>Systemd Units</title>
-
-      <para>
-        To start the <command>vsftpd</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>
-
-<screen role="root"><userinput>make install-vsftpd</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>vsftpd</seg>
-        <seg>None</seg>
-        <seg>//usr/share/vsftpd, /home/ftp</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="vsftpd-prog">
-        <term><command>vsftpd</command></term>
-        <listitem>
-          <para>is the FTP daemon.</para>
-          <indexterm zone="vsftpd vsftpd-prog">
-            <primary sortas="b-vsftpd">vsftpd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: server/major/vsftpd.xml
===================================================================
--- server/major/vsftpd.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ server/major/vsftpd.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -0,0 +1,231 @@
+<?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 vsftpd-download-http "https://security.appspot.com/downloads/vsftpd-&vsftpd-version;.tar.gz">
+  <!ENTITY vsftpd-download-ftp  " ">
+  <!ENTITY vsftpd-md5sum        "da119d084bd3f98664636ea05b5bb398">
+  <!ENTITY vsftpd-size          "196 KB">
+  <!ENTITY vsftpd-buildsize     "2 MB">
+  <!ENTITY vsftpd-time          "less than 0.1 SBU">
+  <!ENTITY vsftpd-empty         "/usr/share/vsftpd/empty">
+]>
+
+<sect1 id="vsftpd" xreflabel="vsftpd-&vsftpd-version;">
+  <?dbhtml filename="vsftpd.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>vsftpd-&vsftpd-version;</title>
+
+  <indexterm zone="vsftpd">
+    <primary sortas="a-vsftpd">vsftpd</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to vsftpd</title>
+
+    <para>The <application>vsftpd</application> package contains a very
+    secure and very small FTP daemon. This is useful for serving files
+    over a network.</para>
+
+    &lfs77_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&vsftpd-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&vsftpd-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &vsftpd-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &vsftpd-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &vsftpd-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &vsftpd-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">vsftpd Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="linux-pam"/> and
+      <xref linkend="openssl"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/vsftpd"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of vsftpd</title>
+
+    <para>For security reasons, running <application>vsftpd</application>
+    as an unprivileged user and group is encouraged. Also, a user should be
+    created to map anonymous users. As the <systemitem
+    class="username">root</systemitem> user, create the needed directories,
+    users, and groups with the following commands:</para>
+
+<screen role="root"><userinput>install -v -dm755 &vsftpd-empty; &amp;&amp;
+install -v -dm755 /home/ftp               &amp;&amp;
+groupadd -g 47 vsftpd                     &amp;&amp;
+groupadd -g 45 ftp                        &amp;&amp;
+
+useradd -c "vsftpd User"  -d /dev/null -g vsftpd -s /bin/false -u 47 vsftpd &amp;&amp;
+useradd -c anonymous_user -d /home/ftp -g ftp    -s /bin/false -u 45 ftp</userinput></screen>
+
+<!--    <para>If you did not install the optional <application>libcap2</application> package,
+    run the following to avoid a build error:</para>
+
+<screen><userinput>sed -i -e 's|#define VSF_SYSDEP_HAVE_LIBCAP|//&amp;|' sysdeputil.c</userinput></screen> -->
+
+    <para>Build <application>vsftpd</application> as an unprivileged user
+    using the following command:</para>
+
+<screen><userinput>make</userinput></screen>
+
+    <para>This package does not come with a test suite.</para>
+
+    <para>Once again, become the <systemitem class="username">root</systemitem>
+    user and install <application>vsftpd</application> with the following
+    commands:</para>
+
+<screen><userinput>install -v -m 755 vsftpd        /usr/sbin/vsftpd    &amp;&amp;
+install -v -m 644 vsftpd.8      /usr/share/man/man8 &amp;&amp;
+install -v -m 644 vsftpd.conf.5 /usr/share/man/man5 &amp;&amp;
+install -v -m 644 vsftpd.conf   /etc</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><command>install -v -d ...</command>: This creates the
+    directory that anonymous users will use (<filename
+    class='directory'>/home/ftp</filename>)
+    and the directory the daemon will chroot into
+    (<filename class='directory'>&vsftpd-empty;</filename>).</para>
+
+    <note>
+      <para><filename class="directory">/home/ftp</filename> should not be
+      owned by the user <systemitem class="username">vsftpd</systemitem>,
+      or the user <systemitem class="username">ftp</systemitem>.</para>
+    </note>
+
+    <para><command>echo "#define VSF_BUILD_TCPWRAPPERS" >>builddefs.h</command>:
+    Use this prior to <command>make</command> to add support for
+    <application>tcpwrappers</application>.</para>
+
+    <para><command>echo "#define VSF_BUILD_SSL" >>builddefs.h</command>:
+    Use this prior to <command>make</command> to add support for SSL.</para>
+
+    <para><command>install -v -m ...</command>:
+    The <filename>Makefile</filename> uses non-standard installation paths.
+    These commands install the files in
+    <filename class='directory'>/usr</filename> and
+    <filename class='directory'>/etc</filename>.</para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring vsftpd</title>
+
+    <sect3 id="vsftpd-config">
+      <title>Config Files</title>
+
+      <para><filename>/etc/vsftpd.conf</filename></para>
+
+      <indexterm zone="vsftpd vsftpd-config">
+        <primary sortas="e-etc-vsftpd.conf">/etc/vsftpd.conf</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para><application>vsftpd</application> comes with a basic
+      anonymous-only configuration file that was copied to
+      <filename class='directory'>/etc</filename> above. While still as
+      <systemitem class="username">root</systemitem>, this file should be
+      modified because it is now recommended to run <command>vsftpd</command>
+      in standalone mode. <!-- as opposed to
+      <command>inetd</command>/<command>xinetd</command> mode. -->Also, you
+      should specify the privilege separation user created above. Finally,
+      you should specify the <command>chroot</command> directory.
+      <command>man vsftpd.conf</command> will give you all the details.</para>
+
+<screen role="root"><userinput>cat &gt;&gt; /etc/vsftpd.conf &lt;&lt; "EOF"
+<literal>background=YES
+listen=YES
+nopriv_user=vsftpd
+secure_chroot_dir=&vsftpd-empty;</literal>
+EOF</userinput></screen>
+
+    </sect3>
+
+    <sect3  id="vsftpd-init">
+      <title>Systemd Units</title>
+
+      <para>
+        To start the <command>vsftpd</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>
+
+<screen role="root"><userinput>make install-vsftpd</userinput></screen>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>vsftpd</seg>
+        <seg>None</seg>
+        <seg>//usr/share/vsftpd, /home/ftp</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="vsftpd-prog">
+        <term><command>vsftpd</command></term>
+        <listitem>
+          <para>is the FTP daemon.</para>
+          <indexterm zone="vsftpd vsftpd-prog">
+            <primary sortas="b-vsftpd">vsftpd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: rver/other/openldap-systemd.xml
===================================================================
--- server/other/openldap-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,805 +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        "47c8e2f283647a6105b8b0325257e922">
-  <!ENTITY openldap-size          "5.4 MB">
-  <!ENTITY openldap-buildsize     "53 MB (client), 103 MB (server, additional 5 MB for the tests)">
-  <!ENTITY openldap-time          "0.6 SBU (client), 1.1 SBU (server, additional 3.4 SBU for the tests)">
-]>
-
-<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>
-
-    &lfs77_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;-consolidated-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">OpenLDAP Dependencies</bridgehead>
-
-    <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="db"/> (not recommended by the
-      developers due to license incompatiblities),
-      <xref linkend="icu"/>,
-      <xref linkend="mariadb"/> or
-      <xref linkend="postgresql"/>,
-      <xref linkend="pth"/>,
-      <xref linkend="unixodbc"/> and
-      <ulink url="http://www.openslp.org/">OpenSLP</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/openldap"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of OpenLDAP</title>
-
-    <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;-consolidated-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>
-
-    <warning>
-      <para>
-        If upgrading from a previos installation that used Berkeley DB as
-        the backend, you will need to dump the database(s) using the
-        <command>slapcat</command> utility, relocate all files in
-        <filename class="directory">/var/lib/openldap</filename>, change all
-        instances of <option>bdb</option> to <option>mdb</option> in
-        <filename>/etc/openldap/slapd.conf</filename> and any files in
-        <filename class="directory">/etc/openldap/slapd.d</filename>, and import
-        using the <command>slapadd</command> utility after the installation is
-        completed.
-      </para>
-    </warning>
-
-    <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;-consolidated-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-bdb         \
-            --disable-hdb         \
-            --disable-ndb         \
-            --disable-sql &amp;&amp;
-make depend &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make -k test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-
-install -v -dm700 -o ldap -g ldap /var/lib/openldap     &amp;&amp;
-install -v -dm700 -o ldap -g ldap /etc/openldap/slapd.d &amp;&amp;
-chmod -v 640       /etc/openldap/slapd.{conf,ldif}      &amp;&amp;
-chown -v root:ldap /etc/openldap/slapd.{conf,ldif}      &amp;&amp;
-
-install -v -dm755              /usr/share/doc/openldap-&openldap-version; &amp;&amp;
-cp -vfr doc/{drafts,rfc,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-bdb --disable-hdb</parameter>: These
-      switches disable
-      <application>Berkeley DB</application> backend due to
-      license incompatiblities with latest version of
-      <application>Berkeley DB</application>.
-    </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 baseObject
-# 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 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ server/other/openldap.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -0,0 +1,805 @@
+<?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        "47c8e2f283647a6105b8b0325257e922">
+  <!ENTITY openldap-size          "5.4 MB">
+  <!ENTITY openldap-buildsize     "53 MB (client), 103 MB (server, additional 5 MB for the tests)">
+  <!ENTITY openldap-time          "0.6 SBU (client), 1.1 SBU (server, additional 3.4 SBU for the tests)">
+]>
+
+<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>
+
+    &lfs77_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;-consolidated-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">OpenLDAP Dependencies</bridgehead>
+
+    <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="db"/> (not recommended by the
+      developers due to license incompatiblities),
+      <xref linkend="icu"/>,
+      <xref linkend="mariadb"/> or
+      <xref linkend="postgresql"/>,
+      <xref linkend="pth"/>,
+      <xref linkend="unixodbc"/> and
+      <ulink url="http://www.openslp.org/">OpenSLP</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/openldap"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of OpenLDAP</title>
+
+    <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;-consolidated-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>
+
+    <warning>
+      <para>
+        If upgrading from a previos installation that used Berkeley DB as
+        the backend, you will need to dump the database(s) using the
+        <command>slapcat</command> utility, relocate all files in
+        <filename class="directory">/var/lib/openldap</filename>, change all
+        instances of <option>bdb</option> to <option>mdb</option> in
+        <filename>/etc/openldap/slapd.conf</filename> and any files in
+        <filename class="directory">/etc/openldap/slapd.d</filename>, and import
+        using the <command>slapadd</command> utility after the installation is
+        completed.
+      </para>
+    </warning>
+
+    <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;-consolidated-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-bdb         \
+            --disable-hdb         \
+            --disable-ndb         \
+            --disable-sql &amp;&amp;
+make depend &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make -k test</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install &amp;&amp;
+
+install -v -dm700 -o ldap -g ldap /var/lib/openldap     &amp;&amp;
+install -v -dm700 -o ldap -g ldap /etc/openldap/slapd.d &amp;&amp;
+chmod -v 640       /etc/openldap/slapd.{conf,ldif}      &amp;&amp;
+chown -v root:ldap /etc/openldap/slapd.{conf,ldif}      &amp;&amp;
+
+install -v -dm755              /usr/share/doc/openldap-&openldap-version; &amp;&amp;
+cp -vfr doc/{drafts,rfc,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-bdb --disable-hdb</parameter>: These
+      switches disable
+      <application>Berkeley DB</application> backend due to
+      license incompatiblities with latest version of
+      <application>Berkeley DB</application>.
+    </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 baseObject
+# 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 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ server/other/other.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -23,9 +23,9 @@
   that you can analyze the risks.</para>
 
-  <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="openldap.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-systemd.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="virtuoso.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xinetd-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xinetd.xml"/>
 
 </chapter>
Index: rver/other/unbound-systemd.xml
===================================================================
--- server/other/unbound-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,365 +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        "f85853baad15adc7ce8acefe6cda4cf8">
-  <!ENTITY unbound-size          "4.6 MB">
-  <!ENTITY unbound-buildsize     "90 MB (with HTML documentation)">
-  <!ENTITY unbound-time          "0.5 SBU (Add 0.2 SBU for tests)">
-]>
-
-<sect1 id="unbound" xreflabel="Unbound-&unbound-version;">
-  <?dbhtml filename="unbound.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</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>
-
-    &lfs77_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="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),
-      <xref linkend="doxygen"/> (for html documentation), and
-      <ulink url="http://dnstap.info/">dnstap</ulink>
-    </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 switch enables libevent support
-      allowing use of large outgoing port ranges.
-    </para>
-
-    <para>
-      <option>--with-pyunbound</option>: This switch 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 as the <systemitem
-        class="username">root</systemitem> user:
-      </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>
-
-      <para>
-        When <application>Unbound</application> is installed, some packages
-        may fail to build if <filename>/etc/unbound/root.key</filename> is
-        not present. It can be created by running the following command as
-        the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>unbound-anchor</userinput></screen>
-
-    </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 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ server/other/unbound.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -0,0 +1,365 @@
+<?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        "f85853baad15adc7ce8acefe6cda4cf8">
+  <!ENTITY unbound-size          "4.6 MB">
+  <!ENTITY unbound-buildsize     "90 MB (with HTML documentation)">
+  <!ENTITY unbound-time          "0.5 SBU (Add 0.2 SBU for tests)">
+]>
+
+<sect1 id="unbound" xreflabel="Unbound-&unbound-version;">
+  <?dbhtml filename="unbound.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</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>
+
+    &lfs77_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="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),
+      <xref linkend="doxygen"/> (for html documentation), and
+      <ulink url="http://dnstap.info/">dnstap</ulink>
+    </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 switch enables libevent support
+      allowing use of large outgoing port ranges.
+    </para>
+
+    <para>
+      <option>--with-pyunbound</option>: This switch 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 as the <systemitem
+        class="username">root</systemitem> user:
+      </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>
+
+      <para>
+        When <application>Unbound</application> is installed, some packages
+        may fail to build if <filename>/etc/unbound/root.key</filename> is
+        not present. It can be created by running the following command as
+        the <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>unbound-anchor</userinput></screen>
+
+    </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: rver/other/xinetd-systemd.xml
===================================================================
--- server/other/xinetd-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,499 +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  "&sources-anduin-ftp;/xinetd/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>
-
-    &lfs77_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 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ server/other/xinetd.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -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  "&sources-anduin-ftp;/xinetd/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>
+
+    &lfs77_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: systemd.ent
===================================================================
--- systemd.ent	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ systemd.ent	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -1,8 +1,2 @@
 <!-- $LastChangedBy: krejzi $ $Date: 2014-10-29 21:23:05 +0100 (Wed, 29 Oct 2014) $ -->
 
-<!ENTITY cups-pk-helper-version       "0.2.5">
-<!ENTITY gcab-version                 "0.6">
-<!ENTITY libva-vdpau-driver-version   "0.7.4">
-<!ENTITY sound-theme-freedesktop-version "0.8">
-<!ENTITY % kde5-package-entities SYSTEM      "kde5/kde5.ent">
-%kde5-package-entities;
Index: x/installing/installing.xml
===================================================================
--- x/installing/installing.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ x/installing/installing.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -65,5 +65,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xcb-util-wm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xcb-util-cursor.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mesalib-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mesalib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xbitmaps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7app.xml"/>
@@ -71,5 +71,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7font.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xkeyboard-config.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xorg-server-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xorg-server.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7driver.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="twm.xml"/>
Index: installing/mesalib-systemd.xml
===================================================================
--- x/installing/mesalib-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,429 +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 mesalib-download-http " ">
-  <!ENTITY mesalib-download-ftp  "ftp://ftp.freedesktop.org/pub/mesa/&mesalib-version;/mesa-&mesalib-version;.tar.bz2">
-  <!ENTITY mesalib-md5sum        "1043dfb907beecb2a761272455960427">
-  <!ENTITY mesalib-size          "7.3 MB">
-  <!ENTITY mesalib-buildsize     "317 MB (with tests and documentation)">
-  <!ENTITY mesalib-time          "2.8 SBU (with the test suite and documentation at -j4)">
-]>
-
-<sect1 id="mesalib" xreflabel="Mesa-&mesalib-version;">
-  <?dbhtml filename="mesalib.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Mesa-&mesalib-version;</title>
-
-  <indexterm zone="mesalib">
-    <primary sortas="a-MesaLib">Mesa</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Mesa</title>
-
-    <para>
-      <application>Mesa</application> is an OpenGL compatible 3D graphics
-      library.
-    </para>
-
-    &lfs78_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&mesalib-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&mesalib-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &mesalib-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &mesalib-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &mesalib-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &mesalib-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Recommended patch:
-          <ulink url="&patch-root;/mesa-&mesalib-version;-add_xdemos-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Mesa Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libdrm"/> and
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="elfutils"/> (required for Gallium3D radeonsi driver),
-      <xref linkend="libva"/> (to build VAAPI drivers for supported hardware),
-      <xref linkend="libvdpau"/> (to build VDPAU drivers for supported hardware),
-      <xref linkend="llvm"/> (required for Gallium3D r300 and radeonsi drivers and
-      also for llvmpipe which is intended to be the fastest of the three software
-      rasterizers, see <ulink url="http://www.mesa3d.org/faq.html#part3"></ulink>)
-      and <xref linkend="wayland"/> (required to build the
-      <filename>libwayland-egl</filename> library which is used by many packages
-      that use <application>Wayland</application>)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libgcrypt"/>,
-      <xref linkend="nettle"/>,
-      <ulink url="ftp://ftp.freedesktop.org/pub/mesa/demos/">mesa-demos</ulink>
-      (provides more than 300 extra demos to test <application>MesaLib</application>
-      this includes the some of the same programs added by the patch above),
-      <ulink url="http://libclc.llvm.org/">libclc</ulink>
-      (to build Radeon OpenCL library), and
-      <ulink url="http://omxil.sourceforge.net/">libomxil-bellagio</ulink>
-      (to build Radeon OpenMAX driver)
-    </para>
-
-    <note>
-      <para>
-        The instructions below assume that <application>elfutils</application>
-        and <application>LLVM</application> are installed. You will
-        need to modify the instructions if you choose not to install them.
-        Please note that <application>elfutils</application> and
-        <application>LLVM</application> are <emphasis>required</emphasis>
-        for Gallium3D r300 and radeonsi drivers. For an explanation of
-        Gallium3D please see
-        <ulink url="https://en.wikipedia.org/wiki/Gallium3D"></ulink>.
-      </para>
-    </note>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/mesa"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Mesa</title>
-
-    <para>
-      If you have downloaded the xdemos patch (needed if testing the Xorg
-      installation per BLFS instructions), apply it by running the following
-      command:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../mesa-&mesalib-version;-add_xdemos-1.patch</userinput></screen>
-
-    <para>
-      Install <application>Mesa</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure CFLAGS="-O2" CXXFLAGS="-O2"  \
-            --prefix=/usr                \
-            --sysconfdir=/etc            \
-            --enable-texture-float       \
-            --enable-gles1               \
-            --enable-gles2               \
-            --enable-xa                  \
-            --enable-glx-tls             \
-            --enable-osmesa              \
-            --with-egl-platforms="drm,x11,wayland" \
-            --with-gallium-drivers="nouveau,r300,r600,radeonsi,svga,swrast" &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have applied the xdemos patch, build the demo programs by
-      running the following command:
-    </para>
-
-<screen><userinput>make -C xdemos DEMOS_PREFIX=/usr</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>
-
-    <para>
-      If you have built the demo programs, install them by running the
-      following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make -C xdemos DEMOS_PREFIX=/usr install</userinput></screen>
-
-    <para>
-      If desired, install the optional documentation by running
-      the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -dm755 /usr/share/doc/mesa-&mesalib-version; &amp;&amp;
-cp -rfv docs/* /usr/share/doc/mesa-&mesalib-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>CFLAGS="-O2" CXXFLAGS="-O2"</parameter>: By default,
-      <application>Autoconf</application> sets CFLAGS and CXXFLAGS to
-      "-g -O2". That results in binaries and libraries being built with
-      debugging symbols which make them bigger. Override the default
-      flags to omit -g compiler flag so the final libraries are smaller.
-    </para>
-
-    <para>
-      <parameter>--enable-texture-float</parameter>: This switch enables
-      floating-point textures and render buffers. Please consult
-      <filename>docs/patents.txt</filename> to see if there are
-      any legal issues if you use this feature.
-    </para>
-
-    <para>
-      <parameter>--enable-gles1</parameter>: This switch enables support for
-      OpenGL ES 1.x API.
-    </para>
-
-    <para>
-      <parameter>--enable-gles2</parameter>: This switch enables support for
-      OpenGL ES 2.x API.
-    </para>
-
-    <para>
-      <parameter>--enable-xa</parameter>: This switch enables building of the
-      XA X Acceleration API (Required for VMware 3D Driver).
-    </para>
-
-    <para>
-      <parameter>--enable-glx-tls</parameter>: This switch enables TLS (Thread
-      Local Storage) support in GLX.
-    </para>
-
-    <para>
-      <parameter>--enable-osmesa</parameter>: This switch enables building of
-      the libOSMesa library.
-    </para>
-
-    <para>
-      <parameter>--with-egl-platforms="..."</parameter>: This parameter
-      controls for which platforms EGL should be built. Available
-      platforms are drm, x11 and wayland. Remove <option>wayland</option>
-      from the list if you did not install
-      <application>Wayland</application>.
-    </para>
-
-    <para>
-      <parameter>--with-gallium-drivers="..."</parameter>: This parameter
-      controls which Gallium3D drivers should be built. Available drivers
-      are: i915, ilo, nouveau, r300, r600, radeonsi, svga and swrast. You
-      will need to remove r300 and radeonsi from the list if you did
-      not install <application>elfutils</application> and
-      <application>LLVM</application>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          glxgears and glxinfo
-        </seg>
-        <seg>
-          libEGL.so,
-          libgbm.so,
-          libglapi.so,
-          libGLESv1_CM.so,
-          libGLESv2.so,
-          libGL.so,
-          libOSMesa.so,
-          libwayland-egl.so,
-          libxatracker.so,
-          libXvMCnouveau.so, and
-          libXvMCr600.so
-        </seg>
-        <seg>
-          /usr/include/{EGL,GL,GLES},
-          /usr/include/{GLES2,GLES3,KHR},
-          /usr/lib/dri,
-          /usr/lib/vdpau, and
-          /usr/share/doc/mesa-&mesalib-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="glxgears">
-        <term><command>glxgears</command></term>
-        <listitem>
-          <para>
-            is a GL demo useful for troubleshooting graphics
-            problems.
-          </para>
-          <indexterm zone="mesalib glxgears">
-            <primary sortas="b-glxgears">glxgears</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="glxinfo">
-        <term><command>glxinfo</command></term>
-        <listitem>
-          <para>
-            is a diagnostic program that displays information about the
-            graphics hardware and installed GL libraries.
-          </para>
-          <indexterm zone="mesalib glxinfo">
-            <primary sortas="b-glxinfo">glxinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libEGL">
-        <term><filename class="libraryfile">libEGL.so</filename></term>
-        <listitem>
-          <para>
-            provides a native platform graphics interface as
-            defined by the EGL-1.4 specification.
-          </para>
-          <indexterm zone="mesalib libEGL">
-            <primary sortas="c-libGL">libEGL.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgbm">
-        <term><filename class="libraryfile">libgbm.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>Mesa</application> Graphics Buffer
-            Manager library.
-          </para>
-          <indexterm zone="mesalib libgbm">
-            <primary sortas="c-libgbm">libgbm.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libGLESv1_CM">
-        <term><filename class="libraryfile">libGLESv1_CM.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>Mesa</application> OpenGL ES 1.1 library.
-          </para>
-          <indexterm zone="mesalib libGLESv1_CM">
-            <primary sortas="c-libGLESv1_CM">libGLESv1_CM.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libGLES2">
-        <term><filename class="libraryfile">libGLES2.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>Mesa</application> OpenGL ES 2.0 library.
-          </para>
-          <indexterm zone="mesalib libGLES2">
-            <primary sortas="c-libGLES2">libGLES2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libGL">
-        <term><filename class="libraryfile">libGL.so</filename></term>
-        <listitem>
-          <para>
-            is the main <application>Mesa</application> OpenGL library.
-          </para>
-          <indexterm zone="mesalib libGL">
-            <primary sortas="c-libGL">libGL.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libOSMesa">
-        <term><filename class="libraryfile">libOSMesa.so</filename></term>
-        <listitem>
-          <para>
-            is the Mesa off screen rendering library.
-          </para>
-          <indexterm zone="mesalib libOSMesa">
-            <primary sortas="c-libOSMesa">libOSMesa.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwayland-egl">
-        <term><filename class="libraryfile">libwayland-egl.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>Wayland</application> specific EGL library.
-          </para>
-          <indexterm zone="mesalib libwayland-egl">
-            <primary sortas="c-libwayland-egl">libwayland-egl.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libxatracker">
-        <term><filename class="libraryfile">libxatracker.so</filename></term>
-        <listitem>
-          <para>
-            is the Xorg Gallium3D acceleration library.
-          </para>
-          <indexterm zone="mesalib libxatracker">
-            <primary sortas="c-libxatracker">libxatracker.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/installing/mesalib.xml
===================================================================
--- x/installing/mesalib.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ x/installing/mesalib.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -0,0 +1,429 @@
+<?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 mesalib-download-http " ">
+  <!ENTITY mesalib-download-ftp  "ftp://ftp.freedesktop.org/pub/mesa/&mesalib-version;/mesa-&mesalib-version;.tar.bz2">
+  <!ENTITY mesalib-md5sum        "1043dfb907beecb2a761272455960427">
+  <!ENTITY mesalib-size          "7.3 MB">
+  <!ENTITY mesalib-buildsize     "317 MB (with tests and documentation)">
+  <!ENTITY mesalib-time          "2.8 SBU (with the test suite and documentation at -j4)">
+]>
+
+<sect1 id="mesalib" xreflabel="Mesa-&mesalib-version;">
+  <?dbhtml filename="mesalib.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Mesa-&mesalib-version;</title>
+
+  <indexterm zone="mesalib">
+    <primary sortas="a-MesaLib">Mesa</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Mesa</title>
+
+    <para>
+      <application>Mesa</application> is an OpenGL compatible 3D graphics
+      library.
+    </para>
+
+    &lfs78_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&mesalib-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&mesalib-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &mesalib-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &mesalib-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &mesalib-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &mesalib-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Recommended patch:
+          <ulink url="&patch-root;/mesa-&mesalib-version;-add_xdemos-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Mesa Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="libdrm"/> and
+      <xref linkend="xorg7-lib"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="elfutils"/> (required for Gallium3D radeonsi driver),
+      <xref linkend="libva"/> (to build VAAPI drivers for supported hardware),
+      <xref linkend="libvdpau"/> (to build VDPAU drivers for supported hardware),
+      <xref linkend="llvm"/> (required for Gallium3D r300 and radeonsi drivers and
+      also for llvmpipe which is intended to be the fastest of the three software
+      rasterizers, see <ulink url="http://www.mesa3d.org/faq.html#part3"></ulink>)
+      and <xref linkend="wayland"/> (required to build the
+      <filename>libwayland-egl</filename> library which is used by many packages
+      that use <application>Wayland</application>)
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="libgcrypt"/>,
+      <xref linkend="nettle"/>,
+      <ulink url="ftp://ftp.freedesktop.org/pub/mesa/demos/">mesa-demos</ulink>
+      (provides more than 300 extra demos to test <application>MesaLib</application>
+      this includes the some of the same programs added by the patch above),
+      <ulink url="http://libclc.llvm.org/">libclc</ulink>
+      (to build Radeon OpenCL library), and
+      <ulink url="http://omxil.sourceforge.net/">libomxil-bellagio</ulink>
+      (to build Radeon OpenMAX driver)
+    </para>
+
+    <note>
+      <para>
+        The instructions below assume that <application>elfutils</application>
+        and <application>LLVM</application> are installed. You will
+        need to modify the instructions if you choose not to install them.
+        Please note that <application>elfutils</application> and
+        <application>LLVM</application> are <emphasis>required</emphasis>
+        for Gallium3D r300 and radeonsi drivers. For an explanation of
+        Gallium3D please see
+        <ulink url="https://en.wikipedia.org/wiki/Gallium3D"></ulink>.
+      </para>
+    </note>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/mesa"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Mesa</title>
+
+    <para>
+      If you have downloaded the xdemos patch (needed if testing the Xorg
+      installation per BLFS instructions), apply it by running the following
+      command:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../mesa-&mesalib-version;-add_xdemos-1.patch</userinput></screen>
+
+    <para>
+      Install <application>Mesa</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure CFLAGS="-O2" CXXFLAGS="-O2"  \
+            --prefix=/usr                \
+            --sysconfdir=/etc            \
+            --enable-texture-float       \
+            --enable-gles1               \
+            --enable-gles2               \
+            --enable-xa                  \
+            --enable-glx-tls             \
+            --enable-osmesa              \
+            --with-egl-platforms="drm,x11,wayland" \
+            --with-gallium-drivers="nouveau,r300,r600,radeonsi,svga,swrast" &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      If you have applied the xdemos patch, build the demo programs by
+      running the following command:
+    </para>
+
+<screen><userinput>make -C xdemos DEMOS_PREFIX=/usr</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>
+
+    <para>
+      If you have built the demo programs, install them by running the
+      following command as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make -C xdemos DEMOS_PREFIX=/usr install</userinput></screen>
+
+    <para>
+      If desired, install the optional documentation by running
+      the following commands as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>install -v -dm755 /usr/share/doc/mesa-&mesalib-version; &amp;&amp;
+cp -rfv docs/* /usr/share/doc/mesa-&mesalib-version;</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>CFLAGS="-O2" CXXFLAGS="-O2"</parameter>: By default,
+      <application>Autoconf</application> sets CFLAGS and CXXFLAGS to
+      "-g -O2". That results in binaries and libraries being built with
+      debugging symbols which make them bigger. Override the default
+      flags to omit -g compiler flag so the final libraries are smaller.
+    </para>
+
+    <para>
+      <parameter>--enable-texture-float</parameter>: This switch enables
+      floating-point textures and render buffers. Please consult
+      <filename>docs/patents.txt</filename> to see if there are
+      any legal issues if you use this feature.
+    </para>
+
+    <para>
+      <parameter>--enable-gles1</parameter>: This switch enables support for
+      OpenGL ES 1.x API.
+    </para>
+
+    <para>
+      <parameter>--enable-gles2</parameter>: This switch enables support for
+      OpenGL ES 2.x API.
+    </para>
+
+    <para>
+      <parameter>--enable-xa</parameter>: This switch enables building of the
+      XA X Acceleration API (Required for VMware 3D Driver).
+    </para>
+
+    <para>
+      <parameter>--enable-glx-tls</parameter>: This switch enables TLS (Thread
+      Local Storage) support in GLX.
+    </para>
+
+    <para>
+      <parameter>--enable-osmesa</parameter>: This switch enables building of
+      the libOSMesa library.
+    </para>
+
+    <para>
+      <parameter>--with-egl-platforms="..."</parameter>: This parameter
+      controls for which platforms EGL should be built. Available
+      platforms are drm, x11 and wayland. Remove <option>wayland</option>
+      from the list if you did not install
+      <application>Wayland</application>.
+    </para>
+
+    <para>
+      <parameter>--with-gallium-drivers="..."</parameter>: This parameter
+      controls which Gallium3D drivers should be built. Available drivers
+      are: i915, ilo, nouveau, r300, r600, radeonsi, svga and swrast. You
+      will need to remove r300 and radeonsi from the list if you did
+      not install <application>elfutils</application> and
+      <application>LLVM</application>.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          glxgears and glxinfo
+        </seg>
+        <seg>
+          libEGL.so,
+          libgbm.so,
+          libglapi.so,
+          libGLESv1_CM.so,
+          libGLESv2.so,
+          libGL.so,
+          libOSMesa.so,
+          libwayland-egl.so,
+          libxatracker.so,
+          libXvMCnouveau.so, and
+          libXvMCr600.so
+        </seg>
+        <seg>
+          /usr/include/{EGL,GL,GLES},
+          /usr/include/{GLES2,GLES3,KHR},
+          /usr/lib/dri,
+          /usr/lib/vdpau, and
+          /usr/share/doc/mesa-&mesalib-version;
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="glxgears">
+        <term><command>glxgears</command></term>
+        <listitem>
+          <para>
+            is a GL demo useful for troubleshooting graphics
+            problems.
+          </para>
+          <indexterm zone="mesalib glxgears">
+            <primary sortas="b-glxgears">glxgears</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="glxinfo">
+        <term><command>glxinfo</command></term>
+        <listitem>
+          <para>
+            is a diagnostic program that displays information about the
+            graphics hardware and installed GL libraries.
+          </para>
+          <indexterm zone="mesalib glxinfo">
+            <primary sortas="b-glxinfo">glxinfo</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libEGL">
+        <term><filename class="libraryfile">libEGL.so</filename></term>
+        <listitem>
+          <para>
+            provides a native platform graphics interface as
+            defined by the EGL-1.4 specification.
+          </para>
+          <indexterm zone="mesalib libEGL">
+            <primary sortas="c-libGL">libEGL.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgbm">
+        <term><filename class="libraryfile">libgbm.so</filename></term>
+        <listitem>
+          <para>
+            is the <application>Mesa</application> Graphics Buffer
+            Manager library.
+          </para>
+          <indexterm zone="mesalib libgbm">
+            <primary sortas="c-libgbm">libgbm.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libGLESv1_CM">
+        <term><filename class="libraryfile">libGLESv1_CM.so</filename></term>
+        <listitem>
+          <para>
+            is the <application>Mesa</application> OpenGL ES 1.1 library.
+          </para>
+          <indexterm zone="mesalib libGLESv1_CM">
+            <primary sortas="c-libGLESv1_CM">libGLESv1_CM.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libGLES2">
+        <term><filename class="libraryfile">libGLES2.so</filename></term>
+        <listitem>
+          <para>
+            is the <application>Mesa</application> OpenGL ES 2.0 library.
+          </para>
+          <indexterm zone="mesalib libGLES2">
+            <primary sortas="c-libGLES2">libGLES2.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libGL">
+        <term><filename class="libraryfile">libGL.so</filename></term>
+        <listitem>
+          <para>
+            is the main <application>Mesa</application> OpenGL library.
+          </para>
+          <indexterm zone="mesalib libGL">
+            <primary sortas="c-libGL">libGL.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libOSMesa">
+        <term><filename class="libraryfile">libOSMesa.so</filename></term>
+        <listitem>
+          <para>
+            is the Mesa off screen rendering library.
+          </para>
+          <indexterm zone="mesalib libOSMesa">
+            <primary sortas="c-libOSMesa">libOSMesa.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libwayland-egl">
+        <term><filename class="libraryfile">libwayland-egl.so</filename></term>
+        <listitem>
+          <para>
+            is the <application>Wayland</application> specific EGL library.
+          </para>
+          <indexterm zone="mesalib libwayland-egl">
+            <primary sortas="c-libwayland-egl">libwayland-egl.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libxatracker">
+        <term><filename class="libraryfile">libxatracker.so</filename></term>
+        <listitem>
+          <para>
+            is the Xorg Gallium3D acceleration library.
+          </para>
+          <indexterm zone="mesalib libxatracker">
+            <primary sortas="c-libxatracker">libxatracker.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: installing/x7driver-vmmouse-systemd.xml
===================================================================
--- x/installing/x7driver-vmmouse-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,197 +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 xorg-vmmouse-driver-version "13.0.0">
-
-  <!ENTITY xorg-vmmouse-driver-download-http "&xorg-download-http;/driver/xf86-input-vmmouse-&xorg-vmmouse-driver-version;.tar.bz2">
-  <!ENTITY xorg-vmmouse-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-input-vmmouse-&xorg-vmmouse-driver-version;.tar.bz2">
-  <!ENTITY xorg-vmmouse-driver-md5sum        "34f9f64ee6a1a51fc8266a9af24e1e07">
-  <!ENTITY xorg-vmmouse-driver-size          "308 KB">
-  <!ENTITY xorg-vmmouse-driver-buildsize     "2.9 MB">
-  <!ENTITY xorg-vmmouse-driver-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin Xorg VMMouse Driver -->
-  <sect2 id="xorg-vmmouse-driver" xreflabel="Xorg VMMouse Driver-&xorg-vmmouse-driver-version;">
-
-    <title>Xorg VMMouse Driver-&xorg-vmmouse-driver-version;</title>
-
-    <indexterm zone="xorg-vmmouse-driver">
-      <primary sortas="a-xorg-vmmouse-driver">xorg-vmmouse-driver</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Xorg VMMouse Driver</title>
-
-      <para>
-        The <application>Xorg VMMouse Driver</application> package contains the
-        VMMouse input driver for the Xorg X server. The VMMouse driver enables
-        support for the special VMMouse protocol that is provided by VMware
-        virtual machines to give absolute pointer positioning. It can be used
-        with <application>Qemu</application>, too.
-      </para>
-
-      &lfs77_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&xorg-vmmouse-driver-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&xorg-vmmouse-driver-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &xorg-vmmouse-driver-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &xorg-vmmouse-driver-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &xorg-vmmouse-driver-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &xorg-vmmouse-driver-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Additional Downloads</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Required patch:
-            <ulink url="&patch-root;/xf86-input-vmmouse-&xorg-vmmouse-driver-version;-build_fix-1.patch"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Xorg VMMouse Driver Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="xorg-server"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/xorg-vmmouse-driver"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Xorg VMMouse Driver</title>
-
-      <para>
-        Install <application>Xorg VMMouse Driver</application> by running the
-        following commands:
-      </para>
-
-<screen><userinput>patch -Np1 -i ../xf86-input-vmmouse-&xorg-vmmouse-driver-version;-build_fix-1.patch &amp;&amp;
-sed -i -e '/__i386__/a iopl(3);' tools/vmmouse_detect.c      &amp;&amp;
-
-./configure $XORG_CONFIG               \
-            --without-hal-callouts-dir \
-            --without-hal-fdi-dir      \
-            --with-udev-rules-dir=/lib/udev/rules.d &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>
-    </sect3>
-
-    <sect3>
-      <title>Command Explanations</title>
-
-      <para>
-        <parameter>--without-hal-*-dir</parameter>: These switches
-        disable installation of the <application>HAL</application>
-        components which are not needed on Linux.
-      </para>
-
-      <para>
-        <command>sed -i -e '/__i386__/a iopl(3);' ...</command>: This command
-        allows <command>vmmouse_detect</command> to detect the VMMouse protocol
-        in a <application>Qemu</application> virtual machine.
-      </para>
-
-      <para>
-        <parameter>--with-udev-rules-dir=/lib/udev/rules.d</parameter>:
-        This switch specifies where Udev rules should be installed.
-      </para>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Program</segtitle>
-        <segtitle>Installed Xorg Drivers</segtitle>
-
-        <seglistitem>
-          <seg>
-            vmmouse_detect
-          </seg>
-          <seg>
-            vmmouse_drv.so
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="vmmouse_detect">
-          <term><command>vmmouse_detect</command></term>
-          <listitem>
-            <para>
-              is a tool for detecting if running in a VMware environment where
-              vmmouse is used.
-            </para>
-            <indexterm zone="xorg-vmmouse-driver vmmouse_detect">
-              <primary sortas="b-vmmouse_detect">vmmouse_detect</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="vmmouse_drv">
-          <term><filename class="libraryfile">vmmouse_drv.so</filename></term>
-          <listitem>
-            <para>
-              is an Xorg input driver for VMware Mouse.
-            </para>
-            <indexterm zone="xorg-vmmouse-driver vmmouse_drv">
-              <primary sortas="c-vmmouse_drv">vmmouse_drv.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
-  <!-- End Xorg VMMouse Driver -->
Index: x/installing/x7driver-vmmouse.xml
===================================================================
--- x/installing/x7driver-vmmouse.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ x/installing/x7driver-vmmouse.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -28,11 +28,12 @@
 
       <para>
-        The <application>Xorg VMMouse Driver</application> package contains the VMMouse input
-        driver for the Xorg X server. The VMMouse driver enables support for the special
-        VMMouse protocol that is provided by VMware virtual machines to give absolute
-        pointer positioning.
+        The <application>Xorg VMMouse Driver</application> package contains the
+        VMMouse input driver for the Xorg X server. The VMMouse driver enables
+        support for the special VMMouse protocol that is provided by VMware
+        virtual machines to give absolute pointer positioning. It can be used
+        with <application>Qemu</application>, too.
       </para>
 
-      &lfs76_checked;
+      &lfs77_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -70,5 +71,5 @@
       </itemizedlist>
 
-      <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+      <bridgehead renderas="sect4">Additional Downloads</bridgehead>
       <itemizedlist spacing="compact">
         <listitem>
@@ -96,9 +97,11 @@
 
       <para>
-        Install <application>Xorg VMMouse Driver</application> by running the following
-        commands:
+        Install <application>Xorg VMMouse Driver</application> by running the
+        following commands:
       </para>
 
-<screen><userinput>/xf86-input-vmmouse-&xorg-vmmouse-driver-version;-build_fix-1.patch &amp;&amp;
+<screen><userinput>patch -Np1 -i ../xf86-input-vmmouse-&xorg-vmmouse-driver-version;-build_fix-1.patch &amp;&amp;
+sed -i -e '/__i386__/a iopl(3);' tools/vmmouse_detect.c      &amp;&amp;
+
 ./configure $XORG_CONFIG               \
             --without-hal-callouts-dir \
@@ -125,4 +128,10 @@
         disable installation of the <application>HAL</application>
         components which are not needed on Linux.
+      </para>
+
+      <para>
+        <command>sed -i -e '/__i386__/a iopl(3);' ...</command>: This command
+        allows <command>vmmouse_detect</command> to detect the VMMouse protocol
+        in a <application>Qemu</application> virtual machine.
       </para>
 
Index: installing/x7driver-vmware-systemd.xml
===================================================================
--- x/installing/x7driver-vmware-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,160 +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 xorg-vmware-driver-version "13.1.0">
-
-  <!ENTITY xorg-vmware-driver-download-http "&xorg-download-http;/driver/xf86-video-vmware-&xorg-vmware-driver-version;.tar.bz2">
-  <!ENTITY xorg-vmware-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-video-vmware-&xorg-vmware-driver-version;.tar.bz2">
-  <!ENTITY xorg-vmware-driver-md5sum        "0cba22fed4cb639d5c4276f7892c543d">
-  <!ENTITY xorg-vmware-driver-size          "452 KB">
-  <!ENTITY xorg-vmware-driver-buildsize     "7.9 MB">
-  <!ENTITY xorg-vmware-driver-time          "0.1 SBU">
-]>
-
-  <!-- Begin Xorg VMware Driver -->
-  <sect2 id="xorg-vmware-driver" xreflabel="Xorg VMware Driver-&xorg-vmware-driver-version;">
-
-    <title>Xorg VMware Driver-&xorg-vmware-driver-version;</title>
-
-    <indexterm zone="xorg-vmware-driver">
-      <primary sortas="a-xorg-vmware-driver">xorg-vmware-driver</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Xorg VMware Driver</title>
-
-      <para>
-        The <application>Xorg VMware Driver</application> package contains the X.Org
-        Video Driver for VMware SVGA virtual video cards.
-      </para>
-
-      &lfs77_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&xorg-vmware-driver-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&xorg-vmware-driver-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &xorg-vmware-driver-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &xorg-vmware-driver-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &xorg-vmware-driver-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &xorg-vmware-driver-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Xorg VMware Driver Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="xorg-server"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/xorg-vmware-driver"/>
-      </para>
-    </sect3>
-
-    <sect3 role="kernel" id="xorg-vmware-driver-kernel">
-      <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration and recompile the
-      kernel if necessary:
-    </para>
-
-<screen><literal>Device Drivers  ---&gt;
-  Graphics support  ---&gt;
-    Direct Rendering Manager  ---&gt;
-      &lt;*&gt; Direct Rendering Manager (XFree86 ... support) ---&gt;  [CONFIG_DRM]
-      &lt;*&gt; DRM driver for VMware Virtual GPU                    [CONFIG_DRM_VMWGFX]
-      [*]   Enable framebuffer console under vmwgfx by default [CONFIG_DRM_VMWGFX_FBCON]</literal></screen>
-
-      <indexterm zone="xorg-vmware-driver xorg-vmware-driver-kernel">
-        <primary sortas="d-xorg-vmware-driver">xorg-vmware-driver</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Xorg VMware Driver</title>
-
-      <para>
-        Install <application>Xorg VMware Driver</application> by running the following
-        commands:
-      </para>
-
-<screen><userinput>./configure $XORG_CONFIG &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>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Xorg Driver</segtitle>
-
-        <seglistitem>
-          <seg>
-            vmware_drv.so
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="vmware_drv">
-          <term><filename class="libraryfile">vmware_drv.so</filename></term>
-          <listitem>
-            <para>
-              is an Xorg video driver for VMware SVGA virtual video card.
-            </para>
-            <indexterm zone="xorg-vmware-driver vmware_drv">
-              <primary sortas="c-vmware_drv">vmware_drv.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
-  <!-- End Xorg VMware Driver -->
Index: x/installing/x7driver-vmware.xml
===================================================================
--- x/installing/x7driver-vmware.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ x/installing/x7driver-vmware.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -5,11 +5,11 @@
   %general-entities;
 
-  <!ENTITY xorg-vmware-driver-version "13.0.2">
+  <!ENTITY xorg-vmware-driver-version "13.1.0">
 
   <!ENTITY xorg-vmware-driver-download-http "&xorg-download-http;/driver/xf86-video-vmware-&xorg-vmware-driver-version;.tar.bz2">
   <!ENTITY xorg-vmware-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-video-vmware-&xorg-vmware-driver-version;.tar.bz2">
-  <!ENTITY xorg-vmware-driver-md5sum        "91d1d7d33181766714405ab013d31244">
-  <!ENTITY xorg-vmware-driver-size          "432 KB">
-  <!ENTITY xorg-vmware-driver-buildsize     "9.1 MB">
+  <!ENTITY xorg-vmware-driver-md5sum        "0cba22fed4cb639d5c4276f7892c543d">
+  <!ENTITY xorg-vmware-driver-size          "452 KB">
+  <!ENTITY xorg-vmware-driver-buildsize     "7.9 MB">
   <!ENTITY xorg-vmware-driver-time          "0.1 SBU">
 ]>
@@ -32,5 +32,5 @@
       </para>
 
-      &lfs76_checked;
+      &lfs77_checked;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -68,14 +68,4 @@
       </itemizedlist>
 
-      <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Required patch:
-            <ulink url="&patch-root;/xf86-video-vmware-&xorg-vmware-driver-version;-upstream_fixes-1.patch"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
       <bridgehead renderas="sect4">Xorg VMware Driver Dependencies</bridgehead>
 
@@ -99,7 +89,9 @@
 
 <screen><literal>Device Drivers  ---&gt;
-  Graphics support ---&gt;
-    DRM driver for VMware Virtual GPU: Y or M
-      Enable framebuffer console under vmwgfx by default: Y</literal></screen>
+  Graphics support  ---&gt;
+    Direct Rendering Manager  ---&gt;
+      &lt;*&gt; Direct Rendering Manager (XFree86 ... support) ---&gt;  [CONFIG_DRM]
+      &lt;*&gt; DRM driver for VMware Virtual GPU                    [CONFIG_DRM_VMWGFX]
+      [*]   Enable framebuffer console under vmwgfx by default [CONFIG_DRM_VMWGFX_FBCON]</literal></screen>
 
       <indexterm zone="xorg-vmware-driver xorg-vmware-driver-kernel">
@@ -116,7 +108,5 @@
       </para>
 
-<screen><userinput>patch -Np1 -i ../xf86-video-vmware-&xorg-vmware-driver-version;-upstream_fixes-1.patch &amp;&amp;
-sed -i "/xf86xv.h/i #include &lt;xorg-server.h&gt;" vmwgfx/vmwgfx_overlay.c &amp;&amp;
-./configure $XORG_CONFIG &amp;&amp;
+<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
 make</userinput></screen>
 
@@ -130,14 +120,4 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
-
-    </sect3>
-
-    <sect3>
-      <title>Command Explanations</title>
-
-      <para>
-        <command>sed -i ...</command>: This sed fixes building with latest
-        version of <application>Glibc</application>.
-      </para>
 
     </sect3>
Index: installing/x7driver-wacom-systemd.xml
===================================================================
--- x/installing/x7driver-wacom-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,204 +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 xorg-wacom-driver-version "0.31.0">
-
-  <!ENTITY xorg-wacom-driver-download-http "&sourceforge-repo;/linuxwacom/xf86-input-wacom-&xorg-wacom-driver-version;.tar.bz2">
-  <!ENTITY xorg-wacom-driver-download-ftp  " ">
-  <!ENTITY xorg-wacom-driver-md5sum        "e6a2e87b73e2744f839c410d41e6cf8d">
-  <!ENTITY xorg-wacom-driver-size          "580 KB">
-  <!ENTITY xorg-wacom-driver-buildsize     "10.6 MB (with the test suite)">
-  <!ENTITY xorg-wacom-driver-time          "0.1 SBU (with the test suite)">
-]>
-
-  <!-- Begin Xorg Wacom Driver -->
-  <sect2 id="xorg-wacom-driver" xreflabel="Xorg Wacom Driver-&xorg-wacom-driver-version;">
-
-    <title>Xorg Wacom Driver-&xorg-wacom-driver-version;</title>
-
-    <indexterm zone="xorg-wacom-driver">
-      <primary sortas="a-xorg-wacom-driver">xorg-wacom-driver</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Xorg Wacom Driver</title>
-
-      <para>
-        The <application>Xorg Wacom Driver</application> package contains the
-        X.Org X11 driver and SDK for Wacom and Wacom-like tablets. It is not
-        required to use a Wacom tablet, the
-        <application>xf86-input-evdev</application> driver can handle these
-        devices without problems.
-      </para>
-
-      &lfs77_built;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&xorg-wacom-driver-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&xorg-wacom-driver-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &xorg-wacom-driver-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &xorg-wacom-driver-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &xorg-wacom-driver-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &xorg-wacom-driver-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Xorg Wacom Drivers Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="xorg-server"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <xref linkend="doxygen"/> and
-        <xref linkend="graphviz"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/xorg-wacom-driver"/>
-      </para>
-    </sect3>
-
-    <sect3 role="kernel" id="xorg-wacom-driver-kernel">
-      <title>Kernel Configuration</title>
-
-      <para>
-        To use a Wacom tablet with USB interface, enable the following
-        options in your kernel configuration and recompile. Note that
-        other configuration options could be required for tablet with a
-        serial or bluetooth interface:
-      </para>
-
-<screen><literal>Device Drivers  ---&gt;
-  HID support  ---&gt;
-    &lt;*/M&gt; HID bus support                                      [CONFIG_HID]
-            Special HID drivers ---&gt;
-              &lt;*/M&gt; Wacom Intuos/Graphire tablet support (USB) [CONFIG_HID_WACOM]</literal></screen>
-
-      <indexterm zone="xorg-wacom-driver xorg-wacom-driver-kernel">
-        <primary sortas="d-xorg-wacom-driver">xorg-wacom-driver</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Xorg Wacom Driver</title>
-
-      <para>
-        Install <application>Xorg Wacom Driver</application> by running the following
-        commands:
-      </para>
-
-<screen><userinput>./configure $XORG_CONFIG                                \
-            --with-udev-rules-dir=/lib/udev/rules.d     \
-            --with-systemd-unit-dir=/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>
-
-    </sect3>
-
-    <sect3>
-      <title>Command Explanations</title>
-
-      <para>
-        <parameter>--with-udev-rules-dir=/lib/udev/rules.d</parameter>:
-        This switch specifies where Udev rules should be installed.
-      </para>
-
-      <para>
-        <parameter>--with-systemd-unit-dir=/lib/systemd/system</parameter>:
-        This switch specifies where systemd units should be installed.
-      </para>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Xorg Driver</segtitle>
-
-        <seglistitem>
-          <seg>
-            isdv4-serial-debugger, isdv4-serial-inputattach, and xsetwacom
-          </seg>
-          <seg>
-            wacom_drv.so
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="xsetwacom">
-          <term><command>xsetwacom</command></term>
-          <listitem>
-            <para>
-              is a commandline utility used to query
-              and modify wacom driver settings.
-            </para>
-            <indexterm zone="xorg-wacom-driver xsetwacom">
-              <primary sortas="b-xsetwacom">xsetwacom</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="wacom_drv">
-          <term><filename class="libraryfile">wacom_drv.so</filename></term>
-          <listitem>
-            <para>
-              is an Xorg input driver for Wacom devices.
-            </para>
-            <indexterm zone="xorg-wacom-driver wacom_drv">
-              <primary sortas="c-wacom_drv">wacom_drv.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
-  <!-- End Xorg Wacom Driver -->
Index: x/installing/x7driver-wacom.xml
===================================================================
--- x/installing/x7driver-wacom.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ x/installing/x7driver-wacom.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -5,12 +5,12 @@
   %general-entities;
 
-  <!ENTITY xorg-wacom-driver-version "0.27.0">
+  <!ENTITY xorg-wacom-driver-version "0.31.0">
 
   <!ENTITY xorg-wacom-driver-download-http "&sourceforge-repo;/linuxwacom/xf86-input-wacom-&xorg-wacom-driver-version;.tar.bz2">
   <!ENTITY xorg-wacom-driver-download-ftp  " ">
-  <!ENTITY xorg-wacom-driver-md5sum        "f75b374c47969fb9b21d9c2134396400">
-  <!ENTITY xorg-wacom-driver-size          "570 KB">
-  <!ENTITY xorg-wacom-driver-buildsize     "6.5 MB (additional 2.3 MB for the tests)">
-  <!ENTITY xorg-wacom-driver-time          "0.1 SBU">
+  <!ENTITY xorg-wacom-driver-md5sum        "e6a2e87b73e2744f839c410d41e6cf8d">
+  <!ENTITY xorg-wacom-driver-size          "580 KB">
+  <!ENTITY xorg-wacom-driver-buildsize     "10.6 MB (with the test suite)">
+  <!ENTITY xorg-wacom-driver-time          "0.1 SBU (with the test suite)">
 ]>
 
@@ -35,5 +35,5 @@
       </para>
 
-      &lfs76_built;
+      &lfs77_built;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
@@ -93,12 +93,15 @@
 
       <para>
-        To use a Wacom tablet, enable the following options in your kernel
-        configuration and recompile:
+        To use a Wacom tablet with USB interface, enable the following
+        options in your kernel configuration and recompile. Note that
+        other configuration options could be required for tablet with a
+        serial or bluetooth interface:
       </para>
 
 <screen><literal>Device Drivers  ---&gt;
-  Input device support  ---&gt;
-    [*] Tablets  ---&gt;
-      Wacom Intuos/Graphire tablet support (USB): Y or M</literal></screen>
+  HID support  ---&gt;
+    &lt;*/M&gt; HID bus support                                      [CONFIG_HID]
+            Special HID drivers ---&gt;
+              &lt;*/M&gt; Wacom Intuos/Graphire tablet support (USB) [CONFIG_HID_WACOM]</literal></screen>
 
       <indexterm zone="xorg-wacom-driver xorg-wacom-driver-kernel">
Index: x/installing/x7driver.xml
===================================================================
--- x/installing/x7driver.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ x/installing/x7driver.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -135,8 +135,8 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="x7driver-vmmouse-systemd.xml"/>
+    href="x7driver-vmmouse.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="x7driver-wacom-systemd.xml"/>
+    href="x7driver-wacom.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -156,5 +156,5 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="x7driver-vmware-systemd.xml"/>
+    href="x7driver-vmware.xml"/>
 
 </sect1>
Index: installing/xorg-server-systemd.xml
===================================================================
--- x/installing/xorg-server-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,398 +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 xorg-server-download-http "&xorg-download-http;/xserver/xorg-server-&xorg-server-version;.tar.bz2">
-  <!ENTITY xorg-server-download-ftp  "&xorg-download-ftp;/xserver/xorg-server-&xorg-server-version;.tar.bz2">
-  <!ENTITY xorg-server-md5sum        "3c1c1057d3ad27380d8dd87ffcc182cd">
-  <!ENTITY xorg-server-size          "5.6 MB">
-  <!ENTITY xorg-server-buildsize     "516 MB (with tests)">
-  <!ENTITY xorg-server-time          "1.6 SBU (with tests)">
-]>
-
-<sect1 id="xorg-server" xreflabel="Xorg-Server-&xorg-server-version;">
-  <?dbhtml filename="xorg-server.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Xorg-Server-&xorg-server-version;</title>
-
-  <indexterm zone="xorg-server">
-    <primary sortas="a-xorg-server">xorg-server</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Xorg Server</title>
-
-    <para>
-      The <application>Xorg</application> Server is the core
-      of the X Window system.
-    </para>
-
-    &lfs78_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xorg-server-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xorg-server-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xorg-server-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xorg-server-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xorg-server-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xorg-server-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional patch:
-          <ulink url="&patch-root;/xorg-server-&xorg-server-version;-add_prime_support-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xorg Server Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="nettle"/> or
-      <xref linkend="libgcrypt"/> or
-      <xref linkend="openssl"/>,
-      <xref linkend="libpciaccess"/>,
-      <xref linkend="pixman"/>,
-      <xref linkend="xorg7-font"/> and
-      <xref linkend="xkeyboard-config"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libepoxy"/> (required to build Glamor),
-      <xref linkend="wayland"/> (both for <command>Xwayland</command>),
-      <xref linkend="systemd"/> and
-      <xref linkend="xcb-util-keysyms"/> (used by <command>Xnest</command>)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="acpid"/> (runtime),
-      <xref linkend="doxygen"/> (to build API documentation),
-      <xref linkend="fop"/>, (to build documentation),
-      <xref linkend="gs"/> (to build documentation),
-      <xref linkend="xcb-util-image"/>,
-      <xref linkend="xcb-util-renderutil"/>,
-      <xref linkend="xcb-util-wm"/> (all three to build <command>Xephyr</command>),
-      <xref linkend="xmlto"/>, (to build documentation) and
-      <ulink url="http://download.savannah.gnu.org/releases/libunwind/">libunwind</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url='&blfs-wiki;/Xorg7Server'/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Xorg Server</title>
-
-    <para>
-      If you have downloaded the optional patch, apply it by running the
-      following command:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../xorg-server-&xorg-server-version;-add_prime_support-1.patch</userinput></screen>
-
-    <para>
-      Install the server by running the following commands:
-    </para>
-
-<screen><userinput>./configure $XORG_CONFIG         \
-           --enable-glamor       \
-           --enable-suid-wrapper \
-           --with-xkb-output=/var/lib/xkb &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 &amp;&amp;
-mkdir -pv /etc/X11/xorg.conf.d</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-glamor</parameter>: This switch enables building
-      of the Glamor DIX module which is required by some drivers and
-      <command>Xwayland</command>. Remove it if you don't want to install
-      <application>libepoxy</application> and are not going to need
-      <command>Xwayland</command> or you don't have any hardware that
-      requires Glamor (Radeon "Southern Islands" and later GPUs). It is
-      also required to build the modesetting driver, which is a generic
-      Xorg Video driver for hardware that has a KMS driver.
-    </para>
-
-    <para>
-      <parameter>--enable-suid-wrapper</parameter>: This switch enables building
-      of the suid-root wrapper for legacy driver support on rootless xserver
-      systems.
-    </para>
-
-    <para>
-      <option>--enable-dmx</option>: This switch enables building of the DMX
-      (Distributed Multihead X) server. Use it if you want to build DMX.
-    </para>
-
-    <para>
-      <option>--enable-kdrive</option>: This switch enables building of the
-      kdrive servers such as <command>Xephyr</command> and
-      <command>Xfbdev</command>. Use it if you have installed optional
-      xcb-util packages and want to build the mentioned programs.
-    </para>
-
-    <para>
-      <option>--disable-systemd-logind --enable-install-setuid</option>: These
-      switches disable <command>systemd-logind</command> integration and
-      restore the setuid bit to the <command>Xorg</command> executable,
-      allowing <application>Xorg Server</application> to work without having
-      the <application>systemd</application> PAM module installed and set up.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Xorg Driver</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          cvt, dmxaddinput, dmxaddscreen, dmxinfo, dmxreconfig, dmxresize,
-          dmxrminput, dmxrmscreen, dmxtodmx, dmxwininfo, gtf, vdltodmx, X,
-          Xdmx, xdmxconfig, Xephyr, Xfbdev, Xnest, Xorg, Xvfb and Xwayland
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          modesetting_drv.so
-        </seg>
-        <seg>
-          $XORG_PREFIX/include/xorg,
-          $XORG_PREFIX/lib/xorg,
-          $XORG_PREFIX/share/X11/xorg.conf.d and
-          /var/lib/xkb
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cvt-x7">
-        <term><command>cvt</command></term>
-        <listitem>
-          <para>
-            calculates VESA CVT mode lines.
-          </para>
-          <indexterm zone="xorg-server cvt-x7">
-            <primary sortas="b-cvt">cvt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dmx-x7">
-        <term><command>dmx*</command></term>
-        <listitem>
-          <para>
-            are various tools used for manipulating the dmx server.
-          </para>
-          <indexterm zone="xorg-server dmx-x7">
-            <primary sortas="b-dmx">dmx*</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtf-x7">
-        <term><command>gtf</command></term>
-        <listitem>
-          <para>
-            calculates VESA GTF mode lines.
-          </para>
-          <indexterm zone="xorg-server gtf-x7">
-            <primary sortas="b-gtf">gtf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vdltodmx-x7">
-        <term><command>vdltodmx</command></term>
-        <listitem>
-          <para>
-            is a tool used to convert VDL config files to DMX config
-            files.
-          </para>
-          <indexterm zone="xorg-server vdltodmx-x7">
-            <primary sortas="b-vdltodmx">vdltodmx</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="X-x7">
-        <term><command>X</command></term>
-        <listitem>
-          <para>
-            is a symbolic link to Xorg.
-          </para>
-          <indexterm zone="xorg-server X-x7">
-            <primary sortas="b-X">X</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="Xdmx-x7">
-        <term><command>Xdmx</command></term>
-        <listitem>
-          <para>
-            is a distributed multi-head X server.
-          </para>
-          <indexterm zone="xorg-server Xdmx-x7">
-            <primary sortas="b-Xdmx">Xdmx</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="Xdmx">
-        <term><command>Xdmx</command></term>
-        <listitem>
-          <para>
-            is a proxy X server that uses one or more other X servers as
-            its display devices.
-          </para>
-          <indexterm zone="xorg-server Xdmx">
-            <primary sortas="b-Xdmx">Xdmx</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="Xephyr-x7">
-        <term><command>Xephyr</command></term>
-        <listitem>
-          <para>
-            is a nested X server that supports modern
-            X extensions.
-          </para>
-          <indexterm zone="xorg-server Xephyr-x7">
-            <primary sortas="b-Xephyr">Xephyr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="Xnest-x7">
-        <term><command>Xnest</command></term>
-        <listitem>
-          <para>
-            is a nested X server.
-          </para>
-          <indexterm zone="xorg-server Xnest-x7">
-            <primary sortas="b-Xnest">Xnest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="Xorg-x7">
-        <term><command>Xorg</command></term>
-        <listitem>
-          <para>
-            is the X11R7 X Server.
-          </para>
-          <indexterm zone="xorg-server Xorg-x7">
-            <primary sortas="b-Xorg">Xorg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="Xvfb-x7">
-        <term><command>Xvfb</command></term>
-        <listitem>
-          <para>
-            is the virtual framebuffer X server for X Version 11.
-          </para>
-          <indexterm zone="xorg-server Xvfb-x7">
-            <primary sortas="b-Xvfb">Xvfb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xdmxconfig-x7">
-        <term><command>xdmxconfig</command></term>
-        <listitem>
-          <para>
-            is a graphical configuration utility for the dmx server.
-          </para>
-          <indexterm zone="xorg-server xdmxconfig-x7">
-            <primary sortas="b-xdmxconfig">xdmxconfig</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="modesetting_drv-x7">
-        <term><filename class="libraryfile">modesetting_drv.so</filename></term>
-        <listitem>
-          <para>
-            is a Xorg video driver for machines using Kernel Mode Setting (KMS).
-            It will use Glamor for 2D acceleration if it has been enabled and
-            the hardware has proper 3D support.
-          </para>
-          <indexterm zone="xorg-server modesetting_drv-x7">
-            <primary sortas="c-modesetting_drv">modesetting_drv.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/installing/xorg-server.xml
===================================================================
--- x/installing/xorg-server.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ x/installing/xorg-server.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -0,0 +1,398 @@
+<?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 xorg-server-download-http "&xorg-download-http;/xserver/xorg-server-&xorg-server-version;.tar.bz2">
+  <!ENTITY xorg-server-download-ftp  "&xorg-download-ftp;/xserver/xorg-server-&xorg-server-version;.tar.bz2">
+  <!ENTITY xorg-server-md5sum        "3c1c1057d3ad27380d8dd87ffcc182cd">
+  <!ENTITY xorg-server-size          "5.6 MB">
+  <!ENTITY xorg-server-buildsize     "516 MB (with tests)">
+  <!ENTITY xorg-server-time          "1.6 SBU (with tests)">
+]>
+
+<sect1 id="xorg-server" xreflabel="Xorg-Server-&xorg-server-version;">
+  <?dbhtml filename="xorg-server.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Xorg-Server-&xorg-server-version;</title>
+
+  <indexterm zone="xorg-server">
+    <primary sortas="a-xorg-server">xorg-server</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Xorg Server</title>
+
+    <para>
+      The <application>Xorg</application> Server is the core
+      of the X Window system.
+    </para>
+
+    &lfs78_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&xorg-server-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&xorg-server-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &xorg-server-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &xorg-server-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &xorg-server-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &xorg-server-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Optional patch:
+          <ulink url="&patch-root;/xorg-server-&xorg-server-version;-add_prime_support-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Xorg Server Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="nettle"/> or
+      <xref linkend="libgcrypt"/> or
+      <xref linkend="openssl"/>,
+      <xref linkend="libpciaccess"/>,
+      <xref linkend="pixman"/>,
+      <xref linkend="xorg7-font"/> and
+      <xref linkend="xkeyboard-config"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="libepoxy"/> (required to build Glamor),
+      <xref linkend="wayland"/> (both for <command>Xwayland</command>),
+      <xref linkend="systemd"/> and
+      <xref linkend="xcb-util-keysyms"/> (used by <command>Xnest</command>)
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="acpid"/> (runtime),
+      <xref linkend="doxygen"/> (to build API documentation),
+      <xref linkend="fop"/>, (to build documentation),
+      <xref linkend="gs"/> (to build documentation),
+      <xref linkend="xcb-util-image"/>,
+      <xref linkend="xcb-util-renderutil"/>,
+      <xref linkend="xcb-util-wm"/> (all three to build <command>Xephyr</command>),
+      <xref linkend="xmlto"/>, (to build documentation) and
+      <ulink url="http://download.savannah.gnu.org/releases/libunwind/">libunwind</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url='&blfs-wiki;/Xorg7Server'/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Xorg Server</title>
+
+    <para>
+      If you have downloaded the optional patch, apply it by running the
+      following command:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../xorg-server-&xorg-server-version;-add_prime_support-1.patch</userinput></screen>
+
+    <para>
+      Install the server by running the following commands:
+    </para>
+
+<screen><userinput>./configure $XORG_CONFIG         \
+           --enable-glamor       \
+           --enable-suid-wrapper \
+           --with-xkb-output=/var/lib/xkb &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 &amp;&amp;
+mkdir -pv /etc/X11/xorg.conf.d</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>--enable-glamor</parameter>: This switch enables building
+      of the Glamor DIX module which is required by some drivers and
+      <command>Xwayland</command>. Remove it if you don't want to install
+      <application>libepoxy</application> and are not going to need
+      <command>Xwayland</command> or you don't have any hardware that
+      requires Glamor (Radeon "Southern Islands" and later GPUs). It is
+      also required to build the modesetting driver, which is a generic
+      Xorg Video driver for hardware that has a KMS driver.
+    </para>
+
+    <para>
+      <parameter>--enable-suid-wrapper</parameter>: This switch enables building
+      of the suid-root wrapper for legacy driver support on rootless xserver
+      systems.
+    </para>
+
+    <para>
+      <option>--enable-dmx</option>: This switch enables building of the DMX
+      (Distributed Multihead X) server. Use it if you want to build DMX.
+    </para>
+
+    <para>
+      <option>--enable-kdrive</option>: This switch enables building of the
+      kdrive servers such as <command>Xephyr</command> and
+      <command>Xfbdev</command>. Use it if you have installed optional
+      xcb-util packages and want to build the mentioned programs.
+    </para>
+
+    <para>
+      <option>--disable-systemd-logind --enable-install-setuid</option>: These
+      switches disable <command>systemd-logind</command> integration and
+      restore the setuid bit to the <command>Xorg</command> executable,
+      allowing <application>Xorg Server</application> to work without having
+      the <application>systemd</application> PAM module installed and set up.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Xorg Driver</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          cvt, dmxaddinput, dmxaddscreen, dmxinfo, dmxreconfig, dmxresize,
+          dmxrminput, dmxrmscreen, dmxtodmx, dmxwininfo, gtf, vdltodmx, X,
+          Xdmx, xdmxconfig, Xephyr, Xfbdev, Xnest, Xorg, Xvfb and Xwayland
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          modesetting_drv.so
+        </seg>
+        <seg>
+          $XORG_PREFIX/include/xorg,
+          $XORG_PREFIX/lib/xorg,
+          $XORG_PREFIX/share/X11/xorg.conf.d and
+          /var/lib/xkb
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="cvt-x7">
+        <term><command>cvt</command></term>
+        <listitem>
+          <para>
+            calculates VESA CVT mode lines.
+          </para>
+          <indexterm zone="xorg-server cvt-x7">
+            <primary sortas="b-cvt">cvt</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="dmx-x7">
+        <term><command>dmx*</command></term>
+        <listitem>
+          <para>
+            are various tools used for manipulating the dmx server.
+          </para>
+          <indexterm zone="xorg-server dmx-x7">
+            <primary sortas="b-dmx">dmx*</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gtf-x7">
+        <term><command>gtf</command></term>
+        <listitem>
+          <para>
+            calculates VESA GTF mode lines.
+          </para>
+          <indexterm zone="xorg-server gtf-x7">
+            <primary sortas="b-gtf">gtf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="vdltodmx-x7">
+        <term><command>vdltodmx</command></term>
+        <listitem>
+          <para>
+            is a tool used to convert VDL config files to DMX config
+            files.
+          </para>
+          <indexterm zone="xorg-server vdltodmx-x7">
+            <primary sortas="b-vdltodmx">vdltodmx</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="X-x7">
+        <term><command>X</command></term>
+        <listitem>
+          <para>
+            is a symbolic link to Xorg.
+          </para>
+          <indexterm zone="xorg-server X-x7">
+            <primary sortas="b-X">X</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="Xdmx-x7">
+        <term><command>Xdmx</command></term>
+        <listitem>
+          <para>
+            is a distributed multi-head X server.
+          </para>
+          <indexterm zone="xorg-server Xdmx-x7">
+            <primary sortas="b-Xdmx">Xdmx</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+     <varlistentry id="Xdmx">
+        <term><command>Xdmx</command></term>
+        <listitem>
+          <para>
+            is a proxy X server that uses one or more other X servers as
+            its display devices.
+          </para>
+          <indexterm zone="xorg-server Xdmx">
+            <primary sortas="b-Xdmx">Xdmx</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="Xephyr-x7">
+        <term><command>Xephyr</command></term>
+        <listitem>
+          <para>
+            is a nested X server that supports modern
+            X extensions.
+          </para>
+          <indexterm zone="xorg-server Xephyr-x7">
+            <primary sortas="b-Xephyr">Xephyr</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="Xnest-x7">
+        <term><command>Xnest</command></term>
+        <listitem>
+          <para>
+            is a nested X server.
+          </para>
+          <indexterm zone="xorg-server Xnest-x7">
+            <primary sortas="b-Xnest">Xnest</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="Xorg-x7">
+        <term><command>Xorg</command></term>
+        <listitem>
+          <para>
+            is the X11R7 X Server.
+          </para>
+          <indexterm zone="xorg-server Xorg-x7">
+            <primary sortas="b-Xorg">Xorg</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="Xvfb-x7">
+        <term><command>Xvfb</command></term>
+        <listitem>
+          <para>
+            is the virtual framebuffer X server for X Version 11.
+          </para>
+          <indexterm zone="xorg-server Xvfb-x7">
+            <primary sortas="b-Xvfb">Xvfb</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xdmxconfig-x7">
+        <term><command>xdmxconfig</command></term>
+        <listitem>
+          <para>
+            is a graphical configuration utility for the dmx server.
+          </para>
+          <indexterm zone="xorg-server xdmxconfig-x7">
+            <primary sortas="b-xdmxconfig">xdmxconfig</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="modesetting_drv-x7">
+        <term><filename class="libraryfile">modesetting_drv.so</filename></term>
+        <listitem>
+          <para>
+            is a Xorg video driver for machines using Kernel Mode Setting (KMS).
+            It will use Glamor for 2D acceleration if it has been enabled and
+            the hardware has proper 3D support.
+          </para>
+          <indexterm zone="xorg-server modesetting_drv-x7">
+            <primary sortas="c-modesetting_drv">modesetting_drv.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: lib/qt4-systemd.xml
===================================================================
--- x/lib/qt4-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,1032 +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 qt4-download-http
-           "http://download.qt.io/official_releases/qt/4.8/&qt4-version;/qt-everywhere-opensource-src-&qt4-version;.tar.gz">
-  <!ENTITY qt4-download-ftp  " ">
-  <!ENTITY qt4-md5sum        "d990ee66bf7ab0c785589776f35ba6ad">
-  <!ENTITY qt4-size          "230 MB">
-  <!ENTITY qt4-buildsize     "2.3 GB">
-  <!ENTITY qt4-time          "39 SBU">
-]>
-
-<sect1 id="qt4" xreflabel="Qt-&qt4-version;">
-  <?dbhtml filename="qt4.html" ?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Qt-&qt4-version;</title>
-
-  <indexterm zone="qt4">
-    <primary sortas="a-Qt">Qt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Qt4</title>
-
-    <para>
-      <application>Qt4</application> is a cross-platform application
-      framework that is widely used for developing application software
-      with a graphical user interface (GUI) (in which cases
-      <application>Qt4</application> is classifiedas a widget toolkit), and
-      also used for developing non-GUI programs such as command-line tools
-      and consoles for servers. One of the major users
-      of <application>Qt4</application> is <application>KDE</application>.
-    </para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qt4-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qt4-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qt4-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qt4-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &qt4-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qt4-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional patch:
-          <ulink url="&patch-root;/qt-&qt4-version;-fedora_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Qt4 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="mesalib"/>,
-      <xref linkend="cacerts"/>,
-      <xref linkend="dbus"/>,
-      <xref linkend="glib2"/>,
-      <xref linkend="icu"/> (unicode support),
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libmng"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libtiff"/>,
-      <xref linkend="openssl"/>, and
-      <xref linkend="sqlite"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cups"/>,
-      <xref linkend="gtk2"/> (GTK+ 2 theme support),
-      <xref linkend="gst-plugins-base"/> (For QtWebKit HTML5 Video),
-      <xref linkend="mariadb"/>,
-      <xref linkend="postgresql"/>,
-      <xref linkend="pulseaudio"/>, and
-      <xref linkend="unixodbc"/>
-    </para>
-
-    <bridgehead renderas="sect4">Runtime Dependency</bridgehead>
-    <para role="optional">
-      <xref linkend="qtchooser"/> (required if installing both
-      Qt4 and Qt5)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/qt4"/>
-    </para>
-  </sect2>
-
-
-  <sect2 role="qt4-prefix">
-    <title>Setting the installation prefix</title>
-
-    <bridgehead renderas="sect3">Installing in /usr</bridgehead>
-
-    <para>
-      If you want to install <application>Qt4</application>
-      in <filename class="directory">/usr</filename>, set the
-      following environment variable:
-    </para>
-
-<screen><userinput>export QT4PREFIX=/usr</userinput></screen>
-
-    <para>
-      The advantage of installing in
-      <filename class="directory">/usr</filename> is that no additional
-      configuration is required. The package files are distributed
-      within several subdirectories of the
-      <filename class="directory">/usr</filename> hierarchy. This is
-      the method that most distributions use. The disadvantage for BLFS
-      users is that this <application>Qt4</application> instance cannot
-      be upgraded while it is in use. It also does not allow reverting
-      to an existing, known working instance of
-      <application>Qt4</application>.
-    </para>
-
-    <bridgehead renderas="sect3">Installing in /opt/qt4</bridgehead>
-
-    <para>
-      If you want to install <application>Qt4</application>
-      in a directory other than <filename
-      class="directory">/usr</filename>, ie
-      <filename class="directory">/opt/qt4</filename>, set
-      the following environment variable:
-    </para>
-
-<screen><userinput>export QT4PREFIX=/opt/qt4</userinput></screen>
-
-    <para>
-      The advantage of installing <application>Qt4</application> in a
-      custom directory such as <filename
-      class="directory">/opt/qt4</filename> is that it keeps all the
-      package files consolidated in a dedicated directory hierarchy. By
-      using this method, an update can be made without overwriting a
-      previous installation and users can easily revert to a previous
-      version by changing one symbolic link or merely changing the
-      PATH variable.
-    </para>
-
-    <tip>
-      <para>
-        Sometimes, the installation paths are hardcoded into installed files.
-        This is the reason why <filename class="directory">/opt/qt4</filename>
-        is used as installation prefix instead of <filename
-        class="directory">/opt/qt-&qt4-version;</filename>. After installing
-        <application>Qt4</application>, you may rename the directory and
-        create a symlink:
-      </para>
-
-<screen role="root"><userinput>mv /opt/qt{4,-&qt4-version;}
-ln -sfvn qt-&qt4-version; /opt/qt4</userinput></screen>
-
-      <para>
-        Later on, you may want to install other versions of
-        <application>Qt4</application>. To do that, just remove the symlink
-        and use <filename class="directory">/opt/qt4</filename> as the
-        prefix again. Which version of <application>Qt4</application> you
-        use depends only on where the symlink points.
-      </para>
-    </tip>
-
-    <bridgehead renderas="sect3">Setting the install location for executables</bridgehead>
-
-    <para>
-      Both <application>Qt4</application> and
-      <application>Qt5</application> executables have
-      the same names and will overwrite each other if
-      they are installed in the same prefix. To overcome
-      such problem, BLFS offers <xref linkend="qtchooser"/>,
-      an utility used to switch between different
-      <application>Qt</application> versions.
-    </para>
-
-    <para>
-      If <xref linkend="qtchooser"/> is to be used or
-      if installing both <application>Qt4</application>
-      and <application>Qt5</application> in
-      <filename class="directory">/usr</filename>, the
-      executables need to be installed to a non-standard
-      location in order to avoid the conflict with
-      <application>Qt5</application> ones. To accomplish
-      that, set the following environment variable:
-    </para>
-
-<screen><userinput>export QT4BINDIR=$QT4PREFIX/lib/qt4/bin</userinput></screen>
-
-    <para>
-      If you choose not to install <xref linkend="qtchooser"/>
-      or if you are not going to install
-      <application>Qt5</application>, simply set the bindir to
-      a <filename class="directory">bin</filename> subdir of the
-      default prefix by setting the following environment variable:
-    </para>
-
-<screen><userinput>export QT4BINDIR=$QT4PREFIX/bin</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Qt4</title>
-
-    <caution>
-      <para>
-        If you did not install some of the recommended dependencies, examine
-        <command>./configure --help</command> output to check how to disable
-        them or use internal versions bundled in the source tarball.
-      </para>
-    </caution>
-
-    <warning>
-      <para>
-        If <application>Qt4</application> is being reinstalled into the
-        same directory as an existing instance, run the commands done by
-        <systemitem class="username">root</systemitem>, such as
-        <command>make install</command>, from a console or non-Qt4 based
-        window manager. It overwrites <application>Qt4</application>
-        libraries that should not be in use during the install process.
-      </para>
-    </warning>
-
-    <note>
-      <para>
-        The build time and space required for the full
-        <application>Qt</application> is quite long. The instructions below
-        do not build the tutorials and examples. Removing the
-        <parameter>-nomake</parameter> lines will create a complete build.
-      </para>
-    </note>
-
-    <para>
-      If you are in need of any features added by the optional patch above
-      (see its header for description of the features it adds), apply it
-      by running the following command:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../qt-&qt4-version;-fedora_fixes-1.patch</userinput></screen>
-
-    <para>
-      Install <application>Qt4</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>sed -e '/BOOST_TT/a pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"];' \
-    -e '/BOOST_TT/a pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];'   \
-    -i src/tools/moc/main.cpp &amp;&amp;
-
-./configure -prefix         $QT4PREFIX                        \
-            -sysconfdir     /etc/xdg                          \
-            -bindir         $QT4BINDIR                        \
-            -plugindir      $QT4PREFIX/lib/qt4/plugins        \
-            -importdir      $QT4PREFIX/lib/qt4/imports        \
-            -headerdir      $QT4PREFIX/include/qt4            \
-            -datadir        $QT4PREFIX/share/qt4              \
-            -docdir         $QT4PREFIX/share/doc/qt4          \
-            -translationdir $QT4PREFIX/share/qt4/translations \
-            -demosdir       $QT4PREFIX/share/doc/qt4/demos    \
-            -examplesdir    $QT4PREFIX/share/doc/qt4/examples \
-            -confirm-license   \
-            -opensource        \
-            -release           \
-            -dbus-linked       \
-            -openssl-linked    \
-            -system-sqlite     \
-            -no-phonon         \
-            -no-phonon-backend \
-            -no-openvg         \
-            -nomake demos      \
-            -nomake examples   \
-            -optimized-qmake   &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Remove references to the build directory from the
-      <filename class="extension">.pc</filename> files by running
-      the following command:
-    </para>
-
-<screen><userinput>find . -name "*.pc" -exec perl -pi -e "s, -L$PWD/?\S+,,g" {} \;</userinput></screen>
-
-    <warning>
-      <para>
-        Make sure that <envar>QT4PREFIX</envar> and <envar>QT4BINDIR</envar>
-        environment variables are set for the
-        <systemitem class="username">root</systemitem> user too.
-      </para>
-    </warning>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-rm -rf $QT4PREFIX/tests</userinput></screen>
-
-    <para>
-      Remove references to the build directory from installed files by
-      running the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>for file in 3Support CLucene Core DBus Declarative DesignerComponents \
-            Designer Gui Help Multimedia Network OpenGL Script \
-            ScriptTools Sql Svg Test UiTools WebKit XmlPatterns Xml phonon
-do
-  if [ -e $QT4PREFIX/lib/libQt${file}.prl ]
-  then
-    sed -r '/^QMAKE_PRL_BUILD_DIR/d;s/(QMAKE_PRL_LIBS =).*/\1/' \
-        -i $QT4PREFIX/lib/libQt${file}.prl
-  fi
-done
-unset file</userinput></screen>
-
-    <para>
-      Install images and create the menu entries for installed
-      applications by running the following commands 
-      as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -Dm644 src/gui/dialogs/images/qtlogo-64.png \
-                  /usr/share/pixmaps/qt4logo.png &amp;&amp;
-
-install -v -Dm644 tools/assistant/tools/assistant/images/assistant-128.png \
-                  /usr/share/pixmaps/assistant-qt4.png &amp;&amp;
-
-install -v -Dm644 tools/designer/src/designer/images/designer.png \
-                  /usr/share/pixmaps/designer-qt4.png &amp;&amp;
-
-install -v -Dm644 tools/linguist/linguist/images/icons/linguist-128-32.png \
-                  /usr/share/pixmaps/linguist-qt4.png &amp;&amp;
-
-install -v -Dm644 tools/qdbus/qdbusviewer/images/qdbusviewer-128.png \
-                  /usr/share/pixmaps/qdbusviewer-qt4.png &amp;&amp;
-
-install -v -dm755 /usr/share/applications &amp;&amp;
-
-cat &gt; /usr/share/applications/assistant-qt4.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt4 Assistant 
-Comment=Shows Qt4 documentation and examples
-Exec=$QT4BINDIR/assistant
-Icon=assistant-qt4.png
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;Documentation;</literal>
-EOF
-
-cat &gt; /usr/share/applications/designer-qt4.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt4 Designer
-Comment=Design GUIs for Qt4 applications
-Exec=$QT4BINDIR/designer
-Icon=designer-qt4.png
-MimeType=application/x-designer;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;</literal>
-EOF
-
-cat &gt; /usr/share/applications/linguist-qt4.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt4 Linguist 
-Comment=Add translations to Qt4 applications
-Exec=$QT4BINDIR/linguist
-Icon=linguist-qt4.png
-MimeType=text/vnd.trolltech.linguist;application/x-linguist;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;</literal>
-EOF
-
-cat &gt; /usr/share/applications/qdbusviewer-qt4.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt4 QDbusViewer 
-GenericName=D-Bus Debugger
-Comment=Debug D-Bus applications
-Exec=$QT4BINDIR/qdbusviewer
-Icon=qdbusviewer-qt4.png
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;Debugger;</literal>
-EOF
-
-cat &gt; /usr/share/applications/qtconfig-qt4.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt4 Config 
-Comment=Configure Qt4 behavior, styles, fonts
-Exec=$QT4BINDIR/qtconfig
-Icon=qt4logo.png
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Settings;</literal>
-EOF</userinput></screen>
-
-    <para>
-      Some packages look for <application>Qt4</application> executables
-      with <filename>-qt4</filename> suffix. Run the following command
-      as the <systemitem class="username">root</systemitem> user to
-      create the necessary symlinks:
-    </para>
-
-<screen role="root"><userinput>for file in assistant designer lconvert linguist lrelease lupdate \
-            moc pixeltool qcollectiongenerator qdbus qdbuscpp2xml \
-            qdbusviewer qdbusxml2cpp qdoc3 qhelpconverter         \
-            qhelpgenerator qmake qmlplugindump qmlviewer qt3to4   \
-            qtconfig qttracereplay rcc uic uic3 xmlpatterns       \
-            xmlpatternsvalidator
-do
-  ln -sfrv $QT4BINDIR/$file /usr/bin/$file-qt4
-done
-unset file</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -e ...</command>: This sed fixes the
-      <command>moc</command> program to prevent it from
-      failing to parse files which include some of the
-      <application>Boost</application> headers.
-    </para>
-
-    <para>
-      <parameter>-confirm-license</parameter>: Accept license
-      without prompting user during configuration.
-    </para>
-
-    <para>
-      <parameter>-opensource</parameter>: Install the opensource
-      version of <application>Qt</application>.
-    </para>
-
-    <para>
-      <parameter>-release</parameter>: This switch disables
-      building with debugging symbols.
-    </para>
-
-    <para>
-      <parameter>-nomake examples -nomake demos</parameter>:
-      These switches disable building programs that are only of
-      interest to a developer using <application>Qt</application>.
-    </para>
-
-    <para>
-      <parameter>-system-sqlite</parameter>: This switch enables use
-      the system version of <application>SQLite</application>.
-    </para>
-
-    <para>
-      <parameter>-no-phonon -no-phonon-backend</parameter>: These
-      switches disable building of the bundled
-      <application>Phonon</application> library. Better version
-      is provided by <xref linkend="phonon"/> package.
-    </para>
-
-    <para>
-      <parameter>-dbus-linked -openssl-linked</parameter>: These
-      switches enable explicit linking of the
-      <application>D-Bus</application> and
-      <application>OpenSSL</application> libraries into
-      <application>Qt</application> libraries instead of
-      <command>dlopen()</command>-ing them.
-    </para>
-
-    <para>
-      <parameter>-no-openvg</parameter>: This switch disables
-      <application>OpenVG</application> support in
-      <application>Qt</application>.
-    </para>
-
-    <para>
-      <parameter>-optimized-qmake</parameter>: This switch enables
-      building of the optimized <command>qmake</command> program.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Qt4</title>
-
-    <sect3 id="qt4-config">
-      <title>Configuration Information</title>
-
-      <para>
-        Ensure that environment variables needed by certain packages
-        are set by running the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/qt4.sh &lt;&lt; EOF
-<literal># Begin /etc/profile.d/qt4.sh
-
-export QT4DIR=$QT4PREFIX
-export QT4BINDIR=$QT4BINDIR
-
-# End /etc/profile.d/qt4.sh</literal>
-EOF</userinput></screen>
-
-      <note>
-        <para>
-          If you have installed <application>Qt4</application>
-          in <filename class="directory">/usr</filename> you
-          can skip the rest of this section.
-        </para>
-      </note>
-
-      <para>
-        If you installed <application>Qt4</application> in a location other
-        than <filename class="directory">/usr</filename>, you need to update the
-        following configuration files so that <application>Qt4</application> is
-        correctly found by other packages and system processes.
-      </para>
-
-      <para>
-        As the <systemitem class="username">root</systemitem> user, update
-        the <filename>/etc/ld.so.conf</filename> file and the dynamic linker's
-        run-time cache file:
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; EOF
-<literal># Begin Qt4 addition
-
-$QT4PREFIX/lib
-
-# End Qt4 addition</literal>
-EOF
-
-ldconfig</userinput></screen>
-
-      <indexterm zone="qt4 qt4-config">
-        <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
-      </indexterm>
-
-      <para>
-        If you have installed <xref linkend="qtchooser"/>, create
-        the <filename>/etc/profile.d/qt4.sh</filename> file by
-        running the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/qt4.sh &lt;&lt; EOF
-<literal># Begin /etc/profile.d/qt4.sh
-
-export QT4DIR=$QT4PREFIX
-export QT4BINDIR=$QT4BINDIR
-
-pathappend $QT4PREFIX/lib/pkgconfig PKG_CONFIG_PATH
-
-# End /etc/profile.d/qt4.sh</literal>
-EOF</userinput></screen>
-
-      <para>
-        If you have not installed <xref linkend="qtchooser"/>,
-        create the <filename>/etc/profile.d/qt4.sh</filename>
-        file by running the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/qt4.sh &lt;&lt; EOF
-<literal># Begin /etc/profile.d/qt4.sh
-
-export QT4DIR=$QT4PREFIX
-export QT4BINDIR=$QT4BINDIR
-
-pathappend $QT4BINDIR               PATH
-pathappend $QT4PREFIX/lib/pkgconfig PKG_CONFIG_PATH
-
-# End /etc/profile.d/qt4.sh</literal>
-EOF</userinput></screen>
-
-      <note>
-        <para>
-          If <xref linkend="qtchooser"/> is not installed and you
-          also have <application>Qt5</application> installed,
-          you will need to manually adjust the <envar>PATH</envar>
-          variable depending on which <application>Qt</application>
-          version is needed.
-        </para>
-      </note>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          assistant, designer, lconvert, linguist,
-          lrelease, lupdate, moc, pixeltool,
-          qcollectiongenerator, qdbuscpp2xml, qdbus,
-          qdbusviewer, qdbusxml2cpp, qdoc3, qhelpconverter,
-          qhelpgenerator, qmake, qmlplugindump, qmlviewer,
-          qt3to4, qtconfig, qttracereplay, rcc, uic3,
-          uic, xmlpatterns, and xmlpatternsvalidator
-        </seg>
-        <seg>
-          libQtUiTools.a, libQt3Support.so, libQtCLucene.so, libQtCore.so,
-          libQtDBus.so, libQtDeclarative.so, libQtDesignerComponents.so,
-          libQtDesigner.so, libQtGui.so, libQtHelp.so, libQtMultimedia.so,
-          libQtNetwork.so, libQtOpenGL.so, libQtScript.so, libQtScriptTools.so,
-          libQtSql.so, libQtSvg.so, libQtTest.so, libQtWebKit.so,
-          libQtXmlPatterns.so, and libQtXml.so, and several plugins under
-          /opt/qt4/imports and /opt/qt4/plugins
-        </seg>
-        <seg>
-          $QT4PREFIX/include/qt4,
-          $QT4PREFIX/lib/qt4,
-          $QT4PREFIX/share/doc/qt4, and
-          $QT4PREFIX/share/qt4 
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="assistant-qt4">
-        <term><command>assistant</command></term>
-        <listitem>
-          <para>
-            is a tool for presenting on-line documentation.
-          </para>
-          <indexterm zone="qt4 assistant-qt4">
-            <primary sortas="b-assistant-qt4">assistant</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="designer-qt4">
-        <term><command>designer</command></term>
-        <listitem>
-          <para>
-            is a full-fledged GUI builder. It includes
-            powerful features such as preview mode, automatic widget
-            layout, support for custom widgets, and an advanced
-            property editor.
-          </para>
-          <indexterm zone="qt4 designer-qt4">
-            <primary sortas="b-designer-qt4">designer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lconvert-qt4">
-        <term><command>lconvert</command></term>
-        <listitem>
-          <para>
-            is part of Qt4's Linguist tool chain. It can be used as a
-            standalone tool to convert and filter translation data files.
-          </para>
-          <indexterm zone="qt4 lconvert-qt4">
-            <primary sortas="b-lconvert-qt4">lconvert</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="linguist-qt4">
-        <term><command>linguist</command></term>
-        <listitem>
-          <para>
-            provides support for translating applications into
-            local languages.
-          </para>
-          <indexterm zone="qt4 linguist-qt4">
-            <primary sortas="b-linguist-qt4">linguist</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lrelease-qt4">
-        <term><command>lrelease</command></term>
-        <listitem>
-          <para>
-            is a simple command line tool. It reads a Qt project
-            file and produces message files used by the application.
-          </para>
-          <indexterm zone="qt4 lrelease-qt4">
-            <primary sortas="b-lrelease-qt4">lrelease</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lupdate-qt4">
-        <term><command>lupdate</command></term>
-        <listitem>
-          <para>
-            reads a Qt project file, finds the translatable
-            strings in the specified source, header and Qt Designer
-            interface files, and produces or updates the translation
-            files listed in the project file.
-          </para>
-          <indexterm zone="qt4 lupdate-qt4">
-            <primary sortas="b-lupdate-qt4">lupdate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="moc-qt4">
-        <term><command>moc</command></term>
-        <listitem>
-          <para>
-            generates Qt meta object support code.
-          </para>
-          <indexterm zone="qt4 moc-qt4">
-            <primary sortas="b-moc-qt4">moc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pixeltool-qt4">
-        <term><command>pixeltool</command></term>
-        <listitem>
-          <para>
-            is a desktop magnifier and as you move your mouse around
-            the screen it will show the magnified contents in its window.
-          </para>
-          <indexterm zone="qt4 pixeltool-qt4">
-            <primary sortas="b-pixeltool-qt4">pixeltool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="qcollectiongenerator-qt4">
-        <term><command>qcollectiongenerator</command></term>
-        <listitem>
-          <para>
-            is a tool used to create a Qt Help Collection.
-          </para>
-          <indexterm zone="qt4 qcollectiongenerator-qt4">
-            <primary sortas="b-qcollectiongenerator-qt4">qcollectiongenerator</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="qdbuscpp2xml-qt4">
-        <term><command>qdbuscpp2xml</command></term>
-        <listitem>
-          <para>
-            takes a C++ source file and generates a D-Bus XML definition
-            of the interface.
-          </para>
-          <indexterm zone="qt4 qdbuscpp2xml-qt4">
-            <primary sortas="b-qdbuscpp2xml-qt4">qdbuscpp2xml</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qdbus-qt4">
-        <term><command>qdbus</command></term>
-        <listitem>
-          <para>
-            lists available services, object paths,  methods, signals, and
-            properties of objects on a bus.
-          </para>
-          <indexterm zone="qt4 qdbus-qt4">
-            <primary sortas="b-qdbus-qt4">qdbus</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qdbusviewer-qt4">
-        <term><command>qdbusviewer</command></term>
-        <listitem>
-          <para>
-            is a graphical D-Bus browser.
-          </para>
-          <indexterm zone="qt4 qdbusviewer-qt4">
-            <primary sortas="b-qdbusviewer-qt4">qdbusviewer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qdbusxml2cpp-qt4">
-        <term><command>qdbusxml2cpp</command></term>
-        <listitem>
-          <para>
-            is a tool that can be used to parse interface descriptions
-            and produce static code representing those interfaces,
-          </para>
-          <indexterm zone="qt4 qdbusxml2cpp-qt4">
-            <primary sortas="b-qdbusxml2cpp-qt4">qdbusxml2cpp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qdoc3-qt4">
-        <term><command>qdoc3</command></term>
-        <listitem>
-          <para>
-            is a tool used by <application>Qt</application> Developers to
-            generate documentation for software projects.
-          </para>
-          <indexterm zone="qt4 qdoc3-qt4">
-            <primary sortas="b-qdoc3-qt4">qdoc3</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qhelpconverter-qt4">
-        <term><command>qhelpconverter</command></term>
-        <listitem>
-          <para>
-            is a tool used to convert files to <application>Qt</application>
-            help format.
-          </para>
-          <indexterm zone="qt4 qhelpconverter-qt4">
-            <primary sortas="b-qhelpconverter-qt4">qhelpconverter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qhelpgenerator-qt4">
-        <term><command>qhelpgenerator</command></term>
-        <listitem>
-          <para>
-            is a tool used to generate a <application>Qt</application>
-            compressed help file.
-          </para>
-          <indexterm zone="qt4 qhelpgenerator-qt4">
-            <primary sortas="b-qhelpgenerator-qt4">qhelpgenerator</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmake-qt4">
-        <term><command>qmake</command></term>
-        <listitem>
-          <para>
-            uses information stored in project files to
-            determine what should go in the makefiles it
-            generates.
-          </para>
-          <indexterm zone="qt4 qmake-qt4">
-            <primary sortas="b-qmake-qt4">qmake</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="qmlplugindump-qt4">
-        <term><command>qmlplugindump</command></term>
-        <listitem>
-          <para>
-            is a tool to create a qmltypes file.
-          </para>
-          <indexterm zone="qt4 qmlplugindump-qt4">
-            <primary sortas="b-qmlplugindump-qt4">qmlplugindump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmlviewer-qt4">
-        <term><command>qmlviewer</command></term>
-        <listitem>
-          <para>
-            is a tool for loading QML documents that makes it easy to quickly
-            develop and debug QML applications.
-          </para>
-          <indexterm zone="qt4 qmlviewer-qt4">
-            <primary sortas="b-qmlviewer-qt4">qmlviewer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qt3to4-qt4">
-        <term><command>qt3to4</command></term>
-        <listitem>
-          <para>
-            qt3to4 is a tool to help update Qt3 code to Qt4.
-          </para>
-          <indexterm zone="qt4 qt3to4-qt4">
-            <primary sortas="b-qt3to4-qt4">qt3to4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qtconfig-qt4">
-        <term><command>qtconfig</command></term>
-        <listitem>
-          <para>
-            is used to customize the appearance of Qt applications.
-          </para>
-          <indexterm zone="qt4 qtconfig-qt4">
-            <primary sortas="b-qtconfig-qt4">qtconfig</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="qttracereplay">
-        <term><command>qttracereplay</command></term>
-        <listitem>
-          <para>
-            is a tool to replay all drawing operations recording with 
-            <command>-graphicssystem trace</command> into a trace buffer.
-          </para>
-          <indexterm zone="qt4 qttracereplay">
-            <primary sortas="b-qttracereplay">qttracereplay</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rcc-qt4">
-        <term><command>rcc</command></term>
-        <listitem>
-          <para>
-            is a resource compiler used in conjunction with designer.
-          </para>
-          <indexterm zone="qt4 rcc-qt4">
-            <primary sortas="b-rcc-qt4">rcc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uic-qt4">
-        <term><command>uic</command></term>
-        <listitem>
-          <para>
-            is a Qt user interface compiler.
-          </para>
-          <indexterm zone="qt4 uic-qt4">
-            <primary sortas="b-uic-qt4">uic</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uic3-qt4">
-        <term><command>uic3</command></term>
-        <listitem>
-          <para>
-            is a tool to generate Qt4 code out of
-            user interface files generated by the Qt3
-            version of designer.
-          </para>
-          <indexterm zone="qt4 uic3-qt4">
-            <primary sortas="b-uic3-qt4">uic3</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xmlpatterns-qt4">
-        <term><command>xmlpatterns</command></term>
-        <listitem>
-          <para>
-            provides support for XPath, XQuery, XSLT, and XML Schema
-            validation.
-          </para>
-          <indexterm zone="qt4 xmlpatterns-qt4">
-            <primary sortas="b-xmlpatterns-qt4">xmlpatterns</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xmlpatternsvalidator-qt4">
-        <term><command>xmlpatternsvalidator</command></term>
-        <listitem>
-          <para>
-            is a tool used to validate XML documents.
-          </para>
-          <indexterm zone="qt4 xmlpatternsvalidator-qt4">
-            <primary sortas="b-xmlpatternsvalidator-qt4">xmlpatternsvalidator</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: lib/qt5-systemd.xml
===================================================================
--- x/lib/qt5-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,1150 +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 qt5-major "5.5">
-  <!ENTITY qt5-url   "http://download.qt.io/official_releases/qt/&qt5-major;/&qt5-version;/single">
-
-  <!ENTITY qt5-download-http "&qt5-url;/qt-everywhere-opensource-src-&qt5-version;.tar.xz">
-  <!ENTITY qt5-download-ftp  " ">
-  <!ENTITY qt5-md5sum        "c2a249e8795d45200d997d96860d0353">
-  <!ENTITY qt5-size          "306 MB">
-  <!ENTITY qt5-buildsize     "7.6 GB (187 MB installed)">
-  <!ENTITY qt5-time          "98 SBU">
-]>
-
-<sect1 id="qt5" xreflabel="Qt-&qt5-version;">
-  <?dbhtml filename="qt5.html" ?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Qt-&qt5-version;</title>
-
-  <indexterm zone="qt5">
-    <primary sortas="a-Qt">Qt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Qt5</title>
-
-    <para>
-      <application>Qt5</application> is a cross-platform application
-      framework that is widely used for developing application software
-      with a graphical user interface (GUI) (in which cases
-      <application>Qt5</application> is classified as a widget toolkit), and
-      also used for developing non-GUI programs such as command-line tools
-      and consoles for servers. 
-    </para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qt5-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qt5-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qt5-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qt5-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &qt5-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qt5-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Qt5 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="mesalib"/>,
-      <xref linkend="xcb-util-image"/>,
-      <xref linkend="xcb-util-keysyms"/>,
-      <xref linkend="xcb-util-renderutil"/> and
-      <xref linkend="xcb-util-wm"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="cacerts"/>,
-      <xref linkend="cups"/>,
-      <xref linkend="glib2"/>,
-      <xref linkend="gst-plugins-base"/> (required for QtMultimedia),
-      <xref linkend="gst10-plugins-base"/> (required for QtWebKit HTML5 Audio and Video Support),
-      <xref linkend="harfbuzz"/>,
-      <xref linkend="icu"/> (Unicode support, also required for QtWebKit),
-      <xref linkend="jasper"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libmng"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libtiff"/>,
-      <xref linkend="libwebp"/>,
-      <xref linkend="libxkbcommon"/>,
-      <xref linkend="libxslt"/> (required for QtWebKit),
-      <xref linkend="mtdev"/>,
-      <xref linkend="nss"/> (required for QtWebEngine),
-      <xref linkend="openssl"/>,
-      <xref linkend="pcre"/>,
-      <xref linkend="ruby"/> (required for QtWebKit),
-      <xref linkend="sqlite"/> and
-      <xref linkend="wayland"/> (<xref linkend="mesalib"/> must be built with
-      <application>Wayland</application> support)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="bluez"/>,
-      <xref linkend="geoclue"/>,
-      <xref linkend="gtk2"/> (GTK+ Theme Support),
-      <xref linkend="ibus"/>,
-      <xref linkend="mariadb"/>,
-      <xref linkend="postgresql"/>,
-      <xref linkend="pulseaudio"/>,
-      <xref linkend="unixodbc"/>,
-      <ulink url="http://www.directfb.org/">DirectFB</ulink>,
-      <ulink url="http://www.firebirdsql.org/">Firebird</ulink> and
-      <ulink url="http://kcat.strangesoft.net/openal-releases/">OpenAL-Soft</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Runtime Dependency</bridgehead>
-    <para role="optional">
-      <xref linkend="qtchooser"/> (required if installing both
-      Qt4 and Qt5)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/qt5"/>
-    </para>
-  </sect2>
-
-  <sect2 role="qt5-prefix">
-    <title>Setting the installation prefix</title>
-
-    <bridgehead renderas="sect3">Installing in /usr</bridgehead>
-
-    <para>
-      If you want to install <application>Qt5</application>
-      in <filename class="directory">/usr</filename>, set the
-      following environment variable:
-    </para>
-
-<screen><userinput>export QT5PREFIX=/usr</userinput></screen>
-
-    <para>
-      The advantage of installing in
-      <filename class="directory">/usr</filename> is that no additional
-      configuration is required. The package files are distributed
-      within several subdirectories of the
-      <filename class="directory">/usr</filename> hierarchy. This is
-      the method that most distributions use. The disadvantage for BLFS
-      users is that this <application>Qt5</application> instance cannot
-      be upgraded while it is in use. It also does not allow reverting
-      to an existing, known working instance of
-      <application>Qt5</application>.
-    </para>
-
-    <bridgehead renderas="sect3">Installing in /opt/qt5</bridgehead>
-
-    <para>
-      If you want to install <application>Qt5</application>
-      in a directory other than <filename
-      class="directory">/usr</filename>, ie
-      <filename class="directory">/opt/qt5</filename>, set
-      the following environment variable:
-    </para>
-
-<screen><userinput>export QT5PREFIX=/opt/qt5</userinput></screen>
-
-    <para>
-      The advantage of installing <application>Qt5</application> in a
-      custom directory such as <filename
-      class="directory">/opt/qt5</filename> is that it keeps all the
-      package files consolidated in a dedicated directory hierarchy. By
-      using this method, an update can be made without overwriting a
-      previous installation and users can easily revert to a previous
-      version by changing one symbolic link or merely changing the
-      PATH variable.
-    </para>
-
-    <tip>
-      <para>
-        Sometimes, the installation paths are hardcoded into installed files.
-        This is the reason why <filename class="directory">/opt/qt5</filename>
-        is used as installation prefix instead of <filename
-        class="directory">/opt/qt-&qt5-version;</filename>. After installing
-        <application>Qt5</application>, you may rename the directory and
-        create a symlink:
-      </para>
-
-<screen role="root"><userinput>mv /opt/qt{5,-&qt5-version;}
-ln -sfvn qt-&qt5-version; /opt/qt5</userinput></screen>
-
-      <para>
-        Later on, you may want to install other versions of
-        <application>Qt5</application>. To do that, just remove the symlink
-        and use <filename class="directory">/opt/qt5</filename> as the
-        prefix again. Which version of <application>Qt5</application> you
-        use depends only on where the symlink points.
-      </para>
-    </tip>
-
-    <bridgehead renderas="sect3">Setting the install location for executables</bridgehead>
-
-    <para>
-      Both <application>Qt4</application> and
-      <application>Qt5</application> executables have
-      the same names and will overwrite each other if
-      they are installed in the same prefix. To overcome
-      such problem, BLFS offers <xref linkend="qtchooser"/>,
-      an utility used to switch between different
-      <application>Qt</application> versions.
-    </para>
-
-    <para>
-      If <xref linkend="qtchooser"/> is to be used or
-      if installing both <application>Qt4</application>
-      and <application>Qt5</application> in
-      <filename class="directory">/usr</filename>, the
-      executables need to be installed to a non-standard
-      location in order to avoid the conflict with
-      <application>Qt4</application> ones. To accomplish
-      that, set the following environment variable:
-    </para>
-
-<screen><userinput>export QT5BINDIR=$QT5PREFIX/lib/qt5/bin</userinput></screen>
-
-    <para>
-      If you choose not to install <xref linkend="qtchooser"/>
-      or if you are not going to install
-      <application>Qt4</application>, simply set the bindir to
-      a <filename class="directory">bin</filename> subdir of the
-      default prefix by setting the following environment variable:
-    </para>
-
-<screen><userinput>export QT5BINDIR=$QT5PREFIX/bin</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Qt5</title>
-
-    <caution>
-      <para>
-        If you did not install some of the recommended dependencies, examine
-        <command>./configure --help</command> output to check how to disable
-        them or use internal versions bundled in the source tarball.
-      </para>
-    </caution>
-
-    <warning>
-      <para>
-        If <application>Qt5</application> is being reinstalled into the
-        same directory as an existing instance, run the commands done by
-        <systemitem class="username">root</systemitem>, such as
-        <command>make install</command>, from a console or non-Qt5 based
-        window manager. It overwrites <application>Qt5</application>
-        libraries that should not be in use during the install process.
-      </para>
-    </warning>
-
-    <para>
-      Install <application>Qt5</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure -prefix         $QT5PREFIX                        \
-            -sysconfdir     /etc/xdg                          \
-            -bindir         $QT5BINDIR                        \
-            -headerdir      $QT5PREFIX/include/qt5            \
-            -archdatadir    $QT5PREFIX/lib/qt5                \
-            -datadir        $QT5PREFIX/share/qt5              \
-            -docdir         $QT5PREFIX/share/doc/qt5          \
-            -translationdir $QT5PREFIX/share/qt5/translations \
-            -examplesdir    $QT5PREFIX/share/doc/qt5/examples \
-            -confirm-license  \
-            -opensource       \
-            -dbus-linked      \
-            -openssl-linked   \
-            -journald         \
-            -system-harfbuzz  \
-            -system-sqlite    \
-            -nomake examples  \
-            -no-rpath         \
-            -optimized-qmake  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Remove references to the build directory from the
-      <filename class="extension">.pc</filename> files by running
-      the following command:
-    </para>
-
-<screen><userinput>find . -name "*.pc" -exec perl -pi -e "s, -L$PWD/?\S+,,g" {} \;</userinput></screen>
-
-    <warning>
-      <para>
-        Make sure that <envar>QT5PREFIX</envar> and <envar>QT5BINDIR</envar>
-        environment variables are set for the
-        <systemitem class="username">root</systemitem> user too.
-      </para>
-    </warning>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      Remove references to the build directory from installed files by
-      running the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>sed -e "s:$PWD/qtbase:$QT5PREFIX/lib/qt5:g" \
-    -i $QT5PREFIX/lib/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri &amp;&amp;
-
-sed -i '/^QMAKE_PRL_BUILD_DIR/d' $QT5PREFIX/lib/lib{Enginio,qgsttools_p,Qt5*}.prl</userinput></screen>
-
-    <para>
-      Install images and create the menu entries for installed
-      applications by running the following commands 
-      as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -Dm644 qttools/src/assistant/assistant/images/assistant-128.png \
-                  /usr/share/pixmaps/assistant-qt5.png &amp;&amp;
-
-install -v -Dm644 qttools/src/designer/src/designer/images/designer.png \
-                  /usr/share/pixmaps/designer-qt5.png &amp;&amp;
-
-install -v -Dm644 qttools/src/linguist/linguist/images/icons/linguist-128-32.png \
-                  /usr/share/pixmaps/linguist-qt5.png &amp;&amp;
-
-install -v -Dm644 qttools/src/qdbus/qdbusviewer/images/qdbusviewer-128.png \
-                  /usr/share/pixmaps/qdbusviewer-qt5.png &amp;&amp;
-
-install -v -dm755 /usr/share/applications &amp;&amp;
-
-cat &gt; /usr/share/applications/assistant-qt5.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt5 Assistant 
-Comment=Shows Qt5 documentation and examples
-Exec=$QT5BINDIR/assistant
-Icon=assistant-qt5.png
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;Documentation;</literal>
-EOF
-
-cat &gt; /usr/share/applications/designer-qt5.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt5 Designer
-GenericName=Interface Designer
-Comment=Design GUIs for Qt5 applications
-Exec=$QT5BINDIR/designer
-Icon=designer-qt5.png
-MimeType=application/x-designer;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;</literal>
-EOF
-
-cat &gt; /usr/share/applications/linguist-qt5.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt5 Linguist
-Comment=Add translations to Qt5 applications
-Exec=$QT5BINDIR/linguist
-Icon=linguist-qt5.png
-MimeType=text/vnd.trolltech.linguist;application/x-linguist;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;</literal>
-EOF
-
-cat &gt; /usr/share/applications/qdbusviewer-qt5.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt5 QDbusViewer 
-GenericName=D-Bus Debugger
-Comment=Debug D-Bus applications
-Exec=$QT5BINDIR/qdbusviewer
-Icon=qdbusviewer-qt5.png
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;Debugger;</literal>
-EOF</userinput></screen>
-
-    <para>
-      Some packages look for <application>Qt5</application> executables
-      with <filename>-qt5</filename> suffix. Run the following command
-      as the <systemitem class="username">root</systemitem> user to
-      create the necessary symlinks:
-    </para>
-
-<screen role="root"><userinput>for file in assistant designer lconvert linguist lrelease lupdate   \
-            moc pixeltool qcollectiongenerator qdbus qdbuscpp2xml   \
-            qdbusviewer qdbusxml2cpp qdoc qhelpconverter            \
-            qhelpgenerator qlalr qmake qml qml1plugindump qmlbundle \
-            qmleasing qmlimportscanner qmllint qmlmin qmlplugindump \
-            qmlprofiler qmlscene qmltestrunner qmlviewer qtdiag     \
-            qtpaths qtwaylandscanner rcc sdpscanner syncqt.pl uic   \
-            xmlpatterns xmlpatternsvalidator
-do
-  ln -sfrv $QT5BINDIR/$file /usr/bin/$file-qt5
-done
-unset file</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-confirm-license</parameter>: Accept license
-      without prompting user during configuration.
-    </para>
-
-    <para>
-      <parameter>-opensource</parameter>: Install the opensource
-      version of <application>Qt5</application>.
-    </para>
-
-    <para>
-      <parameter>-release</parameter>: This switch disables
-      building with debugging symbols.
-    </para>
-
-    <para>
-      <parameter>-dbus-linked -openssl-linked</parameter>: These
-      switches enable explicit linking of the
-      <application>D-Bus</application> and
-      <application>OpenSSL</application> libraries into
-      <application>Qt5</application> libraries instead of
-      <command>dlopen()</command>-ing them.
-    </para>
-
-    <para>
-      <parameter>-journald</parameter>: This switch sets
-      <command>systemd-journald</command> as the default logging
-      target for <application>Qt5</application> apps.
-    </para>
-
-    <para>
-      <parameter>-system-harfbuzz</parameter>: This switch enables use
-      of the system version of <application>Harfbuzz</application>
-      which fixes some font rendering issues in
-      <application>Qt5</application> applications.
-    </para>
-
-    <para>
-      <parameter>-system-sqlite</parameter>: This switch enables use
-      of the system version of <application>SQLite</application>.
-    </para>
-
-    <para>
-      <parameter>-nomake examples</parameter>: This switch
-      disables building of the example programs included
-      in the source tarball. Remove it if you want to build
-      them.
-    </para>
-
-    <para>
-      <parameter>-no-rpath</parameter>: This switch prevents
-      linking with hardcoded runtime path in order to prevent
-      the build from failing if another
-      <application>Qt5</application> instance already exists
-     in the installation prefix.
-    </para>
-
-    <para>
-      <parameter>-optimized-qmake</parameter>: This switch enables
-      building of the optimized <command>qmake</command> program.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Qt5</title>
-
-    <sect3 id="qt5-config">
-      <title>Configuration Information</title>
-
-      <para>
-        Ensure that environment variables needed by certain packages
-        are set by running the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/qt5.sh &lt;&lt; EOF
-<literal># Begin /etc/profile.d/qt5.sh
-
-export QT5DIR=$QT5PREFIX
-export QT5BINDIR=$QT5BINDIR
-
-# End /etc/profile.d/qt5.sh</literal>
-EOF</userinput></screen>
-
-      <note>
-        <para>
-          If you have installed <application>Qt5</application>
-          in <filename class="directory">/usr</filename> you
-          can skip the rest of this section.
-        </para>
-      </note>
-
-      <para>
-        If you installed <application>Qt5</application> in a location other
-        than <filename class="directory">/usr</filename>, you need to update the
-        following configuration files so that <application>Qt5</application> is
-        correctly found by other packages and system processes.
-      </para>
-
-      <para>
-        As the <systemitem class="username">root</systemitem> user, update
-        the <filename>/etc/ld.so.conf</filename> file and the dynamic linker's
-        run-time cache file:
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; EOF
-<literal># Begin Qt5 addition
-
-$QT5PREFIX/lib
-
-# End Qt5 addition</literal>
-EOF
-
-ldconfig</userinput></screen>
-
-      <indexterm zone="qt5 qt5-config">
-        <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
-      </indexterm>
-
-      <para>
-        If you have installed <xref linkend="qtchooser"/>, create
-        the <filename>/etc/profile.d/qt5.sh</filename> file by
-        running the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/qt5.sh &lt;&lt; EOF
-<literal># Begin /etc/profile.d/qt5.sh
-
-export QT5DIR=$QT5PREFIX
-export QT5BINDIR=$QT5BINDIR
-
-pathappend $QT5PREFIX               CMAKE_PREFIX_PATH
-pathappend $QT5PREFIX/lib/pkgconfig PKG_CONFIG_PATH
-
-# End /etc/profile.d/qt5.sh</literal>
-EOF</userinput></screen>
-
-      <para>
-        If you have not installed <xref linkend="qtchooser"/>,
-        create the <filename>/etc/profile.d/qt5.sh</filename>
-        file by running the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/qt5.sh &lt;&lt; EOF
-<literal># Begin /etc/profile.d/qt5.sh
-
-export QT5DIR=$QT5PREFIX
-export QT5BINDIR=$QT5BINDIR
-
-pathappend $QT5PREFIX               CMAKE_PREFIX_PATH
-pathappend $QT5BINDIR               PATH
-pathappend $QT5PREFIX/lib/pkgconfig PKG_CONFIG_PATH
-
-# End /etc/profile.d/qt5.sh</literal>
-EOF</userinput></screen>
-
-      <note>
-        <para>
-          If <xref linkend="qtchooser"/> is not installed and you
-          also have <application>Qt4</application> installed,
-          you will need to manually adjust the <envar>PATH</envar>
-          variable depending on which <application>Qt</application>
-          version is needed.
-        </para>
-      </note>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          assistant, designer, lconvert, linguist, lrelease,
-          lupdate, moc, pixeltool, qcollectiongenerator, qdbus,
-          qdbuscpp2xml, qdbusviewer, qdbusxml2cpp, qdoc, qhelpconverter,
-          qhelpgenerator, qlalr, qmake, qml, qml1plugindump, qmlbundle,
-          qmleasing, qmlimportscanner, qmllint, qmlmin, qmlplugindump,
-          qmlprofiler, qmlscene, qmltestrunner, qmlviewer, qtdiag,
-          qtpaths, qtwaylandscanner, rcc, sdpscanner, syncqt.pl, uic,
-          xmlpatterns, and xmlpatternsvalidator
-        </seg>
-        <seg>
-          libEnginio.so, libqgsttools_p.so, libQt5Bluetooth.so,
-          libQt5Bootstrap.a, libQt5CLucene.so, libQt5Concurrent.so,
-          libQt5Core.so, libQt5DBus.so, libQt5Declarative.so,
-          libQt5DesignerComponents.so, libQt5Designer.so, libQt5Gui.so,
-          libQt5Help.so, libQt5Location.so, libQt5MultimediaQuick_p.so,
-          libQt5Multimedia.so, libQt5MultimediaWidgets.so,
-          libQt5Network.so, libQt5Nfc.so, libQt5OpenGLExtensions.a,
-          libQt5OpenGL.so, libQt5PlatformSupport.a, libQt5Positioning.so,
-          libQt5PrintSupport.so, libQt5QmlDevTools.a, libQt5Qml.so,
-          libQt5QuickParticles.so, libQt5Quick.so, libQt5QuickTest.so,
-          libQt5QuickWidgets.so, libQt5Script.so, libQt5ScriptTools.so,
-          libQt5Sensors.so, libQt5SerialPort.so, libQt5Sql.so, libQt5Svg.so,
-          libQt5Test.so, libQt5UiTools.a, libQt5WaylandClient.so,
-          libQt5WebChannel.so, libQt5WebEngineCore.so, libQt5WebEngine.so,
-          libQt5WebEngineWidgets.so, libQt5WebKit.so, libQt5WebKitWidgets.so,
-          libQt5WebSockets.so, libQt5Widgets.so, libQt5X11Extras.so,
-          libQt5XmlPatterns.so, and libQt5Xml.so
-        </seg>
-        <seg>
-          $QT5PREFIX/include/qt5,
-          $QT5PREFIX/lib/qt5,
-          $QT5PREFIX/lib/cmake/{Qt5,Qt5Bluetooth,Qt5Concurrent},
-          $QT5PREFIX/lib/cmake/{Qt5Core,Qt5DBus,Qt5Declarative},
-          $QT5PREFIX/lib/cmake/{Qt5Designer,Qt5Enginio,Qt5Gui},
-          $QT5PREFIX/lib/cmake/{Qt5Help,Qt5LinguistTools,Qt5Location},
-          $QT5PREFIX/lib/cmake/{Qt5Multimedia,Qt5MultimediaWidgets},
-          $QT5PREFIX/lib/cmake/{Qt5Network,Qt5Nfc,Qt5OpenGL},
-          $QT5PREFIX/lib/cmake/{Qt5OpenGLExtensions,Qt5Positioning},
-          $QT5PREFIX/lib/cmake/{Qt5PrintSupport,Qt5Qml,Qt5Quick},
-          $QT5PREFIX/lib/cmake/{Qt5QuickTest,Qt5QuickWidgets,Qt5Script},
-          $QT5PREFIX/lib/cmake/{Qt5ScriptTools,Qt5Sensors,Qt5SerialPort},
-          $QT5PREFIX/lib/cmake/{Qt5Sql,Qt5Svg,Qt5Test,Qt5UiTools},
-          $QT5PREFIX/lib/cmake/{Qt5WaylandClient,Qt5WebChannel},
-          $QT5PREFIX/lib/cmake/{Qt5WebEngine,Qt5WebEngineCore},
-          $QT5PREFIX/lib/cmake/{Qt5WebEngineWidgets,Qt5WebKit},
-          $QT5PREFIX/lib/cmake/{Qt5WebKitWidgets,Qt5WebSockets,Qt5Widgets},
-          $QT5PREFIX/lib/cmake/{Qt5X11Extras,Qt5Xml,Qt5XmlPatterns},
-          $QT5PREFIX/share/doc/qt5, and
-          $QT5PREFIX/share/qt5
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="assistant-qt5">
-        <term><command>assistant</command></term>
-        <listitem>
-          <para>
-            is a tool for presenting on-line documentation.
-          </para>
-          <indexterm zone="qt5 assistant-qt5">
-            <primary sortas="b-assistant-qt5">assistant</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="designer-qt5">
-        <term><command>designer</command></term>
-        <listitem>
-          <para>
-            is a full-fledged GUI builder. It includes
-            powerful features such as preview mode, automatic widget
-            layout, support for custom widgets, and an advanced
-            property editor.
-          </para>
-          <indexterm zone="qt5 designer-qt5">
-            <primary sortas="b-designer-qt5">designer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lconvert-qt5">
-        <term><command>lconvert</command></term>
-        <listitem>
-          <para>
-            is part of Qt5's Linguist tool chain. It can be used as a
-            standalone tool to convert and filter translation data files.
-          </para>
-          <indexterm zone="qt5 lconvert-qt5">
-            <primary sortas="b-lconvert-qt5">lconvert</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="linguist-qt5">
-        <term><command>linguist</command></term>
-        <listitem>
-          <para>
-            provides support for translating applications into
-            local languages.
-          </para>
-          <indexterm zone="qt5 linguist-qt5">
-            <primary sortas="b-linguist-qt5">linguist</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lrelease-qt5">
-        <term><command>lrelease</command></term>
-        <listitem>
-          <para>
-            is a simple command line tool. It reads a Qt project
-            file and produces message files used by the application.
-          </para>
-          <indexterm zone="qt5 lrelease-qt5">
-            <primary sortas="b-lrelease-qt5">lrelease</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lupdate-qt5">
-        <term><command>lupdate</command></term>
-        <listitem>
-          <para>
-            reads a Qt project file, finds the translatable
-            strings in the specified source, header and Qt Designer
-            interface files, and produces or updates the translation
-            files listed in the project file.
-          </para>
-          <indexterm zone="qt5 lupdate-qt5">
-            <primary sortas="b-lupdate-qt5">lupdate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="moc-qt5">
-        <term><command>moc</command></term>
-        <listitem>
-          <para>
-            generates Qt meta object support code.
-          </para>
-          <indexterm zone="qt5 moc-qt5">
-            <primary sortas="b-moc-qt5">moc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pixeltool-qt5">
-        <term><command>pixeltool</command></term>
-        <listitem>
-          <para>
-            is a desktop magnifier and as you move your mouse around
-            the screen it will show the magnified contents in its window.
-          </para>
-          <indexterm zone="qt5 pixeltool-qt5">
-            <primary sortas="b-pixeltool-qt5">pixeltool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="qcollectiongenerator-qt5">
-        <term><command>qcollectiongenerator</command></term>
-        <listitem>
-          <para>
-            is a tool used to create a Qt Help Collection.
-          </para>
-          <indexterm zone="qt5 qcollectiongenerator-qt5">
-            <primary sortas="b-qcollectiongenerator-qt5">qcollectiongenerator</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="qdbuscpp2xml-qt5">
-        <term><command>qdbuscpp2xml</command></term>
-        <listitem>
-          <para>
-            takes a C++ source file and generates a D-Bus XML definition
-            of the interface. 
-          </para>
-          <indexterm zone="qt5 qdbuscpp2xml-qt5">
-            <primary sortas="b-qdbuscpp2xml-qt5">qdbuscpp2xml</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qdbus-qt5">
-        <term><command>qdbus</command></term>
-        <listitem>
-          <para>
-            lists available services, object paths,  methods, signals, and
-            properties of objects on a bus.
-          </para>
-          <indexterm zone="qt5 qdbus-qt5">
-            <primary sortas="b-qdbus-qt5">qdbus</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qdbusviewer-qt5">
-        <term><command>qdbusviewer</command></term>
-        <listitem>
-          <para>
-            is a graphical D-Bus browser.
-          </para>
-          <indexterm zone="qt5 qdbusviewer-qt5">
-            <primary sortas="b-qdbusviewer-qt5">qdbusviewer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qdbusxml2cpp-qt5">
-        <term><command>qdbusxml2cpp</command></term>
-        <listitem>
-          <para>
-            is a tool that can be used to parse interface descriptions
-            and produce static code representing those interfaces,
-          </para>
-          <indexterm zone="qt5 qdbusxml2cpp-qt5">
-            <primary sortas="b-qdbusxml2cpp-qt5">qdbusxml2cpp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
- 
-      <varlistentry id="qdoc-qt5">
-        <term><command>qdoc</command></term>
-        <listitem>
-          <para>
-            is a tool used by <application>Qt</application> Developers to
-            generate documentation for software projects.
-          </para>
-          <indexterm zone="qt5 qdoc-qt5">
-            <primary sortas="b-qdoc-qt5">qdoc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qhelpconverter-qt5">
-        <term><command>qhelpconverter</command></term>
-        <listitem>
-          <para>
-            is a tool used to convert files to <application>Qt</application>
-            help format.
-          </para>
-          <indexterm zone="qt5 qhelpconverter-qt5">
-            <primary sortas="b-qhelpconverter-qt5">qhelpconverter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qhelpgenerator-qt5">
-        <term><command>qhelpgenerator</command></term>
-        <listitem>
-          <para>
-            is a tool used to generate a <application>Qt</application>
-            compressed help file. 
-          </para>
-          <indexterm zone="qt5 qhelpgenerator-qt5">
-            <primary sortas="b-qhelpgenerator-qt5">qhelpgenerator</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qlalr-qt5">
-        <term><command>qlalr</command></term>
-        <listitem>
-          <para>
-            is a tool used to generate code from grammar specifications.
-          </para>
-          <indexterm zone="qt5 qlalr-qt5">
-            <primary sortas="b-qlalr-qt5">qlalr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmake-qt5">
-        <term><command>qmake</command></term>
-        <listitem>
-          <para>
-            uses information stored in project files to
-            determine what should go in the makefiles it
-            generates.
-          </para>
-          <indexterm zone="qt5 qmake-qt5">
-            <primary sortas="b-qmake-qt5">qmake</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qml1plugindump-qt5">
-        <term><command>qml1plugindump</command></term>
-        <listitem>
-          <para>
-            is a symlink to <application>qtchooser</application>.
-          </para>
-          <indexterm zone="qt5 qml1plugindump-qt5">
-            <primary sortas="b-qml1plugindump-qt5">qml1plugindump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="qmlbundle-qt5">
-        <term><command>qmlbundle</command></term>
-        <listitem>
-          <para>
-            is a tool used to manage QML bundle.
-          </para>
-          <indexterm zone="qt5 qmlbundle-qt5">
-            <primary sortas="b-qmlbundle-qt5">qmlbundle</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="qmleasing-qt5">
-        <term><command>qmleasing</command></term>
-        <listitem>
-          <para>
-            is a tool used to define the easing curves using an
-            interactive curve editor.
-          </para>
-          <indexterm zone="qt5 qmleasing-qt5">
-            <primary sortas="b-qmleasing-qt5">qmleasing</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmlimportscanner-qt5">
-        <term><command>qmlimportscanner</command></term>
-        <listitem>
-          <para>
-            is a tool used to import QML files from a directory.
-          </para>
-          <indexterm zone="qt5 qmlimportscanner-qt5">
-            <primary sortas="b-qmlimportscanner-qt5">qmlimportscanner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmllint-qt5">
-        <term><command>qmllint</command></term>
-        <listitem>
-          <para>
-            is a syntax checker for QML files.
-          </para>
-          <indexterm zone="qt5 qmllint-qt5">
-            <primary sortas="b-qmllint-qt5">qmllint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmlmin-qt5">
-        <term><command>qmlmin</command></term>
-        <listitem>
-          <para>
-            removes comments and layout characters from a QML file.
-          </para>
-          <indexterm zone="qt5 qmlmin-qt5">
-            <primary sortas="b-qmlmin-qt5">qmlmin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="qmlplugindump-qt5">
-        <term><command>qmlplugindump</command></term>
-        <listitem>
-          <para>
-            is a tool to create a qmltypes file.
-          </para>
-          <indexterm zone="qt5 qmlplugindump-qt5">
-            <primary sortas="b-qmlplugindump-qt5">qmlplugindump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmlprofiler-qt5">
-        <term><command>qmlprofiler</command></term>
-        <listitem>
-          <para>
-            is a tool used to analyze QML applications.
-          </para>
-          <indexterm zone="qt5 qmlprofiler-qt5">
-            <primary sortas="b-qmlprofiler-qt5">qmlprofiler</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!--
-      <varlistentry id="qml-qt5">
-        <term><command>qml</command></term>
-        <listitem>
-          <para>
-            do something.......
-          </para>
-          <indexterm zone="qt5 qml-qt5">
-            <primary sortas="b-qml-qt5">qml</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-
-      <varlistentry id="qmlscene-qt5">
-        <term><command>qmlscene</command></term>
-        <listitem>
-          <para>
-            is a utility that loads and displays QML documents even before
-            the application is complete.
-          </para>
-          <indexterm zone="qt5 qmlscene-qt5">
-            <primary sortas="b-qmlscene-qt5">qmlscene</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmltestrunner-qt5">
-        <term><command>qmltestrunner</command></term>
-        <listitem>
-          <para>
-            is a tool used to make tests.
-          </para>
-          <indexterm zone="qt5 qmltestrunner-qt5">
-            <primary sortas="b-qmltestrunner-qt5">qmltestrunner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmlviewer-qt5">
-        <term><command>qmlviewer</command></term>
-        <listitem>
-          <para>
-            is a tool for loading QML documents that makes it easy to quickly
-            develop and debug QML applications.
-          </para>
-          <indexterm zone="qt5 qmlviewer-qt5">
-            <primary sortas="b-qmlviewer-qt5">qmlviewer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qtdiag-qt5">
-        <term><command>qtdiag</command></term>
-        <listitem>
-          <para>
-            is a tool for reporting diagnostic information about Qt and its
-            environment.
-          </para>
-          <indexterm zone="qt5 qtdiag-qt5">
-            <primary sortas="b-qtdiag-qt5">qtdiag</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qtpaths-qt5">
-        <term><command>qtpaths</command></term>
-        <listitem>
-          <para>
-            is a tool to query Qt path information.
-          </para>
-          <indexterm zone="qt5 qtpaths-qt5">
-            <primary sortas="b-qtpaths-qt5">qtpaths</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rcc-qt5">
-        <term><command>rcc</command></term>
-        <listitem>
-          <para>
-            is a resource compiler used in conjunction with designer.
-          </para>
-          <indexterm zone="qt5 rcc-qt5">
-            <primary sortas="b-rcc-qt5">rcc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="syncqt.pl-qt5">
-        <term><command>syncqt.pl</command></term>
-        <listitem>
-          <para>
-            is a script to create the forwarding headers in the include
-            directories. It is an internal development tool.
-          </para>
-          <indexterm zone="qt5 syncqt.pl-qt5">
-            <primary sortas="b-syncqt.pl-qt5">syncqt.pl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uic-qt5">
-        <term><command>uic</command></term>
-        <listitem>
-          <para>
-            is a Qt user interface compiler.
-          </para>
-          <indexterm zone="qt5 uic-qt5">
-            <primary sortas="b-uic-qt5">uic</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xmlpatterns-qt5">
-        <term><command>xmlpatterns</command></term>
-        <listitem>
-          <para>
-            provides support for XPath, XQuery, XSLT, and XML Schema
-            validation.
-          </para>
-          <indexterm zone="qt5 xmlpatterns-qt5">
-            <primary sortas="b-xmlpatterns-qt5">xmlpatterns</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="xmlpatternsvalidator-qt5">
-        <term><command>xmlpatternsvalidator</command></term>
-        <listitem>
-          <para>
-            is a tool used to validate XML documents.
-          </para>
-          <indexterm zone="qt5 xmlpatternsvalidator-qt5">
-            <primary sortas="b-xmlpatternsvalidator-qt5">xmlpatternsvalidator</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: lib/webkitgtk26-systemd.xml
===================================================================
--- x/lib/webkitgtk26-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,373 +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 webkitgtk26-download-http "http://webkitgtk.org/releases/webkitgtk-&webkitgtk26-version;.tar.xz">
-  <!ENTITY webkitgtk26-download-ftp  " ">
-  <!ENTITY webkitgtk26-md5sum        "1de090e3c263565c07796e5e98f8b73d">
-  <!ENTITY webkitgtk26-size          "9.5 MB">
-  <!ENTITY webkitgtk26-buildsize     "884.8 MB">
-  <!ENTITY webkitgtk26-time          "72.8 SBU (using parallelism=2)">
-]>
-
-<sect1 id="webkitgtk26" xreflabel="WebKitGTK+-&webkitgtk26-version;">
-  <?dbhtml filename="webkitgtk26.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy: cjg $</othername>
-    <date>$Date: 2014-09-07 19:15:49 +1200 (Sun, 07 Sep 2014) $</date>
-  </sect1info>
-
-  <title>WebKitGTK+-&webkitgtk26-version;</title>
-
-  <indexterm zone="webkitgtk26">
-    <primary sortas="a-WebKitGTK+">WebKitGTK+</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to WebKitGTK+</title>
-
-    <para>
-      The <application>WebKitGTK+</application> is the port of the portable
-      web rendering engine <application>WebKit</application> to the
-      <application>GTK+ 3</application> platform.  This version also changes
-      to the cmake build system and is not yet compatible with all applications.
-    </para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&webkitgtk26-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&webkitgtk26-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &webkitgtk26-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &webkitgtk26-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &webkitgtk26-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &webkitgtk26-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">WebKitGTK+ Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gst10-plugins-base"/>,
-      <xref linkend="gtk3"/> or
-      <xref linkend="gtk2"/> or both,
-      <xref linkend="icu"/>,
-      <xref linkend="libsecret"/>,
-      <xref linkend="libsoup"/>,
-      <xref linkend="libwebp"/>,
-      <xref linkend="mesalib"/>,
-      <xref linkend="ruby"/>,
-      <xref linkend="sqlite"/>,
-      <xref linkend="systemd"/> (for GUdev) and
-      <xref linkend="which"/>
-    </para>
-
-    <note>
-      <para>
-        Note that WebKit2 links against <application>GTK+ 2</application>
-        (even if <application>GTK+ 3</application> is being used) in order
-        to be able to use NPAPI plugins such as Adobe Flash.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="enchant"/>,
-      <xref linkend="geoclue2"/> or
-      <xref linkend="geoclue"/>,
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="hicolor-icon-theme"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="llvm"/> and
-      <ulink url="http://xsltml.sourceforge.net/">MathML</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/webkitgtk"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of WebKitGTK+</title>
-
-<!--    <para>
-      If you have not installed <xref linkend="gtk-doc"/>, fix a bug that will
-      cause <command>make install</command> to fail:
-    </para>
-
-<screen><userinput>sed -i '/generate-gtkdoc - -rebase/s:^:# :' GNUmakefile.in</userinput></screen>-->
-
-<!--    <note>
-      <para>
-        Unless noted otherwise, the packages depending on this package
-        expect it to be built against <application>GTK+ 3</application>.
-      </para>
-    </note>
-
-    <para>
-      To build <application>WebKitGTK+</application> against
-      <application>GTK+ 3</application>, run the following
-      commands:
-    </para>
-
-<screen><userinput>./configure - -prefix=/usr - -enable-introspection &amp;&amp;
-make</userinput></screen>-->
-
-    <para>
-      To build <application>WebKitGTK+</application>, run the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-pushd build &amp;&amp;
-      cmake -DCMAKE_BUILD_TYPE=Release  \
-       -DCMAKE_INSTALL_PREFIX=/usr \
-       -DCMAKE_SKIP_RPATH=ON       \
-       -DPORT=GTK                  \
-       -DENABLE_GTKDOC=ON          \
-       -DUSE_SYSTEM_MALLOC=ON      \
-       -DCMAKE_INSTALL_DOCDIR=/usr/share/doc \
-       -DLIB_INSTALL_DIR=/usr/lib .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not have a working testsuite. However, there are two
-      useable basic graphical web browsers in the source directory,
-      <application>Programs/GtkLauncher</application> and
-      <application>Programs/MiniBrowser</application>. If launching any one
-      fails, there is a problem with the build.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-<!--    <para>
-      If you have built the package against <application>GTK+ 3</application>,
-      rename the following directory to avoid conflicts with the package
-      built against <application>GTK+ 2</application> by running the
-      following commands as the <systemitem
-      class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>rm -rf /usr/share/gtk-doc/html/webkit{,dom}gtk-3.0 &amp;&amp;
-mv -v /usr/share/gtk-doc/html/webkitdomgtk{,-3.0}  &amp;&amp;
-mv -v /usr/share/gtk-doc/html/webkitgtk{,-3.0}</userinput></screen>
-
-    <para>
-      If you have built the package against <application>GTK+ 2</application>,
-      rename the following directory to avoid conflicts with the package
-      built against <application>GTK+ 3</application> by running the
-      following commands as the <systemitem
-      class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>rm -rf /usr/share/gtk-doc/html/webkit{,dom}gtk-1.0 &amp;&amp;
-mv -v /usr/share/gtk-doc/html/webkitdomgtk{,-1.0}  &amp;&amp;
-mv -v /usr/share/gtk-doc/html/webkitgtk{,-1.0}</userinput></screen>-->
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-<!--    <para>
-      <parameter>- -enable-introspection</parameter>: This switch enables
-      <application>Gobject Introspection</application> bindings and is
-      required if building <application>GNOME</application> Desktop.
-      Remove if you don't have <application>Gobject
-      Introspection</application> installed or you don't want to install
-      <application>GNOME</application>. It is not needed if building
-      against <application>GTK+ 2</application>, although it can be used
-      if desired.
-    </para>-->
-
-<!--    <para>
-      <parameter>- -with-gtk=2.0 - -disable-webkit2</parameter>: These switches
-      force <application>WebKitGTK+</application> to compile against
-      <application>GTK+ 2</application>, even if
-      <application>GTK+ 3</application> is also installed.
-    </para>-->
-
-    <para>
-      <option>-DUSE_SYSTEM_MALLOC=ON</option>: This switch enables building
-      against the system installed <application>malloc</application>.
-    </para>
-
-    <para>
-      <option>-DENABLE_GEOLOCATION=OFF</option>: Use this switch if you don't
-      want to install <xref linkend="geoclue"/> or
-      <xref linkend="geoclue2"/>.
-    </para>
-
-    <para>
-      <option>-DENABLE_GTKDOC=ON</option>: Remove this switch if you don't
-      want to install <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          jsc
-        </seg>
-        <seg>
-          libjavascriptcoregtk-4.0.so and
-          libwebkit2gtk-4.0.so
-        </seg>
-        <seg>
-          /usr/include/webkitgtk-4.0,
-          /usr/lib/webkit2gtk-4.0,
-          /usr/libexec/webkit2gtk-4.0,
-          /usr/share/gtk-doc/html/webkit2gtk-4.0, and
-          /usr/share/gtk-doc/html/webkitdomgtk-4.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="jsc">
-        <term><command>jsc</command></term>
-        <listitem>
-          <para>
-            is a command-line utility that allows you to run JavaScript programs
-            outside of the context of a web browser linked against
-            <filename class="libraryfile">libjavascriptcoregtk-4.0.so</filename>.
-          </para>
-          <indexterm zone="webkitgtk26 jsc">
-            <primary sortas="b-jsc">jsc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!--      <varlistentry id="jsc-1">
-        <term><command>jsc-1</command></term>
-        <listitem>
-          <para>
-            is a command-line utility that allows you to run JavaScript programs
-            outside of the context of a web browser linked against
-            <filename class="libraryfile">libjavascriptcoregtk-1.0.so</filename>.
-          </para>
-          <indexterm zone="webkitgtk2 jsc-1">
-            <primary sortas="b-jsc-1">jsc-1</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
-
-      <varlistentry id="libjavascriptcoregtk-4.0">
-        <term><filename
-        class="libraryfile">libjavascriptcoregtk-4.0.so</filename></term>
-        <listitem>
-          <para>
-            contains core JavaScript API functions used by <command>jsc</command>
-            and <filename class="libraryfile">libwebkitgtk-4.0.so</filename>.
-          </para>
-          <indexterm zone="webkitgtk26 libjavascriptcoregtk-4.0">
-            <primary sortas="c-libjavascriptcoregtk-4.0">libjavascriptcoregtk-4.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwebkitgtk-4.0">
-        <term><filename class="libraryfile">libwebkitgtk-4.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>WebKitGTK+</application> API functions for
-            <application>GTK+ 3</application>.
-          </para>
-          <indexterm zone="webkitgtk26 libwebkitgtk-4.0">
-            <primary sortas="c-libwebkitgtk-3.0">libwebkitgtk-4.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!--      <varlistentry id="libwebkit2gtk-3.0">
-        <term><filename class="libraryfile">libwebkit2gtk-3.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>WebKit2</application> API functions.
-          </para>
-          <indexterm zone="webkitgtk26 libwebkit2gtk-3.0">
-            <primary sortas="c-libwebkit2gtk-3.0">libwebkit2gtk-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
-
-<!--      <varlistentry id="libjavascriptcoregtk-1.0">
-        <term><filename
-        class="libraryfile">libjavascriptcoregtk-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains core JavaScript API functions used by <command>jsc-1</command>
-            and <filename class="libraryfile">libwebkitgtk-1.0.so</filename>.
-          </para>
-          <indexterm zone="webkitgtk26 libjavascriptcoregtk-1.0">
-            <primary sortas="c-libjavascriptcoregtk-1.0">libjavascriptcoregtk-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwebkitgtk-1.0">
-        <term><filename class="libraryfile">libwebkitgtk-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>WebKitGTK+</application> API functions for
-            <application>GTK+ 2</application>.
-          </para>
-          <indexterm zone="webkitgtk26 libwebkitgtk-1.0">
-            <primary sortas="c-libwebkitgtk-1.0">libwebkitgtk-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: xfce/core/core.xml
===================================================================
--- xfce/core/core.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ xfce/core/core.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -53,5 +53,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfdesktop.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfwm4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfce4-session-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfce4-session.xml"/>
 
 </chapter>
Index: ce/core/thunar-systemd.xml
===================================================================
--- xfce/core/thunar-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,229 +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 thunar-download-http
-           "http://archive.xfce.org/src/xfce/thunar/1.6/Thunar-&thunar-version;.tar.bz2">
-  <!ENTITY thunar-download-ftp  " ">
-  <!ENTITY thunar-md5sum        "4f10d5d5576ce5127308d6badbac3afa">
-  <!ENTITY thunar-size          "1.9 MB">
-  <!ENTITY thunar-buildsize     "60 MB">
-  <!ENTITY thunar-time          "0.7 SBU">
-]>
-
-<sect1 id="thunar" xreflabel="Thunar-&thunar-version;">
-  <?dbhtml filename="thunar.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Thunar-&thunar-version;</title>
-
-  <indexterm zone="thunar">
-    <primary sortas="a-Thunar">Thunar</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Thunar</title>
-
-    <para>
-      <application>Thunar</application> is the <application>Xfce</application>
-      file manager, a <application>GTK+ 2</application> GUI to organise the files
-      on your computer.
-    </para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&thunar-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&thunar-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &thunar-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &thunar-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &thunar-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &thunar-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Thunar Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="exo"/> and
-      <xref linkend="libxfce4ui"/>
-    </para>
-
-    <bridgehead renderas="sect4">Required (Runtime)</bridgehead>
-    <para role="required runtime">
-      <xref linkend="gnome-icon-theme"/> or
-      <xref linkend="lxde-icon-theme"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libnotify"/>,
-      <xref linkend="startup-notification"/>,
-      <xref linkend="systemd"/> (for GUdev) and
-      <xref linkend="xfce4-panel"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libexif"/> and
-      <xref linkend="tumbler"/> (runtime)
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/thunar"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Thunar</title>
-
-    <para>
-      Install <application>Thunar</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --docdir=/usr/share/doc/Thunar-&thunar-version; &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>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          Thunar, thunar and thunar-settings
-        </seg>
-        <seg>
-          libthunarx-2.so
-        </seg>
-        <seg>
-          /etc/xdg/Thunar,
-          /usr/include/thunarx-2,
-          /usr/lib/Thunar,
-          /usr/lib/thunarx-2,
-          /usr/share/doc/Thunar-&thunar-version;,
-          /usr/share/gtk-doc/html/thunarx,
-          /usr/share/pixmaps/Thunar and
-          /usr/share/Thunar
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="Thunar">
-        <term><command>Thunar</command></term>
-        <listitem>
-          <para>
-            is the <application>Xfce</application> file manager.
-          </para>
-          <indexterm zone="thunar Thunar">
-            <primary sortas="b-Thunar">Thunar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="thunar-prog">
-        <term><command>thunar</command></term>
-        <listitem>
-          <para>
-            is a symbolic link to <application>Thunar</application>.
-          </para>
-          <indexterm zone="thunar thunar-prog">
-            <primary sortas="b-thunar">thunar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="thunar-settings">
-        <term><command>thunar-settings</command></term>
-        <listitem>
-          <para>
-            is a shell script that launches a dialog box to allow you to alter
-            the behaviour of <application>Thunar</application>.
-          </para>
-          <indexterm zone="thunar thunar-settings">
-            <primary sortas="b-thunar-settings">thunar-settings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libthunarx-2">
-        <term><filename class="libraryfile">libthunarx-2.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Thunar</application> extension library
-            which permits adding new features to the
-            <application>Thunar</application> file manager.
-          </para>
-          <indexterm zone="thunar libthunarx-2">
-            <primary sortas="c-libthunarx-2">libthunarx-2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ce/core/thunar-volman-systemd.xml
===================================================================
--- xfce/core/thunar-volman-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,180 +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 thunar-volman-download-http
-           "http://archive.xfce.org/src/xfce/thunar-volman/0.8/thunar-volman-&thunar-volman-version;.tar.bz2">
-  <!ENTITY thunar-volman-download-ftp  " ">
-  <!ENTITY thunar-volman-md5sum        "250af757ea629c7c27f554d17119080c">
-  <!ENTITY thunar-volman-size          "404 KB">
-  <!ENTITY thunar-volman-buildsize     "6.6 MB">
-  <!ENTITY thunar-volman-time          "0.1 SBU">
-]>
-
-<sect1 id="thunar-volman" xreflabel="thunar-volman-&thunar-volman-version;">
-  <?dbhtml filename="thunar-volman.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>thunar-volman-&thunar-volman-version;</title>
-
-  <indexterm zone="thunar-volman">
-    <primary sortas="a-thunar-volman">thunar-volman</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to the Thunar Volume Manager</title>
-
-    <para>
-      The <application>Thunar Volume Manager</application> is an extension for
-      the <application>Thunar</application> file manager, which enables
-      automatic management of removable drives and media.
-    </para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&thunar-volman-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&thunar-volman-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &thunar-volman-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &thunar-volman-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &thunar-volman-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &thunar-volman-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Thunar Volume Manager Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="exo"/>,
-      <xref linkend="libxfce4ui"/> and
-      <xref linkend="systemd"/> (for GUdev)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libnotify"/> and
-      <xref linkend="startup-notification"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended Runtime Dependencies</bridgehead>
-    <para role="optional">
-      <xref linkend="gvfs"/> and
-      <xref linkend="polkit-gnome"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/thunar-volman"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of the Thunar Volume Manager</title>
-
-    <para>
-      Install the <application>Thunar Volume Manager</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &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="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          thunar-volman and thunar-volman-settings
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="thunar-volman-prog">
-        <term><command>thunar-volman</command></term>
-        <listitem>
-          <para>
-            is the <application>Thunar</application> Volume Manager, a command
-            line utility to automatically mount or unmount removable media.
-          </para>
-          <indexterm zone="thunar-volman thunar-volman-prog">
-            <primary sortas="b-thunar-volman">thunar-volman</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="thunar-volman-settings">
-        <term><command>thunar-volman-settings</command></term>
-        <listitem>
-          <para>
-            is a small <application>GTK+ 2</application> application for changing
-            <application>Thunar Volume Manager</application> settings.
-          </para>
-          <indexterm zone="thunar-volman thunar-volman-settings">
-            <primary sortas="b-thunar-volman-settings">thunar-volman-settings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ce/core/xfce4-session-systemd.xml
===================================================================
--- xfce/core/xfce4-session-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,265 +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 xfce4-session-download-http
-           "http://archive.xfce.org/src/xfce/xfce4-session/&xfce4-version;/xfce4-session-&xfce4-session-version;.tar.bz2">
-  <!ENTITY xfce4-session-download-ftp  " ">
-  <!ENTITY xfce4-session-md5sum        "f4921fb2e606e74643daf1212263076c">
-  <!ENTITY xfce4-session-size          "1.2 MB">
-  <!ENTITY xfce4-session-buildsize     "14 MB">
-  <!ENTITY xfce4-session-time          "0.2 SBU">
-]>
-
-<sect1 id="xfce4-session" xreflabel="xfce4-session-&xfce4-session-version;">
-  <?dbhtml filename="xfce4-session.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>xfce4-session-&xfce4-session-version;</title>
-
-  <indexterm zone="xfce4-session">
-    <primary sortas="a-xfce4-session">xfce4-session</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Xfce4 Session</title>
-
-    <para>
-      <application>Xfce4 Session</application> is a session manager for
-      <application>Xfce</application>. Its task is to save the state of your
-      desktop (opened applications and their location) and restore it during a
-      next startup. You can create several different sessions and choose one of
-      them on startup.
-    </para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xfce4-session-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xfce4-session-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xfce4-session-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xfce4-session-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xfce4-session-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xfce4-session-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xfce4 Session Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libwnck2"/>,
-      <xref linkend="libxfce4ui"/>,
-      <xref linkend="which"/>, and
-      <xref linkend="xorg7-app"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="desktop-file-utils"/> and
-      <xref linkend="shared-mime-info"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/xfce4-session"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Xfce4 Session</title>
-
-    <para>
-      Install <application>Xfce4 Session</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --disable-legacy-sm &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>
-
-    <para>
-      <option>--disable-legacy-sm</option>: This switch disables
-      legacy session management which isn't necessary on modern
-      system.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Xfce4 Session</title>
-
-    <para>
-      There are several optional run time dependencies for
-      <application>Xfce4</application>:
-      <xref linkend="dbus"/>,
-      <xref linkend="gnupg2"/>,
-      <xref linkend="hicolor-icon-theme"/>,
-      <xref linkend="openssh"/> and
-      <xref linkend="systemd"/>
-    </para>
-
-    <para>
-      To launch <application>Xfce4</application> use the command
-      <command>startxfce4</command>.
-    </para>
-
-    <para>
-      When building an <application>Xfce4</application> packages, some
-      configuration files are installed in <filename class="directory">
-      /usr/share/applications</filename>, <filename class="directory">
-      /usr/share/icons</filename>, and <filename class="directory">
-      /usr/share/mime</filename>. In order to use those files in your
-      <application>Xfce4</application> session, you need to update
-      various databases. Run the following commands as the
-      <systemitem class="username">root</systemitem> user to update
-      them (you need to have the recommended dependencies installed):
-   </para>
-
-<screen role="root"><userinput>update-desktop-database &amp;&amp;
-update-mime-database</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          xfce4-session,
-          xfce4-session-logout,
-          xfce4-session-settings and
-          xfce4-tips
-        </seg>
-        <seg>
-          libxfsm-4.6.so
-        </seg>
-        <seg>
-          /usr/include/xfce4/xfce4-session-4.6,
-          /usr/share/xfce4/tips and
-          /usr/share/doc/xfce4-session-&xfce4-session-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xfce4-session-prog">
-        <term><command>xfce4-session</command></term>
-        <listitem>
-          <para>
-            starts up the <application>Xfce</application> Desktop Environment.
-          </para>
-          <indexterm zone="xfce4-session xfce4-session-prog">
-            <primary sortas="b-xfce4-session">xfce4-session</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfce4-session-logout">
-        <term><command>xfce4-session-logout</command></term>
-        <listitem>
-          <para>
-            logs out from <application>Xfce</application>.
-          </para>
-          <indexterm zone="xfce4-session xfce4-session-logout">
-            <primary sortas="b-xfce4-session-logout">xfce4-session-logout</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfce4-session-settings">
-        <term><command>xfce4-session-settings</command></term>
-        <listitem>
-          <para>
-            is a <application>GTK+ 2</application> GUI which allows you to alter
-            your preferences for your <application>Xfce Session</application>.
-          </para>
-          <indexterm zone="xfce4-session xfce4-session-settings">
-            <primary sortas="b-xfce4-session-settings">xfce4-session-settings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xfce4-tips">
-        <term><command>xfce4-tips</command></term>
-        <listitem>
-          <para>
-            is a <application>GTK+ 2</application> GUI which displays tips when
-            you log in to an <application>Xfce Session</application>.
-          </para>
-          <indexterm zone="xfce4-session xfce4-tips">
-            <primary sortas="b-xfce4-tips">xfce4-tips</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libxfsm-4">
-        <term><filename class="libraryfile">libxfsm-4.6.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Xfce Session</application> API functions.
-          </para>
-          <indexterm zone="xfce4-session libxfsm-4">
-            <primary sortas="c-libxfsm-4">libxfsm-4.6.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: xfce/core/xfce4-session.xml
===================================================================
--- xfce/core/xfce4-session.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ xfce/core/xfce4-session.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -0,0 +1,265 @@
+<?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 xfce4-session-download-http
+           "http://archive.xfce.org/src/xfce/xfce4-session/&xfce4-version;/xfce4-session-&xfce4-session-version;.tar.bz2">
+  <!ENTITY xfce4-session-download-ftp  " ">
+  <!ENTITY xfce4-session-md5sum        "f4921fb2e606e74643daf1212263076c">
+  <!ENTITY xfce4-session-size          "1.2 MB">
+  <!ENTITY xfce4-session-buildsize     "14 MB">
+  <!ENTITY xfce4-session-time          "0.2 SBU">
+]>
+
+<sect1 id="xfce4-session" xreflabel="xfce4-session-&xfce4-session-version;">
+  <?dbhtml filename="xfce4-session.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>xfce4-session-&xfce4-session-version;</title>
+
+  <indexterm zone="xfce4-session">
+    <primary sortas="a-xfce4-session">xfce4-session</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Xfce4 Session</title>
+
+    <para>
+      <application>Xfce4 Session</application> is a session manager for
+      <application>Xfce</application>. Its task is to save the state of your
+      desktop (opened applications and their location) and restore it during a
+      next startup. You can create several different sessions and choose one of
+      them on startup.
+    </para>
+
+    &lfs77_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&xfce4-session-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&xfce4-session-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &xfce4-session-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &xfce4-session-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &xfce4-session-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &xfce4-session-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Xfce4 Session Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="libwnck2"/>,
+      <xref linkend="libxfce4ui"/>,
+      <xref linkend="which"/>, and
+      <xref linkend="xorg7-app"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="desktop-file-utils"/> and
+      <xref linkend="shared-mime-info"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/xfce4-session"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Xfce4 Session</title>
+
+    <para>
+      Install <application>Xfce4 Session</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --disable-legacy-sm &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>
+
+    <para>
+      <option>--disable-legacy-sm</option>: This switch disables
+      legacy session management which isn't necessary on modern
+      system.
+    </para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring Xfce4 Session</title>
+
+    <para>
+      There are several optional run time dependencies for
+      <application>Xfce4</application>:
+      <xref linkend="dbus"/>,
+      <xref linkend="gnupg2"/>,
+      <xref linkend="hicolor-icon-theme"/>,
+      <xref linkend="openssh"/> and
+      <xref linkend="systemd"/>
+    </para>
+
+    <para>
+      To launch <application>Xfce4</application> use the command
+      <command>startxfce4</command>.
+    </para>
+
+    <para>
+      When building an <application>Xfce4</application> packages, some
+      configuration files are installed in <filename class="directory">
+      /usr/share/applications</filename>, <filename class="directory">
+      /usr/share/icons</filename>, and <filename class="directory">
+      /usr/share/mime</filename>. In order to use those files in your
+      <application>Xfce4</application> session, you need to update
+      various databases. Run the following commands as the
+      <systemitem class="username">root</systemitem> user to update
+      them (you need to have the recommended dependencies installed):
+   </para>
+
+<screen role="root"><userinput>update-desktop-database &amp;&amp;
+update-mime-database</userinput></screen>
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          xfce4-session,
+          xfce4-session-logout,
+          xfce4-session-settings and
+          xfce4-tips
+        </seg>
+        <seg>
+          libxfsm-4.6.so
+        </seg>
+        <seg>
+          /usr/include/xfce4/xfce4-session-4.6,
+          /usr/share/xfce4/tips and
+          /usr/share/doc/xfce4-session-&xfce4-session-version;
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="xfce4-session-prog">
+        <term><command>xfce4-session</command></term>
+        <listitem>
+          <para>
+            starts up the <application>Xfce</application> Desktop Environment.
+          </para>
+          <indexterm zone="xfce4-session xfce4-session-prog">
+            <primary sortas="b-xfce4-session">xfce4-session</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xfce4-session-logout">
+        <term><command>xfce4-session-logout</command></term>
+        <listitem>
+          <para>
+            logs out from <application>Xfce</application>.
+          </para>
+          <indexterm zone="xfce4-session xfce4-session-logout">
+            <primary sortas="b-xfce4-session-logout">xfce4-session-logout</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xfce4-session-settings">
+        <term><command>xfce4-session-settings</command></term>
+        <listitem>
+          <para>
+            is a <application>GTK+ 2</application> GUI which allows you to alter
+            your preferences for your <application>Xfce Session</application>.
+          </para>
+          <indexterm zone="xfce4-session xfce4-session-settings">
+            <primary sortas="b-xfce4-session-settings">xfce4-session-settings</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xfce4-tips">
+        <term><command>xfce4-tips</command></term>
+        <listitem>
+          <para>
+            is a <application>GTK+ 2</application> GUI which displays tips when
+            you log in to an <application>Xfce Session</application>.
+          </para>
+          <indexterm zone="xfce4-session xfce4-tips">
+            <primary sortas="b-xfce4-tips">xfce4-tips</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libxfsm-4">
+        <term><filename class="libraryfile">libxfsm-4.6.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>Xfce Session</application> API functions.
+          </para>
+          <indexterm zone="xfce4-session libxfsm-4">
+            <primary sortas="c-libxfsm-4">libxfsm-4.6.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: oft/graphweb/firefox-systemd.xml
===================================================================
--- xsoft/graphweb/firefox-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,443 +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 firefox-download-http
-           "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
-  <!ENTITY firefox-download-ftp
-           "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
-  <!ENTITY firefox-md5sum        "d9b7e4819899e23466f5b0750408f128">
-  <!ENTITY firefox-size          "156.7 MB">
-  <!ENTITY firefox-buildsize     "3.9 GB (74 MB installed)">
-  <!ENTITY firefox-time          "46.3 SBU (using parallelism=2)">
-]>
-
-<sect1 id="firefox" xreflabel="Firefox-&firefox-version;">
-  <?dbhtml filename="firefox.html" ?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Firefox-&firefox-version;</title>
-
-  <indexterm zone="firefox">
-    <primary sortas="a-Firefox">Firefox</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Firefox</title>
-
-    <para>
-      <application>Firefox</application> is a stand-alone browser based on the
-      <application>Mozilla</application> codebase.
-    </para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&firefox-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&firefox-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &firefox-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &firefox-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &firefox-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &firefox-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Firefox Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="gtk2"/>,
-      <xref linkend="unzip"/> and
-      <xref linkend="zip"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="icu"/>,
-      <xref linkend="libevent"/>,
-      <xref linkend="libvpx"/>,
-      <xref linkend="nspr"/>,
-      <xref linkend="nss"/>,
-      <xref linkend="sqlite"/> and
-      <xref linkend="yasm"/>
-    </para>
-
-    <note>
-      <para>
-        If you don't install recommended dependencies,
-        then internal copies of those packages will
-        be used. They might be tested to work, but
-        they can be out of date or contain security
-        holes.
-      </para>
-    </note>
-
-    <note>
-      <para>
-        With <application>Firefox-31.0</application> and later versions, you
-        must have installed <application>OpenSSL</application> before
-        <application>Python 2</application>, or the build system will quickly
-        fail with output including "ImportError: cannot import name
-        HTTPSHandler". If you are in any doubt about this (e.g. upgrading
-        from an older version of Firefox), check if
-        <filename>/usr/lib/python2.7/lib-dynload/_ssl.so</filename> exists.
-        If it does not, reinstall <xref linkend="python2"/> (after
-        installing <xref linkend="openssl"/>  - the latest version of any
-        <emphasis>currently maintained</emphasis> version of Openssl should
-        be satisfactory if already installed - if that package has not already
-        been installed).
-      </para>
-    </note>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="curl"/>,
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="doxygen"/>,
-      <xref linkend="gst-plugins-base"/> (with
-      <xref linkend="gst-plugins-good"/> and
-      <xref linkend="gst-ffmpeg"/> at runtime), or
-      <xref linkend="gst10-plugins-base"/> (with
-      <xref linkend="gst10-plugins-good"/> and
-      <xref linkend="gst10-libav"/> at runtime),
-      <xref linkend="libnotify"/>,
-      <xref linkend="openjdk"/>,
-      <xref linkend="pulseaudio"/>,
-      <xref linkend="startup-notification"/>,
-      <xref linkend="wget"/>,
-      <xref linkend="wireless_tools"/> and
-      <ulink url="http://hunspell.sourceforge.net/">Hunspell</ulink>
-      <!-- <xref linkend="xulrunner"/> -->
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/firefox"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Firefox</title>
-
-    <!-- <para>
-      There are two major methods for building
-      <application>Firefox</application>. In the standard case, the entire suite
-      of libraries is built and installed. In the other, most of the system is
-      built using the procedures found in <xref linkend="xulrunner"/>. This is
-      advantageous if you are planning to build other related packages such as
-      <xref linkend="icedtea-web"/>. With either build method, you need to run
-      the main build procedure below with the appropriate options in the
-      <filename>mozconfig</filename> file. Then use the appropriate install
-      instructions depending on the chosen build method.
-    </para> -->
-
-    <para>
-      The configuration of <application>Firefox</application> is accomplished by
-      creating a <filename>mozconfig</filename> file containing the desired
-      configuration options. A default <filename>mozconfig</filename> is created
-      below. To see the entire list of available configuration options (and an
-      abbreviated description of each one), issue <command>./configure
-      --help</command>. You may also wish to review the entire file and
-      uncomment any other desired options.
-      Create the file by issuing the following command:
-    </para>
-
-<screen><userinput>cat &gt; mozconfig &lt;&lt; "EOF"
-<literal># If you have a multicore machine, firefox will now use all the cores by
-# default. Exceptionally, you can reduce the number of cores, e.g. to 1,
-# by uncommenting the next line and setting a valid number of CPU cores.
-#mk_add_options MOZ_MAKE_FLAGS="-j1"
-
-# If you have installed DBus-Glib comment out this line:
-ac_add_options --disable-dbus
-
-# If you have installed dbus-glib, and you have installed (or will install)
-# wireless-tools, and you wish to use geolocation web services, comment out
-# this line
-ac_add_options --disable-necko-wifi
-
-# If you have installed libnotify comment out this line:
-ac_add_options --disable-libnotify
-
-# GStreamer is necessary for H.264 video playback in HTML5 Video Player;
-# to be enabled, also remember to set "media.gstreamer.enabled" to "true"
-# in about:config. If you do *not* have GStreamer 0.x.y, uncomment this line:
-#ac_add_options --disable-gstreamer
-# or uncomment this line, if you have GStreamer 1.x.y
-#ac_add_options --enable-gstreamer=1.0
-
-# Uncomment these lines if you have installed optional dependencies:
-#ac_add_options --enable-system-hunspell
-#ac_add_options --enable-startup-notification
-
-# Comment out following option if you have PulseAudio installed
-ac_add_options --disable-pulseaudio
-
-# If you have not installed Yasm then uncomment this line:
-#ac_add_options --disable-webm
-<!--
-# If you have installed xulrunner uncomment the next two ac_add_options lines
-# and check that the sdk will be set by running pkg-config in a subshell
-# and has not become hardcoded or empty when you created this file
-#ac_add_options -\-with-system-libxul
-#ac_add_options -\-with-libxul-sdk=$(pkg-config -\-variable=sdkdir libxul)
--->
-# Comment out following options if you have not installed
-# recommended dependencies:
-ac_add_options --enable-system-sqlite
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-icu
-
-# The BLFS editors recommend not changing anything below this line:
-ac_add_options --prefix=/usr
-ac_add_options --enable-application=browser
-
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-
-ac_add_options --enable-optimize
-ac_add_options --enable-strip
-ac_add_options --enable-install-strip
-
-ac_add_options --enable-gio
-ac_add_options --enable-official-branding
-ac_add_options --enable-safe-browsing
-ac_add_options --enable-url-classifier
-
-ac_add_options --enable-system-cairo
-ac_add_options --enable-system-ffi
-ac_add_options --enable-system-pixman
-
-ac_add_options --with-pthreads
-
-ac_add_options --with-system-bz2
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-png
-ac_add_options --with-system-zlib
-
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-build-dir</literal>
-EOF</userinput></screen>
-
-    <para>
-      Compile <application>Firefox</application> by issuing the following
-      commands:
-    </para>
-
-    <note><para>
-      If you are compiling <application>Firefox</application> in chroot, prepend
-      <envar>SHELL=/bin/sh</envar> to the first make command below.
-    </para></note>
-<!--<screen><userinput>test $(uname -m) = "i686" &amp;&amp; sed -i 's/enable-optimize/disable-optimize/' mozconfig || true &amp;&amp;-->
-<screen><userinput>make -f client.mk</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <!-- <para>
-      Now, as the <systemitem class="username">root</systemitem> user, if you
-      have <emphasis>not</emphasis> linked <application>Firefox</application>
-      against an installed <application>Xulrunner</application>, install the
-      package:
-    </para> -->
-
-    <para>
-      Install <application>Firefox</application> by running the following
-      commands as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make -f client.mk install INSTALL_SDK= &amp;&amp;
-
-mkdir -pv /usr/lib/mozilla/plugins &amp;&amp;
-ln -sfv ../mozilla/plugins /usr/lib/firefox-&firefox-version;</userinput></screen>
-
-    <para>
-      The above instruction just installs the parts you need to run
-      <application>Firefox</application>. Alternatively, if you want to
-      install the full <application>Firefox</application> development
-      environment, run the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make -C firefox-build-dir install</userinput></screen>
-
-    <!-- <para>
-      If you <emphasis>have</emphasis> linked against an already installed
-      <application>Xulrunner</application>, as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make -C firefox-build-dir install &amp;&amp;
-ln -sfv ../lib/firefox-&firefox-version;/firefox /usr/bin &amp;&amp;
-ln -sfv ../xulrunner-&firefox-version; /usr/lib/firefox-&firefox-version;/xulrunner &amp;&amp;
-
-mkdir -pv /usr/lib/mozilla/plugins &amp;&amp;
-ln -sfv ../mozilla/plugins /usr/lib/firefox-&firefox-version;</userinput></screen> -->
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-<!--
-    <para>
-      <command>test $(uname -m) = "i686" &amp;&amp; sed ...</command>:
-      On this version of firefox, an old bug has reappeared in 32-bit builds.
-      With optimization, the install fails with a Python error.  This
-      command will fix i686 builds and preserve the optimization on x86_64.
-    </para>-->
-
-    <para>
-      <command>make -f client.mk ...</command>: Mozilla products are packaged to
-      allow the use of a configuration file which can be used to pass the
-      configuration settings to the <command>configure</command> command.
-      <command>make</command> uses the <filename>client.mk</filename> file to
-      get initial configuration and setup parameters.
-    </para>
-
-    <!-- <para>
-      <command>ln -sfv ... /usr/bin/firefox</command>: This puts a symbolic link
-      to the <command>firefox</command> executable in your <envar>PATH</envar>
-      variable.
-    </para> -->
-
-    <para>
-      <command>ln -sv ... /usr/lib/firefox-&firefox-version;</command>: This
-      command creates a symbolic link to
-      <filename class="directory">/usr/lib/mozilla/plugins</filename>. It's not
-      really needed, as <application>Firefox</application> checks
-      <filename class="directory">/usr/lib/mozilla/plugins</filename> by
-      default, but the symbolic link is made to keep all the plugins installed in
-      one folder.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Firefox</title>
-
-    <para>
-      If you deleted the <option>--disable-webm</option> option from your
-      <filename>mozconfig</filename>, your <application>Firefox</application>
-      can play most YouTube videos without the need for the flash plugin. To
-      enable this, go to <ulink url="http://www.youtube.com/html5"/> and click
-      on 'Join the HTML5 Trial' (needs cookies enabled).
-    </para>
-
-    <para>
-      If you use a desktop environment like <application>Gnome</application> or
-      <application>KDE</application> you may like to create a
-      <filename>firefox.desktop</filename> file so that
-      <application>Firefox</application> appears in the panel's menus. If you
-      didn't enable startup-notification in your mozconfig change the
-      StartupNotify line to false. As the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>mkdir -pv /usr/share/applications &amp;&amp;
-
-cat &gt; /usr/share/applications/firefox.desktop &lt;&lt; "EOF" &amp;&amp;
-<literal>[Desktop Entry]
-Encoding=UTF-8
-Name=Firefox Web Browser
-Comment=Browse the World Wide Web
-GenericName=Web Browser
-Exec=firefox %u
-Terminal=false
-Type=Application
-Icon=firefox
-Categories=GNOME;GTK;Network;WebBrowser;
-MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
-StartupNotify=true</literal>
-EOF
-
-for s in 16 32 48
-do
-install -v -Dm644 /usr/lib/firefox-&firefox-version;/browser/chrome/icons/default/default${s}.png \
-                  /usr/share/icons/hicolor/${s}x${s}/apps/firefox.png
-done &amp;&amp;
-install -v -Dm644 /usr/lib/firefox-&firefox-version;/browser/icons/mozicon128.png \
-                  /usr/share/icons/hicolor/128x128/apps/firefox.png &amp;&amp;
-gtk-update-icon-cache -qf /usr/share/icons/hicolor &amp;&amp;
-unset s</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          firefox
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/firefox-&firefox-version; and
-          /usr/lib/mozilla/plugins
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="firefox-prog">
-        <term><command>firefox</command></term>
-        <listitem>
-          <para>
-            is a <application>GTK+ 2</application> internet browser that uses the
-            Mozilla Gecko rendering engine.
-          </para>
-          <indexterm zone="firefox firefox-prog">
-            <primary sortas="b-firefox">firefox</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: oft/office/libreoffice-systemd.xml
===================================================================
--- xsoft/office/libreoffice-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,660 +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 libreoffice-dl "http://download.documentfoundation.org/libreoffice/src/&libreoffice-version;">
-
-  <!ENTITY libreoffice-core-download-http "&libreoffice-dl;/libreoffice-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-core-md5sum        "e8e79a7706fd22416d5f3b58195b0ee7">
-  <!ENTITY libreoffice-core-size          "159 MB">
-
-  <!ENTITY libreoffice-dict-download-http "&libreoffice-dl;/libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-dict-md5sum        "bdf1f534ae937786dda2cf186f83d1a3">
-  <!ENTITY libreoffice-dict-size          "36 MB">
-
-  <!ENTITY libreoffice-help-download-http "&libreoffice-dl;/libreoffice-help-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-help-md5sum        "029d47223caa6dc8c66817ed76f4c3a2">
-  <!ENTITY libreoffice-help-size          "1.8 MB">
-
-  <!ENTITY libreoffice-translations-download-http "&libreoffice-dl;/libreoffice-translations-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-translations-md5sum        "232bbb0e98de27f9fd3500e9d7558176">
-  <!ENTITY libreoffice-translations-size          "124 MB">
-
-  <!ENTITY libreoffice-buildsize          "9.8 GB (649 MB installed)">
-  <!ENTITY libreoffice-time               "62 (using parallelism=4) estimated 170 SBU with one core">
-]>
-
-<sect1 id="libreoffice" xreflabel="LibreOffice-&libreoffice-version;">
-  <?dbhtml filename="libreoffice.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy: krejzi $</othername>
-    <date>$Date: 2014-10-30 22:25:41 +0100 (Thu, 30 Oct 2014) $</date>
-  </sect1info>
-
-  <title>LibreOffice-&libreoffice-version;</title>
-
-  <indexterm zone="libreoffice">
-    <primary sortas="a-LibreOffice">LibreOffice</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to LibreOffice</title>
-
-    <para>
-      <application>LibreOffice</application> is a full-featured office suite.
-      It is largely compatible with <application>Microsoft Office</application>
-      and is descended from <application>OpenOffice.org</application>.
-    </para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Core Download: <ulink url="&libreoffice-core-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Core Download MD5 sum: &libreoffice-core-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Core Download size: &libreoffice-core-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libreoffice-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libreoffice-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Dictionaries: <ulink url="&libreoffice-dict-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Dictionaries MD5 sum: &libreoffice-dict-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Dictionaries size: &libreoffice-dict-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Help Files: <ulink url="&libreoffice-help-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Help Files MD5 sum: &libreoffice-help-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Help Files size: &libreoffice-help-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Translations: <ulink url="&libreoffice-translations-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Translations MD5 sum: &libreoffice-translations-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Translations size: &libreoffice-translations-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">LibreOffice Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="perl-archive-zip"/>,
-      <xref linkend="unzip"/>,
-      <xref linkend="wget"/>,
-      <xref linkend="which"/>, and
-      <xref linkend="zip"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <note>
-      <para>
-        Most of these packages are recommended because if they're not installed,
-        the build process will compile and install its own (often older)
-        version. If you have not installed some of the dependencies listed below,
-        make sure you examine the <command>./configure --help</command> output
-        for information on switches needed to prevent
-        <command>./configure</command> to look for them.
-      </para>
-    </note>
-
-    <para role="recommended">
-      <xref linkend="boost"/>,
-      <xref linkend="clucene"/>,
-      <xref linkend="cups"/>,
-      <xref linkend="curl"/>,
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="glu"/>,
-      <xref linkend="graphite2"/>,
-      <xref linkend="gst-plugins-base"/> or
-      <xref linkend="gst10-plugins-base"/>,
-      <xref linkend="gtk2"/>,
-      <xref linkend="harfbuzz"/>,
-      <xref linkend="icu"/>,
-      <xref linkend="lcms2"/>,
-      <xref linkend="libatomic_ops"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="librsvg"/>,
-      <xref linkend="libxml2"/> and
-      <xref linkend="libxslt"/>,
-      <xref linkend="mesalib"/>,
-      <xref linkend="neon"/>,
-      <xref linkend="npapi-sdk"/>,
-      <xref linkend="nss"/>,
-      <xref linkend="openldap"/>,
-      <xref linkend="openssl"/> or 
-      <xref linkend="gnutls"/>,
-      <xref linkend="poppler"/>,
-      <xref linkend="python3"/>,
-      <xref linkend="redland"/>, and
-      <xref linkend="unixodbc"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="apache-ant"/>,
-      <xref linkend="avahi"/>,
-      <xref linkend="bluez"/>,
-      <xref linkend="doxygen"/> (not relevant if using --disable-odk),
-      <xref linkend="GConf"/>,
-      <xref linkend="gdb"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="kdelibs"/>,
-      <xref linkend="mariadb"/>,
-      <xref linkend="mitkrb"/>,
-      <xref linkend="nasm"/>,
-      <xref linkend="openjdk"/>,
-      <xref linkend="postgresql"/>,
-      <xref linkend="sane"/>,
-      <xref linkend="valgrind"/>,
-      <xref linkend="vlc"/>,
-      <xref linkend="zenity"/>,
-      <ulink url="https://commons.apache.org/proper/commons-codec/">Apache Commons Codec</ulink>,
-      <ulink url="https://hc.apache.org/httpclient-3.x/">Apache Commons HttpClient</ulink>,
-      <ulink url="https://commons.apache.org/proper/commons-lang/">Apache Commons Lang</ulink>,
-      <ulink url="https://commons.apache.org/proper/commons-logging/">Apache Commons Logging</ulink>,
-      <ulink url="http://www.beanshell.org/">BeanShell</ulink>,
-      <ulink url="https://projects.coin-or.org/CoinMP/">CoinMP</ulink>,
-      <ulink url="http://sourceforge.net/projects/cppunit/">Cppunit</ulink>,
-      <ulink url="http://www.firebirdsql.org/">Firebird</ulink>,
-      <ulink url="http://downloads.sourceforge.net/glew/">GLEW</ulink>,
-      <ulink url="https://code.google.com/p/hamcrest/">Hamcrest</ulink>,
-      <ulink url="http://hunspell.sourceforge.net/">Hunspell</ulink>,
-      <ulink url="http://sourceforge.net/projects/hunspell/files/Hyphen/">Hyphen</ulink>,
-      <ulink url="https://code.google.com/p/include-what-you-use/">IWYU</ulink>,
-      <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libabw">libabw</ulink>,
-      <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libcdr">libcdr</ulink>,
-      <ulink url="http://sourceforge.net/projects/libcmis/">libcmis</ulink>,
-      <ulink url="http://www.sourceforge.net/projects/libebook/">libebook</ulink>,
-      <ulink url="http://www.freedesktop.org/wiki/Software/libexttextcat/">libexttextcat</ulink>,
-      <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libfreehand">libfreehand</ulink>,
-      <ulink url="http://tagoh.bitbucket.org/liblangtag/">liblangtag</ulink>,
-      <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libmspub">libmspub</ulink>,
-      <ulink url="http://sourceforge.net/projects/libmwaw/">libmwaw</ulink>,
-      <ulink url="http://sourceforge.net/projects/libwpd/files/libodfgen/">libodfgen</ulink>,
-      <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker">libpagemaker</ulink>,
-      <ulink url="http://sourceforge.net/projects/libwpd/files/librevenge/">librevenge</ulink>,
-      <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libvisio">libvisio</ulink>,
-      <ulink url="http://libwpd.sourceforge.net/">libwpd</ulink>,
-      <ulink url="http://libwpg.sourceforge.net/">libwpg</ulink>,
-      <ulink url="http://libwps.sourceforge.net/">libwps</ulink>,
-      <ulink url="http://lpsolve.sourceforge.net/">lp_solve</ulink>,
-      <ulink url="http://code.google.com/p/multidimalgorithm/">mdds</ulink>,
-      <ulink url="http://sourceforge.net/projects/hunspell/files/MyThes/">MyThes</ulink>,
-      <ulink url="http://sourceforge.net/projects/ogl-math/">OGL-Math</ulink>,
-      <ulink url="https://github.com/KhronosGroup/OpenCOLLADA/">OpenCOLLADA</ulink>,
-      <ulink url="https://gitorious.org/orcus">Orcus</ulink>,
-      <xref linkend="telepathy-glib"/>, and
-      <ulink url="http://hci.iwr.uni-heidelberg.de/vigra/">VIGRA</ulink>
-    </para>
-
-    <para>
-      There are many optional dependencies not listed here. They can be
-      found in <quote>download.lst</quote> in the source directory.
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/libreoffice"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of LibreOffice</title>
-
-    <para>
-      Create symlinks to tarballs from the source directory so they won't
-      get downloaded again:
-    </para>
-
-<screen><userinput>install -v -dm755 external/tarballs &amp;&amp;
-
-ln -sfv ../../../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz external/tarballs/ &amp;&amp;
-ln -sfv ../../../libreoffice-help-&libreoffice-dlversion;.tar.xz external/tarballs/</userinput></screen>
-
-    <para>
-      If you have downloaded the translations tarball, create a symlink:
-    </para>
-
-<screen><userinput>ln -sfv ../../../libreoffice-translations-&libreoffice-dlversion;.tar.xz external/tarballs/</userinput></screen>
-
-    <note>
-      <para>
-        During the build process, some packages will be downloaded (including
-        the ones listed as recommended and optional dependencies) if they are
-        not present on the system. Doing so, build time may be different
-        for everyone.
-      </para>
-    </note>
-
-    <para>
-      In the rest of the page, locales "fr" and "en-GB" are examples. Change
-      them to suit your needs. You might want to read the "Command Explanations"
-      further below before proceeding.
-    </para>
-
-    <para>
-      Prepare <application>LibreOffice</application> for compilation by running
-      the following commands:
-    </para>
-
-<screen><userinput>sed -e "/gzip -f/d"   \
-    -e "s|.1.gz|.1|g" \
-    -i bin/distro-install-desktop-integration &amp;&amp;
-
-sed -e "/distro-install-file-lists/d" \
-    -i Makefile.in                            &amp;&amp;
-
-sed -e "/ustrbuf/a #include &lt;algorithm&gt;" \
-    -i svl/source/misc/gridprinter.cxx        &amp;&amp;
-
-chmod -v +x bin/unpack-sources                &amp;&amp;
-
-./autogen.sh --prefix=/usr               \
-             --sysconfdir=/etc           \
-             --with-vendor="BLFS"        \
-             --with-lang="fr en-GB"      \
-             --with-help                 \
-             --with-myspell-dicts        \
-             --with-alloc=system         \
-             --without-java              \
-             --without-system-dicts      \
-             --disable-gconf             \
-             --disable-odk               \
-             --disable-postgresql-sdbc   \
-             --enable-release-build      \
-             --enable-python=system      \
-             --with-system-boost         \
-             --with-system-clucene       \
-             --with-system-cairo         \
-             --with-system-curl          \
-             --with-system-expat         \
-             --with-system-graphite      \
-             --with-system-harfbuzz      \
-             --with-system-icu           \
-             --with-system-jpeg          \
-             --with-system-lcms2         \
-             --with-system-libatomic_ops \
-             --with-system-libpng        \
-             --with-system-libxml        \
-             --with-system-mesa-headers  \
-             --with-system-neon          \
-             --with-system-npapi-headers \
-             --with-system-nss           \
-             --with-system-odbc          \
-             --with-system-openldap      \
-             --with-system-openssl       \
-             --with-system-poppler       \
-             --with-system-redland       \
-             --with-system-zlib          \
-             --with-parallelism=$(getconf _NPROCESSORS_ONLN)</userinput></screen>
-
-    <para>
-      The instructions below will only build the package without running
-      any unit tests. If you prefer to run the unit tests, replace
-      <command>make build</command> with <command>make</command>.
-    </para>
-
-    <note>
-      <para>
-        The package needs to be built from an X terminal emulator.
-      </para>
-    </note>
-
-    <para>
-      Build the package:
-    </para>
-
-<screen><userinput>make build</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make distro-pack-install             &amp;&amp;
-install -v -dm755 /usr/share/appdata &amp;&amp;
-install -v -m644  sysui/desktop/appstream-appdata/*.xml \
-                  /usr/share/appdata</userinput></screen>
-
-    <para>
-      If installed in 
-      <filename class="directory">/opt/libreoffice-&libreoffice-dlversion;</filename>
-      some additional steps are necessary. Issue the following commands as the
-      <systemitem class="username">root</systemitem>user:
-    </para>
-
-<screen role="root"><userinput>if ["$LO_PREFIX" != "/usr" ]; then
-
-   # This symlink is necessary for the desktop menu entries
-   ln -svf $LO_PREFIX/lib/libreoffice/program/soffice /usr/bin/libreoffice &amp;&amp;
-
-   # Icons
-   for i in $LO_PREFIX/share/icons/hicolor/32x32/apps/*; do
-      ln -svf $i /usr/share/pixmaps
-   done &amp;&amp;
-
-   # Desktop menu entries
-   for i in $LO_PREFIX/lib/libreoffice/share/xdg/*; do
-      ln -svf $i /usr/share/applications/libreoffice-$(basename $i)
-   done &amp;&amp;
-
-   # Man pages
-   for i in $LO_PREFIX/share/man/man1/*; do
-      ln -svf $i /usr/share/man/man1/
-   done
-
-   unset i
-fi</userinput></screen>
-
-   <para>
-      If you have installed <xref linkend="desktop-file-utils"/>, and you wish
-      to update the MIME database, issue, as the <systemitem class="username">
-      root</systemitem> user:
-   </para>
-
-<screen role="root"><userinput>update-desktop-database</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -e ...</command>: The first sed prevents compression of the
-      manual pages, the second one prevents install from failing and the
-      third one prevents a build failure by adding a necessary include.
-    </para>
-
-    <para>
-      <command>chmod -v +x ...</command>: Fix the unpack script's permissions.
-    </para>
-
-    <para>
-      <parameter>--with-vendor=BLFS</parameter>: This switch sets BLFS as
-      the vendor which is mentioned when you click "About" on the toolbar.
-    </para>
-
-    <para>
-      <parameter>--with-lang="fr en-GB"</parameter>: This switch sets
-      what languages to support. To list several languages, separate them
-      with a space. For all languages, use
-      <parameter>--with-lang=ALL</parameter>.
-    </para>
-
-    <note>
-      <para>
-        For a list of the available languages, look in
-        <filename>solenv/inc/langlist.mk</filename>.
-      </para>
-    </note>
-
-    <para>
-      <parameter>--with-help</parameter>: This switch is used to enable
-      installation of the help files.
-    </para>
-
-    <para>
-      <parameter>--with-myspell-dicts</parameter>: This switch is used
-      to enable installation of the bundled dictionaries.
-    </para>
-
-    <para>
-      <parameter>--with-alloc=system</parameter>: This switch tells
-      <application>LibreOffice</application> to use system allocator
-      instead of the internal one.
-    </para>
-
-    <para>
-      <parameter>--without-system-dicts</parameter>: This switch is
-      used to ensure that the dictionaries installed by this
-      package are being used.
-    </para>
-
-    <para>
-      <parameter>--without-java</parameter>: This switch disables
-      <application>Java</application> support in
-      <application>LibreOffice</application>.
-    </para>
-
-    <para>
-      <parameter>--disable-gconf</parameter>: This switch disables compiling
-      <application>LibreOffice</application> with the deprecated
-      <application>GNOME</application> configuration system support.
-    </para>
-
-    <para>
-      <parameter>--disable-odk</parameter>: This switch disables installing the
-      office development kit. Remove if you want to develop a
-      <application>LibreOffice</application> based application.
-    </para>
-
-    <para>
-      <parameter>--disable-postgresql-sdbc</parameter>: This switch disables compiling
-      <application>LibreOffice</application> with the ability to connect to a
-      <application>PostgreSQL</application> database. Remove it if you would
-      like <application>LibreOffice</application> to be able to connect to a
-      <application>PostgreSQL</application> database. If you have installed
-      <application>PostgreSQL</application> on your system and would like
-      <application>LibreOffice</application> to use that rather than compile its
-      own copy, use the <option>--with-system-postgresql</option> switch.
-    </para>
- 
-    <para>
-      <parameter>--enable-release-build</parameter>: This switch is used to
-      remove "Beta" or "Dev" from <application>LibreOffice</application>
-      splash screen and "About" menu.
-    </para>
-
-    <para>
-      <parameter>--enable-python=system</parameter>: This switch tells
-      <application>LibreOffice</application> to use installed
-      <application>Python 3</application> to build the translations
-      instead of the bundled one.
-    </para>
-
-    <para>
-      <parameter>--with-system-*</parameter>: These switches prevent
-      <application>LibreOffice</application> from trying to compile its own
-      versions of these dependencies. If you've not installed some of the
-      dependencies, remove the corresponding switches.
-    </para>
-
-    <para>
-      <parameter>--with-parallelism=$(getconf _NPROCESSORS_ONLN)</parameter>: This
-      switch tells <application>LibreOffice</application> to use all your
-      CPUs to compile in parallel and speed up the build.
-    </para>
-
-    <para>
-      <option>--enable-gstreamer-0-10</option>: Use this switch if you want to
-      use <xref linkend="gst-plugins-base"/> instead of
-      <xref linkend="gst10-plugins-base"/> for the avmedia module.
-    </para>
-
-    <para>
-      <option>--disable-gstreamer-1-0</option>: Use this switch if you
-      haven't installed <xref linkend="gst10-plugins-base"/>.
-    </para>
-
-    <para>
-      <option>--enable-gtk3</option>: Use this switch if you want to
-      build the <application>GTK+ 3</application> integration module.
-    </para>
-
-    <para>
-      <option>--enable-kde4</option>: Use this switch if you want to
-      build the <application>KDE</application> integration module.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          libreoffice, lobase, localc, lodraw, loffice, lofromtemplate,
-          loimpress, lomath, loweb, lowriter, soffice and unopkg
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/libreoffice
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lobase">
-        <term><command>lobase</command></term>
-        <listitem>
-          <para>
-            is a database manager.
-          </para>
-          <indexterm zone="libreoffice lobase">
-            <primary sortas="b-lobase">lobase</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="localc">
-        <term><command>localc</command></term>
-        <listitem>
-          <para>
-            is a spreadsheet program.
-          </para>
-          <indexterm zone="libreoffice localc">
-            <primary sortas="b-localc">localc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lodraw">
-        <term><command>lodraw</command></term>
-        <listitem>
-          <para>
-            is a vector graphics editor and diagramming tool.
-          </para>
-          <indexterm zone="libreoffice lodraw">
-            <primary sortas="b-lodraw">lodraw</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="loimpress">
-        <term><command>loimpress</command></term>
-        <listitem>
-          <para>
-            can edit and display PowerPoint presentations.
-          </para>
-          <indexterm zone="libreoffice loimpress">
-            <primary sortas="b-loimpress">loimpress</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lomath">
-        <term><command>lomath</command></term>
-        <listitem>
-          <para>
-            is a mathematical formula editor. 
-          </para>
-          <indexterm zone="libreoffice lomath">
-            <primary sortas="b-lomath">lomath</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lowriter">
-        <term><command>lowriter</command></term>
-        <listitem>
-          <para>
-            is a word processor.
-          </para>
-          <indexterm zone="libreoffice lowriter">
-            <primary sortas="b-lowriter">lowriter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unopkg">
-        <term><command>unopkg</command></term>
-        <listitem>
-          <para>
-            is a tool to manage <application>LibreOffice</application>
-            extensions from the command line. 
-          </para>
-          <indexterm zone="libreoffice unopkg">
-            <primary sortas="b-unopkg">unopkg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: xsoft/office/libreoffice.xml
===================================================================
--- xsoft/office/libreoffice.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ xsoft/office/libreoffice.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -8,37 +8,21 @@
 
   <!ENTITY libreoffice-core-download-http "&libreoffice-dl;/libreoffice-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-core-md5sum        "86b47f5b6e4b816f54fa12eaf75dbd79">
-  <!ENTITY libreoffice-core-size          "146 MB">
+  <!ENTITY libreoffice-core-md5sum        "e8e79a7706fd22416d5f3b58195b0ee7">
+  <!ENTITY libreoffice-core-size          "159 MB">
 
   <!ENTITY libreoffice-dict-download-http "&libreoffice-dl;/libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-dict-md5sum        "e5a28bbd127951abafc0d43bcc2127a9">
+  <!ENTITY libreoffice-dict-md5sum        "bdf1f534ae937786dda2cf186f83d1a3">
   <!ENTITY libreoffice-dict-size          "36 MB">
 
   <!ENTITY libreoffice-help-download-http "&libreoffice-dl;/libreoffice-help-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-help-md5sum        "ae73ebf344f02c4d24b0c698e52fa587">
+  <!ENTITY libreoffice-help-md5sum        "029d47223caa6dc8c66817ed76f4c3a2">
   <!ENTITY libreoffice-help-size          "1.8 MB">
 
   <!ENTITY libreoffice-translations-download-http "&libreoffice-dl;/libreoffice-translations-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-translations-md5sum        "ffc4271845377c407db316f6adce084f">
-  <!ENTITY libreoffice-translations-size          "122 MB">
-
-  <!-- This package has some peculiarities, some discussed in the text.
-  Two values for SBU and buildsize are given due to the large difference
-  measured by editors, depending on architecture and sometimes installed
-  dependencies (with-system... -->
-
-  <!ENTITY libreoffice-buildsize          "6.1 GB (538 MB installed), with translations">
-  <!ENTITY libreoffice-time               "191.7 SBU (using parallelism=2), with translations">
-
-  <!-- [bdubbs]  For version 4.3.2.2 Built on x86_64 using -\-with-parallelism=4 -->
-
-  <!-- [fo] For version 4.3.1.2 I've got, for i686, statistcs over the upper
-  boundaries for x86_64 of previous versions, thus, temporarily, decided to use
-  single statistcs, instead of a range.
-  -->
-  <!-- This package has some peculiarities, some discussed in the text.
-  Two values for SBU and buildsize are given due to the large difference
-  measured by editors, depending on architecture and sometimes installed
-  dependencies (with-system... -->
+  <!ENTITY libreoffice-translations-md5sum        "232bbb0e98de27f9fd3500e9d7558176">
+  <!ENTITY libreoffice-translations-size          "124 MB">
+
+  <!ENTITY libreoffice-buildsize          "9.8 GB (649 MB installed)">
+  <!ENTITY libreoffice-time               "62 (using parallelism=4) estimated 170 SBU with one core">
 ]>
 
@@ -47,6 +31,6 @@
 
   <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
+    <othername>$LastChangedBy: krejzi $</othername>
+    <date>$Date: 2014-10-30 22:25:41 +0100 (Thu, 30 Oct 2014) $</date>
   </sect1info>
 
@@ -66,5 +50,5 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -142,17 +126,4 @@
         <para>
           Translations size: &libreoffice-translations-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Required patch to fix building with system Boost:
-          <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-boost_1_56_0-1.patch"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Required patch for i686 systems, in order to fix a problem inroduced
-          by <application>&gcc-490;</application>:
-          <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-gcc_4_9_0-1.patch"/>
         </para>
       </listitem>
@@ -175,5 +146,8 @@
         Most of these packages are recommended because if they're not installed,
         the build process will compile and install its own (often older)
-        version.
+        version. If you have not installed some of the dependencies listed below,
+        make sure you examine the <command>./configure --help</command> output
+        for information on switches needed to prevent
+        <command>./configure</command> to look for them.
       </para>
     </note>
@@ -185,5 +159,4 @@
       <xref linkend="curl"/>,
       <xref linkend="dbus-glib"/>,
-      <xref linkend="libjpeg"/>,
       <xref linkend="glu"/>,
       <xref linkend="graphite2"/>,
@@ -194,4 +167,6 @@
       <xref linkend="icu"/>,
       <xref linkend="lcms2"/>,
+      <xref linkend="libatomic_ops"/>,
+      <xref linkend="libjpeg"/>,
       <xref linkend="librsvg"/>,
       <xref linkend="libxml2"/> and
@@ -202,5 +177,6 @@
       <xref linkend="nss"/>,
       <xref linkend="openldap"/>,
-      <xref linkend="openssl"/>,
+      <xref linkend="openssl"/> or 
+      <xref linkend="gnutls"/>,
       <xref linkend="poppler"/>,
       <xref linkend="python3"/>,
@@ -211,34 +187,47 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="apache-ant"/>,
       <xref linkend="avahi"/>,
       <xref linkend="bluez"/>,
       <xref linkend="doxygen"/> (not relevant if using --disable-odk),
+      <xref linkend="GConf"/>,
       <xref linkend="gdb"/>,
       <xref linkend="gtk3"/>,
       <xref linkend="kdelibs"/>,
-      <xref linkend="libatomic_ops"/>,
-      <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
+      <xref linkend="mariadb"/>,
       <xref linkend="mitkrb"/>,
+      <xref linkend="nasm"/>,
       <xref linkend="openjdk"/>,
       <xref linkend="postgresql"/>,
       <xref linkend="sane"/>,
+      <xref linkend="valgrind"/>,
       <xref linkend="vlc"/>,
+      <xref linkend="zenity"/>,
+      <ulink url="https://commons.apache.org/proper/commons-codec/">Apache Commons Codec</ulink>,
+      <ulink url="https://hc.apache.org/httpclient-3.x/">Apache Commons HttpClient</ulink>,
+      <ulink url="https://commons.apache.org/proper/commons-lang/">Apache Commons Lang</ulink>,
+      <ulink url="https://commons.apache.org/proper/commons-logging/">Apache Commons Logging</ulink>,
+      <ulink url="http://www.beanshell.org/">BeanShell</ulink>,
+      <ulink url="https://projects.coin-or.org/CoinMP/">CoinMP</ulink>,
       <ulink url="http://sourceforge.net/projects/cppunit/">Cppunit</ulink>,
-      <ulink url="http://www.firebirdsql.org/">firebird</ulink>,
-      <ulink url="http://downloads.sourceforge.net/glew/">glew (OpenGL Extension Wrangler Library)</ulink>,
+      <ulink url="http://www.firebirdsql.org/">Firebird</ulink>,
+      <ulink url="http://downloads.sourceforge.net/glew/">GLEW</ulink>,
+      <ulink url="https://code.google.com/p/hamcrest/">Hamcrest</ulink>,
       <ulink url="http://hunspell.sourceforge.net/">Hunspell</ulink>,
       <ulink url="http://sourceforge.net/projects/hunspell/files/Hyphen/">Hyphen</ulink>,
-      <ulink url="http://www.freedesktop.org/wiki/Software/libabw/">libabw</ulink>,
-      <ulink url="http://www.freedesktop.org/wiki/Software/libcdr/">libcdr</ulink>,
+      <ulink url="https://code.google.com/p/include-what-you-use/">IWYU</ulink>,
+      <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libabw">libabw</ulink>,
+      <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libcdr">libcdr</ulink>,
       <ulink url="http://sourceforge.net/projects/libcmis/">libcmis</ulink>,
       <ulink url="http://www.sourceforge.net/projects/libebook/">libebook</ulink>,
       <ulink url="http://www.freedesktop.org/wiki/Software/libexttextcat/">libexttextcat</ulink>,
-      <ulink url="http://www.freedesktop.org/wiki/Software/libfreehand/">libfreehand</ulink>,
+      <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libfreehand">libfreehand</ulink>,
       <ulink url="http://tagoh.bitbucket.org/liblangtag/">liblangtag</ulink>,
-      <ulink url="http://www.freedesktop.org/wiki/Software/libmspub/">libmspub</ulink>,
+      <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libmspub">libmspub</ulink>,
       <ulink url="http://sourceforge.net/projects/libmwaw/">libmwaw</ulink>,
       <ulink url="http://sourceforge.net/projects/libwpd/files/libodfgen/">libodfgen</ulink>,
-      <ulink url="http://sourceforge.net/projects/libwpd/files/librevenge/">librevenge (WordPerfect Document importer)</ulink>,
-      <ulink url="http://www.freedesktop.org/wiki/Software/libvisio/">libvisio</ulink>,
+      <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker">libpagemaker</ulink>,
+      <ulink url="http://sourceforge.net/projects/libwpd/files/librevenge/">librevenge</ulink>,
+      <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libvisio">libvisio</ulink>,
       <ulink url="http://libwpd.sourceforge.net/">libwpd</ulink>,
       <ulink url="http://libwpg.sourceforge.net/">libwpg</ulink>,
@@ -247,12 +236,14 @@
       <ulink url="http://code.google.com/p/multidimalgorithm/">mdds</ulink>,
       <ulink url="http://sourceforge.net/projects/hunspell/files/MyThes/">MyThes</ulink>,
-      <ulink url="http://sourceforge.net/projects/ogl-math/">ogl-math - OpenGL Mathematics (GLM)</ulink>,
-      <ulink url="https://gitorious.org/orcus/">Orcus</ulink>,
-      <ulink url="http://hci.iwr.uni-heidelberg.de/vigra/">VIGRA</ulink>, and
-      <ulink url="&gnome-download-http;/zenity/">Zenity</ulink>
-    </para>
-
-    <para>There are many optional dependencies not listed here. They can be
-    found in <quote>download.lst</quote> (source directory).
+      <ulink url="http://sourceforge.net/projects/ogl-math/">OGL-Math</ulink>,
+      <ulink url="https://github.com/KhronosGroup/OpenCOLLADA/">OpenCOLLADA</ulink>,
+      <ulink url="https://gitorious.org/orcus">Orcus</ulink>,
+      <xref linkend="telepathy-glib"/>, and
+      <ulink url="http://hci.iwr.uni-heidelberg.de/vigra/">VIGRA</ulink>
+    </para>
+
+    <para>
+      There are many optional dependencies not listed here. They can be
+      found in <quote>download.lst</quote> in the source directory.
     </para>
 
@@ -264,80 +255,20 @@
   <sect2 role="installation">
     <title>Installation of LibreOffice</title>
-<!--
-    <warning>
-      <para>
-        Untaring the libreoffice-&libreoffice-dlversion; tarball as
-        <systemitem class="username">root</systemitem> has the curious effect of
-        changing the ownership of the <emphasis>parent</emphasis> directory
-        to a user with numerical id 11012 and with the permissions set to allow
-        read, write and execute for that user only! If you untared as
-        <systemitem class="username">root</systemitem> in your home folder you
-        could end up unable to log in again. If you untared it in
-        <filename class="directory">/usr</filename> you would find your user
-        account unable to access any file in
-        <filename class="directory">/usr</filename>.
-      </para>
-
-      <para>
-        You can avoid this unpleasantness by
-        <emphasis>not</emphasis> untaring it as
-        <systemitem class="username">root</systemitem>. If you must untar it as
-        <systemitem class="username">root</systemitem> pass the option
-        <option>-\-no-overwrite-dir</option> to tar. This is the default when you
-        untar as a user but has to be passed as an option when untaring as
-        <systemitem class="username">root</systemitem>:
-      </para>
-    </warning>-->
-
-    <note>
-      <para>
-       Building this package in a graphical environment is recommended.
-       There have been reports of build failures, when using
-       <command>chroot</command> or <command>ssh</command>.
-      </para>
-    </note>
-
-    <important>
-      <para>
-      Unlike the other packages, we suppose that you have not yet unpacked the
-      package. This is so because the <option>--no-overwrite-dir</option> switch
-      is needed in case you unpack as the
-      <systemitem class="username">root</systemitem> user.
-      </para>
-    </important>
-
-<screen><userinput>tar -xf libreoffice-&libreoffice-dlversion;.tar.xz --no-overwrite-dir &amp;&amp;
-cd libreoffice-&libreoffice-dlversion;</userinput></screen>
-
-    <para>
-      Unpack the dictionaries file and create symlinks to tarballs from the
-      source directory so they won't get downloaded again.  It is not necessary
-      to unpack the help nor the translations tarballs:
-    </para>
-
-<screen><userinput>install -dm755 external/tarballs &amp;&amp;
-<!-- Not necessary for this version
-tar -xf ../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz \
-        -\-no-overwrite-dir -\-strip-components=1    &amp;&amp;
-
-tar -xf ../libreoffice-help-&libreoffice-dlversion;.tar.xz -\-no-overwrite-dir -\-strip-components=1 &amp;&amp;
--->
-
-ln -sv ../../../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz external/tarballs/ &amp;&amp;
-ln -sv ../../../libreoffice-help-&libreoffice-dlversion;.tar.xz         external/tarballs/</userinput></screen>
-
-<!-- Not necessary for this version
-    <para>
-      If you have downloaded the translations tarball, unpack it:
-    </para>
-
-<screen><userinput>tar -xf ../libreoffice-translations-&libreoffice-dlversion;.tar.xz -\-no-overwrite-dir -\-strip-components=1 &amp;&amp;
-ln -sv ../../libreoffice-translations-&libreoffice-dlversion;.tar.xz src/</userinput></screen>
--->
+
+    <para>
+      Create symlinks to tarballs from the source directory so they won't
+      get downloaded again:
+    </para>
+
+<screen><userinput>install -v -dm755 external/tarballs &amp;&amp;
+
+ln -sfv ../../../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz external/tarballs/ &amp;&amp;
+ln -sfv ../../../libreoffice-help-&libreoffice-dlversion;.tar.xz external/tarballs/</userinput></screen>
+
     <para>
       If you have downloaded the translations tarball, create a symlink:
     </para>
 
-<screen><userinput>ln -sv ../../../libreoffice-translations-&libreoffice-dlversion;.tar.xz external/tarballs/</userinput></screen>
+<screen><userinput>ln -sfv ../../../libreoffice-translations-&libreoffice-dlversion;.tar.xz external/tarballs/</userinput></screen>
 
     <note>
@@ -345,31 +276,14 @@
         During the build process, some packages will be downloaded (including
         the ones listed as recommended and optional dependencies) if they are
-        not present on the system. Because of this, build time may vary from the
-        published time more than usual.
+        not present on the system. Doing so, build time may be different
+        for everyone.
       </para>
     </note>
 
     <para>
-      In the rest of the page, locales "en-US" and "pt-BR" are examples; you
-      can change them to suit your needs - you might want to read the
-      "Command Explanations", further below, before proceeding.
-    </para>
-
-    <para>
-      Due to the large size of the package, you may prefer to install it in
-      <filename class="directory">/opt</filename>, instead of
-      <filename class="directory">/usr</filename>. Depending on your choice,
-      replace <replaceable>&lt;PREFIX&gt;</replaceable> by
-      <filename class="directory">/usr</filename> or by
-      <filename class="directory">/opt/libreoffice-&libreoffice-dlversion;</filename>:
-    </para>
-
-<screen><userinput>export LO_PREFIX=<replaceable>&lt;PREFIX&gt;</replaceable></userinput></screen>
-
-    <para>
-     For i686 systems, fix a problem inroduced by <application>&gcc-490;</application>:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-gcc_4_9_0-1.patch &amp;&amp;</userinput></screen>
+      In the rest of the page, locales "fr" and "en-GB" are examples. Change
+      them to suit your needs. You might want to read the "Command Explanations"
+      further below before proceeding.
+    </para>
 
     <para>
@@ -378,25 +292,29 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-boost_1_56_0-1.patch &amp;&amp;
-
-sed -e "/gzip -f/d"   \
+<screen><userinput>sed -e "/gzip -f/d"   \
     -e "s|.1.gz|.1|g" \
     -i bin/distro-install-desktop-integration &amp;&amp;
 
-sed -e "/distro-install-file-lists/d" -i Makefile.in &amp;&amp;
-
-chmod -v +x bin/unpack-sources &amp;&amp;
-
-./autogen.sh --prefix=$LO_PREFIX         \
+sed -e "/distro-install-file-lists/d" \
+    -i Makefile.in                            &amp;&amp;
+
+sed -e "/ustrbuf/a #include &lt;algorithm&gt;" \
+    -i svl/source/misc/gridprinter.cxx        &amp;&amp;
+
+chmod -v +x bin/unpack-sources                &amp;&amp;
+
+./autogen.sh --prefix=/usr               \
              --sysconfdir=/etc           \
              --with-vendor="BLFS"        \
-             --with-lang="en-US pt-BR"   \
+             --with-lang="fr en-GB"      \
              --with-help                 \
+             --with-myspell-dicts        \
              --with-alloc=system         \
              --without-java              \
+             --without-system-dicts      \
              --disable-gconf             \
              --disable-odk               \
              --disable-postgresql-sdbc   \
-             --enable-release-build=yes  \
+             --enable-release-build      \
              --enable-python=system      \
              --with-system-boost         \
@@ -410,4 +328,5 @@
              --with-system-jpeg          \
              --with-system-lcms2         \
+             --with-system-libatomic_ops \
              --with-system-libpng        \
              --with-system-libxml        \
@@ -430,4 +349,10 @@
     </para>
 
+    <note>
+      <para>
+        The package needs to be built from an X terminal emulator.
+      </para>
+    </note>
+
     <para>
       Build the package:
@@ -440,36 +365,46 @@
     </para>
 
-<screen role="root"><userinput>make distro-pack-install                                  &amp;&amp;
-install -v -m755 -d $LO_PREFIX/share/appdata              &amp;&amp;
-install -v -m644    sysui/desktop/appstream-appdata/*.xml \
-                    $LO_PREFIX/share/appdata</userinput></screen>
-
-    <para>
-       If the dictionaries have been built, again as
-       <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>chown -cR 0:0 dictionaries/                                                        &amp;&amp;
-mkdir -pv $LO_PREFIX/lib/libreoffice/share/extensions/dict-en                      &amp;&amp;
-cp -vR dictionaries/en/*    $LO_PREFIX/lib/libreoffice/share/extensions/dict-en    &amp;&amp;
-mkdir -pv $LO_PREFIX/lib/libreoffice/share/extensions/dict-pt-BR                   &amp;&amp;
-cp -vR dictionaries/pt_BR/* $LO_PREFIX/lib/libreoffice/share/extensions/dict-pt-BR</userinput></screen>
-
-    <para>
-       If installed in <filename class="directory">/opt/libreoffice-&libreoffice-dlversion;</filename>
-       and the icons in the new items of the desktop menu are not properly displayed,
-       optionally run the following commands, as
-       <systemitem class="username">root</systemitem> user (it may be necessary
-       to logout the session, before the icons appear):
-    </para>
-
-<screen role="root"><userinput>mkdir -pv /usr/share/pixmaps &amp;&amp;
-
-for i in writer base calc draw impress math startcenter writer
-do
-  ln -svf /opt/libreoffice-&libreoffice-dlversion;/share/icons/hicolor/32x32/apps/libreoffice-$i.png \
-          /usr/share/pixmaps/
-done
-unset i</userinput></screen>
+<screen role="root"><userinput>make distro-pack-install             &amp;&amp;
+install -v -dm755 /usr/share/appdata &amp;&amp;
+install -v -m644  sysui/desktop/appstream-appdata/*.xml \
+                  /usr/share/appdata</userinput></screen>
+
+    <para>
+      If installed in 
+      <filename class="directory">/opt/libreoffice-&libreoffice-dlversion;</filename>
+      some additional steps are necessary. Issue the following commands as the
+      <systemitem class="username">root</systemitem>user:
+    </para>
+
+<screen role="root"><userinput>if ["$LO_PREFIX" != "/usr" ]; then
+
+   # This symlink is necessary for the desktop menu entries
+   ln -svf $LO_PREFIX/lib/libreoffice/program/soffice /usr/bin/libreoffice &amp;&amp;
+
+   # Icons
+   for i in $LO_PREFIX/share/icons/hicolor/32x32/apps/*; do
+      ln -svf $i /usr/share/pixmaps
+   done &amp;&amp;
+
+   # Desktop menu entries
+   for i in $LO_PREFIX/lib/libreoffice/share/xdg/*; do
+      ln -svf $i /usr/share/applications/libreoffice-$(basename $i)
+   done &amp;&amp;
+
+   # Man pages
+   for i in $LO_PREFIX/share/man/man1/*; do
+      ln -svf $i /usr/share/man/man1/
+   done
+
+   unset i
+fi</userinput></screen>
+
+   <para>
+      If you have installed <xref linkend="desktop-file-utils"/>, and you wish
+      to update the MIME database, issue, as the <systemitem class="username">
+      root</systemitem> user:
+   </para>
+
+<screen role="root"><userinput>update-desktop-database</userinput></screen>
 
   </sect2>
@@ -480,5 +415,6 @@
     <para>
       <command>sed -e ...</command>: The first sed prevents compression of the
-      manual pages, the second one prevents install from failing.
+      manual pages, the second one prevents install from failing and the
+      third one prevents a build failure by adding a necessary include.
     </para>
 
@@ -491,30 +427,27 @@
       the vendor which is mentioned when you click "About" on the toolbar.
     </para>
-<!-- I believe en-US is not necessary anymore
-    <para>
-      <parameter>-\-with-lang="en-US pt-BR"</parameter>: This switch sets
-      what languages to support. en-US is always needed. To list several
-      languages, separate them with a space. For all languages, use
-      <parameter>-\-with-lang=ALL</parameter>
-    </para>
--->
-
-    <para>
-      <parameter>--with-lang="en-US pt-BR"</parameter>: This switch sets
-      what languages to support. To list several languages, separate them with
-      a space. For all languages, use
+
+    <para>
+      <parameter>--with-lang="fr en-GB"</parameter>: This switch sets
+      what languages to support. To list several languages, separate them
+      with a space. For all languages, use
       <parameter>--with-lang=ALL</parameter>.
     </para>
 
-    <note><para>
-      For a list of the 117 available languages, you can look at the 
-      translations tarball: <command>tar -tf
-      ../libreoffice-translations-&libreoffice-dlversion;.tar.xz |
-      grep translations/source| cut -d/ -f4 | uniq</command>.
-    </para></note>
-
-    <para>
-      <parameter>--with-help</parameter>: Without this switch, the help files
-      are not built.
+    <note>
+      <para>
+        For a list of the available languages, look in
+        <filename>solenv/inc/langlist.mk</filename>.
+      </para>
+    </note>
+
+    <para>
+      <parameter>--with-help</parameter>: This switch is used to enable
+      installation of the help files.
+    </para>
+
+    <para>
+      <parameter>--with-myspell-dicts</parameter>: This switch is used
+      to enable installation of the bundled dictionaries.
     </para>
 
@@ -523,4 +456,10 @@
       <application>LibreOffice</application> to use system allocator
       instead of the internal one.
+    </para>
+
+    <para>
+      <parameter>--without-system-dicts</parameter>: This switch is
+      used to ensure that the dictionaries installed by this
+      package are being used.
     </para>
 
@@ -555,10 +494,7 @@
  
     <para>
-      <parameter>--enable-release-build=yes</parameter>: This switch enables a
-      Release Build.
-      <application>LibreOffice</application> can be built as a Release Build or
-      as a Developer Build, because their default installation paths and user
-      profile paths are different. Developer Build displays the words "Dev" and
-      "Beta" in several places (e.g, menu and splash screen).
+      <parameter>--enable-release-build</parameter>: This switch is used to
+      remove "Beta" or "Dev" from <application>LibreOffice</application>
+      splash screen and "About" menu.
     </para>
 
@@ -567,5 +503,5 @@
       <application>LibreOffice</application> to use installed
       <application>Python 3</application> to build the translations
-      instead of the bundled one. 
+      instead of the bundled one.
     </para>
 
@@ -584,23 +520,17 @@
 
     <para>
-      <option>--disable-cups</option>: Use this switch if you don't need
-      printing support.
-    </para>
-
-    <para>
-      <option>--disable-dbus</option>: Use this switch if you've not
-      installed D-Bus-1.8.0 or later. It also disables Bluetooth support and 
-      font install via PackageKit. 
-    </para>
-
-    <para>
-      <option>--disable-gstreamer-0-10</option>: Use this switch if you've
-      not installed <xref linkend="gst-plugins-base"/>.
-    </para>
-
-    <para>
-      <option>--enable-gstreamer</option>: Use this switch if you want to
-      use <xref linkend="gst10-plugins-base"/> instead of
-      <xref linkend="gst-plugins-base"/> for the avmedia module.
+      <option>--enable-gstreamer-0-10</option>: Use this switch if you want to
+      use <xref linkend="gst-plugins-base"/> instead of
+      <xref linkend="gst10-plugins-base"/> for the avmedia module.
+    </para>
+
+    <para>
+      <option>--disable-gstreamer-1-0</option>: Use this switch if you
+      haven't installed <xref linkend="gst10-plugins-base"/>.
+    </para>
+
+    <para>
+      <option>--enable-gtk3</option>: Use this switch if you want to
+      build the <application>GTK+ 3</application> integration module.
     </para>
 
@@ -618,19 +548,16 @@
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>
           libreoffice, lobase, localc, lodraw, loffice, lofromtemplate,
-          loimpress, lomath, loweb, lowriter, soffice and unopkg;
-          several programs under
-          $LO_PREFIX/lib/libreoffice/program
+          loimpress, lomath, loweb, lowriter, soffice and unopkg
         </seg>
         <seg>
-          several libraries under
-          $LO_PREFIX/lib/libreoffice/{ure/lib,program}
+          None
         </seg>
         <seg>
-          $LO_PREFIX/lib/libreoffice
+          /usr/lib/libreoffice
         </seg>
       </seglistitem>
Index: xsoft/office/office.xml
===================================================================
--- xsoft/office/office.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ xsoft/office/office.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -24,4 +24,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="abiword.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnumeric.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libreoffice-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libreoffice.xml"/>
 </chapter>
Index: oft/other/fontforge-systemd.xml
===================================================================
--- xsoft/other/fontforge-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,249 +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 fontforge-download-http "&sources-anduin-other-http;/fontforge-&fontforge-version;.tar.xz">-->
-  <!ENTITY fontforge-download-http "https://github.com/fontforge/fontforge/releases/download/&fontforge-version;/fontforge-&fontforge-version;.tar.gz">
-  <!ENTITY fontforge-download-ftp  " ">
-  <!ENTITY fontforge-md5sum        "a68cd6797e2e5fb0aa88a33bbe15315b">
-  <!ENTITY fontforge-size          "120 MB">
-  <!ENTITY fontforge-buildsize     "406 MB">
-  <!ENTITY fontforge-time          "2.4 SBU">
-]>
-
-<sect1 id="fontforge" xreflabel="FontForge-&fontforge-version;">
-  <?dbhtml filename="fontforge.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>FontForge-&fontforge-version;</title>
-
-  <indexterm zone="fontforge">
-    <primary sortas="a-FontForge">FontForge</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to FontForge</title>
-
-    <para>
-      The <application>FontForge</application> package contains an
-      outline font editor that lets you create your own postscript,
-      truetype, opentype, cid-keyed, multi-master, cff, svg and
-      bitmap (bdf, FON, NFNT) fonts, or edit existing ones.
-    </para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&fontforge-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&fontforge-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &fontforge-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &fontforge-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &fontforge-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &fontforge-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">FontForge Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="freetype2"/>,
-      <xref linkend="git"/>,
-      <xref linkend="glib2"/> and
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="cairo"/>,
-      <xref linkend="gtk2"/>,
-      <xref linkend="harfbuzz"/>,
-      <xref linkend="pango"/> and
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="giflib"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libtiff"/>,
-      <xref linkend="python2"/>,
-      <ulink url="http://ipython.org/">IPython</ulink>,
-      <ulink url="https://github.com/fontforge/libspiro">libspiro</ulink>,
-      <ulink url="https://bitbucket.org/sortsmill/libunicodenames">
-      libunicodenames</ulink>,
-      <ulink url="https://github.com/fontforge/libuninameslist">
-      libuninameslist</ulink>, and
-      <ulink url="http://www.zeromq.org/">libzmq</ulink>,
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/fontforge"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of FontForge</title>
-
-    <para>
-      Install <application>FontForge</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>rm -rf libltdl &amp;&amp;
-rm m4/argz.m4  &amp;&amp;
-./bootstrap    &amp;&amp;
-./configure --prefix=/usr     \
-            --enable-gtk2-use \
-            --disable-static  \
-            --docdir=/usr/share/doc/fontforge-&fontforge-version; &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>
-
-    <para>
-      <command>rm -rf libltdl ... ./bootstrap</command>:
-      These commands work around the old version of libtool in the source,
-      and the idiosyncracies of the bootstrap command, to allow it to build with
-      current libtool where some files have been renamed.
-    </para>
-
-    <para>
-      <parameter>--enable-gtk2-use</parameter>: This switch enables building
-      of the utilities that require <application>GTK+2</application>.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          fontforge, fontimage, fontlint and sfddiff
-        </seg>
-        <seg>
-          libfontforgeexe.so, libfontforge.so, libgdraw.so,
-          libgioftp.so, libgunicode.so and libgutils.so
-        </seg>
-        <seg>
-          /usr/include/fontforge,
-          /usr/share/doc/fontforge-&fontforge-version; and
-          /usr/share/fontforge
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="fontforge-prog">
-        <term><command>fontforge</command></term>
-        <listitem>
-          <para>
-            is a program that allows you to create and
-            modify font files.
-          </para>
-          <indexterm zone="fontforge fontforge-prog">
-            <primary sortas="b-fontforge">fontforge</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fontimage">
-        <term><command>fontimage</command></term>
-        <listitem>
-          <para>
-            is a program that produces an image showing
-            representative glyphs of the font.
-          </para>
-          <indexterm zone="fontforge fontimage">
-            <primary sortas="b-fontimage">fontimage</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fontlint">
-        <term><command>fontlint</command></term>
-        <listitem>
-          <para>
-            is a program that checks the font for certain
-            common errors.
-          </para>
-          <indexterm zone="fontforge fontlint">
-            <primary sortas="b-fontlint">fontlint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sfddiff">
-        <term><command>sfddiff</command></term>
-        <listitem>
-          <para>
-            is a program that compares two font files.
-          </para>
-          <indexterm zone="fontforge sfddiff">
-            <primary sortas="b-sfddiff">sfddiff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: xsoft/other/fontforge.xml
===================================================================
--- xsoft/other/fontforge.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ xsoft/other/fontforge.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -0,0 +1,249 @@
+<?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 fontforge-download-http "&sources-anduin-other-http;/fontforge-&fontforge-version;.tar.xz">-->
+  <!ENTITY fontforge-download-http "https://github.com/fontforge/fontforge/releases/download/&fontforge-version;/fontforge-&fontforge-version;.tar.gz">
+  <!ENTITY fontforge-download-ftp  " ">
+  <!ENTITY fontforge-md5sum        "a68cd6797e2e5fb0aa88a33bbe15315b">
+  <!ENTITY fontforge-size          "120 MB">
+  <!ENTITY fontforge-buildsize     "406 MB">
+  <!ENTITY fontforge-time          "2.4 SBU">
+]>
+
+<sect1 id="fontforge" xreflabel="FontForge-&fontforge-version;">
+  <?dbhtml filename="fontforge.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>FontForge-&fontforge-version;</title>
+
+  <indexterm zone="fontforge">
+    <primary sortas="a-FontForge">FontForge</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to FontForge</title>
+
+    <para>
+      The <application>FontForge</application> package contains an
+      outline font editor that lets you create your own postscript,
+      truetype, opentype, cid-keyed, multi-master, cff, svg and
+      bitmap (bdf, FON, NFNT) fonts, or edit existing ones.
+    </para>
+
+    &lfs77_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&fontforge-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&fontforge-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &fontforge-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &fontforge-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &fontforge-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &fontforge-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">FontForge Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="freetype2"/>,
+      <xref linkend="git"/>,
+      <xref linkend="glib2"/> and
+      <xref linkend="libxml2"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="cairo"/>,
+      <xref linkend="gtk2"/>,
+      <xref linkend="harfbuzz"/>,
+      <xref linkend="pango"/> and
+      <xref linkend="xorg7-lib"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="giflib"/>,
+      <xref linkend="libjpeg"/>,
+      <xref linkend="libpng"/>,
+      <xref linkend="libtiff"/>,
+      <xref linkend="python2"/>,
+      <ulink url="http://ipython.org/">IPython</ulink>,
+      <ulink url="https://github.com/fontforge/libspiro">libspiro</ulink>,
+      <ulink url="https://bitbucket.org/sortsmill/libunicodenames">
+      libunicodenames</ulink>,
+      <ulink url="https://github.com/fontforge/libuninameslist">
+      libuninameslist</ulink>, and
+      <ulink url="http://www.zeromq.org/">libzmq</ulink>,
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/fontforge"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of FontForge</title>
+
+    <para>
+      Install <application>FontForge</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>rm -rf libltdl &amp;&amp;
+rm m4/argz.m4  &amp;&amp;
+./bootstrap    &amp;&amp;
+./configure --prefix=/usr     \
+            --enable-gtk2-use \
+            --disable-static  \
+            --docdir=/usr/share/doc/fontforge-&fontforge-version; &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>
+
+    <para>
+      <command>rm -rf libltdl ... ./bootstrap</command>:
+      These commands work around the old version of libtool in the source,
+      and the idiosyncracies of the bootstrap command, to allow it to build with
+      current libtool where some files have been renamed.
+    </para>
+
+    <para>
+      <parameter>--enable-gtk2-use</parameter>: This switch enables building
+      of the utilities that require <application>GTK+2</application>.
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          fontforge, fontimage, fontlint and sfddiff
+        </seg>
+        <seg>
+          libfontforgeexe.so, libfontforge.so, libgdraw.so,
+          libgioftp.so, libgunicode.so and libgutils.so
+        </seg>
+        <seg>
+          /usr/include/fontforge,
+          /usr/share/doc/fontforge-&fontforge-version; and
+          /usr/share/fontforge
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="fontforge-prog">
+        <term><command>fontforge</command></term>
+        <listitem>
+          <para>
+            is a program that allows you to create and
+            modify font files.
+          </para>
+          <indexterm zone="fontforge fontforge-prog">
+            <primary sortas="b-fontforge">fontforge</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="fontimage">
+        <term><command>fontimage</command></term>
+        <listitem>
+          <para>
+            is a program that produces an image showing
+            representative glyphs of the font.
+          </para>
+          <indexterm zone="fontforge fontimage">
+            <primary sortas="b-fontimage">fontimage</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="fontlint">
+        <term><command>fontlint</command></term>
+        <listitem>
+          <para>
+            is a program that checks the font for certain
+            common errors.
+          </para>
+          <indexterm zone="fontforge fontlint">
+            <primary sortas="b-fontlint">fontlint</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="sfddiff">
+        <term><command>sfddiff</command></term>
+        <listitem>
+          <para>
+            is a program that compares two font files.
+          </para>
+          <indexterm zone="fontforge sfddiff">
+            <primary sortas="b-sfddiff">sfddiff</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: oft/other/gimp-systemd.xml
===================================================================
--- xsoft/other/gimp-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,577 +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 gimp-download-http "http://download.gimp.org/pub/gimp/v2.8/gimp-&gimp-version;.tar.bz2">
-  <!ENTITY gimp-download-ftp  "ftp://mirrors.xmission.com/gimp/gimp/v2.8/gimp-&gimp-version;.tar.bz2">
-  <!ENTITY gimp-md5sum        "233c948203383fa078434cc3f8f925cb">
-  <!ENTITY gimp-size          "20 MB">
-  <!ENTITY gimp-buildsize     "570 MB (additional 553 MB to run the test suite,
-                                the help files add from 288 MB (en only) to 1.3
-                                GB (all 18 languages), typically increasing by
-                                54 MB per translation)">
-  <!ENTITY gimp-time          "4.2 SBU (additional 0.9 SBU to run the test
-                                suite, for the help files from 0.6 SBU (en only)
-                                to 19 SBU (all) - typically 1.3 SBU
-                                per translation)">
-
-  <!ENTITY gimp-help-version  "2.8.2">
-  <!ENTITY gimp-help-download "http://download.gimp.org/pub/gimp/help/gimp-help-&gimp-help-version;.tar.bz2">
-  <!ENTITY gimp-help-md5sum   "a591c8974b2f4f584d0a769d52ed6c5b">
-  <!ENTITY gimp-help-size     "152 MB">
-]>
-
-<sect1 id="gimp" xreflabel="Gimp-&gimp-version;">
-  <?dbhtml filename="gimp.html" ?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Gimp-&gimp-version;</title>
-
-  <indexterm zone="gimp">
-    <primary sortas="a-Gimp">Gimp</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gimp</title>
-
-    <para>
-      The <application>Gimp</application> package contains
-      the GNU Image Manipulation Program which is useful for
-      photo retouching, image composition and image authoring.
-    </para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gimp-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gimp-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gimp-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gimp-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gimp-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gimp-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional help files: <ulink url="&gimp-help-download;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gimp-help-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gimp-help-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Optional patch:
-          <ulink url="&patch-root;/gimp-&gimp-version;-device_info-1.patch"/>
-        </para>
-      </listitem>
-<!--      <listitem>
-        <para>
-          Compressed Patch MD5 sum: 5312793a67132131a6e3360e76f392e4
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-         Compressed Patch size: 486 KB
-        </para>
-      </listitem> -->
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gimp Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gegl"/> and
-      <xref linkend="gtk2"/> 
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="pygtk"/> (including the gtk and pango modules)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="aalib"/>,
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="curl"/>,
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="gs"/> (with libgs installed),
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="gvfs"/>,
-      <xref linkend="iso-codes"/>,
-      <xref linkend="jasper"/>,
-      <xref linkend="lcms"/> or <xref linkend="lcms2"/>,
-      <xref linkend="libexif"/>,
-      <xref linkend="libmng"/>,
-      <xref linkend="librsvg"/>,
-      <ulink url="http://wvware.sourceforge.net/libwmf.html">libwmf</ulink>,
-      <xref linkend="poppler"/>,
-      an <xref linkend="server-mail"/> (that provides a
-      <command>sendmail</command> program),
-      <xref linkend="systemd"/> (for GUdev), and
-      <xref linkend="webkitgtk2"/> (Compiled against GTK+ 2, required for the help-plugin)
-    </para>
-
-    <bridgehead renderas="sect4">Optional, for optimizing the PNG files in the
-    help system</bridgehead>
-    <para role="optional">
-      <ulink url="http://pngnq.sourceforge.net/">pngnq</ulink> and
-      <ulink url="http://pmt.sourceforge.net/pngcrush/">pngcrush</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/gimp"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gimp</title>
-
-    <para>
-      In order to get rid of an annoying message when running from a terminal
-      and/or if you wish to run the test suite, optionally use the
-      following patch:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../gimp-&gimp-version;-device_info-1.patch</userinput></screen>
-
-    <para>
-      Install <application>Gimp</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc --without-gvfs &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results (requires an X-Windowed terminal) 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>
-
-    <para>
-      The <filename>gimp-help</filename> tarball contains images and English
-      text help for help files, together with translations. It is
-      &quot;work in progress&quot;.
-    </para>
-
-    <para>
-      If you downloaded the <filename>gimp-help</filename> tarball, unpack
-      it and change into the root of the newly created source tree. Prepare for
-      the build with the following command:
-    </para>
-
-<screen><userinput>ALL_LINGUAS=&quot;ca da de el en en_GB es fr it ja ko nl nn pt_BR ru sl sv zh_CN&quot; \
-./configure --prefix=/usr &amp;&amp;</userinput></screen>
-
-    <para>
-      Remove from <envar>ALL_LINGUAS</envar> the codes for any languages which
-      you do not wish to install. Alternatively, remove the line starting with
-      <envar>ALL_LINGUAS</envar>, if you wish to build all languages. 
-    </para>
-
-<!--    <para>
-      Alternatively, if you wish to build languages including Catalan,
-      apply the patch:
-    </para>
-
-<screen role="nodump"><userinput>xzcat ../gimp-help-2.8.0-build_fixes-1.patch.xz \
- | patch -p1 &amp;&amp;
-./autogen.sh -prefix=/usr &amp;&amp;</userinput></screen>
-
-    <para>
-      Again, you can specify a subset of languages by specifying
-      <envar>ALL_LINGUAS</envar> in front of <command>./autogen.sh</command>, but
-      this time including &quot;ca&quot;.
-    </para>
- -->
-    <para>
-      Now build the help files:
-    </para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>
-      Issue the following commands as the
-      <systemitem class="username">root</systemitem> user to install the help
-      files:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-chown -R root:root /usr/share/gimp/2.0/help</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/update-icons-and-desktop.xml"/>
-
-  </sect2>
-
-  <sect2 role="commands" id="gimp-cmd-explanations">
-    <title>Command Explanations</title>
-
-    <para>
-      <envar>ALL_LINGUAS=&quot;ca da de el en en_GB ...&quot;</envar>: by
-      default, the help files will be rendered in all the available languages.
-      Remove the codes of any languages you do not wish to build.
-    </para>
-
-    <para>
-      <parameter>--without-gvfs</parameter>: the choice of the backend to
-      handle URI information, e.g., when dragging images from a browser into the
-      <application>Gimp</application>, is made at compile time.  This parameter will
-      ensure that <application>cURL</application> is used at run-time, instead of
-      <application>Gvfs</application>.  You can omit this if you are installing
-      <application>Gvfs</application> AND will be running <command>gvfsd</command>,
-      e.g., in a <application>GNOME</application> desktop.
-    </para>
-
-    <para><option>--disable-python</option>: This option is necessary if
-    you have not installed <application>PyGTK</application>.</para>
-
-<!--<para>
-      <command>./autogen.sh</command> <parameter>-prefix=/usr</parameter>: In this case, using
-      <command>autoreconf</command> to regenerate <filename>configure</filename>
-      does not work, because of how the gimp-help developers chose to address
-      problems with the autotools.
-    </para>
-
-    <para>
-      <command>xzcat ../gimp-help-2.8.0-build_fixes-1.patch.xz</command>:
-      this patch is large, so it has been compressed with
-      <application>xz</application>. You are encouraged to be suspicious of
-      all patches until you have looked at them. Use <command>view</command>
-      to read the compressed patch before you apply it.
-    </para>
--->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring The Gimp</title>
-
-    <sect3 id="gimp-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/gimp/2.0/*</filename> and
-        <filename>~/.gimp-2.8/gimprc</filename>
-      </para>
-
-      <indexterm zone="gimp gimp-config">
-        <primary sortas="e-AA.gimp-2.0/gimprc">~/.gimp-2.0/gimprc</primary>
-      </indexterm>
-
-      <indexterm zone="gimp gimp-config">
-        <primary sortas="e-etc-gimp-2.0-star">/etc/gimp/2.0/*</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        The <application>Gimp</application> executes a configuration wizard
-        for each user upon their initial use of the program.
-      </para>
-
-      <para>
-        The <application>Gimp</application> executes the
-        <command>firefox</command> web browser by default to view the help
-        files. If you do not have <application>Firefox</application>, or
-        prefer a different web browser, you can set a new system value in
-        <filename>/etc/gimp/2.0/gimprc</filename>. Execute the following
-        command as the <systemitem class="username">root</systemitem> user,
-        replacing <replaceable>&lt;browser&gt;</replaceable> with your
-        preferred web browser:
-      </para>
-
-<screen role="root"><userinput>echo '(web-browser "<replaceable>&lt;browser&gt;</replaceable> %s")' &gt;&gt; /etc/gimp/2.0/gimprc</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>
-          gimp, gimp-2.8, gimp-console, gimp-console-2.8 and
-          gimptool-2.0
-        </seg>
-        <seg>
-          libgimp-2.0.so, libgimpbase-2.0.so, libgimpcolor-2.0.so,
-          libgimpconfig-2.0.so, libgimpmath-2.0.so, libgimpmodule-2.0.so,
-          libgimpthumb-2.0.so, libgimpui-2.0.so and libgimpwidgets-2.0.so
-        </seg>
-        <seg>
-          /etc/gimp,
-          /usr/include/gimp-2.0,
-          /usr/lib/gimp,
-          /usr/share/gimp,
-          /usr/share/gtk-doc/html/{libgimp,libgimpbase,libgimpcolor},
-          /usr/share/gtk-doc/html/{libgimpconfig,libgimpmath},
-          /usr/share/gtk-doc/html/{libgimpmodule,libgimpthumb} and
-          /usr/share/gtk-doc/html/libgimpwidgets
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gimp-prog">
-        <term><command>gimp</command></term>
-        <listitem>
-          <para>
-            is a symbolic link to <command>gimp-2.8</command>.
-          </para>
-          <indexterm zone="gimp gimp-prog">
-            <primary sortas="b-gimp">gimp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gimp-2.8">
-        <term><command>gimp-2.8</command></term>
-        <listitem>
-          <para>
-            is the Gnu Image Manipulation Program. It works with a variety
-            of image formats and provides a large selection of tools.
-          </para>
-          <indexterm zone="gimp gimp-2.8">
-            <primary sortas="b-gimp-2.8">gimp-2.8</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gimp-console">
-        <term><command>gimp-console</command></term>
-        <listitem>
-          <para>
-            is a symbolic link to <command>gimp-console-2.8</command>.
-          </para>
-          <indexterm zone="gimp gimp-console">
-            <primary sortas="b-gimp-console">gimp-console</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gimp-console-2.8">
-        <term><command>gimp-console-2.8</command></term>
-        <listitem>
-          <para>
-            is a console program that behaves as if The
-            <application>Gimp</application> was called with the
-            <option>--no-interface</option> command-line option.
-          </para>
-          <indexterm zone="gimp gimp-console-2.8">
-            <primary sortas="b-gimp-console-2.8">gimp-console-2.8</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gimptool-2.0">
-        <term><command>gimptool-2.0</command></term>
-        <listitem>
-          <para>
-            is a tool that can build plug-ins or scripts and install them
-            if they are distributed in one source file.
-            <command>gimptool-2.0</command> can also be used by programs that
-            need to know what libraries and include-paths The
-            <application>Gimp</application> was compiled with.
-          </para>
-          <indexterm zone="gimp gimptool-2.0">
-            <primary sortas="b-gimptool-2.0">gimptool-2.0</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgimp-2.0">
-        <term><filename class="libraryfile">libgimp-2.0.so</filename></term>
-        <listitem>
-          <para>
-            provides C bindings for The <application>Gimp</application>'s
-            Procedural Database (PDB) which offers an interface to core functions
-            and to functionality provided by plug-ins.
-          </para>
-          <indexterm zone="gimp libgimp-2.0">
-            <primary sortas="c-libgimp-2.0">libgimp-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgimpbase-2.0">
-        <term><filename class="libraryfile">libgimpbase-2.0.so</filename></term>
-        <listitem>
-          <para>
-            provides the C functions for basic
-            <application>Gimp</application> functionality such as determining
-            enumeration data types, gettext translation, determining The
-            <application>Gimp</application>'s version number and capabilities,
-            handling data files and accessing the environment.
-          </para>
-          <indexterm zone="gimp libgimpbase-2.0">
-            <primary sortas="c-libgimpbase-2.0">libgimpbase-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgimpcolor-2.0">
-        <term><filename
-        class="libraryfile">libgimpcolor-2.0.so</filename></term>
-        <listitem>
-          <para>
-            provides the C functions relating to RGB, HSV and CMYK colors as
-            well as converting colors between different color models and
-            performing adaptive supersampling on an area.
-          </para>
-          <indexterm zone="gimp libgimpcolor-2.0">
-            <primary sortas="c-libgimpcolor-2.0">libgimpcolor-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgimpconfig-2.0">
-        <term><filename
-        class="libraryfile">libgimpconfig-2.0.so</filename></term>
-        <listitem>
-          <para>
-            contains C functions for reading and writing config information.
-          </para>
-          <indexterm zone="gimp libgimpconfig-2.0">
-            <primary sortas="c-libgimpconfig-2.0">libgimpconfig-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgimpmath-2.0">
-        <term><filename class="libraryfile">libgimpmath-2.0.so</filename></term>
-        <listitem>
-          <para>
-            contains C functions which provide mathematical definitions and
-            macros, manipulate 3x3 transformation matrices, set up and manipulate
-            vectors and the MD5 message-digest algorithm.
-          </para>
-          <indexterm zone="gimp libgimpmath-2.0">
-            <primary sortas="c-libgimpmath-2.0">libgimpmath-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgimpmodule-2.0">
-        <term><filename class="libraryfile">libgimpmodule-2.0.so</filename></term>
-        <listitem>
-          <para>
-            provides the C functions which implements module loading using
-            GModule and keeps a list of GimpModule's found in a given
-            searchpath.
-          </para>
-          <indexterm zone="gimp libgimpmodule-2.0">
-            <primary sortas="c-libgimpmodule-2.0">libgimpmodule-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgimpthumb-2.0">
-        <term><filename class="libraryfile">libgimpthumb-2.0.so</filename></term>
-        <listitem>
-          <para>
-            provides the C functions for handling The
-            <application>Gimp</application>'s thumbnail objects.
-          </para>
-          <indexterm zone="gimp libgimpthumb-2.0">
-            <primary sortas="c-libgimpthumb-2.0">libgimpthumb-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgimpui-2.0">
-        <term><filename class="libraryfile">libgimpui-2.0.so</filename></term>
-        <listitem>
-          <para>
-            contains The <application>Gimp</application>'s common user
-            interface functions.
-          </para>
-          <indexterm zone="gimp libgimpui-2.0">
-            <primary sortas="c-libgimpui-2.0">libgimpui-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgimpwidgets-2.0">
-        <term><filename class="libraryfile">libgimpwidgets-2.0.so</filename></term>
-        <listitem>
-          <para>
-            contains The <application>Gimp</application>
-            and <application>GTK</application>'s widget creation and
-            manipulation functions.
-          </para>
-          <indexterm zone="gimp libgimpwidgets-2.0">
-            <primary
-            sortas="c-libgimpwidgets-2.0">libgimpwidgets-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: oft/other/gparted-systemd.xml
===================================================================
--- xsoft/other/gparted-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,301 +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 gparted-download-http
-           "&sourceforge-repo;/gparted/gparted-&gparted-version;.tar.bz2">
-  <!ENTITY gparted-download-ftp  " ">
-  <!ENTITY gparted-md5sum        "67c4bdf680461e1107b718aff6095ea6">
-  <!ENTITY gparted-size          "2.1 MB">
-  <!ENTITY gparted-buildsize     "94 MB">
-  <!ENTITY gparted-time          "0.9 SBU">
-]>
-
-<sect1 id="gparted" xreflabel="Gparted-&gparted-version;">
-  <?dbhtml filename="gparted.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Gparted-&gparted-version;</title>
-
-  <indexterm zone="gparted">
-    <primary sortas="a-Gparted">Gparted</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gparted</title>
-
-    <para>
-      Gparted is the Gnome Partition Editor, a Gtk 2 GUI for other command line
-      tools that can create, reorganise or delete disk partitions.
-    </para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gparted-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gparted-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gparted-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gparted-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gparted-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gparted-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gparted Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtkmm2"/> and
-      <xref linkend="parted"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="&gnome-download-http;/gnome-doc-utils/">
-      GNOME Doc Utils</ulink> and
-      <xref linkend="rarian"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/gparted"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gparted</title>
-
-    <para>
-      Install <application>Gparted</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-doc    \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a testsuite.
-    </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>--disable-doc</option>: This switch disables building of
-      the optional documentation. Remove it if you have installed
-      <application>GNOME Doc Utils</application>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="using">
-    <title>Using Gparted</title>
-
-    <para>
-      To manipulate file systems Gparted has a run time dependency on various
-      file system tools (you only need to install the tools for file systems you
-      actually use):
-      e2fsprogs (installed as part of LFS),
-      <xref linkend="jfsutils"/>,
-      <xref linkend="ntfs-3g"/>,
-      <xref linkend="reiserfs"/>,
-      <xref linkend="xfsprogs"/>,
-      <ulink url="https://btrfs.wiki.kernel.org/index.php/Btrfs_source_repositories">
-      btrfs-progs</ulink>,
-      <ulink url="http://www.daniel-baumann.ch/software/dosfstools/">dosfstools</ulink>,
-      <ulink url="http://ftp.gnu.org/pub/gnu/mtools/">mtools</ulink> (required
-      to read and write FAT16/32 volume labels and UUIDs),
-      <ulink url="ftp://ftp.mars.org/pub/hfs/">hfsutils</ulink>,
-      hfsprogs,
-      <ulink url="http://www.nilfs.org/download/">nilfs-utils</ulink> and
-      reiser4progs.
-    </para>
-
-    <para>
-      Root privileges are required to run Gparted. If you wish to run the
-      application from the menu, further packages and configuration are
-      necessary. One solution is to use <command>pkexec</command>
-      from <xref linkend="polkit"/>. Another solution is to use <xref
-      linkend="ssh-askpass"/>.
-    </para>
-
-    <sect3 role="ssh-askpass">
-      <title>ssh-askpass</title>
-        <para>
-          To optionally use <xref linkend="ssh-askpass"/>, run the following
-          commands as the <systemitem class="username">root</systemitem> user:
-        </para>
-
-<screen role="root"><userinput>cp -v  /usr/share/applications/gparted.desktop \
-       /usr/share/applications/gparted.desktop.back &amp;&amp;
-
-sed -i 's/Exec=/Exec=sudo -A /' \
-       /usr/share/applications/gparted.desktop</userinput></screen>
-
-    </sect3>
-
-    <sect3 role="pkexec">
-      <title>pkexec</title>
-
-        <para>
-          To optionally use <command>pkexec</command>, you need
-          <xref linkend="polkit-gnome"/> or any Polkit authentication agent
-          provided by your desktop environment and
-          <xref linkend="systemd"/>. Run the following commands
-          as the <systemitem class="username">root</systemitem> user:
-        </para>
-
-<screen role="root"><userinput>cp -v  /usr/share/applications/gparted.desktop \
-       /usr/share/applications/gparted.desktop.back &amp;&amp;
-
-sed -i 's:/usr/sbin/gparted:/usr/sbin/gparted_polkit:' \
-       /usr/share/applications/gparted.desktop      &amp;&amp;
-
-cat &gt; /usr/sbin/gparted_polkit &lt;&lt; "EOF" &amp;&amp;
-<literal>#!/bin/sh
-
-pkexec /usr/sbin/gparted $@</literal>
-EOF
-
-chmod -v 755 /usr/sbin/gparted_polkit
-
-cat &gt; /usr/share/polkit-1/actions/org.gnome.gparted.policy &lt;&lt; "EOF"
-<literal>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;!DOCTYPE policyconfig PUBLIC
- "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd"&gt;
-&lt;policyconfig&gt;
-
-  &lt;action id="org.freedesktop.policykit.pkexec.run-gparted"&gt;
-    &lt;description&gt;Run GParted&lt;/description&gt;
-    &lt;message&gt;Authentication is required to run GParted&lt;/message&gt;
-    &lt;defaults&gt;
-      &lt;allow_any&gt;no&lt;/allow_any&gt;
-      &lt;allow_inactive&gt;no&lt;/allow_inactive&gt;
-      &lt;allow_active&gt;auth_admin_keep&lt;/allow_active&gt;
-    &lt;/defaults&gt;
-    &lt;annotate key="org.freedesktop.policykit.exec.path"&gt;/usr/sbin/gparted&lt;/annotate&gt;
-    &lt;annotate key="org.freedesktop.policykit.exec.allow_gui"&gt;true&lt;/annotate&gt;
-  &lt;/action&gt;
-
-&lt;/policyconfig&gt;</literal>
-EOF
-
-chmod -v 644 /usr/share/polkit-1/actions/org.gnome.gparted.policy</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>
-          gparted, gpartedbin and gparted_polkit (optional)
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/gnome/help/gparted and
-          /usr/share/omf/gparted
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gparted-prog">
-        <term><command>gparted</command></term>
-        <listitem>
-          <para>
-            is a shell script which sets up the environment before calling
-            <command>gpartedbin</command>.
-          </para>
-          <indexterm zone="gparted gparted-prog">
-            <primary sortas="b-gparted">gparted</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpartedbin">
-        <term><command>gpartedbin</command></term>
-        <listitem>
-          <para>
-            is the Gparted binary.
-          </para>
-          <indexterm zone="gparted gpartedbin">
-            <primary sortas="b-gpartedbin">gpartedbin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gparted_polkit">
-        <term><command>gparted_polkit</command></term>
-        <listitem>
-          <para>
-            is an optional script which can be used to run gparted with polkit,
-            from a menu.
-          </para>
-          <indexterm zone="gparted gparted_polkit">
-            <primary sortas="b-gparted_polkit">gparted_polkit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: xsoft/other/gparted.xml
===================================================================
--- xsoft/other/gparted.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ xsoft/other/gparted.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -0,0 +1,301 @@
+<?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 gparted-download-http
+           "&sourceforge-repo;/gparted/gparted-&gparted-version;.tar.bz2">
+  <!ENTITY gparted-download-ftp  " ">
+  <!ENTITY gparted-md5sum        "67c4bdf680461e1107b718aff6095ea6">
+  <!ENTITY gparted-size          "2.1 MB">
+  <!ENTITY gparted-buildsize     "94 MB">
+  <!ENTITY gparted-time          "0.9 SBU">
+]>
+
+<sect1 id="gparted" xreflabel="Gparted-&gparted-version;">
+  <?dbhtml filename="gparted.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Gparted-&gparted-version;</title>
+
+  <indexterm zone="gparted">
+    <primary sortas="a-Gparted">Gparted</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Gparted</title>
+
+    <para>
+      Gparted is the Gnome Partition Editor, a Gtk 2 GUI for other command line
+      tools that can create, reorganise or delete disk partitions.
+    </para>
+
+    &lfs77_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&gparted-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&gparted-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &gparted-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &gparted-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &gparted-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &gparted-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Gparted Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="gtkmm2"/> and
+      <xref linkend="parted"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <ulink url="&gnome-download-http;/gnome-doc-utils/">
+      GNOME Doc Utils</ulink> and
+      <xref linkend="rarian"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/gparted"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Gparted</title>
+
+    <para>
+      Install <application>Gparted</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr    \
+            --disable-doc    \
+            --disable-static &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a testsuite.
+    </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>--disable-doc</option>: This switch disables building of
+      the optional documentation. Remove it if you have installed
+      <application>GNOME Doc Utils</application>.
+    </para>
+
+  </sect2>
+
+  <sect2 role="using">
+    <title>Using Gparted</title>
+
+    <para>
+      To manipulate file systems Gparted has a run time dependency on various
+      file system tools (you only need to install the tools for file systems you
+      actually use):
+      e2fsprogs (installed as part of LFS),
+      <xref linkend="jfsutils"/>,
+      <xref linkend="ntfs-3g"/>,
+      <xref linkend="reiserfs"/>,
+      <xref linkend="xfsprogs"/>,
+      <ulink url="https://btrfs.wiki.kernel.org/index.php/Btrfs_source_repositories">
+      btrfs-progs</ulink>,
+      <ulink url="http://www.daniel-baumann.ch/software/dosfstools/">dosfstools</ulink>,
+      <ulink url="http://ftp.gnu.org/pub/gnu/mtools/">mtools</ulink> (required
+      to read and write FAT16/32 volume labels and UUIDs),
+      <ulink url="ftp://ftp.mars.org/pub/hfs/">hfsutils</ulink>,
+      hfsprogs,
+      <ulink url="http://www.nilfs.org/download/">nilfs-utils</ulink> and
+      reiser4progs.
+    </para>
+
+    <para>
+      Root privileges are required to run Gparted. If you wish to run the
+      application from the menu, further packages and configuration are
+      necessary. One solution is to use <command>pkexec</command>
+      from <xref linkend="polkit"/>. Another solution is to use <xref
+      linkend="ssh-askpass"/>.
+    </para>
+
+    <sect3 role="ssh-askpass">
+      <title>ssh-askpass</title>
+        <para>
+          To optionally use <xref linkend="ssh-askpass"/>, run the following
+          commands as the <systemitem class="username">root</systemitem> user:
+        </para>
+
+<screen role="root"><userinput>cp -v  /usr/share/applications/gparted.desktop \
+       /usr/share/applications/gparted.desktop.back &amp;&amp;
+
+sed -i 's/Exec=/Exec=sudo -A /' \
+       /usr/share/applications/gparted.desktop</userinput></screen>
+
+    </sect3>
+
+    <sect3 role="pkexec">
+      <title>pkexec</title>
+
+        <para>
+          To optionally use <command>pkexec</command>, you need
+          <xref linkend="polkit-gnome"/> or any Polkit authentication agent
+          provided by your desktop environment and
+          <xref linkend="systemd"/>. Run the following commands
+          as the <systemitem class="username">root</systemitem> user:
+        </para>
+
+<screen role="root"><userinput>cp -v  /usr/share/applications/gparted.desktop \
+       /usr/share/applications/gparted.desktop.back &amp;&amp;
+
+sed -i 's:/usr/sbin/gparted:/usr/sbin/gparted_polkit:' \
+       /usr/share/applications/gparted.desktop      &amp;&amp;
+
+cat &gt; /usr/sbin/gparted_polkit &lt;&lt; "EOF" &amp;&amp;
+<literal>#!/bin/sh
+
+pkexec /usr/sbin/gparted $@</literal>
+EOF
+
+chmod -v 755 /usr/sbin/gparted_polkit
+
+cat &gt; /usr/share/polkit-1/actions/org.gnome.gparted.policy &lt;&lt; "EOF"
+<literal>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+&lt;!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd"&gt;
+&lt;policyconfig&gt;
+
+  &lt;action id="org.freedesktop.policykit.pkexec.run-gparted"&gt;
+    &lt;description&gt;Run GParted&lt;/description&gt;
+    &lt;message&gt;Authentication is required to run GParted&lt;/message&gt;
+    &lt;defaults&gt;
+      &lt;allow_any&gt;no&lt;/allow_any&gt;
+      &lt;allow_inactive&gt;no&lt;/allow_inactive&gt;
+      &lt;allow_active&gt;auth_admin_keep&lt;/allow_active&gt;
+    &lt;/defaults&gt;
+    &lt;annotate key="org.freedesktop.policykit.exec.path"&gt;/usr/sbin/gparted&lt;/annotate&gt;
+    &lt;annotate key="org.freedesktop.policykit.exec.allow_gui"&gt;true&lt;/annotate&gt;
+  &lt;/action&gt;
+
+&lt;/policyconfig&gt;</literal>
+EOF
+
+chmod -v 644 /usr/share/polkit-1/actions/org.gnome.gparted.policy</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>
+          gparted, gpartedbin and gparted_polkit (optional)
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /usr/share/gnome/help/gparted and
+          /usr/share/omf/gparted
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="gparted-prog">
+        <term><command>gparted</command></term>
+        <listitem>
+          <para>
+            is a shell script which sets up the environment before calling
+            <command>gpartedbin</command>.
+          </para>
+          <indexterm zone="gparted gparted-prog">
+            <primary sortas="b-gparted">gparted</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gpartedbin">
+        <term><command>gpartedbin</command></term>
+        <listitem>
+          <para>
+            is the Gparted binary.
+          </para>
+          <indexterm zone="gparted gpartedbin">
+            <primary sortas="b-gpartedbin">gpartedbin</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gparted_polkit">
+        <term><command>gparted_polkit</command></term>
+        <listitem>
+          <para>
+            is an optional script which can be used to run gparted with polkit,
+            from a menu.
+          </para>
+          <indexterm zone="gparted gparted_polkit">
+            <primary sortas="b-gparted_polkit">gparted_polkit</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: oft/other/inkscape-systemd.xml
===================================================================
--- xsoft/other/inkscape-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,216 +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;
-
-  <!-- inkscape.org appears to point to launchpad, sf is out of date -->
-  <!ENTITY inkscape-download-http "https://launchpad.net/inkscape/0.91.x/0.91/+download/inkscape-&inkscape-version;.tar.bz2">
-  <!ENTITY inkscape-download-ftp  " ">
-  <!ENTITY inkscape-md5sum        "278dfa4514adcde23546370ec2c84581">
-  <!ENTITY inkscape-size          "25 MB">
-  <!ENTITY inkscape-buildsize     "1.9 GB">
-  <!ENTITY inkscape-time          "16 SBU">
-]>
-
-<sect1 id="inkscape" xreflabel="Inkscape-&inkscape-version;">
-  <?dbhtml filename="inkscape.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy: fernando $</othername>
-    <date>$Date: 2015-02-08 11:30:45 +0100 (Sun, 08 Feb 2015) $</date>
-  </sect1info>
-
-  <title>Inkscape-&inkscape-version;</title>
-
-  <indexterm zone="inkscape">
-    <primary sortas="a-Inkscape">Inkscape</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Inkscape</title>
-
-    <para>
-      <application>Inkscape</application> is a what you see is what you get
-      Scalable Vector Graphics editor. It is useful for creating, viewing and
-      changing SVG images.
-    </para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&inkscape-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&inkscape-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &inkscape-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &inkscape-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &inkscape-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &inkscape-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional patch (for full test coverage):
-          <ulink url="&patch-root;/inkscape-&inkscape-version;-testfiles-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Inkscape Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="boost"/>,
-      <xref linkend="gc"/>,
-      <xref linkend="gsl"/>,
-      <xref linkend="gtkmm2"/>
-      (or <xref linkend="gtkmm3"/> and
-      <ulink url="http://ftp.gnome.org/pub/gnome/sources/gdl/">GDL</ulink>
-      for the experimental GTK+3 build),
-      <xref linkend="libxslt"/> and
-      <xref linkend="popt"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="lcms2"/> or
-      <xref linkend="lcms"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="aspell"/>,
-      <xref linkend="dbus"/>,
-      <xref linkend="doxygen"/>,
-      <xref linkend="imagemagick"/>,
-      <xref linkend="poppler"/>,
-      <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libcdr">libcdr</ulink>,
-      <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libvisio">libvisio</ulink>,
-      <ulink url="https://github.com/LibreOffice/libcdr">libcdr</ulink>,
-      <ulink url="https://github.com/LibreOffice/libvisio">libvisio</ulink>,
-      <ulink url="http://libwpg.sourceforge.net/">libwpg</ulink>,
-      <ulink url="&sourceforge-repo;/NumPy/">NumPy</ulink>
-      (for the testsuite and at runtime for some extensions) and
-      <ulink url="https://pypi.python.org/pypi/lxml">python-lxml</ulink>
-      (for the testsuite, and at runtime for some of the extensions)
-    </para>
-
-    <bridgehead renderas="sect4">Optional Runtime Dependencies
-    (for some of the Inkscape extensions)</bridgehead>
-    <para role="optional">
-      <ulink url="http://search.cpan.org/dist/XML-XQL/">XML::XQL</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/inkscape"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Inkscape</title>
-
-    <para>
-      Install <application>Inkscape</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../inkscape-&inkscape-version;-testfiles-1.patch &amp;&amp;
-
-./configure --prefix=/usr &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>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/update-icons-and-desktop.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          inkscape and inkview
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/inkscape
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="inkscape-prog">
-        <term><command>inkscape</command></term>
-        <listitem>
-          <para>
-            an SVG (Scalable Vector Graphics) editing program.
-          </para>
-          <indexterm zone="inkscape inkscape-prog">
-            <primary sortas="b-inkscape">inkscape</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="inkview">
-        <term><command>inkview</command></term>
-        <listitem>
-          <para>
-            is a simple program for displaying SVG files.
-          </para>
-          <indexterm zone="inkscape inkview">
-            <primary sortas="b-inkview">inkview</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: xsoft/other/inkscape.xml
===================================================================
--- xsoft/other/inkscape.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ xsoft/other/inkscape.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -5,10 +5,11 @@
   %general-entities;
 
-  <!ENTITY inkscape-download-http "&sourceforge-repo;/inkscape/inkscape-&inkscape-version;.tar.bz2">
+  <!-- inkscape.org appears to point to launchpad, sf is out of date -->
+  <!ENTITY inkscape-download-http "https://launchpad.net/inkscape/0.91.x/0.91/+download/inkscape-&inkscape-version;.tar.bz2">
   <!ENTITY inkscape-download-ftp  " ">
-  <!ENTITY inkscape-md5sum        "431cda5cd40cd4fdf2b89db1bdcce61f">
-  <!ENTITY inkscape-size          "19 MB">
-  <!ENTITY inkscape-buildsize     "1.4 GB">
-  <!ENTITY inkscape-time          "12 SBU">
+  <!ENTITY inkscape-md5sum        "278dfa4514adcde23546370ec2c84581">
+  <!ENTITY inkscape-size          "25 MB">
+  <!ENTITY inkscape-buildsize     "1.9 GB">
+  <!ENTITY inkscape-time          "16 SBU">
 ]>
 
@@ -17,6 +18,6 @@
 
   <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
+    <othername>$LastChangedBy: fernando $</othername>
+    <date>$Date: 2015-02-08 11:30:45 +0100 (Sun, 08 Feb 2015) $</date>
   </sect1info>
 
@@ -36,5 +37,5 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -76,6 +77,6 @@
       <listitem>
         <para>
-          Required patch:
-          <ulink url="&patch-root;/inkscape-&inkscape-version;-poppler-1.patch"/>
+          Optional patch (for full test coverage):
+          <ulink url="&patch-root;/inkscape-&inkscape-version;-testfiles-1.patch"/>
         </para>
       </listitem>
@@ -89,10 +90,15 @@
       <xref linkend="gc"/>,
       <xref linkend="gsl"/>,
-      <xref linkend="gtkmm2"/> and
-      <xref linkend="libxslt"/>
+      <xref linkend="gtkmm2"/>
+      (or <xref linkend="gtkmm3"/> and
+      <ulink url="http://ftp.gnome.org/pub/gnome/sources/gdl/">GDL</ulink>
+      for the experimental GTK+3 build),
+      <xref linkend="libxslt"/> and
+      <xref linkend="popt"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
+      <xref linkend="lcms2"/> or
       <xref linkend="lcms"/>
     </para>
@@ -101,9 +107,17 @@
     <para role="optional">
       <xref linkend="aspell"/>,
+      <xref linkend="dbus"/>,
       <xref linkend="doxygen"/>,
       <xref linkend="imagemagick"/>,
+      <xref linkend="poppler"/>,
+      <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libcdr">libcdr</ulink>,
+      <ulink url="https://wiki.documentfoundation.org/DLP/Libraries/libvisio">libvisio</ulink>,
+      <ulink url="https://github.com/LibreOffice/libcdr">libcdr</ulink>,
+      <ulink url="https://github.com/LibreOffice/libvisio">libvisio</ulink>,
       <ulink url="http://libwpg.sourceforge.net/">libwpg</ulink>,
-      <xref linkend="poppler"/> and
-      <xref linkend="popt"/>
+      <ulink url="&sourceforge-repo;/NumPy/">NumPy</ulink>
+      (for the testsuite and at runtime for some extensions) and
+      <ulink url="https://pypi.python.org/pypi/lxml">python-lxml</ulink>
+      (for the testsuite, and at runtime for some of the extensions)
     </para>
 
@@ -111,6 +125,5 @@
     (for some of the Inkscape extensions)</bridgehead>
     <para role="optional">
-      <ulink url="http://search.cpan.org/~tjmather/XML-XQL-0.68/lib/XML/XQL.pm">XML::XQL</ulink>
-      and <ulink url="http://cheeseshop.python.org/pypi/lxml/">python-lxml</ulink>
+      <ulink url="http://search.cpan.org/dist/XML-XQL/">XML::XQL</ulink>
     </para>
 
@@ -123,12 +136,4 @@
     <title>Installation of Inkscape</title>
 
-<!--
-    <para>If <application>Xorg</application> is installed in a prefix other
-    than <filename class='directory'>/usr</filename>, the build will fail. Fix
-    this by issuing the following command:</para>
-
-<screen><userinput>export LIBRARY_PATH=$XORG_PREFIX/lib</userinput></screen>
--->
-
     <para>
       Install <application>Inkscape</application> by running the following
@@ -136,17 +141,12 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../inkscape-&inkscape-version;-poppler-1.patch &amp;&amp;
-autoreconf -vi &amp;&amp;
-
-sed -ri "s:.*(unsigned GC_version).*:\1 = GC_get_version()\;:" configure &amp;&amp;
-
-./configure --prefix=/usr &amp;&amp; 
+<screen><userinput>patch -Np1 -i ../inkscape-&inkscape-version;-testfiles-1.patch &amp;&amp;
+
+./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
-<!-- Test suite is broken as of inkscape-0.48.5
     <para>
       To test the results, issue: <command>make check</command>.
     </para>
--->
     <para>
       Now, as the <systemitem class="username">root</systemitem> user:
@@ -157,15 +157,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/update-icons-and-desktop.xml"/>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -ri ... configure</command>:
-      This <command>sed</command> fixes building problems starting
-      with gc-7.4.2.
-    </para>
 
   </sect2>
Index: xsoft/other/other.xml
===================================================================
--- xsoft/other/other.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ xsoft/other/other.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -21,10 +21,10 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="balsa.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="feh.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fontforge-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fontforge.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gimp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gparted-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gparted.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hexchat.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="icedtea-web.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inkscape-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inkscape.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pidgin.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rox-filer.xml"/>
@@ -32,5 +32,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="thunderbird.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tigervnc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="transmission-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="transmission.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xchat.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xdg-utils.xml"/>
Index: oft/other/transmission-systemd.xml
===================================================================
--- xsoft/other/transmission-systemd.xml	(revision 3e63daa9b53b0c2e1f1ddb1ec2214767bac3b4e2)
+++ 	(revision )
@@ -1,313 +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 transmission-download-http "https://transmission.cachefly.net/transmission-&transmission-version;.tar.xz">
-  <!ENTITY transmission-download-ftp  " ">
-  <!ENTITY transmission-md5sum        "411aec1c418c14f6765710d89743ae42">
-  <!ENTITY transmission-size          "3 MB">
-  <!ENTITY transmission-buildsize     "230 MB">
-  <!ENTITY transmission-time          "1.1 SBU">
-]>
-
-<sect1 id="transmission" xreflabel="Transmission-&transmission-version;">
-  <?dbhtml filename="transmission.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Transmission-&transmission-version;</title>
-
-  <indexterm zone="transmission">
-    <primary sortas="a-Transmission">Transmission</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Transmission</title>
-
-    <para>
-      <application>Transmission</application> is a cross-platform, open source
-      BitTorrent client. This is useful for downloading large files (such as
-      Linux ISOs) and reduces the need for the distributors to provide server
-      bandwidth.
-    </para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&transmission-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&transmission-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &transmission-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &transmission-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &transmission-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &transmission-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional patch:
-          <ulink url="&patch-root;/transmission-&transmission-version;-qt4-1.patch"/>
-       </para>
-      </listitem>
-    </itemizedlist>-->
-
-    <bridgehead renderas="sect3">Transmission Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="curl"/>,
-      <xref linkend="libevent"/>, and
-      <xref linkend="openssl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (to build a GUI)</bridgehead>
-    <para role="recommended">
-      <xref linkend="gtk3"/> and either
-      <xref linkend="qt4"/> or
-      <xref linkend="qt5"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> and
-      <xref linkend="gdb"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/transmission"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Transmission</title>
-<!--
-    <para>If you want to build the Qt interface using <xref linkend="qt4"/>,
-    apply the following patch:</para>
-
-<screen><userinput>patch -Np1 -i ../transmission-&transmission-version;-qt4-1.patch</userinput></screen>-->
-
-    <para>
-      Install <application>Transmission</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To build the <application>Qt4</application> GUI, run the following commands:
-    </para>
-
-<screen><userinput>sed -i '/^CONFIG/aQMAKE_CXXFLAGS += -std=c++11' qt/qtr.pro &amp;&amp;
-pushd qt    &amp;&amp;
-  qmake-qt4 &amp;&amp;
-  make      &amp;&amp;
-popd</userinput></screen>
-
-    <para>
-      To build the <application>Qt5</application> GUI, run the following commands:
-    </para>
-
-<screen><userinput>pushd qt    &amp;&amp;
-  qmake-qt5 &amp;&amp;
-  make      &amp;&amp;
-popd</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>
-
-    <para>
-      If you compiled the Qt GUI, install it by running the following commands
-      as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make INSTALL_ROOT=/usr -C qt install &amp;&amp;
-
-install -v -m644 qt/transmission-qt.desktop /usr/share/applications/transmission-qt.desktop &amp;&amp;
-install -v -m644 qt/icons/transmission.png  /usr/share/pixmaps/transmission-qt.png</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <!-- with-gtk is auto detected if gtk3 is present -->
-    <para>
-      <option>--without-gtk</option>: This switch disables building of the
-      <application>GTK+</application> interface if
-      <application>GTK+</application> is present on the system (useful for
-      <application>Qt5</application> or cli only builds).
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          transmission-cli, transmission-create, transmission-daemon,
-          transmission-edit, transmission-gtk, transmission-qt,
-          transmission-remote and transmission-show
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/transmission
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="transmission-cli">
-        <term><command>transmission-cli</command></term>
-        <listitem>
-          <para>
-            is a lightweight, command-line BitTorrent client with scripting
-            capabilities.
-          </para>
-          <indexterm zone="transmission transmission-cli">
-            <primary sortas="b-transmission-cli">transmission-cli</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="transmission-create">
-        <term><command>transmission-create</command></term>
-        <listitem>
-          <para>
-            is a command line tool used to create .torrent files.
-          </para>
-          <indexterm zone="transmission transmission-create">
-            <primary sortas="b-transmission-create">transmission-create</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="transmission-daemon">
-        <term><command>transmission-daemon</command></term>
-        <listitem>
-          <para>
-            is a daemon-based Transmission session that can be controlled via
-            RPC commands from transmission's web interface or
-            <command>transmission-remote</command>.
-          </para>
-          <indexterm zone="transmission transmission-daemon">
-            <primary sortas="b-transmission-daemon">transmission-daemon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="transmission-edit">
-        <term><command>transmission-edit</command></term>
-        <listitem>
-          <para>
-            is a command-line utility to modify .torrent files' announce URLs.
-          </para>
-          <indexterm zone="transmission transmission-edit">
-            <primary sortas="b-transmission-edit">transmission-edit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="transmission-gtk">
-        <term><command>transmission-gtk</command></term>
-        <listitem>
-          <para>
-            is a GTK+ bittorrent client.
-          </para>
-          <indexterm zone="transmission transmission-gtk">
-            <primary sortas="b-transmission-gtk">transmission-gtk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="transmission-qt">
-        <term><command>transmission-qt</command></term>
-        <listitem>
-          <para>
-            is a Qt bittorrent client.
-          </para>
-          <indexterm zone="transmission transmission-qt">
-            <primary sortas="b-transmission-qt">transmission-qt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="transmission-remote">
-        <term><command>transmission-remote</command></term>
-        <listitem>
-          <para>
-            is a remote control utility for transmission-daemon and transmission.
-          </para>
-          <indexterm zone="transmission transmission-remote">
-            <primary sortas="b-transmission-remote">transmission-remote</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="transmission-show">
-        <term><command>transmission-show</command></term>
-        <listitem>
-          <para>
-            is a command line tool to display bittorrent .torrent file metadata.
-          </para>
-          <indexterm zone="transmission transmission-show">
-            <primary sortas="b-transmission-show">transmission-show</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: xsoft/other/transmission.xml
===================================================================
--- xsoft/other/transmission.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ xsoft/other/transmission.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
@@ -0,0 +1,313 @@
+<?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 transmission-download-http "https://transmission.cachefly.net/transmission-&transmission-version;.tar.xz">
+  <!ENTITY transmission-download-ftp  " ">
+  <!ENTITY transmission-md5sum        "411aec1c418c14f6765710d89743ae42">
+  <!ENTITY transmission-size          "3 MB">
+  <!ENTITY transmission-buildsize     "230 MB">
+  <!ENTITY transmission-time          "1.1 SBU">
+]>
+
+<sect1 id="transmission" xreflabel="Transmission-&transmission-version;">
+  <?dbhtml filename="transmission.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Transmission-&transmission-version;</title>
+
+  <indexterm zone="transmission">
+    <primary sortas="a-Transmission">Transmission</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Transmission</title>
+
+    <para>
+      <application>Transmission</application> is a cross-platform, open source
+      BitTorrent client. This is useful for downloading large files (such as
+      Linux ISOs) and reduces the need for the distributors to provide server
+      bandwidth.
+    </para>
+
+    &lfs77_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&transmission-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&transmission-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &transmission-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &transmission-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &transmission-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &transmission-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+<!--
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Optional patch:
+          <ulink url="&patch-root;/transmission-&transmission-version;-qt4-1.patch"/>
+       </para>
+      </listitem>
+    </itemizedlist>-->
+
+    <bridgehead renderas="sect3">Transmission Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="curl"/>,
+      <xref linkend="libevent"/>, and
+      <xref linkend="openssl"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended (to build a GUI)</bridgehead>
+    <para role="recommended">
+      <xref linkend="gtk3"/> and either
+      <xref linkend="qt4"/> or
+      <xref linkend="qt5"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="doxygen"/> and
+      <xref linkend="gdb"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/transmission"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Transmission</title>
+<!--
+    <para>If you want to build the Qt interface using <xref linkend="qt4"/>,
+    apply the following patch:</para>
+
+<screen><userinput>patch -Np1 -i ../transmission-&transmission-version;-qt4-1.patch</userinput></screen>-->
+
+    <para>
+      Install <application>Transmission</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To build the <application>Qt4</application> GUI, run the following commands:
+    </para>
+
+<screen><userinput>sed -i '/^CONFIG/aQMAKE_CXXFLAGS += -std=c++11' qt/qtr.pro &amp;&amp;
+pushd qt    &amp;&amp;
+  qmake-qt4 &amp;&amp;
+  make      &amp;&amp;
+popd</userinput></screen>
+
+    <para>
+      To build the <application>Qt5</application> GUI, run the following commands:
+    </para>
+
+<screen><userinput>pushd qt    &amp;&amp;
+  qmake-qt5 &amp;&amp;
+  make      &amp;&amp;
+popd</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>
+
+    <para>
+      If you compiled the Qt GUI, install it by running the following commands
+      as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make INSTALL_ROOT=/usr -C qt install &amp;&amp;
+
+install -v -m644 qt/transmission-qt.desktop /usr/share/applications/transmission-qt.desktop &amp;&amp;
+install -v -m644 qt/icons/transmission.png  /usr/share/pixmaps/transmission-qt.png</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <!-- with-gtk is auto detected if gtk3 is present -->
+    <para>
+      <option>--without-gtk</option>: This switch disables building of the
+      <application>GTK+</application> interface if
+      <application>GTK+</application> is present on the system (useful for
+      <application>Qt5</application> or cli only builds).
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>
+          transmission-cli, transmission-create, transmission-daemon,
+          transmission-edit, transmission-gtk, transmission-qt,
+          transmission-remote and transmission-show
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /usr/share/transmission
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="transmission-cli">
+        <term><command>transmission-cli</command></term>
+        <listitem>
+          <para>
+            is a lightweight, command-line BitTorrent client with scripting
+            capabilities.
+          </para>
+          <indexterm zone="transmission transmission-cli">
+            <primary sortas="b-transmission-cli">transmission-cli</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="transmission-create">
+        <term><command>transmission-create</command></term>
+        <listitem>
+          <para>
+            is a command line tool used to create .torrent files.
+          </para>
+          <indexterm zone="transmission transmission-create">
+            <primary sortas="b-transmission-create">transmission-create</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="transmission-daemon">
+        <term><command>transmission-daemon</command></term>
+        <listitem>
+          <para>
+            is a daemon-based Transmission session that can be controlled via
+            RPC commands from transmission's web interface or
+            <command>transmission-remote</command>.
+          </para>
+          <indexterm zone="transmission transmission-daemon">
+            <primary sortas="b-transmission-daemon">transmission-daemon</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="transmission-edit">
+        <term><command>transmission-edit</command></term>
+        <listitem>
+          <para>
+            is a command-line utility to modify .torrent files' announce URLs.
+          </para>
+          <indexterm zone="transmission transmission-edit">
+            <primary sortas="b-transmission-edit">transmission-edit</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="transmission-gtk">
+        <term><command>transmission-gtk</command></term>
+        <listitem>
+          <para>
+            is a GTK+ bittorrent client.
+          </para>
+          <indexterm zone="transmission transmission-gtk">
+            <primary sortas="b-transmission-gtk">transmission-gtk</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="transmission-qt">
+        <term><command>transmission-qt</command></term>
+        <listitem>
+          <para>
+            is a Qt bittorrent client.
+          </para>
+          <indexterm zone="transmission transmission-qt">
+            <primary sortas="b-transmission-qt">transmission-qt</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="transmission-remote">
+        <term><command>transmission-remote</command></term>
+        <listitem>
+          <para>
+            is a remote control utility for transmission-daemon and transmission.
+          </para>
+          <indexterm zone="transmission transmission-remote">
+            <primary sortas="b-transmission-remote">transmission-remote</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="transmission-show">
+        <term><command>transmission-show</command></term>
+        <listitem>
+          <para>
+            is a command line tool to display bittorrent .torrent file metadata.
+          </para>
+          <indexterm zone="transmission transmission-show">
+            <primary sortas="b-transmission-show">transmission-show</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
