Index: neral/prog/Jinja2-systemd.xml
===================================================================
--- general/prog/Jinja2-systemd.xml	(revision 14ba5f44e63d70830e1827b8a4df93417c45f815)
+++ 	(revision )
@@ -1,129 +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 Jinja2-download-http
-           "https://pypi.python.org/packages/source/J/Jinja2/Jinja2-&Jinja2-version;.tar.gz">
-  <!ENTITY Jinja2-download-ftp  " ">
-  <!ENTITY Jinja2-md5sum        "b9dffd2f3b43d673802fe857c8445b1a">
-  <!ENTITY Jinja2-size          "372 KB">
-  <!ENTITY Jinja2-buildsize     "7.8 MB">
-  <!ENTITY Jinja2-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin Jinja2 -->
-  <sect2 id="Jinja2" xreflabel="Jinja2-&Jinja2-version;">
-
-    <title>Jinja2-&Jinja2-version;</title>
-
-    <indexterm zone="Jinja2">
-      <primary sortas="a-Jinja2">Jinja2</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Jinja2 Module</title>
-
-      <para>
-        <application>Jinja2</application> is a <application>Python</application>
-        module that implements a simple pythonic template language.
-      </para>
-
-      &lfs76_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&Jinja2-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&Jinja2-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &Jinja2-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &Jinja2-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &Jinja2-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &Jinja2-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Jinja2 Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="MarkupSafe"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/Jinja2"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Jinja2</title>
-
-      <note>
-        <para>
-          Both <application>Python 2</application> and
-          <application>Python 3</application> modules can
-          be built and installed without any conflicts.
-        </para>
-      </note>
-
-      <para>
-        To install the <application>Python 2</application> module,
-        run the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>python setup.py install --optimize=1</userinput></screen>
-
-      <para>
-        To install the <application>Python 3</application> module,
-        run the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            /usr/lib/python&python2-majorver;/site-packages/Jinja2,
-            /usr/lib/python&python2-majorver;/site-packages/Jinja2-&Jinja2-version;-py&python2-majorver;.egg-info and/or
-            /usr/lib/python&python3-majorver;/site-packages/Jinja2,
-            /usr/lib/python&python3-majorver;/site-packages/Jinja2-&Jinja2-version;-py&python3-majorver;.egg-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
-  <!--End Jinja2 -->
Index: neral/prog/MarkupSafe-systemd.xml
===================================================================
--- general/prog/MarkupSafe-systemd.xml	(revision 14ba5f44e63d70830e1827b8a4df93417c45f815)
+++ 	(revision )
@@ -1,143 +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 MarkupSafe-download-http
-           "https://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-&MarkupSafe-version;.tar.gz">
-  <!ENTITY MarkupSafe-download-ftp  " ">
-  <!ENTITY MarkupSafe-md5sum        "f5ab3deee4c37cd6a922fb81e730da6e">
-  <!ENTITY MarkupSafe-size          "16 KB">
-  <!ENTITY MarkupSafe-buildsize     "780 KB">
-  <!ENTITY MarkupSafe-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin MarkupSafe -->
-  <sect2 id="MarkupSafe" xreflabel="MarkupSafe-&MarkupSafe-version;">
-
-    <title>MarkupSafe-&MarkupSafe-version;</title>
-
-    <indexterm zone="MarkupSafe">
-      <primary sortas="a-MarkupSafe">MarkupSafe</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to MarkupSafe Module</title>
-
-      <para>
-        <application>MarkupSafe</application> is a <application>Python</application>
-        module that implements a XML/HTML/XHTML Markup safe string.
-      </para>
-
-      &lfs76_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&MarkupSafe-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&MarkupSafe-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &MarkupSafe-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &MarkupSafe-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &MarkupSafe-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &MarkupSafe-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">MarkupSafe Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="setuptools"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/MarkupSafe"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of MarkupSafe</title>
-
-      <note>
-        <para>
-          Both <application>Python 2</application> and
-          <application>Python 3</application> modules can
-          be built and installed without any conflicts.
-        </para>
-      </note>
-
-      <para>
-        To build the <application>Python 2</application> module,
-        run the following command:
-      </para>
-
-<screen><userinput>python setup.py build</userinput></screen>
-
-      <para>
-        To install the <application>Python 2</application> module,
-        run the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>python setup.py install --optimize=1</userinput></screen>
-
-      <para>
-        To build the <application>Python 3</application> module,
-        run the following command:
-      </para>
-
-<screen><userinput>python3 setup.py build</userinput></screen>
-
-      <para>
-        To install the <application>Python 3</application> module,
-        run the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            /usr/lib/python&python2-majorver;/site-packages/markupsafe,
-            /usr/lib/python&python2-majorver;/site-packages/MarkupSafe-&MarkupSafe-version;-py&python2-majorver;.egg-info and/or
-            /usr/lib/python&python3-majorver;/site-packages/markupsafe,
-            /usr/lib/python&python3-majorver;/site-packages/MarkupSafe-&MarkupSafe-version;-py&python3-majorver;.egg-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
-  <!--End MarkupSafe -->
Index: neral/prog/PyYAML-systemd.xml
===================================================================
--- general/prog/PyYAML-systemd.xml	(revision 14ba5f44e63d70830e1827b8a4df93417c45f815)
+++ 	(revision )
@@ -1,146 +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 PyYAML-download-http "http://pyyaml.org/download/pyyaml/PyYAML-&PyYAML-version;.tar.gz">
-  <!ENTITY PyYAML-download-ftp  " ">
-  <!ENTITY PyYAML-md5sum        "f50e08ef0fe55178479d3a618efe21db">
-  <!ENTITY PyYAML-size          "244 KB">
-  <!ENTITY PyYAML-buildsize     "13 MB">
-  <!ENTITY PyYAML-time          "0.1 SBU">
-]>
-
-  <!-- Begin PyYAML -->
-  <sect2 id="PyYAML" xreflabel="PyYAML-&PyYAML-version;">
-
-    <title>PyYAML-&PyYAML-version;</title>
-
-    <indexterm zone="PyYAML">
-      <primary sortas="a-PyYAML">PyYAML</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to PyYAML Module</title>
-
-      <para>
-        <application>PyYAML</application> is a <application>Python</application>
-        module that implements the next generation YAML parser and emitter.
-      </para>
-
-      &lfs76_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&PyYAML-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&PyYAML-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &PyYAML-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &PyYAML-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &PyYAML-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &PyYAML-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">PyYAML Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="python2"/> and/or
-        <xref linkend="python3"/> and
-        <xref linkend="yaml"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/PyYAML"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of PyYAML</title>
-
-      <note>
-        <para>
-          Both <application>Python 2</application> and
-          <application>Python 3</application> modules can
-          be built and installed without any conflicts.
-        </para>
-      </note>
-
-      <para>
-        To build the <application>Python 2</application> module,
-        run the following command:
-      </para>
-
-<screen><userinput>python setup.py build</userinput></screen>
-
-      <para>
-        To install the <application>Python 2</application> module,
-        run the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>python setup.py install --optimize=1</userinput></screen>
-
-      <para>
-        To build the <application>Python 3</application> module,
-        run the following command:
-      </para>
-
-<screen><userinput>python3 setup.py build</userinput></screen>
-
-      <para>
-        To install the <application>Python 3</application> module,
-        run the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            _yaml.so
-          </seg>
-          <seg>
-            /usr/lib/python&python2-majorver;/site-packages/yaml and/or
-            /usr/lib/python&python3-majorver;/site-packages/yaml,
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
-  <!--End PyYAML -->
Index: neral/prog/beaker-systemd.xml
===================================================================
--- general/prog/beaker-systemd.xml	(revision 14ba5f44e63d70830e1827b8a4df93417c45f815)
+++ 	(revision )
@@ -1,138 +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 Beaker-download-http
-           "https://pypi.python.org/packages/source/B/Beaker/Beaker-&Beaker-version;.tar.gz">
-  <!ENTITY Beaker-download-ftp  " ">
-  <!ENTITY Beaker-md5sum        "386be3f7fe427358881eee4622b428b3">
-  <!ENTITY Beaker-size          "36 KB">
-  <!ENTITY Beaker-buildsize     "1.8 MB">
-  <!ENTITY Beaker-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin Beaker -->
-  <sect2 id="Beaker" xreflabel="Beaker-&Beaker-version;">
-
-    <title>Beaker-&Beaker-version;</title>
-
-    <indexterm zone="Beaker">
-      <primary sortas="a-Beaker">Beaker</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Beaker Module</title>
-
-      <para>
-        <application>Beaker</application> is a <application>Python</application>
-        module that implements caching and sessions WSGI middleware for use with
-        web applications and stand-alone Python scripts and applications.
-      </para>
-
-      &lfs77_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&Beaker-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&Beaker-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &Beaker-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &Beaker-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &Beaker-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &Beaker-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Beaker Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="setuptools"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/Beaker"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Beaker</title>
-
-      <note>
-        <para>
-          Both <application>Python 2</application> and
-          <application>Python 3</application> modules can
-          be built and installed without any conflicts.
-        </para>
-      </note>
-
-      <para>
-        To install the <application>Python 2</application> module,
-        run the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>python setup.py install --optimize=1</userinput></screen>
-
-      <para>
-        To install the <application>Python 3</application> module,
-        run the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
-
-    </sect3>
-
-    <sect3 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/lib/python&python2-majorver;/site-packages/beaker,
-            /usr/lib/python&python2-majorver;/site-packages/Beaker-&Beaker-version;-py&python2-majorver;.egg-info and/or
-            /usr/lib/python&python3-majorver;/site-packages/beaker,
-            /usr/lib/python&python3-majorver;/site-packages/Beaker-&Beaker-version;-py&python3-majorver;.egg-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
-  <!--End Beaker -->
Index: general/prog/beaker.xml
===================================================================
--- general/prog/beaker.xml	(revision 8cf08a1124bf7befb69d69cb3f90e4b9346bc9d7)
+++ general/prog/beaker.xml	(revision 8cf08a1124bf7befb69d69cb3f90e4b9346bc9d7)
@@ -0,0 +1,138 @@
+<?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 Beaker-download-http
+           "https://pypi.python.org/packages/source/B/Beaker/Beaker-&Beaker-version;.tar.gz">
+  <!ENTITY Beaker-download-ftp  " ">
+  <!ENTITY Beaker-md5sum        "386be3f7fe427358881eee4622b428b3">
+  <!ENTITY Beaker-size          "36 KB">
+  <!ENTITY Beaker-buildsize     "1.8 MB">
+  <!ENTITY Beaker-time          "less than 0.1 SBU">
+]>
+
+  <!-- Begin Beaker -->
+  <sect2 id="Beaker" xreflabel="Beaker-&Beaker-version;">
+
+    <title>Beaker-&Beaker-version;</title>
+
+    <indexterm zone="Beaker">
+      <primary sortas="a-Beaker">Beaker</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to Beaker Module</title>
+
+      <para>
+        <application>Beaker</application> is a <application>Python</application>
+        module that implements caching and sessions WSGI middleware for use with
+        web applications and stand-alone Python scripts and applications.
+      </para>
+
+      &lfs77_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&Beaker-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&Beaker-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &Beaker-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &Beaker-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &Beaker-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &Beaker-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">Beaker Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="setuptools"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/Beaker"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of Beaker</title>
+
+      <note>
+        <para>
+          Both <application>Python 2</application> and
+          <application>Python 3</application> modules can
+          be built and installed without any conflicts.
+        </para>
+      </note>
+
+      <para>
+        To install the <application>Python 2</application> module,
+        run the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>python setup.py install --optimize=1</userinput></screen>
+
+      <para>
+        To install the <application>Python 3</application> module,
+        run the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
+
+    </sect3>
+
+    <sect3 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/lib/python&python2-majorver;/site-packages/beaker,
+            /usr/lib/python&python2-majorver;/site-packages/Beaker-&Beaker-version;-py&python2-majorver;.egg-info and/or
+            /usr/lib/python&python3-majorver;/site-packages/beaker,
+            /usr/lib/python&python3-majorver;/site-packages/Beaker-&Beaker-version;-py&python3-majorver;.egg-info
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
+  <!--End Beaker -->
Index: neral/prog/cmake-systemd.xml
===================================================================
--- general/prog/cmake-systemd.xml	(revision 14ba5f44e63d70830e1827b8a4df93417c45f815)
+++ 	(revision )
@@ -1,256 +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 cmake-download-http "http://www.cmake.org/files/v&cmake-major-version;/cmake-&cmake-version;.tar.gz">
-  <!ENTITY cmake-download-ftp  " ">
-  <!ENTITY cmake-md5sum        "cd3034e0a44256a0917e25477217fc8">
-  <!ENTITY cmake-size          "6.4 MB">
-  <!ENTITY cmake-buildsize     "632 MB (with tests)">
-  <!ENTITY cmake-time          "13.2 SBU (with tests)">
-]>
-
-<sect1 id="cmake" xreflabel="CMake-&cmake-version;">
-  <?dbhtml filename="cmake.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>CMake-&cmake-version;</title>
-
-  <indexterm zone="cmake">
-    <primary sortas="a-CMake">CMake</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to CMake</title>
-
-    <para>
-      The <application>CMake</application> package contains a modern
-      toolset used for generating Makefiles. It is a successor of the
-      auto-generated <command>configure</command> script and aims to
-      be platform- and compiler-independent. A significant user of
-      <application>CMake</application> is <application>KDE</application>
-      since version 4.
-    </para>
-
-    &lfs78_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&cmake-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&cmake-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cmake-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cmake-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &cmake-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &cmake-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">CMake Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="curl"/> and
-      <xref linkend="libarchive"/> 
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="qt4"/> or <xref linkend="qt5"/> (for the Qt-based GUI),
-      <xref linkend="subversion"/> (for testing), and
-       <ulink url="http://pypi.python.org/pypi/Sphinx">Sphinx</ulink>
-       (for building documents)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/cmake"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of CMake</title>
-
-    <para>
-      Install <application>CMake</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./bootstrap --prefix=/usr       \
-            --system-libs       \
-            --mandir=/share/man \
-            --no-system-jsoncpp \
-            --docdir=/share/doc/cmake-&cmake-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>bin/ctest</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>
-      <parameter>--system-libs</parameter>: This switch forces the build system
-      to link against the <application>Zlib</application>,
-      <application>Bzip2</application>, <application>cURL</application>,
-      <application>Expat</application> and <application>libarchive</application>
-      packages already installed on the system.
-    </para>
-
-    <para>
-      <parameter>--no-system-jsoncpp</parameter>: This switch removes the
-      <application>JSON-C++</application> library from the list of system
-      libraries. A bundled version of that library is used instead.
-    </para>
-
-    <para>
-      <option>--qt-gui</option>: This switch enables building of the
-      <application>Qt</application>-based  GUI for
-      <application>CMake</application>.
-    </para>
-
-    <para>
-      <option>--qt-qmake=/usr/bin/qmake-qt5</option>: Use this switch if
-      you have both <application>Qt4</application> and
-      <application>Qt5</application> installed but wish to build the
-      <application>Qt5</application> based GUI (it defaults to
-      <application>Qt4</application> one).
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          ccmake, 
-          cmake, 
-          cmake-gui (optional), 
-          cpack,
-          and ctest
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/cmake-&cmake-major-version; and
-          /usr/share/doc/cmake-&cmake-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ccmake">
-        <term><command>ccmake</command></term>
-        <listitem>
-          <para>
-            is a curses based interactive frontend to
-            <command>cmake</command>.
-          </para>
-          <indexterm zone="cmake ccmake">
-            <primary sortas="b-ccmake">ccmake</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cmake-prog">
-        <term><command>cmake</command></term>
-        <listitem>
-          <para>
-            is the makefile generator.
-          </para>
-          <indexterm zone="cmake cmake-prog">
-            <primary sortas="b-cmake">cmake</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cmake-gui">
-        <term><command>cmake-gui</command></term>
-        <listitem>
-          <para>
-            (optional) is the <application>Qt</application>-based frontent to
-            <command>cmake</command>.
-          </para>
-          <indexterm zone="cmake cmake-gui">
-            <primary sortas="b-cmake-gui">cmake-gui</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cpack">
-        <term><command>cpack</command></term>
-        <listitem>
-          <para>
-            is the <application>CMake</application> packaging program.
-          </para>
-          <indexterm zone="cmake cpack">
-            <primary sortas="b-cpack">cpack</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ctest">
-        <term><command>ctest</command></term>
-        <listitem>
-          <para>
-            is a testing utility for cmake-generated build trees.
-          </para>
-          <indexterm zone="cmake ctest">
-            <primary sortas="b-ctest">ctest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/prog/cmake.xml
===================================================================
--- general/prog/cmake.xml	(revision 8cf08a1124bf7befb69d69cb3f90e4b9346bc9d7)
+++ general/prog/cmake.xml	(revision 8cf08a1124bf7befb69d69cb3f90e4b9346bc9d7)
@@ -0,0 +1,256 @@
+<?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 cmake-download-http "http://www.cmake.org/files/v&cmake-major-version;/cmake-&cmake-version;.tar.gz">
+  <!ENTITY cmake-download-ftp  " ">
+  <!ENTITY cmake-md5sum        "cd3034e0a44256a0917e25477217fc8">
+  <!ENTITY cmake-size          "6.4 MB">
+  <!ENTITY cmake-buildsize     "632 MB (with tests)">
+  <!ENTITY cmake-time          "13.2 SBU (with tests)">
+]>
+
+<sect1 id="cmake" xreflabel="CMake-&cmake-version;">
+  <?dbhtml filename="cmake.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>CMake-&cmake-version;</title>
+
+  <indexterm zone="cmake">
+    <primary sortas="a-CMake">CMake</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to CMake</title>
+
+    <para>
+      The <application>CMake</application> package contains a modern
+      toolset used for generating Makefiles. It is a successor of the
+      auto-generated <command>configure</command> script and aims to
+      be platform- and compiler-independent. A significant user of
+      <application>CMake</application> is <application>KDE</application>
+      since version 4.
+    </para>
+
+    &lfs78_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&cmake-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&cmake-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &cmake-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &cmake-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &cmake-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &cmake-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">CMake Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="curl"/> and
+      <xref linkend="libarchive"/> 
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="qt4"/> or <xref linkend="qt5"/> (for the Qt-based GUI),
+      <xref linkend="subversion"/> (for testing), and
+       <ulink url="http://pypi.python.org/pypi/Sphinx">Sphinx</ulink>
+       (for building documents)
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/cmake"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of CMake</title>
+
+    <para>
+      Install <application>CMake</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./bootstrap --prefix=/usr       \
+            --system-libs       \
+            --mandir=/share/man \
+            --no-system-jsoncpp \
+            --docdir=/share/doc/cmake-&cmake-version; &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>bin/ctest</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>
+      <parameter>--system-libs</parameter>: This switch forces the build system
+      to link against the <application>Zlib</application>,
+      <application>Bzip2</application>, <application>cURL</application>,
+      <application>Expat</application> and <application>libarchive</application>
+      packages already installed on the system.
+    </para>
+
+    <para>
+      <parameter>--no-system-jsoncpp</parameter>: This switch removes the
+      <application>JSON-C++</application> library from the list of system
+      libraries. A bundled version of that library is used instead.
+    </para>
+
+    <para>
+      <option>--qt-gui</option>: This switch enables building of the
+      <application>Qt</application>-based  GUI for
+      <application>CMake</application>.
+    </para>
+
+    <para>
+      <option>--qt-qmake=/usr/bin/qmake-qt5</option>: Use this switch if
+      you have both <application>Qt4</application> and
+      <application>Qt5</application> installed but wish to build the
+      <application>Qt5</application> based GUI (it defaults to
+      <application>Qt4</application> one).
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          ccmake, 
+          cmake, 
+          cmake-gui (optional), 
+          cpack,
+          and ctest
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /usr/share/cmake-&cmake-major-version; and
+          /usr/share/doc/cmake-&cmake-version;
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="ccmake">
+        <term><command>ccmake</command></term>
+        <listitem>
+          <para>
+            is a curses based interactive frontend to
+            <command>cmake</command>.
+          </para>
+          <indexterm zone="cmake ccmake">
+            <primary sortas="b-ccmake">ccmake</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cmake-prog">
+        <term><command>cmake</command></term>
+        <listitem>
+          <para>
+            is the makefile generator.
+          </para>
+          <indexterm zone="cmake cmake-prog">
+            <primary sortas="b-cmake">cmake</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cmake-gui">
+        <term><command>cmake-gui</command></term>
+        <listitem>
+          <para>
+            (optional) is the <application>Qt</application>-based frontent to
+            <command>cmake</command>.
+          </para>
+          <indexterm zone="cmake cmake-gui">
+            <primary sortas="b-cmake-gui">cmake-gui</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cpack">
+        <term><command>cpack</command></term>
+        <listitem>
+          <para>
+            is the <application>CMake</application> packaging program.
+          </para>
+          <indexterm zone="cmake cpack">
+            <primary sortas="b-cpack">cpack</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ctest">
+        <term><command>ctest</command></term>
+        <listitem>
+          <para>
+            is a testing utility for cmake-generated build trees.
+          </para>
+          <indexterm zone="cmake ctest">
+            <primary sortas="b-ctest">ctest</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: neral/prog/jinja2-systemd.xml
===================================================================
--- general/prog/jinja2-systemd.xml	(revision 14ba5f44e63d70830e1827b8a4df93417c45f815)
+++ 	(revision )
@@ -1,137 +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 Jinja2-download-http
-           "https://pypi.python.org/packages/source/J/Jinja2/Jinja2-&Jinja2-version;.tar.gz">
-  <!ENTITY Jinja2-download-ftp  " ">
-  <!ENTITY Jinja2-md5sum        "b9dffd2f3b43d673802fe857c8445b1a">
-  <!ENTITY Jinja2-size          "372 KB">
-  <!ENTITY Jinja2-buildsize     "7.8 MB">
-  <!ENTITY Jinja2-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin Jinja2 -->
-  <sect2 id="Jinja2" xreflabel="Jinja2-&Jinja2-version;">
-
-    <title>Jinja2-&Jinja2-version;</title>
-
-    <indexterm zone="Jinja2">
-      <primary sortas="a-Jinja2">Jinja2</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Jinja2 Module</title>
-
-      <para>
-        <application>Jinja2</application> is a <application>Python</application>
-        module that implements a simple pythonic template language.
-      </para>
-
-      &lfs77_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&Jinja2-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&Jinja2-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &Jinja2-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &Jinja2-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &Jinja2-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &Jinja2-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Jinja2 Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="MarkupSafe"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/Jinja2"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Jinja2</title>
-
-      <note>
-        <para>
-          Both <application>Python 2</application> and
-          <application>Python 3</application> modules can
-          be built and installed without any conflicts.
-        </para>
-      </note>
-
-      <para>
-        To install the <application>Python 2</application> module,
-        run the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>python setup.py install --optimize=1</userinput></screen>
-
-      <para>
-        To install the <application>Python 3</application> module,
-        run the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
-
-    </sect3>
-
-    <sect3 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/lib/python&python2-majorver;/site-packages/Jinja2,
-            /usr/lib/python&python2-majorver;/site-packages/Jinja2-&Jinja2-version;-py&python2-majorver;.egg-info and/or
-            /usr/lib/python&python3-majorver;/site-packages/Jinja2,
-            /usr/lib/python&python3-majorver;/site-packages/Jinja2-&Jinja2-version;-py&python3-majorver;.egg-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
-  <!--End Jinja2 -->
Index: general/prog/jinja2.xml
===================================================================
--- general/prog/jinja2.xml	(revision 8cf08a1124bf7befb69d69cb3f90e4b9346bc9d7)
+++ general/prog/jinja2.xml	(revision 8cf08a1124bf7befb69d69cb3f90e4b9346bc9d7)
@@ -0,0 +1,137 @@
+<?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 Jinja2-download-http
+           "https://pypi.python.org/packages/source/J/Jinja2/Jinja2-&Jinja2-version;.tar.gz">
+  <!ENTITY Jinja2-download-ftp  " ">
+  <!ENTITY Jinja2-md5sum        "b9dffd2f3b43d673802fe857c8445b1a">
+  <!ENTITY Jinja2-size          "372 KB">
+  <!ENTITY Jinja2-buildsize     "7.8 MB">
+  <!ENTITY Jinja2-time          "less than 0.1 SBU">
+]>
+
+  <!-- Begin Jinja2 -->
+  <sect2 id="Jinja2" xreflabel="Jinja2-&Jinja2-version;">
+
+    <title>Jinja2-&Jinja2-version;</title>
+
+    <indexterm zone="Jinja2">
+      <primary sortas="a-Jinja2">Jinja2</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to Jinja2 Module</title>
+
+      <para>
+        <application>Jinja2</application> is a <application>Python</application>
+        module that implements a simple pythonic template language.
+      </para>
+
+      &lfs77_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&Jinja2-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&Jinja2-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &Jinja2-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &Jinja2-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &Jinja2-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &Jinja2-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">Jinja2 Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="MarkupSafe"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/Jinja2"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of Jinja2</title>
+
+      <note>
+        <para>
+          Both <application>Python 2</application> and
+          <application>Python 3</application> modules can
+          be built and installed without any conflicts.
+        </para>
+      </note>
+
+      <para>
+        To install the <application>Python 2</application> module,
+        run the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>python setup.py install --optimize=1</userinput></screen>
+
+      <para>
+        To install the <application>Python 3</application> module,
+        run the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
+
+    </sect3>
+
+    <sect3 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/lib/python&python2-majorver;/site-packages/Jinja2,
+            /usr/lib/python&python2-majorver;/site-packages/Jinja2-&Jinja2-version;-py&python2-majorver;.egg-info and/or
+            /usr/lib/python&python3-majorver;/site-packages/Jinja2,
+            /usr/lib/python&python3-majorver;/site-packages/Jinja2-&Jinja2-version;-py&python3-majorver;.egg-info
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
+  <!--End Jinja2 -->
Index: neral/prog/mako-systemd.xml
===================================================================
--- general/prog/mako-systemd.xml	(revision 14ba5f44e63d70830e1827b8a4df93417c45f815)
+++ 	(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 Mako-download-http
-           "https://pypi.python.org/packages/source/M/Mako/Mako-&Mako-version;.tar.gz">
-  <!ENTITY Mako-download-ftp  " ">
-  <!ENTITY Mako-md5sum        "9f0aafd177b039ef67b90ea350497a54">
-  <!ENTITY Mako-size          "47 KB">
-  <!ENTITY Mako-buildsize     "464 KB">
-  <!ENTITY Mako-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin Mako -->
-  <sect2 id="Mako" xreflabel="Mako-&Mako-version;">
-
-    <title>Mako-&Mako-version;</title>
-
-    <indexterm zone="Mako">
-      <primary sortas="a-Mako">Mako</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Mako Module</title>
-
-      <para>
-        <application>Mako</application> is a <application>Python</application>
-        module that implements hyperfast and lightweight templating for the
-        <application>Python</application> platform.
-      </para>
-
-      &lfs77_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&Mako-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&Mako-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &Mako-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &Mako-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &Mako-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &Mako-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Mako Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="Beaker"/> and
-        <xref linkend="MarkupSafe"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/Mako"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Mako</title>
-
-      <note>
-        <para>
-          Both <application>Python 2</application> and
-          <application>Python 3</application> modules can
-          be built and installed without any conflicts.
-        </para>
-      </note>
-
-      <para>
-        To install the <application>Python 2</application> module,
-        run the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>python setup.py install --optimize=1</userinput></screen>
-
-      <para>
-        To install the <application>Python 3</application> module,
-        run the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>sed -i "s:mako-render:&amp;3:g" setup.py &amp;&amp;
-python3 setup.py install --optimize=1</userinput></screen>
-
-    </sect3>
-
-    <sect3 role="commands">
-      <title>Command Explanations</title>
-
-      <para>
-        <command>sed -i "s:mako-render:&amp;3:g" setup.py</command>: This sed
-        prevents <command>setup.py</command> from overwriting an already
-        installed script by the <application>Python 2</application> module.
-        Remove it if you are building this module only for
-        <application>Python 3</application>.
-      </para>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            mako-render and/or mako-render3
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python2-majorver;/site-packages/mako,
-            /usr/lib/python&python2-majorver;/site-packages/Mako-&Mako-version;-py&python2-majorver;.egg-info and/or
-            /usr/lib/python&python3-majorver;/site-packages/mako,
-            /usr/lib/python&python3-majorver;/site-packages/Mako-&Mako-version;-py&python3-majorver;.egg-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
-  <!--End Mako -->
Index: general/prog/mako.xml
===================================================================
--- general/prog/mako.xml	(revision 8cf08a1124bf7befb69d69cb3f90e4b9346bc9d7)
+++ general/prog/mako.xml	(revision 8cf08a1124bf7befb69d69cb3f90e4b9346bc9d7)
@@ -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 Mako-download-http
+           "https://pypi.python.org/packages/source/M/Mako/Mako-&Mako-version;.tar.gz">
+  <!ENTITY Mako-download-ftp  " ">
+  <!ENTITY Mako-md5sum        "9f0aafd177b039ef67b90ea350497a54">
+  <!ENTITY Mako-size          "47 KB">
+  <!ENTITY Mako-buildsize     "464 KB">
+  <!ENTITY Mako-time          "less than 0.1 SBU">
+]>
+
+  <!-- Begin Mako -->
+  <sect2 id="Mako" xreflabel="Mako-&Mako-version;">
+
+    <title>Mako-&Mako-version;</title>
+
+    <indexterm zone="Mako">
+      <primary sortas="a-Mako">Mako</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to Mako Module</title>
+
+      <para>
+        <application>Mako</application> is a <application>Python</application>
+        module that implements hyperfast and lightweight templating for the
+        <application>Python</application> platform.
+      </para>
+
+      &lfs77_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&Mako-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&Mako-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &Mako-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &Mako-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &Mako-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &Mako-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">Mako Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="Beaker"/> and
+        <xref linkend="MarkupSafe"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/Mako"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of Mako</title>
+
+      <note>
+        <para>
+          Both <application>Python 2</application> and
+          <application>Python 3</application> modules can
+          be built and installed without any conflicts.
+        </para>
+      </note>
+
+      <para>
+        To install the <application>Python 2</application> module,
+        run the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>python setup.py install --optimize=1</userinput></screen>
+
+      <para>
+        To install the <application>Python 3</application> module,
+        run the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>sed -i "s:mako-render:&amp;3:g" setup.py &amp;&amp;
+python3 setup.py install --optimize=1</userinput></screen>
+
+    </sect3>
+
+    <sect3 role="commands">
+      <title>Command Explanations</title>
+
+      <para>
+        <command>sed -i "s:mako-render:&amp;3:g" setup.py</command>: This sed
+        prevents <command>setup.py</command> from overwriting an already
+        installed script by the <application>Python 2</application> module.
+        Remove it if you are building this module only for
+        <application>Python 3</application>.
+      </para>
+
+    </sect3>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Programs</segtitle>
+        <segtitle>Installed Libraries</segtitle>
+        <segtitle>Installed Directories</segtitle>
+
+        <seglistitem>
+          <seg>
+            mako-render and/or mako-render3
+          </seg>
+          <seg>
+            None
+          </seg>
+          <seg>
+            /usr/lib/python&python2-majorver;/site-packages/mako,
+            /usr/lib/python&python2-majorver;/site-packages/Mako-&Mako-version;-py&python2-majorver;.egg-info and/or
+            /usr/lib/python&python3-majorver;/site-packages/mako,
+            /usr/lib/python&python3-majorver;/site-packages/Mako-&Mako-version;-py&python3-majorver;.egg-info
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
+  <!--End Mako -->
Index: neral/prog/markupsafe-systemd.xml
===================================================================
--- general/prog/markupsafe-systemd.xml	(revision 14ba5f44e63d70830e1827b8a4df93417c45f815)
+++ 	(revision )
@@ -1,151 +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 MarkupSafe-download-http
-           "https://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-&MarkupSafe-version;.tar.gz">
-  <!ENTITY MarkupSafe-download-ftp  " ">
-  <!ENTITY MarkupSafe-md5sum        "f5ab3deee4c37cd6a922fb81e730da6e">
-  <!ENTITY MarkupSafe-size          "16 KB">
-  <!ENTITY MarkupSafe-buildsize     "780 KB">
-  <!ENTITY MarkupSafe-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin MarkupSafe -->
-  <sect2 id="MarkupSafe" xreflabel="MarkupSafe-&MarkupSafe-version;">
-
-    <title>MarkupSafe-&MarkupSafe-version;</title>
-
-    <indexterm zone="MarkupSafe">
-      <primary sortas="a-MarkupSafe">MarkupSafe</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to MarkupSafe Module</title>
-
-      <para>
-        <application>MarkupSafe</application> is a <application>Python</application>
-        module that implements a XML/HTML/XHTML Markup safe string.
-      </para>
-
-      &lfs77_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&MarkupSafe-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&MarkupSafe-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &MarkupSafe-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &MarkupSafe-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &MarkupSafe-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &MarkupSafe-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">MarkupSafe Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="setuptools"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/MarkupSafe"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of MarkupSafe</title>
-
-      <note>
-        <para>
-          Both <application>Python 2</application> and
-          <application>Python 3</application> modules can
-          be built and installed without any conflicts.
-        </para>
-      </note>
-
-      <para>
-        To build the <application>Python 2</application> module,
-        run the following command:
-      </para>
-
-<screen><userinput>python setup.py build</userinput></screen>
-
-      <para>
-        To install the <application>Python 2</application> module,
-        run the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>python setup.py install --optimize=1</userinput></screen>
-
-      <para>
-        To build the <application>Python 3</application> module,
-        run the following command:
-      </para>
-
-<screen><userinput>python3 setup.py build</userinput></screen>
-
-      <para>
-        To install the <application>Python 3</application> module,
-        run the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
-
-    </sect3>
-
-    <sect3 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/lib/python&python2-majorver;/site-packages/markupsafe,
-            /usr/lib/python&python2-majorver;/site-packages/MarkupSafe-&MarkupSafe-version;-py&python2-majorver;.egg-info and/or
-            /usr/lib/python&python3-majorver;/site-packages/markupsafe,
-            /usr/lib/python&python3-majorver;/site-packages/MarkupSafe-&MarkupSafe-version;-py&python3-majorver;.egg-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
-  <!--End MarkupSafe -->
Index: general/prog/markupsafe.xml
===================================================================
--- general/prog/markupsafe.xml	(revision 8cf08a1124bf7befb69d69cb3f90e4b9346bc9d7)
+++ general/prog/markupsafe.xml	(revision 8cf08a1124bf7befb69d69cb3f90e4b9346bc9d7)
@@ -0,0 +1,151 @@
+<?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 MarkupSafe-download-http
+           "https://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-&MarkupSafe-version;.tar.gz">
+  <!ENTITY MarkupSafe-download-ftp  " ">
+  <!ENTITY MarkupSafe-md5sum        "f5ab3deee4c37cd6a922fb81e730da6e">
+  <!ENTITY MarkupSafe-size          "16 KB">
+  <!ENTITY MarkupSafe-buildsize     "780 KB">
+  <!ENTITY MarkupSafe-time          "less than 0.1 SBU">
+]>
+
+  <!-- Begin MarkupSafe -->
+  <sect2 id="MarkupSafe" xreflabel="MarkupSafe-&MarkupSafe-version;">
+
+    <title>MarkupSafe-&MarkupSafe-version;</title>
+
+    <indexterm zone="MarkupSafe">
+      <primary sortas="a-MarkupSafe">MarkupSafe</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to MarkupSafe Module</title>
+
+      <para>
+        <application>MarkupSafe</application> is a <application>Python</application>
+        module that implements a XML/HTML/XHTML Markup safe string.
+      </para>
+
+      &lfs77_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&MarkupSafe-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&MarkupSafe-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &MarkupSafe-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &MarkupSafe-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &MarkupSafe-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &MarkupSafe-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">MarkupSafe Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="setuptools"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/MarkupSafe"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of MarkupSafe</title>
+
+      <note>
+        <para>
+          Both <application>Python 2</application> and
+          <application>Python 3</application> modules can
+          be built and installed without any conflicts.
+        </para>
+      </note>
+
+      <para>
+        To build the <application>Python 2</application> module,
+        run the following command:
+      </para>
+
+<screen><userinput>python setup.py build</userinput></screen>
+
+      <para>
+        To install the <application>Python 2</application> module,
+        run the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>python setup.py install --optimize=1</userinput></screen>
+
+      <para>
+        To build the <application>Python 3</application> module,
+        run the following command:
+      </para>
+
+<screen><userinput>python3 setup.py build</userinput></screen>
+
+      <para>
+        To install the <application>Python 3</application> module,
+        run the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
+
+    </sect3>
+
+    <sect3 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/lib/python&python2-majorver;/site-packages/markupsafe,
+            /usr/lib/python&python2-majorver;/site-packages/MarkupSafe-&MarkupSafe-version;-py&python2-majorver;.egg-info and/or
+            /usr/lib/python&python3-majorver;/site-packages/markupsafe,
+            /usr/lib/python&python3-majorver;/site-packages/MarkupSafe-&MarkupSafe-version;-py&python3-majorver;.egg-info
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
+  <!--End MarkupSafe -->
Index: neral/prog/php-systemd.xml
===================================================================
--- general/prog/php-systemd.xml	(revision 14ba5f44e63d70830e1827b8a4df93417c45f815)
+++ 	(revision )
@@ -1,564 +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 php-download-http "http://www.php.net/distributions/php-&php-version;.tar.xz">
-  <!ENTITY php-download-ftp  "ftp://ftp.isu.edu.tw/pub/Unix/Web/PHP/distributions/php-&php-version;.tar.xz">
-  <!ENTITY php-md5sum        "f2cc602602eb2b121779f2c4b8bacaba">
-  <!ENTITY php-size          "12 MB">
-  <!ENTITY php-buildsize     "394 MB (with tests)">
-  <!ENTITY php-time          "5.6 SBU (with tests)">
-]>
-
-<sect1 id="php" xreflabel="PHP-&php-version;">
-  <?dbhtml filename="php.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>PHP-&php-version;</title>
-
-  <indexterm zone="php">
-    <primary sortas="a-PHP">PHP</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to PHP</title>
-
-    <para>
-      <application>PHP</application> is the PHP Hypertext Preprocessor.
-      Primarily used in dynamic web sites, it allows for programming code to be
-      directly embedded into the HTML markup.  It is also useful as a
-      general purpose scripting language.
-    </para>
-
-    &lfs78_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&php-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&php-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &php-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &php-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &php-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &php-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Pre-built documentation (optional): <ulink
-          url="http://www.php.net/download-docs.php"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">PHP Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="apache"/> and
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional System Utilities and Libraries</bridgehead>
-    <para role="optional">
-      <xref linkend="aspell"/>,
-      <xref linkend="enchant"/>,
-      <xref linkend="libxslt"/>,
-      <xref linkend="pcre"/>,
-      <xref linkend="pth"/>,
-      an <xref linkend="server-mail"/> (that provides a
-      <command>sendmail</command> command)
-      <ulink url="http://dmalloc.com/">Dmalloc</ulink>,
-      <ulink url="http://www.net-snmp.org/">Net-SNMP</ulink>,
-      <ulink url="http://www.ossp.org/pkg/lib/mm/">OSSP mm</ulink>,
-      <ulink url="http://re2c.org/">re2c</ulink>,
-      <ulink url="http://xmlrpc-epi.sourceforge.net/main.php?t=php_about">XMLRPC-EPI</ulink>, and
-    </para>
-
-    <bridgehead renderas="sect4">Optional Graphics Utilities and Libraries</bridgehead>
-    <para role="optional">
-      <xref linkend="freetype2"/>,
-      <xref linkend="libexif"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libtiff"/>,
-      <xref linkend="x-window-system"/>,
-      <ulink url="http://www.fastio.com/">ClibPDF</ulink>,
-      <ulink url="http://www.adobe.com/devnet/acrobat/fdftoolkit.html">FDF Toolkit</ulink>,
-      <ulink url="https://bitbucket.org/libgd/gd-libgd/downloads">GD</ulink>, and
-      <ulink url="http://fossies.org/linux/misc/t1lib-5.1.2.tar.gz/">t1lib</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional Web Utilities</bridgehead>
-    <para role="optional">
-      <xref linkend="curl"/>,
-      <xref linkend="html-tidy"/>,
-      <ulink url="http://sourceforge.net/projects/caudium/">Caudium</ulink>,
-      <ulink url="http://www.hyperwave.com/">Hyperwave</ulink>,
-      <ulink url="http://www.mnogosearch.org/">mnoGoSearch</ulink>,
-      <ulink url="http://www.roxen.com/products/webserver/">Roxen WebServer</ulink>, and
-      <ulink url="https://wddxnet.codeplex.com/">WDDX</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional Data Management Utilities and Libraries</bridgehead>
-    <para role="optional">
-      <xref linkend="db"/>,
-      <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
-      <xref linkend="openldap"/>,
-      <xref linkend="postgresql"/>,
-      <xref linkend="sqlite"/>,
-      <xref linkend="unixodbc"/>,
-      <ulink url="http://www.softwareag.com/">Abadas</ulink>,
-      <ulink url="http://www.birdstep.com/">Birdstep</ulink>,
-      <ulink url="http://cr.yp.to/cdb.html">cdb</ulink>,
-      <ulink url="http://www.dbmaker.com/">DBMaker</ulink>,
-      <ulink url="http://www.empress.com/">Empress</ulink>,
-      <ulink url="http://www.frontbase.com/">FrontBase</ulink>,
-      <ulink url="http://www.hughes.com.au/products/msql/">Mini SQL</ulink>,
-      <ulink url="http://www.monetra.com/">Monetra</ulink>, and
-      <ulink url="http://sourceforge.net/projects/qdbm">QDBM</ulink>
-    </para>
-
-    <para>
-      <application>PHP</application> also provides support for many
-      commercial database tools such as <application>Oracle</application>,
-      <application>SAP</application> and
-      <application>ODBC Router</application>.
-    </para>
-
-    <bridgehead renderas="sect4">Optional Security/Encryption Utilities and Libraries</bridgehead>
-    <para role="optional">
-      <xref linkend="cyrus-sasl"/>,
-      <xref linkend="mitkrb"/>,
-      <xref linkend="openssl"/>,
-      <ulink url="http://mcrypt.sourceforge.net/">libmcrypt</ulink>, and
-      <ulink url="http://mhash.sourceforge.net/">mhash</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/php"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of PHP</title>
-
-    <para>
-      You can use <application>PHP</application> for server-side
-      scripting, command-line scripting or client-side GUI applications. This
-      book provides instructions for setting up <application>PHP</application>
-      for server-side scripting as it is the most common form.
-    </para>
-
-    <note>
-      <para>
-        <application>PHP</application> has many more
-        <command>configure</command> options that will enable support for
-        various things. You can use <command>./configure --help</command> to
-        see a full list of the available options. Also, use of the
-        <ulink url="http://www.php.net/">PHP web site</ulink>
-        is highly recommended, as their online docs are very good. An example
-        of a <command>configure</command> command that utilizes many of the
-        most common dependencies can be found at <ulink
-        url="&sources-anduin-http;/files/php_configure.txt"/>.
-      </para>
-
-      <para>
-        If, for whatever reason, you don't have <xref linkend="libxml2"/>
-        installed, you need to add <option>--disable-libxml</option> to the
-        <command>configure</command> command in the instructions below. Note
-        that this will prevent the <command>pear</command> command from being
-        built.
-      </para>
-    </note>
-
-    <para>
-      Install <application>PHP</application> by running the following commands:
-    </para>
-
-<screen><userinput>sed -i "s|lsystemd-daemon|lsystemd|g" configure &amp;&amp;
-
-./configure --prefix=/usr                \
-            --sysconfdir=/etc            \
-            --localstatedir=/var         \
-            --datadir=/usr/share/php     \
-            --mandir=/usr/share/man      \
-            --enable-fpm                 \
-            --with-fpm-user=apache       \
-            --with-fpm-group=apache      \
-            --with-fpm-systemd           \
-            --with-config-file-path=/etc \
-            --with-zlib                  \
-            --enable-bcmath              \
-            --with-bz2                   \
-            --enable-calendar            \
-            --enable-dba=shared          \
-            --with-gdbm                  \
-            --with-gmp                   \
-            --enable-ftp                 \
-            --with-gettext               \
-            --enable-mbstring            \
-            --with-readline              &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>. A few
-      tests may fail, in which case you are asked whether you want to send
-      the report to the PHP developpers. If you want to automate the test,
-      you may prefix the command with <command>yes "n" | </command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<!-- dev note: make INSTALL_ROOT=<DESTDIR> install -->
-
-<screen role="root"><userinput>make install                                         &amp;&amp;
-install -v -m644 php.ini-production /etc/php.ini     &amp;&amp;
-mv -v /etc/php-fpm.conf{.default,}                   &amp;&amp;
-
-install -v -dm755 /usr/share/doc/php-&php-version; &amp;&amp;
-install -v -m644  CODING_STANDARDS EXTENSIONS INSTALL NEWS README* UPGRADING* php.gif \
-                  /usr/share/doc/php-&php-version; &amp;&amp;
-ln -sfv           /usr/lib/php/doc/Archive_Tar/docs/Archive_Tar.txt \
-                  /usr/share/doc/php-&php-version; &amp;&amp;
-ln -sfv           /usr/lib/php/doc/Structures_Graph/docs \
-                  /usr/share/doc/php-&php-version;</userinput></screen>
-
-    <para>
-      The pre-built HTML documentation is packaged in two forms: a tarball
-      containing many individual files, useful for quick loading into your
-      browser, and one large individual file, which is useful for using the
-      search utility of your browser. If you downloaded either, or both, of the
-      documentation files, issue the following commands as the
-      <systemitem class='username'>root</systemitem> user to install them (note
-      these instructions assume English docs, modify the tarball names below if
-      necessary).
-    </para>
-
-    <para>
-      For the <quote>Single HTML</quote> file:
-    </para>
-
-<screen role="root"><userinput>install -v -m644 ../php_manual_en.html.gz \
-    /usr/share/doc/php-&php-version; &amp;&amp;
-gunzip -v /usr/share/doc/php-&php-version;/php_manual_en.html.gz</userinput></screen>
-
-    <para>
-      For the <quote>Many HTML files</quote> tarball:
-    </para>
-
-<screen role="root"><userinput>tar -xvf ../php_manual_en.tar.gz \
-    -C /usr/share/doc/php-&php-version; --no-same-owner</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-      <para>
-        <command>sed -i "s|lsystemd-daemon|lsystemd|g" configure</command>:
-        This command fixes the detection of the systemd library.
-      </para>
-
-      <para>
-        <parameter>--with-datadir=/usr/share/php</parameter>: This works
-        around a bug in the build machinery, which installs some data to a
-        wrong location.
-      </para>
-
-      <para>
-        <parameter>--enable-fpm</parameter>: This parameter allows
-        building the fastCGI Process Manager.
-      </para>
-
-      <para>
-        <parameter>--with-fpm-systemd</parameter>: This parameter allows
-        the FastCGI Process Manager to integrate with systemd.
-      </para>
-
-      <para>
-        <parameter>--with-config-file-path=/etc</parameter>: This parameter
-        makes <application>PHP</application> look for the
-        <filename>php.ini</filename> configuration file in
-        <filename class="directory">/etc</filename>.
-      </para>
-
-      <para>
-        <parameter>--with-zlib</parameter>: This parameter adds
-        support for <application>Zlib</application> compression.
-      </para>
-
-      <para>
-        <parameter>--enable-bcmath</parameter>: Enables
-        <command>bc</command> style precision math functions.
-      </para>
-
-      <para>
-        <parameter>--with-bz2</parameter>: Adds support for
-        <application>Bzip2</application> compression functions.
-      </para>
-
-      <para>
-        <parameter>--enable-calendar</parameter>: This parameter
-        provides support for calendar conversion.
-      </para>
-
-      <para>
-        <parameter>--enable-dba=shared</parameter>: This parameter enables
-        support for database (dbm-style) abstraction layer functions.
-      </para>
-
-      <para>
-        <parameter>--enable-ftp</parameter>: This parameter
-        enables FTP functions.
-      </para>
-
-      <para>
-        <parameter>--with-gettext</parameter>: Enables functions
-        that use <application>Gettext</application> text translation.
-      </para>
-
-      <para>
-        <parameter>--enable-mbstring</parameter>: This parameter
-        enables multibyte string support.
-      </para>
-
-      <para>
-        <parameter>--with-readline</parameter>: This parameter
-        enables command line <application>Readline</application> support.
-      </para>
-
-      <para>
-        <option>--with-mysql</option>: This option
-        includes <application>MariaDB/MySQL</application> support.
-      </para>
-
-      <para>
-        <option>--disable-libxml</option>: This option
-        allows building PHP without <application>libxml2</application>
-        installed.
-      </para>
-
-      <para>
-        <option>--with-apxs2</option>: Instead of building the fastCGI process
-        manager, it is possible to build an <application>apache</application>
-        module.  This has some performance penalty for heavy loaded servers,
-        but may be easier to set up. This switch is incompatible with the
-        <parameter>--enable-fpm</parameter> and
-        <parameter>--with-fpm-...</parameter> switches.
-      </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring PHP</title>
-
-    <sect3 id="php-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/php.ini</filename>,
-        <filename>/etc/pear.conf</filename>, and
-        <filename>/etc/php-fpm.conf</filename>
-      </para>
-
-      <indexterm zone="php php-config">
-        <primary sortas="e-etc-php.ini">/etc/php.ini</primary>
-      </indexterm>
-
-      <indexterm zone="php php-config">
-        <primary sortas="e-etc-pear.conf">/etc/pear.conf</primary>
-      </indexterm>
-
-      <indexterm zone="php php-config">
-        <primary sortas="e-etc-php-fpm.conf">/etc/php-fpm.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        The file used as the default <filename>/etc/php.ini</filename>
-        configuration file is recommended by the <application>PHP</application>
-        development team. This file modifies the default behavior of
-        <application>PHP</application>.  If no <filename>/etc/php.ini</filename>
-        is used, all configuration settings fall to the defaults. You should
-        review the comments in this file and ensure the changes are acceptable
-        in your particular environment.
-      </para>
-
-      <para>
-        You may have noticed the following from the output of the
-        <command>make install</command> command:
-     </para>
-
-<screen><computeroutput>You may want to add: /usr/lib/php to your php.ini include_path</computeroutput></screen>
-
-      <para>
-        If desired, add the entry using the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>sed -i 's@php/includes"@&amp;\ninclude_path = ".:/usr/lib/php"@' \
-    /etc/php.ini</userinput></screen>
-
-      <para>
-        To enable fastCGI support in the <application>Apache</application>
-        web server, two LoadModule directives must be added to the
-        <filename>httpd.conf</filename> file. They are commented out, so just
-        issue the following command as
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>sed -e '/proxy_module/s/^#//'      \
-    -e '/proxy_fcgi_module/s/^#//' \
-    -i  /etc/httpd/httpd.conf</userinput></screen>
-
-      <para>
-        Those modules accept various <command>ProxyPass</command>
-        directives. One possibility is (as the
-        <systemitem class="username">root</systemitem> user):
-      </para>
-
-<screen role="root"><userinput>echo 'ProxyPassMatch ^/(.*\.php)$ fcgi://127.0.0.1:9000/srv/www/$1' &gt;&gt; \
-     /etc/httpd/httpd.conf</userinput></screen>
-
-      <para>
-        Additionally, it may be useful to add an entry for
-        <filename>index.php</filename> to the DirectoryIndex directive of the
-        <filename>httpd.conf</filename> file. Lastly, adding a line to setup the
-        <filename class='extension'>.phps</filename> extension to show
-        highlighted <application>PHP</application> source may be
-        desirable:
-      </para>
-
-<screen><literal>AddType application/x-httpd-php-source .phps</literal></screen>
-
-      <para>
-        You'll need to restart the <application>Apache</application> web server
-        after making any modifications to the <filename>httpd.conf</filename>
-        file.
-      </para>
-
-    </sect3>
-
-    <sect3  id="php-init">
-      <title>Systemd Units</title>
-
-      <para>
-        To start the <command>php-fpm</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="php php-init">
-        <primary sortas="f-php-fpm">php-fpm</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-php-fpm</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>pear, peardev, pecl, phar (symlink), phar.phar,
-        php, php-cgi, php-config, php-fpm, and phpize</seg>
-        <seg>None</seg>
-        <seg>/usr/include/php, /usr/lib/php, /usr/share/php and
-        /usr/share/doc/php-&php-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="php-prog">
-        <term><command>php</command></term>
-        <listitem>
-          <para>
-            is a command line interface that enables you to parse and
-            execute PHP code.
-          </para>
-          <indexterm zone="php php-prog">
-            <primary sortas="b-php">php</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pear">
-        <term><command>pear</command></term>
-        <listitem>
-          <para>
-            is the PHP Extension and Application Repository (PEAR) package
-            manager.
-          </para>
-          <indexterm zone="php pear">
-            <primary sortas="b-pear">pear</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="php-fpm">
-        <term><command>php-fpm</command></term>
-        <listitem>
-          <para>
-            is the fastCGI process manager for PHP.
-          </para>
-          <indexterm zone="php php-fpm">
-            <primary sortas="b-php-fpm">php-fpm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/prog/php.xml
===================================================================
--- general/prog/php.xml	(revision 8cf08a1124bf7befb69d69cb3f90e4b9346bc9d7)
+++ general/prog/php.xml	(revision 8cf08a1124bf7befb69d69cb3f90e4b9346bc9d7)
@@ -0,0 +1,564 @@
+<?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 php-download-http "http://www.php.net/distributions/php-&php-version;.tar.xz">
+  <!ENTITY php-download-ftp  "ftp://ftp.isu.edu.tw/pub/Unix/Web/PHP/distributions/php-&php-version;.tar.xz">
+  <!ENTITY php-md5sum        "f2cc602602eb2b121779f2c4b8bacaba">
+  <!ENTITY php-size          "12 MB">
+  <!ENTITY php-buildsize     "394 MB (with tests)">
+  <!ENTITY php-time          "5.6 SBU (with tests)">
+]>
+
+<sect1 id="php" xreflabel="PHP-&php-version;">
+  <?dbhtml filename="php.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>PHP-&php-version;</title>
+
+  <indexterm zone="php">
+    <primary sortas="a-PHP">PHP</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to PHP</title>
+
+    <para>
+      <application>PHP</application> is the PHP Hypertext Preprocessor.
+      Primarily used in dynamic web sites, it allows for programming code to be
+      directly embedded into the HTML markup.  It is also useful as a
+      general purpose scripting language.
+    </para>
+
+    &lfs78_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&php-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&php-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &php-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &php-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &php-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &php-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Pre-built documentation (optional): <ulink
+          url="http://www.php.net/download-docs.php"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">PHP Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="apache"/> and
+      <xref linkend="libxml2"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional System Utilities and Libraries</bridgehead>
+    <para role="optional">
+      <xref linkend="aspell"/>,
+      <xref linkend="enchant"/>,
+      <xref linkend="libxslt"/>,
+      <xref linkend="pcre"/>,
+      <xref linkend="pth"/>,
+      an <xref linkend="server-mail"/> (that provides a
+      <command>sendmail</command> command)
+      <ulink url="http://dmalloc.com/">Dmalloc</ulink>,
+      <ulink url="http://www.net-snmp.org/">Net-SNMP</ulink>,
+      <ulink url="http://www.ossp.org/pkg/lib/mm/">OSSP mm</ulink>,
+      <ulink url="http://re2c.org/">re2c</ulink>,
+      <ulink url="http://xmlrpc-epi.sourceforge.net/main.php?t=php_about">XMLRPC-EPI</ulink>, and
+    </para>
+
+    <bridgehead renderas="sect4">Optional Graphics Utilities and Libraries</bridgehead>
+    <para role="optional">
+      <xref linkend="freetype2"/>,
+      <xref linkend="libexif"/>,
+      <xref linkend="libjpeg"/>,
+      <xref linkend="libpng"/>,
+      <xref linkend="libtiff"/>,
+      <xref linkend="x-window-system"/>,
+      <ulink url="http://www.fastio.com/">ClibPDF</ulink>,
+      <ulink url="http://www.adobe.com/devnet/acrobat/fdftoolkit.html">FDF Toolkit</ulink>,
+      <ulink url="https://bitbucket.org/libgd/gd-libgd/downloads">GD</ulink>, and
+      <ulink url="http://fossies.org/linux/misc/t1lib-5.1.2.tar.gz/">t1lib</ulink>
+    </para>
+
+    <bridgehead renderas="sect4">Optional Web Utilities</bridgehead>
+    <para role="optional">
+      <xref linkend="curl"/>,
+      <xref linkend="html-tidy"/>,
+      <ulink url="http://sourceforge.net/projects/caudium/">Caudium</ulink>,
+      <ulink url="http://www.hyperwave.com/">Hyperwave</ulink>,
+      <ulink url="http://www.mnogosearch.org/">mnoGoSearch</ulink>,
+      <ulink url="http://www.roxen.com/products/webserver/">Roxen WebServer</ulink>, and
+      <ulink url="https://wddxnet.codeplex.com/">WDDX</ulink>
+    </para>
+
+    <bridgehead renderas="sect4">Optional Data Management Utilities and Libraries</bridgehead>
+    <para role="optional">
+      <xref linkend="db"/>,
+      <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
+      <xref linkend="openldap"/>,
+      <xref linkend="postgresql"/>,
+      <xref linkend="sqlite"/>,
+      <xref linkend="unixodbc"/>,
+      <ulink url="http://www.softwareag.com/">Abadas</ulink>,
+      <ulink url="http://www.birdstep.com/">Birdstep</ulink>,
+      <ulink url="http://cr.yp.to/cdb.html">cdb</ulink>,
+      <ulink url="http://www.dbmaker.com/">DBMaker</ulink>,
+      <ulink url="http://www.empress.com/">Empress</ulink>,
+      <ulink url="http://www.frontbase.com/">FrontBase</ulink>,
+      <ulink url="http://www.hughes.com.au/products/msql/">Mini SQL</ulink>,
+      <ulink url="http://www.monetra.com/">Monetra</ulink>, and
+      <ulink url="http://sourceforge.net/projects/qdbm">QDBM</ulink>
+    </para>
+
+    <para>
+      <application>PHP</application> also provides support for many
+      commercial database tools such as <application>Oracle</application>,
+      <application>SAP</application> and
+      <application>ODBC Router</application>.
+    </para>
+
+    <bridgehead renderas="sect4">Optional Security/Encryption Utilities and Libraries</bridgehead>
+    <para role="optional">
+      <xref linkend="cyrus-sasl"/>,
+      <xref linkend="mitkrb"/>,
+      <xref linkend="openssl"/>,
+      <ulink url="http://mcrypt.sourceforge.net/">libmcrypt</ulink>, and
+      <ulink url="http://mhash.sourceforge.net/">mhash</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/php"/>
+    </para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of PHP</title>
+
+    <para>
+      You can use <application>PHP</application> for server-side
+      scripting, command-line scripting or client-side GUI applications. This
+      book provides instructions for setting up <application>PHP</application>
+      for server-side scripting as it is the most common form.
+    </para>
+
+    <note>
+      <para>
+        <application>PHP</application> has many more
+        <command>configure</command> options that will enable support for
+        various things. You can use <command>./configure --help</command> to
+        see a full list of the available options. Also, use of the
+        <ulink url="http://www.php.net/">PHP web site</ulink>
+        is highly recommended, as their online docs are very good. An example
+        of a <command>configure</command> command that utilizes many of the
+        most common dependencies can be found at <ulink
+        url="&sources-anduin-http;/files/php_configure.txt"/>.
+      </para>
+
+      <para>
+        If, for whatever reason, you don't have <xref linkend="libxml2"/>
+        installed, you need to add <option>--disable-libxml</option> to the
+        <command>configure</command> command in the instructions below. Note
+        that this will prevent the <command>pear</command> command from being
+        built.
+      </para>
+    </note>
+
+    <para>
+      Install <application>PHP</application> by running the following commands:
+    </para>
+
+<screen><userinput>sed -i "s|lsystemd-daemon|lsystemd|g" configure &amp;&amp;
+
+./configure --prefix=/usr                \
+            --sysconfdir=/etc            \
+            --localstatedir=/var         \
+            --datadir=/usr/share/php     \
+            --mandir=/usr/share/man      \
+            --enable-fpm                 \
+            --with-fpm-user=apache       \
+            --with-fpm-group=apache      \
+            --with-fpm-systemd           \
+            --with-config-file-path=/etc \
+            --with-zlib                  \
+            --enable-bcmath              \
+            --with-bz2                   \
+            --enable-calendar            \
+            --enable-dba=shared          \
+            --with-gdbm                  \
+            --with-gmp                   \
+            --enable-ftp                 \
+            --with-gettext               \
+            --enable-mbstring            \
+            --with-readline              &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make test</command>. A few
+      tests may fail, in which case you are asked whether you want to send
+      the report to the PHP developpers. If you want to automate the test,
+      you may prefix the command with <command>yes "n" | </command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<!-- dev note: make INSTALL_ROOT=<DESTDIR> install -->
+
+<screen role="root"><userinput>make install                                         &amp;&amp;
+install -v -m644 php.ini-production /etc/php.ini     &amp;&amp;
+mv -v /etc/php-fpm.conf{.default,}                   &amp;&amp;
+
+install -v -dm755 /usr/share/doc/php-&php-version; &amp;&amp;
+install -v -m644  CODING_STANDARDS EXTENSIONS INSTALL NEWS README* UPGRADING* php.gif \
+                  /usr/share/doc/php-&php-version; &amp;&amp;
+ln -sfv           /usr/lib/php/doc/Archive_Tar/docs/Archive_Tar.txt \
+                  /usr/share/doc/php-&php-version; &amp;&amp;
+ln -sfv           /usr/lib/php/doc/Structures_Graph/docs \
+                  /usr/share/doc/php-&php-version;</userinput></screen>
+
+    <para>
+      The pre-built HTML documentation is packaged in two forms: a tarball
+      containing many individual files, useful for quick loading into your
+      browser, and one large individual file, which is useful for using the
+      search utility of your browser. If you downloaded either, or both, of the
+      documentation files, issue the following commands as the
+      <systemitem class='username'>root</systemitem> user to install them (note
+      these instructions assume English docs, modify the tarball names below if
+      necessary).
+    </para>
+
+    <para>
+      For the <quote>Single HTML</quote> file:
+    </para>
+
+<screen role="root"><userinput>install -v -m644 ../php_manual_en.html.gz \
+    /usr/share/doc/php-&php-version; &amp;&amp;
+gunzip -v /usr/share/doc/php-&php-version;/php_manual_en.html.gz</userinput></screen>
+
+    <para>
+      For the <quote>Many HTML files</quote> tarball:
+    </para>
+
+<screen role="root"><userinput>tar -xvf ../php_manual_en.tar.gz \
+    -C /usr/share/doc/php-&php-version; --no-same-owner</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+      <para>
+        <command>sed -i "s|lsystemd-daemon|lsystemd|g" configure</command>:
+        This command fixes the detection of the systemd library.
+      </para>
+
+      <para>
+        <parameter>--with-datadir=/usr/share/php</parameter>: This works
+        around a bug in the build machinery, which installs some data to a
+        wrong location.
+      </para>
+
+      <para>
+        <parameter>--enable-fpm</parameter>: This parameter allows
+        building the fastCGI Process Manager.
+      </para>
+
+      <para>
+        <parameter>--with-fpm-systemd</parameter>: This parameter allows
+        the FastCGI Process Manager to integrate with systemd.
+      </para>
+
+      <para>
+        <parameter>--with-config-file-path=/etc</parameter>: This parameter
+        makes <application>PHP</application> look for the
+        <filename>php.ini</filename> configuration file in
+        <filename class="directory">/etc</filename>.
+      </para>
+
+      <para>
+        <parameter>--with-zlib</parameter>: This parameter adds
+        support for <application>Zlib</application> compression.
+      </para>
+
+      <para>
+        <parameter>--enable-bcmath</parameter>: Enables
+        <command>bc</command> style precision math functions.
+      </para>
+
+      <para>
+        <parameter>--with-bz2</parameter>: Adds support for
+        <application>Bzip2</application> compression functions.
+      </para>
+
+      <para>
+        <parameter>--enable-calendar</parameter>: This parameter
+        provides support for calendar conversion.
+      </para>
+
+      <para>
+        <parameter>--enable-dba=shared</parameter>: This parameter enables
+        support for database (dbm-style) abstraction layer functions.
+      </para>
+
+      <para>
+        <parameter>--enable-ftp</parameter>: This parameter
+        enables FTP functions.
+      </para>
+
+      <para>
+        <parameter>--with-gettext</parameter>: Enables functions
+        that use <application>Gettext</application> text translation.
+      </para>
+
+      <para>
+        <parameter>--enable-mbstring</parameter>: This parameter
+        enables multibyte string support.
+      </para>
+
+      <para>
+        <parameter>--with-readline</parameter>: This parameter
+        enables command line <application>Readline</application> support.
+      </para>
+
+      <para>
+        <option>--with-mysql</option>: This option
+        includes <application>MariaDB/MySQL</application> support.
+      </para>
+
+      <para>
+        <option>--disable-libxml</option>: This option
+        allows building PHP without <application>libxml2</application>
+        installed.
+      </para>
+
+      <para>
+        <option>--with-apxs2</option>: Instead of building the fastCGI process
+        manager, it is possible to build an <application>apache</application>
+        module.  This has some performance penalty for heavy loaded servers,
+        but may be easier to set up. This switch is incompatible with the
+        <parameter>--enable-fpm</parameter> and
+        <parameter>--with-fpm-...</parameter> switches.
+      </para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring PHP</title>
+
+    <sect3 id="php-config">
+      <title>Config Files</title>
+
+      <para>
+        <filename>/etc/php.ini</filename>,
+        <filename>/etc/pear.conf</filename>, and
+        <filename>/etc/php-fpm.conf</filename>
+      </para>
+
+      <indexterm zone="php php-config">
+        <primary sortas="e-etc-php.ini">/etc/php.ini</primary>
+      </indexterm>
+
+      <indexterm zone="php php-config">
+        <primary sortas="e-etc-pear.conf">/etc/pear.conf</primary>
+      </indexterm>
+
+      <indexterm zone="php php-config">
+        <primary sortas="e-etc-php-fpm.conf">/etc/php-fpm.conf</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para>
+        The file used as the default <filename>/etc/php.ini</filename>
+        configuration file is recommended by the <application>PHP</application>
+        development team. This file modifies the default behavior of
+        <application>PHP</application>.  If no <filename>/etc/php.ini</filename>
+        is used, all configuration settings fall to the defaults. You should
+        review the comments in this file and ensure the changes are acceptable
+        in your particular environment.
+      </para>
+
+      <para>
+        You may have noticed the following from the output of the
+        <command>make install</command> command:
+     </para>
+
+<screen><computeroutput>You may want to add: /usr/lib/php to your php.ini include_path</computeroutput></screen>
+
+      <para>
+        If desired, add the entry using the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>sed -i 's@php/includes"@&amp;\ninclude_path = ".:/usr/lib/php"@' \
+    /etc/php.ini</userinput></screen>
+
+      <para>
+        To enable fastCGI support in the <application>Apache</application>
+        web server, two LoadModule directives must be added to the
+        <filename>httpd.conf</filename> file. They are commented out, so just
+        issue the following command as
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>sed -e '/proxy_module/s/^#//'      \
+    -e '/proxy_fcgi_module/s/^#//' \
+    -i  /etc/httpd/httpd.conf</userinput></screen>
+
+      <para>
+        Those modules accept various <command>ProxyPass</command>
+        directives. One possibility is (as the
+        <systemitem class="username">root</systemitem> user):
+      </para>
+
+<screen role="root"><userinput>echo 'ProxyPassMatch ^/(.*\.php)$ fcgi://127.0.0.1:9000/srv/www/$1' &gt;&gt; \
+     /etc/httpd/httpd.conf</userinput></screen>
+
+      <para>
+        Additionally, it may be useful to add an entry for
+        <filename>index.php</filename> to the DirectoryIndex directive of the
+        <filename>httpd.conf</filename> file. Lastly, adding a line to setup the
+        <filename class='extension'>.phps</filename> extension to show
+        highlighted <application>PHP</application> source may be
+        desirable:
+      </para>
+
+<screen><literal>AddType application/x-httpd-php-source .phps</literal></screen>
+
+      <para>
+        You'll need to restart the <application>Apache</application> web server
+        after making any modifications to the <filename>httpd.conf</filename>
+        file.
+      </para>
+
+    </sect3>
+
+    <sect3  id="php-init">
+      <title>Systemd Units</title>
+
+      <para>
+        To start the <command>php-fpm</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="php php-init">
+        <primary sortas="f-php-fpm">php-fpm</primary>
+      </indexterm>
+
+<screen role="root"><userinput>make install-php-fpm</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>pear, peardev, pecl, phar (symlink), phar.phar,
+        php, php-cgi, php-config, php-fpm, and phpize</seg>
+        <seg>None</seg>
+        <seg>/usr/include/php, /usr/lib/php, /usr/share/php and
+        /usr/share/doc/php-&php-version;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="php-prog">
+        <term><command>php</command></term>
+        <listitem>
+          <para>
+            is a command line interface that enables you to parse and
+            execute PHP code.
+          </para>
+          <indexterm zone="php php-prog">
+            <primary sortas="b-php">php</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pear">
+        <term><command>pear</command></term>
+        <listitem>
+          <para>
+            is the PHP Extension and Application Repository (PEAR) package
+            manager.
+          </para>
+          <indexterm zone="php pear">
+            <primary sortas="b-pear">pear</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="php-fpm">
+        <term><command>php-fpm</command></term>
+        <listitem>
+          <para>
+            is the fastCGI process manager for PHP.
+          </para>
+          <indexterm zone="php php-fpm">
+            <primary sortas="b-php-fpm">php-fpm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/prog/prog.xml
===================================================================
--- general/prog/prog.xml	(revision 14ba5f44e63d70830e1827b8a4df93417c45f815)
+++ general/prog/prog.xml	(revision 8cf08a1124bf7befb69d69cb3f90e4b9346bc9d7)
@@ -25,5 +25,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="check.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clisp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cmake-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cmake.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cvs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cvsserver.xml"/>
@@ -46,13 +46,13 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="npapi-sdk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="perl-modules.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="php-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="php.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python3.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python-modules-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python-modules.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ruby.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="scons.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="slang.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="subversion-systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="svnserver-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="subversion.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="svnserver.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="swig.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tcl.xml"/>
Index: neral/prog/pyatspi2-systemd.xml
===================================================================
--- general/prog/pyatspi2-systemd.xml	(revision 14ba5f44e63d70830e1827b8a4df93417c45f815)
+++ 	(revision )
@@ -1,172 +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 pyatspi2-download-http
-           "&gnome-download-http;/pyatspi/2.16/pyatspi-&pyatspi2-version;.tar.xz">
-  <!ENTITY pyatspi2-download-ftp
-           "&gnome-download-ftp;/pyatspi/2.16/pyatspi-&pyatspi2-version;.tar.xz">
-  <!ENTITY pyatspi2-md5sum        "76a3dc0ec2d3cb0ae1a77ab6c43a3099">
-  <!ENTITY pyatspi2-size          "296 KB">
-  <!ENTITY pyatspi2-buildsize     "4.4 MB">
-  <!ENTITY pyatspi2-time          "less than 0.1 SBU">
-]>
-
-   <!-- Begin PyAtSpi2 -->
-  <sect2 id="pyatspi2" xreflabel="PyAtSpi2-&pyatspi2-version;">
-
-    <title>PyAtSpi2-&pyatspi2-version;</title>
-
-    <indexterm zone="pyatspi2">
-      <primary sortas="a-PyAtSpi2">PyAtSpi2</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to PyAtSpi2</title>
-
-      <para>
-        The <application>PyAtSpi2</application> package contains
-        <application>Python</application> bindings for the core
-        components of the <application>GNOME</application>
-        Accessibility.
-      </para>
-
-      &lfs77_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pyatspi2-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pyatspi2-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pyatspi2-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pyatspi2-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pyatspi2-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pyatspi2-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">PyAtSpi2 Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="pygobject3"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended</bridgehead>
-      <para role="recommended">
-        <xref linkend="at-spi2-core"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/pyatspi2"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of PyAtSpi2</title>
-
-      <note>
-        <para>
-          Both <application>Python 2</application> and
-          <application>Python 3</application> modules can
-          be built and installed without any conflicts.
-        </para>
-      </note>
-
-      <para>
-        To build <application>PyAtSpi2</application> as the
-        <application>Python 2</application> module, run the
-        following commands:
-      </para>
-
-<screen><userinput>mkdir python2 &amp;&amp;
-pushd python2 &amp;&amp;
-../configure --prefix=/usr --with-python=/usr/bin/python &amp;&amp;
-make &amp;&amp;
-popd</userinput></screen>
-
-      <para>
-        To build <application>PyAtSpi2</application> as the
-        <application>Python 3</application> module, run the
-        following commands:
-      </para>
-
-<screen><userinput>mkdir python3 &amp;&amp;
-pushd python3 &amp;&amp;
-../configure --prefix=/usr --with-python=/usr/bin/python3 &amp;&amp;
-make &amp;&amp;
-popd</userinput></screen>
-
-      <para>
-        This package does not come with a testsuite.
-      </para>
-
-      <para>
-        To install the <application>Python 2</application> module,
-        run the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>make -C python2 install</userinput></screen>
-
-      <para>
-        To install the <application>Python 3</application> module,
-        run the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>make -C python3 install</userinput></screen>
-
-    </sect3>
-
-    <sect3 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/lib/python&python2-majorver;/site-packages/pyatspi and/or
-            /usr/lib/python&python3-majorver;/site-packages/pyatspi
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
-  <!-- End PyAtSpi2 -->
Index: general/prog/pyatspi2.xml
===================================================================
--- general/prog/pyatspi2.xml	(revision 8cf08a1124bf7befb69d69cb3f90e4b9346bc9d7)
+++ general/prog/pyatspi2.xml	(revision 8cf08a1124bf7befb69d69cb3f90e4b9346bc9d7)
@@ -0,0 +1,172 @@
+<?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 pyatspi2-download-http
+           "&gnome-download-http;/pyatspi/2.16/pyatspi-&pyatspi2-version;.tar.xz">
+  <!ENTITY pyatspi2-download-ftp
+           "&gnome-download-ftp;/pyatspi/2.16/pyatspi-&pyatspi2-version;.tar.xz">
+  <!ENTITY pyatspi2-md5sum        "76a3dc0ec2d3cb0ae1a77ab6c43a3099">
+  <!ENTITY pyatspi2-size          "296 KB">
+  <!ENTITY pyatspi2-buildsize     "4.4 MB">
+  <!ENTITY pyatspi2-time          "less than 0.1 SBU">
+]>
+
+   <!-- Begin PyAtSpi2 -->
+  <sect2 id="pyatspi2" xreflabel="PyAtSpi2-&pyatspi2-version;">
+
+    <title>PyAtSpi2-&pyatspi2-version;</title>
+
+    <indexterm zone="pyatspi2">
+      <primary sortas="a-PyAtSpi2">PyAtSpi2</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to PyAtSpi2</title>
+
+      <para>
+        The <application>PyAtSpi2</application> package contains
+        <application>Python</application> bindings for the core
+        components of the <application>GNOME</application>
+        Accessibility.
+      </para>
+
+      &lfs77_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&pyatspi2-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&pyatspi2-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &pyatspi2-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &pyatspi2-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &pyatspi2-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &pyatspi2-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">PyAtSpi2 Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="pygobject3"/>
+      </para>
+
+      <bridgehead renderas="sect5">Recommended</bridgehead>
+      <para role="recommended">
+        <xref linkend="at-spi2-core"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/pyatspi2"/>
+      </para>
+
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of PyAtSpi2</title>
+
+      <note>
+        <para>
+          Both <application>Python 2</application> and
+          <application>Python 3</application> modules can
+          be built and installed without any conflicts.
+        </para>
+      </note>
+
+      <para>
+        To build <application>PyAtSpi2</application> as the
+        <application>Python 2</application> module, run the
+        following commands:
+      </para>
+
+<screen><userinput>mkdir python2 &amp;&amp;
+pushd python2 &amp;&amp;
+../configure --prefix=/usr --with-python=/usr/bin/python &amp;&amp;
+make &amp;&amp;
+popd</userinput></screen>
+
+      <para>
+        To build <application>PyAtSpi2</application> as the
+        <application>Python 3</application> module, run the
+        following commands:
+      </para>
+
+<screen><userinput>mkdir python3 &amp;&amp;
+pushd python3 &amp;&amp;
+../configure --prefix=/usr --with-python=/usr/bin/python3 &amp;&amp;
+make &amp;&amp;
+popd</userinput></screen>
+
+      <para>
+        This package does not come with a testsuite.
+      </para>
+
+      <para>
+        To install the <application>Python 2</application> module,
+        run the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>make -C python2 install</userinput></screen>
+
+      <para>
+        To install the <application>Python 3</application> module,
+        run the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>make -C python3 install</userinput></screen>
+
+    </sect3>
+
+    <sect3 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/lib/python&python2-majorver;/site-packages/pyatspi and/or
+            /usr/lib/python&python3-majorver;/site-packages/pyatspi
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
+  <!-- End PyAtSpi2 -->
Index: neral/prog/python-modules-systemd.xml
===================================================================
--- general/prog/python-modules-systemd.xml	(revision 14ba5f44e63d70830e1827b8a4df93417c45f815)
+++ 	(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;
-]>
-
-<sect1 id="python-modules" xreflabel="Python Modules">
-  <?dbhtml filename="python-modules.html" ?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Python Modules</title>
-
-  <indexterm zone="python-modules">
-    <primary sortas="a-Python-Modules">Python Modules</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Python Modules</title>
-
-    <para>
-      The <application>Python</application> module packages add useful objects
-      to the <application>Python</application> language. Modules utilized by
-      packages throughout BLFS are listed here, along with their dependencies.
-      Installation of the modules shown on this page is meant to follow from top
-      to bottom to handle optional dependencies in each module.
-    </para>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          <xref linkend="dbus-python"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pyatspi2"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="py2cairo"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pycairo"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pygobject2"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pygobject3"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pygtk"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pyxdg"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="setuptools"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="Beaker"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="MarkupSafe"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="Jinja2"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="Mako"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="PyYAML"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="dbus-python.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="pyatspi2-systemd.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="py2cairo.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="pycairo.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="pygobject2.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="pygobject3.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="pygtk.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="pyxdg.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="setuptools-systemd.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="beaker-systemd.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="markupsafe-systemd.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="jinja2-systemd.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="mako-systemd.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="pyyaml-systemd.xml"/>
-
-</sect1>
Index: general/prog/python-modules.xml
===================================================================
--- general/prog/python-modules.xml	(revision 8cf08a1124bf7befb69d69cb3f90e4b9346bc9d7)
+++ general/prog/python-modules.xml	(revision 8cf08a1124bf7befb69d69cb3f90e4b9346bc9d7)
@@ -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;
+]>
+
+<sect1 id="python-modules" xreflabel="Python Modules">
+  <?dbhtml filename="python-modules.html" ?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Python Modules</title>
+
+  <indexterm zone="python-modules">
+    <primary sortas="a-Python-Modules">Python Modules</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Python Modules</title>
+
+    <para>
+      The <application>Python</application> module packages add useful objects
+      to the <application>Python</application> language. Modules utilized by
+      packages throughout BLFS are listed here, along with their dependencies.
+      Installation of the modules shown on this page is meant to follow from top
+      to bottom to handle optional dependencies in each module.
+    </para>
+
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          <xref linkend="dbus-python"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <xref linkend="pyatspi2"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <xref linkend="py2cairo"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <xref linkend="pycairo"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <xref linkend="pygobject2"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <xref linkend="pygobject3"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <xref linkend="pygtk"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <xref linkend="pyxdg"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <xref linkend="setuptools"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <xref linkend="Beaker"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <xref linkend="MarkupSafe"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <xref linkend="Jinja2"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <xref linkend="Mako"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <xref linkend="PyYAML"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="dbus-python.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="pyatspi2.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="py2cairo.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="pycairo.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="pygobject2.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="pygobject3.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="pygtk.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="pyxdg.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="setuptools.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="beaker.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="markupsafe.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="jinja2.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="mako.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="pyyaml.xml"/>
+
+</sect1>
Index: neral/prog/pyyaml-systemd.xml
===================================================================
--- general/prog/pyyaml-systemd.xml	(revision 14ba5f44e63d70830e1827b8a4df93417c45f815)
+++ 	(revision )
@@ -1,150 +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 PyYAML-download-http "http://pyyaml.org/download/pyyaml/PyYAML-&PyYAML-version;.tar.gz">
-  <!ENTITY PyYAML-download-ftp  " ">
-  <!ENTITY PyYAML-md5sum        "f50e08ef0fe55178479d3a618efe21db">
-  <!ENTITY PyYAML-size          "244 KB">
-  <!ENTITY PyYAML-buildsize     "13 MB">
-  <!ENTITY PyYAML-time          "0.1 SBU">
-]>
-
-  <!-- Begin PyYAML -->
-  <sect2 id="PyYAML" xreflabel="PyYAML-&PyYAML-version;">
-
-    <title>PyYAML-&PyYAML-version;</title>
-
-    <indexterm zone="PyYAML">
-      <primary sortas="a-PyYAML">PyYAML</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to PyYAML Module</title>
-
-      <para>
-        <application>PyYAML</application> is a <application>Python</application>
-        module that implements the next generation YAML parser and emitter.
-      </para>
-
-      &lfs77_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&PyYAML-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&PyYAML-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &PyYAML-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &PyYAML-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &PyYAML-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &PyYAML-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">PyYAML Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="python2"/> and/or
-        <xref linkend="python3"/> and
-        <xref linkend="yaml"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/PyYAML"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of PyYAML</title>
-
-      <note>
-        <para>
-          Both <application>Python 2</application> and
-          <application>Python 3</application> modules can
-          be built and installed without any conflicts.
-        </para>
-      </note>
-
-      <para>
-        To build the <application>Python 2</application> module,
-        run the following command:
-      </para>
-
-<screen><userinput>python setup.py build</userinput></screen>
-
-      <para>
-        To install the <application>Python 2</application> module,
-        run the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>python setup.py install --optimize=1</userinput></screen>
-
-      <para>
-        To build the <application>Python 3</application> module,
-        run the following command:
-      </para>
-
-<screen><userinput>python3 setup.py build</userinput></screen>
-
-      <para>
-        To install the <application>Python 3</application> module,
-        run the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            _yaml.so
-          </seg>
-          <seg>
-            /usr/lib/python&python2-majorver;/site-packages/yaml and/or
-            /usr/lib/python&python3-majorver;/site-packages/yaml,
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
-  <!--End PyYAML -->
Index: general/prog/pyyaml.xml
===================================================================
--- general/prog/pyyaml.xml	(revision 8cf08a1124bf7befb69d69cb3f90e4b9346bc9d7)
+++ general/prog/pyyaml.xml	(revision 8cf08a1124bf7befb69d69cb3f90e4b9346bc9d7)
@@ -0,0 +1,150 @@
+<?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 PyYAML-download-http "http://pyyaml.org/download/pyyaml/PyYAML-&PyYAML-version;.tar.gz">
+  <!ENTITY PyYAML-download-ftp  " ">
+  <!ENTITY PyYAML-md5sum        "f50e08ef0fe55178479d3a618efe21db">
+  <!ENTITY PyYAML-size          "244 KB">
+  <!ENTITY PyYAML-buildsize     "13 MB">
+  <!ENTITY PyYAML-time          "0.1 SBU">
+]>
+
+  <!-- Begin PyYAML -->
+  <sect2 id="PyYAML" xreflabel="PyYAML-&PyYAML-version;">
+
+    <title>PyYAML-&PyYAML-version;</title>
+
+    <indexterm zone="PyYAML">
+      <primary sortas="a-PyYAML">PyYAML</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to PyYAML Module</title>
+
+      <para>
+        <application>PyYAML</application> is a <application>Python</application>
+        module that implements the next generation YAML parser and emitter.
+      </para>
+
+      &lfs77_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&PyYAML-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&PyYAML-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &PyYAML-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &PyYAML-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &PyYAML-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &PyYAML-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">PyYAML Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="python2"/> and/or
+        <xref linkend="python3"/> and
+        <xref linkend="yaml"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/PyYAML"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of PyYAML</title>
+
+      <note>
+        <para>
+          Both <application>Python 2</application> and
+          <application>Python 3</application> modules can
+          be built and installed without any conflicts.
+        </para>
+      </note>
+
+      <para>
+        To build the <application>Python 2</application> module,
+        run the following command:
+      </para>
+
+<screen><userinput>python setup.py build</userinput></screen>
+
+      <para>
+        To install the <application>Python 2</application> module,
+        run the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>python setup.py install --optimize=1</userinput></screen>
+
+      <para>
+        To build the <application>Python 3</application> module,
+        run the following command:
+      </para>
+
+<screen><userinput>python3 setup.py build</userinput></screen>
+
+      <para>
+        To install the <application>Python 3</application> module,
+        run the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
+
+    </sect3>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Programs</segtitle>
+        <segtitle>Installed Libraries</segtitle>
+        <segtitle>Installed Directories</segtitle>
+
+        <seglistitem>
+          <seg>
+            None
+          </seg>
+          <seg>
+            _yaml.so
+          </seg>
+          <seg>
+            /usr/lib/python&python2-majorver;/site-packages/yaml and/or
+            /usr/lib/python&python3-majorver;/site-packages/yaml,
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
+  <!--End PyYAML -->
Index: neral/prog/setuptools-systemd.xml
===================================================================
--- general/prog/setuptools-systemd.xml	(revision 14ba5f44e63d70830e1827b8a4df93417c45f815)
+++ 	(revision )
@@ -1,141 +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 setuptools-download-http
-           "https://pypi.python.org/packages/source/s/setuptools/setuptools-&setuptools-version;.tar.gz">
-  <!ENTITY setuptools-download-ftp  " ">
-  <!ENTITY setuptools-md5sum        "7edec6cc30aca5518fa9bad42ff0179b">
-  <!ENTITY setuptools-size          "616 KB">
-  <!ENTITY setuptools-buildsize     "8.6 MB">
-  <!ENTITY setuptools-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin Setuptools -->
-  <sect2 id="setuptools" xreflabel="Setuptools-&setuptools-version;">
-
-    <title>Setuptools-&setuptools-version;</title>
-
-    <indexterm zone="setuptools">
-      <primary sortas="a-Setuptools">Setuptools</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Setuptools Module</title>
-
-      <para>
-        <application>Setuptools</application> is a <application>Python</application>
-        module that makes it easier to download, build, install, upgrade, and
-        uninstall <application>Python</application> packages.
-      </para>
-
-      &lfs77_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&setuptools-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&setuptools-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &setuptools-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &setuptools-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &setuptools-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &setuptools-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Setuptools Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="python2"/> and/or
-        <xref linkend="python3"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/setuptools"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Setuptools</title>
-
-      <note>
-        <para>
-          Both <application>Python 2</application> and
-          <application>Python 3</application> modules can
-          be built and installed without any conflicts.
-        </para>
-      </note>
-
-      <para>
-        To install the <application>Python 2</application> module,
-        run the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>python setup.py install --optimize=1</userinput></screen>
-
-      <para>
-        To install the <application>Python 3</application> module,
-        run the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            easy_install, easy_install-&python2-majorver;, and easy_install-&python3-majorver;
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python2-majorver;/site-packages/_markerlib,
-            /usr/lib/python&python2-majorver;/site-packages/setuptools,
-            /usr/lib/python&python2-majorver;/site-packages/setuptools-&setuptools-version;-py&python2-majorver;.egg-info and/or
-            /usr/lib/python&python3-majorver;/site-packages/_markerlib,
-            /usr/lib/python&python3-majorver;/site-packages/setuptools,
-            /usr/lib/python&python3-majorver;/site-packages/setuptools-&setuptools-version;-py&python3-majorver;.egg-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
-  <!--End Setuptools -->
Index: general/prog/setuptools.xml
===================================================================
--- general/prog/setuptools.xml	(revision 8cf08a1124bf7befb69d69cb3f90e4b9346bc9d7)
+++ general/prog/setuptools.xml	(revision 8cf08a1124bf7befb69d69cb3f90e4b9346bc9d7)
@@ -0,0 +1,141 @@
+<?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 setuptools-download-http
+           "https://pypi.python.org/packages/source/s/setuptools/setuptools-&setuptools-version;.tar.gz">
+  <!ENTITY setuptools-download-ftp  " ">
+  <!ENTITY setuptools-md5sum        "7edec6cc30aca5518fa9bad42ff0179b">
+  <!ENTITY setuptools-size          "616 KB">
+  <!ENTITY setuptools-buildsize     "8.6 MB">
+  <!ENTITY setuptools-time          "less than 0.1 SBU">
+]>
+
+  <!-- Begin Setuptools -->
+  <sect2 id="setuptools" xreflabel="Setuptools-&setuptools-version;">
+
+    <title>Setuptools-&setuptools-version;</title>
+
+    <indexterm zone="setuptools">
+      <primary sortas="a-Setuptools">Setuptools</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to Setuptools Module</title>
+
+      <para>
+        <application>Setuptools</application> is a <application>Python</application>
+        module that makes it easier to download, build, install, upgrade, and
+        uninstall <application>Python</application> packages.
+      </para>
+
+      &lfs77_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&setuptools-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&setuptools-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &setuptools-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &setuptools-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &setuptools-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &setuptools-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">Setuptools Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="python2"/> and/or
+        <xref linkend="python3"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/setuptools"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of Setuptools</title>
+
+      <note>
+        <para>
+          Both <application>Python 2</application> and
+          <application>Python 3</application> modules can
+          be built and installed without any conflicts.
+        </para>
+      </note>
+
+      <para>
+        To install the <application>Python 2</application> module,
+        run the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>python setup.py install --optimize=1</userinput></screen>
+
+      <para>
+        To install the <application>Python 3</application> module,
+        run the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
+
+    </sect3>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Programs</segtitle>
+        <segtitle>Installed Libraries</segtitle>
+        <segtitle>Installed Directories</segtitle>
+
+        <seglistitem>
+          <seg>
+            easy_install, easy_install-&python2-majorver;, and easy_install-&python3-majorver;
+          </seg>
+          <seg>
+            None
+          </seg>
+          <seg>
+            /usr/lib/python&python2-majorver;/site-packages/_markerlib,
+            /usr/lib/python&python2-majorver;/site-packages/setuptools,
+            /usr/lib/python&python2-majorver;/site-packages/setuptools-&setuptools-version;-py&python2-majorver;.egg-info and/or
+            /usr/lib/python&python3-majorver;/site-packages/_markerlib,
+            /usr/lib/python&python3-majorver;/site-packages/setuptools,
+            /usr/lib/python&python3-majorver;/site-packages/setuptools-&setuptools-version;-py&python3-majorver;.egg-info
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
+  <!--End Setuptools -->
Index: neral/prog/subversion-systemd.xml
===================================================================
--- general/prog/subversion-systemd.xml	(revision 14ba5f44e63d70830e1827b8a4df93417c45f815)
+++ 	(revision )
@@ -1,520 +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 subversion-download-http
-           "http://www.apache.org/dist/subversion/subversion-&subversion-version;.tar.bz2">
-  <!ENTITY subversion-download-ftp  " ">
-  <!ENTITY subversion-md5sum        "20ae7b0d4ef07eeaf73eb4e23317b495">
-  <!ENTITY subversion-size          "7.4 MB">
-  <!ENTITY subversion-buildsize     "130 MB (349 MB with all bindings and API documentation built; additional 703 MB for tests)">
-  <!ENTITY subversion-time          "1.1 SBU (2.9 SBU with all bindings and API documentation built; additional 11 SBU for tests)">
-]>
-
-<sect1 id="subversion" xreflabel="Subversion-&subversion-version;">
-  <?dbhtml filename="subversion.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy: krejzi $</othername>
-    <date>$Date: 2014-10-26 18:38:54 +0100 (Sun, 26 Oct 2014) $</date>
-  </sect1info>
-
-  <title>Subversion-&subversion-version;</title>
-
-  <indexterm zone="subversion">
-    <primary sortas="a-Subversion">Subversion</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Subversion</title>
-
-    <para>
-      <application>Subversion</application> is a version control system that is
-      designed to be a compelling replacement for <application>CVS</application>
-      in the open source community. It extends and enhances
-      <application>CVS</application>' feature set, while maintaining a similar
-      interface for those already familiar with <application>CVS</application>.
-      These instructions install the client and server software used to
-      manipulate a <application>Subversion</application> repository. Creation of
-      a repository is covered at <xref linkend="svnserver"/>.
-    </para>
-
-    &lfs78_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&subversion-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&subversion-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &subversion-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &subversion-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &subversion-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &subversion-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Subversion Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="apr-util"/> and
-      <xref linkend="sqlite"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="serf"/> (for handling http:// and https:// URLs)
-    </para>
-
-<!-- support for berkeley db is deprecated since 1.8
-    <note>
-      <para>
-        If you require the <application>Berkeley DB</application> back-end hooks
-        in <application>Subversion</application> to build or support BDB based
-        repositories, you must have <application>APR-util</application> linked to
-        the <application>Berkeley DB</application> library.
-      </para>
-    </note>
--->
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="apache"/>,
-<!-- support for berkeley db is deprecated since 1.8
-      <xref linkend="db"/>,
--->
-      <xref linkend="cyrus-sasl"/>,
-      <xref linkend="dbus"/>,
-      <xref linkend="kdelibs"/> (for <ulink url="http://utils.kde.org/projects/kwalletmanager/">KWallet</ulink> support),
-      <xref linkend="python2"/> (with sqlite support for the tests),
-      <xref linkend="ruby"/>, and
-      <xref linkend="swig"/> (for building Perl, Python and Ruby bindings)
-    </para>
-
-    <bridgehead renderas="sect4">Optional (for the Java Bindings)</bridgehead>
-    <para role="optional">
-      One of <xref linkend="openjdk"/>,
-      <ulink url="http://www.inet.no/dante/">Dante</ulink> or
-      <ulink url="http://oss.software.ibm.com/developerworks/opensource/jikes/">Jikes</ulink>,
-      and <xref linkend="junit"/> (to test the Java bindings)
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/subversion"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Subversion</title>
-
-    <para>
-      Install <application>Subversion</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static \
-            --with-apache-libexecdir &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have <xref linkend="doxygen"/> installed and you wish to build the
-      API documentation, issue: <command>doxygen doc/doxygen.conf</command>.
-    </para>
-
-    <para>
-      If you are using multiple jobs to compile packages, then fix a bug in the
-      <filename>Makefile</filename> will prevent the
-      <application>Perl</application> bindings from compiling correctly:
-    </para>
-
-<screen><userinput>sed -i 's#Makefile.PL.in$#&amp; libsvn_swig_perl#' Makefile.in</userinput></screen>
-
-    <para>
-      If you want to compile <application>Java</application>,
-      <application>Perl</application>,
-      <application>Python2</application> or
-      <application>Ruby</application>
-      bindings, issue any of the following commands:
-    </para>
-
-    <note>
-      <para>
-        Make sure that you have passed <option>--enable-javahl</option>
-        switch to <command>configure</command> before trying to build
-        the Java bindings.
-      </para>
-    </note>
-
-    <para>
-      For <application>Java</application> bindings:
-    </para>
-
-<screen><userinput>make javahl</userinput></screen>
-
-    <para>
-      For <application>Perl</application> bindings:
-    </para>
-
-<screen><userinput>make swig-pl</userinput></screen>
-
-    <para>
-      For <application>Python2</application> bindings:
-    </para>
-
-<screen><userinput>make swig-py \
-     swig_pydir=/usr/lib/python&python2-majorver;/site-packages/libsvn \
-     swig_pydir_extra=/usr/lib/python&python2-majorver;/site-packages/svn</userinput></screen>
-
-    <para>
-      For <application>Ruby</application> bindings:
-    </para>
-
-<screen><userinput>make swig-rb</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      To test the results of any of the <application>SWIG</application>
-      bindings, you can use any of the following commands:
-      <command>make check-javahl</command>,
-      <command>make check-swig-pl</command>,
-      <command> make check-swig-py</command> or
-      <command>make check-swig-rb</command>. Note you must have the
-      <application>JUnit</application> testing framework installed if
-      running the Java bindings tests.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make -j1 install &amp;&amp;
-install -v -dm755 /usr/share/doc/subversion-&subversion-version; &amp;&amp;
-cp      -rv       doc/* \
-                  /usr/share/doc/subversion-&subversion-version;</userinput></screen>
-
-    <para>
-      If you have built any of the <application>Java</application>,
-      <application>Perl</application>,
-      <application>Python2</application> or
-      <application>Ruby</application> bindings, issue any of the following
-      commands as the <systemitem class="username">root</systemitem> user
-      to install them:
-    </para>
-
-    <para>
-      For <application>Java</application> bindings:
-    </para>
-
-<screen role="root"><userinput>make install-javahl</userinput></screen>
-
-    <para>
-      For <application>Perl</application> bindings:
-    </para>
-
-<screen role="root"><userinput>make install-swig-pl</userinput></screen>
-
-    <para>
-      For <application>Python2</application> bindings:
-    </para>
-
-<screen role="root"><userinput>make install-swig-py \
-     swig_pydir=/usr/lib/python&python2-majorver;/site-packages/libsvn \
-     swig_pydir_extra=/usr/lib/python&python2-majorver;/site-packages/svn</userinput></screen>
-
-    <para>
-      For <application>Ruby</application> bindings:
-    </para>
-
-<screen role="root"><userinput>make install-swig-rb</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-apache-libexecdir</parameter>:
-      If <xref linkend="apache"/> is installed, the shared
-      <application>Apache</application> modules are
-      built. This switch allows to have those modules installed to
-      <application>Apache</application>'s configured module dir instead
-      of <filename class="directory">/usr/libexec</filename>. It has no effect
-      if <application>Apache</application> is not installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Subversion</title>
-
-    <sect3 id="subversion-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>~/.subversion/config</filename> and
-        <filename>/etc/subversion/config</filename>
-      </para>
-
-      <indexterm zone="subversion subversion-config">
-        <primary sortas="e-AA.subversion/config">~/.subversion/config</primary>
-      </indexterm>
-
-      <indexterm zone="subversion subversion-config">
-        <primary sortas="e-etc-subversion-config">/etc/subversion/config</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        <filename>/etc/subversion/config</filename> is the
-        <application>Subversion</application> system-wide configuration file.
-        This file is used to specify defaults for different
-        <command>svn</command> commands.
-      </para>
-
-      <para>
-        <filename>~/.subversion/config</filename> is the user's personal
-        configuration file. It is used to override the system-wide defaults set
-        in <filename>/etc/subversion/config</filename>.
-      </para>
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          svn, svnadmin, svndumpfilter, svnlook, svnmucc, svnrdump, svnserve,
-          svnsync, and svnversion
-        </seg>
-        <seg>
-          libsvn_*-1.so and optionally, a Java library, the mod_dav_svn.so and
-          and mod_authz_svn.so <application>Apache HTTP</application> DSO
-          modules and various <application>Perl</application>,
-          <application>Python</application> and
-          <application>Ruby</application> modules.
-        </seg>
-        <seg>
-          /usr/include/subversion-1,
-          /usr/lib/perl5/site_perl/&lfs-perl-version;/auto/SVN,
-          /usr/lib/perl5/site_perl/&lfs-perl-version;/SVN,
-          /usr/lib/python&python2-majorver;/site-packages/{libsvn,svn},
-          /usr/lib/ruby/site_ruby/&lt;x.y.z&gt;/&lt;arch-linux&gt;-linux/svn,
-          /usr/lib/ruby/site_ruby/&lt;x.y.z&gt;/svn,
-          /usr/lib/svn-javahl, and
-          /usr/share/doc/subversion-&subversion-version;
-<!--      /usr/lib/svn-python/libsvn (optional),
-          /usr/lib/svn-python/svn (optional),
--->
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="svn">
-        <term><command>svn</command></term>
-        <listitem>
-          <para>
-            is a command-line client program used to access
-            <application>Subversion</application> repositories.
-          </para>
-          <indexterm zone="subversion svn">
-            <primary sortas="b-svn">svn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="svnadmin">
-        <term><command>svnadmin</command></term>
-        <listitem>
-          <para>
-            is a tool for creating, tweaking or repairing a
-            <application>Subversion</application> repository.
-          </para>
-          <indexterm zone="subversion svnadmin">
-            <primary sortas="b-svnadmin">svnadmin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="svndumpfilter">
-        <term><command>svndumpfilter</command></term>
-        <listitem>
-          <para>
-            is a program for filtering <application>Subversion</application>
-            repository dumpfile format streams.
-          </para>
-          <indexterm zone="subversion svndumpfilter">
-            <primary sortas="b-svndumpfilter">svndumpfilter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="svnlook">
-        <term><command>svnlook</command></term>
-        <listitem>
-          <para>
-            is a tool for inspecting a <application>Subversion</application>
-            repository.
-          </para>
-          <indexterm zone="subversion svnlook">
-            <primary sortas="b-svnlook">svnlook</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="svnmucc">
-        <term><command>svnmucc</command></term>
-        <listitem>
-          <para>
-            is a Multiple URL Command Client for <application>Subversion</application>.
-          </para>
-          <indexterm zone="subversion svnmucc">
-            <primary sortas="b-svnmucc">svnmucc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="svnrdump">
-        <term><command>svnrdump</command></term>
-        <listitem>
-          <para>
-            is a tool for dumping or loading a remote
-            <application>Subversion</application> repository.
-          </para>
-          <indexterm zone="subversion svnrdump">
-            <primary sortas="b-svnrdump">svnrdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="svnserve">
-        <term><command>svnserve</command></term>
-        <listitem>
-          <para>
-            is a custom standalone server program, able to run as a daemon
-            process or invoked by SSH.
-          </para>
-          <indexterm zone="subversion svnserve">
-           <primary sortas="b-svnserve">svnserve</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="svnsync">
-        <term><command>svnsync</command></term>
-        <listitem>
-          <para>
-            is a <application>Subversion</application> repository
-            synchronisation tool.
-          </para>
-          <indexterm zone="subversion svnsync">
-           <primary sortas="b-svnsync">svnsync</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="svnversion">
-        <term><command>svnversion</command></term>
-        <listitem>
-          <para>
-            is used to report the version number and state of a working
-            <application>Subversion</application> repository copy.
-          </para>
-          <indexterm zone="subversion svnversion">
-            <primary sortas="b-svnversion">svnversion</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libsvn_star-1">
-        <term><filename class="libraryfile">libsvn_*-1.so</filename></term>
-        <listitem>
-          <para>
-            are the support libraries used by the
-            <application>Subversion</application> programs.
-          </para>
-          <indexterm zone="subversion libsvn_star-1">
-            <primary sortas="c-libsvn_star-1">libsvn_*-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mod_authz_svn">
-        <term><filename class="libraryfile">mod_authz_svn.so</filename></term>
-        <listitem>
-          <para>
-            is a plug-in module for the <application>Apache</application> HTTP
-            server, used to authenticate users to a
-            <application>Subversion</application> repository over the Internet
-            or an intranet.
-          </para>
-          <indexterm zone="subversion mod_authz_svn">
-            <primary sortas="c-mod_authz_svn">mod_authz_svn.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mod_dav_svn">
-        <term><filename class="libraryfile">mod_dav_svn.so</filename></term>
-        <listitem>
-          <para>
-            is a plug-in module for the <application>Apache</application> HTTP
-            server, used to make a <application>Subversion</application>
-            repository available to others over the Internet or an intranet.
-          </para>
-          <indexterm zone="subversion mod_dav_svn">
-            <primary sortas="c-mod_authz_svn">mod_dav_svn.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/prog/subversion.xml
===================================================================
--- general/prog/subversion.xml	(revision 14ba5f44e63d70830e1827b8a4df93417c45f815)
+++ general/prog/subversion.xml	(revision 8cf08a1124bf7befb69d69cb3f90e4b9346bc9d7)
@@ -8,8 +8,8 @@
            "http://www.apache.org/dist/subversion/subversion-&subversion-version;.tar.bz2">
   <!ENTITY subversion-download-ftp  " ">
-  <!ENTITY subversion-md5sum        "766a89bbbb388f8eb76166672d3b9e49">
-  <!ENTITY subversion-size          "6.6 MB">
-  <!ENTITY subversion-buildsize     "143 MB  (284 MB with all bindings and API documentation built; additional 968 MB for tests)">
-  <!ENTITY subversion-time          "0.9 SBU (Additional 30 SBU to build documentation, all bindings and to run full test suite.)">
+  <!ENTITY subversion-md5sum        "20ae7b0d4ef07eeaf73eb4e23317b495">
+  <!ENTITY subversion-size          "7.4 MB">
+  <!ENTITY subversion-buildsize     "130 MB (349 MB with all bindings and API documentation built; additional 703 MB for tests)">
+  <!ENTITY subversion-time          "1.1 SBU (2.9 SBU with all bindings and API documentation built; additional 11 SBU for tests)">
 ]>
 
@@ -42,5 +42,5 @@
     </para>
 
-    &lfs76_checked;
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -88,5 +88,4 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="openssl"/> and
       <xref linkend="serf"/> (for handling http:// and https:// URLs)
     </para>
@@ -199,6 +198,5 @@
 
     <para>
-      To test the results, issue: <command>make -k check</command>. One test
-      (wc-queries-test) is known to fail with recent versions of SQLite. 
+      To test the results, issue: <command>make check</command>.
     </para>
 
@@ -219,7 +217,7 @@
 
 <screen role="root"><userinput>make -j1 install &amp;&amp;
-install -v -m755 -d /usr/share/doc/subversion-&subversion-version; &amp;&amp;
-cp      -v -R       doc/* \
-                    /usr/share/doc/subversion-&subversion-version;</userinput></screen>
+install -v -dm755 /usr/share/doc/subversion-&subversion-version; &amp;&amp;
+cp      -rv       doc/* \
+                  /usr/share/doc/subversion-&subversion-version;</userinput></screen>
 
     <para>
@@ -339,15 +337,14 @@
         <seg>
           /usr/include/subversion-1,
-          /usr/lib/perl5/site_perl/&lfs-perl-version;/auto/SVN (optional),
-          /usr/lib/perl5/site_perl/&lfs-perl-version;/SVN (optional),
-          /usr/lib/python&python2-majorver;/site-packages/libsvn (optional),
-          /usr/lib/python&python2-majorver;/site-packages/svn (optional),
-          /usr/lib/ruby/site_ruby/&lt;x.y&gt;/i686-linux/svn (optional),
-          /usr/lib/ruby/site_ruby/&lt;x.y&gt;/svn (optional),
+          /usr/lib/perl5/site_perl/&lfs-perl-version;/auto/SVN,
+          /usr/lib/perl5/site_perl/&lfs-perl-version;/SVN,
+          /usr/lib/python&python2-majorver;/site-packages/{libsvn,svn},
+          /usr/lib/ruby/site_ruby/&lt;x.y.z&gt;/&lt;arch-linux&gt;-linux/svn,
+          /usr/lib/ruby/site_ruby/&lt;x.y.z&gt;/svn,
+          /usr/lib/svn-javahl, and
+          /usr/share/doc/subversion-&subversion-version;
 <!--      /usr/lib/svn-python/libsvn (optional),
           /usr/lib/svn-python/svn (optional),
 -->
-          /usr/lib/svn-javahl (optional), and
-          /usr/share/doc/subversion-&subversion-version;
         </seg>
       </seglistitem>
Index: neral/prog/svnserver-systemd.xml
===================================================================
--- general/prog/svnserver-systemd.xml	(revision 14ba5f44e63d70830e1827b8a4df93417c45f815)
+++ 	(revision )
@@ -1,281 +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="svnserver" xreflabel="Running a Subversion Server">
-  <?dbhtml filename="svnserver.html"?>
-
-  <sect1info>
-  <othername>$LastChangedBy$</othername>
-  <date>$Date$</date>
-  </sect1info>
-
-  <title>Running a Subversion Server</title>
-
-  <sect2 role="package">
-    <title>Running a Subversion Server</title>
-
-    <para>This section will describe how to set up, administer and secure
-    a <application>Subversion</application> server.</para>
-
-    <!-- <note>
-      <para>The default build instructions for
-      <application>Subversion</application> disabled the
-      <application>Berkeley DB</application> repository back-end due to the
-      errors encountered in the test suite while building the
-      <xref linkend="subversion"/> package. This should not present a
-      functionality issue as the FSFS repository back-end is now the default,
-      and recommended by the <application>Subversion</application> development
-      team.</para>
-
-      <para>If you have existing repositories based on a
-      <application>Berkeley DB</application> back-end and you followed the
-      BLFS instructions for building <application>Subversion</application>,
-      you'll need to dump the databases, create new repositories using the
-      FSFS back-end, then then reload the data into the new repositories.
-      Instructions for performing these operations can be found at <ulink
-      url="http://svnbook.red-bean.com/en/1.1/ch05s03.html#svn-ch-5-sect-3.5"/>.
-      </para>
-    </note> -->
-
-    <bridgehead renderas="sect3">Subversion Server Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="subversion"/> and
-    <xref linkend="openssh"/></para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Setting up a Subversion Server.</title>
-
-    <para>The following instructions will install a
-    <application>Subversion</application> server, which will be set up
-    to use <application>OpenSSH</application> as the secure remote access
-    method, with <command>svnserve</command> available for anonymous
-    access.</para>
-
-    <para>Configuration of the <application>Subversion</application> server
-    consists of the following steps:</para>
-
-    <sect3>
-      <title>1. Setup Users, Groups, and Permissions</title>
-
-      <para>You'll need to be user
-      <systemitem class='username'>root</systemitem> for the initial portion of
-      configuration. Create the <systemitem class="username">svn</systemitem>
-      user and group with the following commands:</para>
-
-<screen role="root"><userinput>groupadd -g 56 svn &amp;&amp;
-useradd -c "SVN Owner" -d /home/svn -m -g svn -s /bin/false -u 56 svn</userinput></screen>
-
-      <para>If you plan to have multiple repositories, you should have a
-      group dedicated to each repository for ease of administration. Create
-      the <systemitem class="groupname">svntest</systemitem> group for the test
-      repository and add the <systemitem class="username">svn</systemitem>
-      user to that group with the following commands:</para>
-
-<screen role="root"><userinput>groupadd -g 57 svntest &amp;&amp;
-usermod -G svntest -a svn</userinput></screen>
-
-    </sect3>
-
-    <sect3>
-      <title>2. Create a Subversion repository.</title>
-
-      <para>With subversion-1.1.0 and greater, a new type of repository
-      data-store is available, FSFS. There is a tradeoff for speed with
-      the new backend, however, the repository can now be placed on a
-      network mount, and any corruption does not require an admin to
-      recover the repository.  For more information and comparison between
-      FSFS and BDB, see <ulink
-      url="http://svnbook.red-bean.com/svnbook-1.1/ch05.html#svn-ch-5-sect-1.2.A"/>.
-      </para>
-
-      <para>Create a new <application>Subversion</application> repository with
-      the following commands:</para>
-
-<screen role="root"><userinput>install -v -m 0755 -d /srv/svn &amp;&amp;
-install -v -m 0755 -o svn -g svn -d /srv/svn/repositories &amp;&amp;
-svnadmin create --fs-type fsfs /srv/svn/repositories/svntest</userinput></screen>
-
-      <para>Now that the repository is created, it should be populated with
-      with something useful. You'll need to have a predefined directory
-      layout set up exactly as you want your repository to look. For
-      example, here is a sample BLFS layout setup with a root of
-      <filename>svntest/</filename>. You'll need to setup a directory
-      tree similar to the following:</para>
-
-<screen><literal>svntest/            # The name of the repository
-   trunk/           # Contains the existing source tree
-      BOOK/
-      bootscripts/
-      edguide/
-      patches/
-      scripts/
-   branches/        # Needed for additional branches
-   tags/            # Needed for tagging release points</literal></screen>
-
-      <para>Once you've created your directory layout as shown above, you
-      are ready to do the initial import:</para>
-
-<screen role="root"><userinput>svn import -m "Initial import." \
-    <replaceable>&lt;/path/to/source/tree&gt;</replaceable>      \
-    file:///srv/svn/repositories/svntest</userinput></screen>
-
-      <para>Now change owner and group information on the
-      repository, and add an unprivileged user to the
-      <systemitem class="groupname">svn</systemitem> and
-      <systemitem class="groupname">svntest</systemitem> groups:</para>
-
-<screen role="root"><userinput>chown -R svn:svntest /srv/svn/repositories/svntest    &amp;&amp;
-chmod -R g+w         /srv/svn/repositories/svntest    &amp;&amp;
-chmod g+s            /srv/svn/repositories/svntest/db &amp;&amp;
-usermod -G svn,svntest -a <replaceable>&lt;username&gt;</replaceable></userinput></screen>
-
-      <para><systemitem class="groupname">svntest</systemitem> is the group
-      assigned to the svntest repository. As mentioned earlier, this eases
-      administration of multiple repositories when using
-      <application>OpenSSH</application> for authentication. Going forward,
-      you'll need to add your unprivileged user, and any additional users that
-      you wish to have write access to the repository, to the
-      <systemitem class="groupname">svn</systemitem> and
-      <systemitem class="groupname">svntest</systemitem> groups.</para>
-
-      <para>In addition, you'll notice that the new repository's
-      <filename>db</filename> directory is set-groupID. If the reasoning is
-      not immediately obvious, when using any external authentication method
-      (such as <command>ssh</command>), the sticky bit is set so that all
-      new files will be owned by the user, but group of
-      <systemitem class="groupname">svntest</systemitem>. Anyone in the
-      <systemitem class="groupname">svntest</systemitem> group can create
-      files, but still give the entire group write access to those
-      files. This avoids locking out other users from the repository.</para>
-
-      <para>Now, return to an unprivileged user account, and take a
-      look at the new repository using <command>svnlook</command>:</para>
-
-<screen><userinput>svnlook tree /srv/svn/repositories/svntest/</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>
-
-    <sect3>
-      <title>3. Configure the Server</title>
-
-      <para>As mentioned previously, these instructions will configure the
-      server to use only <command>ssh</command> for write access to the
-      repository and to provide anonymous access using
-      <command>svnserve</command>. There are several other ways to provide
-      access to the repository. These additional configurations are best
-      explained at <ulink url="http://svnbook.red-bean.com/"/>.</para>
-
-      <para>Access configuration needs to be done for each repository.
-      Create the <filename>svnserve.conf</filename> file for the svntest
-      repository using the following commands:</para>
-
-<screen role="root"><userinput>cp /srv/svn/repositories/svntest/conf/svnserve.conf \
-   /srv/svn/repositories/svntest/conf/svnserve.conf.default &amp;&amp;
-
-cat &gt; /srv/svn/repositories/svntest/conf/svnserve.conf &lt;&lt; "EOF"
-<literal>[general]
-anon-access = read
-auth-access = write</literal>
-EOF</userinput></screen>
-
-      <para>There is not a lot to the configuration file at all. You'll
-      notice that only the general section is required. Take a look at the
-      <filename>svnserve.conf.default</filename> file for information on using
-      <command>svnserve</command>'s built-in authentication method.</para>
-
-    </sect3>
-
-    <sect3 id="svnserver-init">
-      <title>4. Starting the Server</title>
-<!--
-      <para>There are a couple of ways to start <command>svnserve</command>.
-      The most common way is to start it as an <command>inetd</command> or
-      <command>xinetd</command> process. Alternately, you can use a
-      bootscript to start the service at startup.</para>
-
-      <note>
-        <para>If you do not wish to provide anonymous access to your svn
-        repositories or use <command>svnserve</command>'s built-in
-        authentication, you do not need to run
-        <command>svnserve</command>.</para>
-      </note>
-
-      <para>If you use <command>inetd</command>, add a line to
-      <filename>/etc/inetd.conf</filename> using the following
-      commands:</para>
-
-      <indexterm zone="svnserver svnserver-init">
-        <primary sortas="e-etc-inetd.conf">/etc/inetd.conf</primary>
-      </indexterm>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/inetd.conf &lt;&lt; "EOF"
-<literal>svn stream tcp nowait svn /usr/bin/svnserve svnserve -i</literal>
-EOF</userinput></screen>
-
-      <para>If you use <command>xinetd</command>, the following command will
-      create the <application>Subversion</application> server file as
-      <filename>/etc/xinetd.d/svn</filename>:</para>
-
-      <indexterm zone="svnserver svnserver-init ">
-        <primary sortas="e-etc-xinetd.d-svn">/etc/xinetd.d/svn</primary>
-      </indexterm>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/xinetd.d/svn &lt;&lt; "EOF"
-<literal># Begin /etc/xinetd.d/svn
-
-service svn
-{
-        port                    = 3690
-        socket_type             = stream
-        protocol                = tcp
-        wait                    = no
-        user                    = svn
-        server                  = /usr/bin/svnserve
-        server_args             = -i -r /srv/svn/repositories
-}
-
-# End /etc/xinetd.d/svn</literal>
-EOF</userinput></screen> -->
-
-      <para>
-        To start the <command>svnserve</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="svnserver svnserver-init">
-        <primary sortas="f-svnserve">svnserve</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-svnserve</userinput></screen>
-
-      <para>Additionally, the instructions above require that svn server
-      uses <command>umask 002</command> so that all new files will
-      be writable by owner and group. This can be achieved by creating
-      a systemd unit override file by running the following command:</para>
-
-<screen role="root"><userinput>mkdir -p /etc/systemd/system/svnserve.service.d
-echo "UMask=0002" > /etc/systemd/system/svnserve.service.d/99-user.conf</userinput></screen>
-
-      <para>Options which are passed to <command>svnserve</command> daemon
-      can be changed in <filename>/etc/default/svnserve</filename>.</para>
-
-    </sect3>
-
-  </sect2>
-
-</sect1>
Index: general/prog/svnserver.xml
===================================================================
--- general/prog/svnserver.xml	(revision 8cf08a1124bf7befb69d69cb3f90e4b9346bc9d7)
+++ general/prog/svnserver.xml	(revision 8cf08a1124bf7befb69d69cb3f90e4b9346bc9d7)
@@ -0,0 +1,281 @@
+<?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="svnserver" xreflabel="Running a Subversion Server">
+  <?dbhtml filename="svnserver.html"?>
+
+  <sect1info>
+  <othername>$LastChangedBy$</othername>
+  <date>$Date$</date>
+  </sect1info>
+
+  <title>Running a Subversion Server</title>
+
+  <sect2 role="package">
+    <title>Running a Subversion Server</title>
+
+    <para>This section will describe how to set up, administer and secure
+    a <application>Subversion</application> server.</para>
+
+    <!-- <note>
+      <para>The default build instructions for
+      <application>Subversion</application> disabled the
+      <application>Berkeley DB</application> repository back-end due to the
+      errors encountered in the test suite while building the
+      <xref linkend="subversion"/> package. This should not present a
+      functionality issue as the FSFS repository back-end is now the default,
+      and recommended by the <application>Subversion</application> development
+      team.</para>
+
+      <para>If you have existing repositories based on a
+      <application>Berkeley DB</application> back-end and you followed the
+      BLFS instructions for building <application>Subversion</application>,
+      you'll need to dump the databases, create new repositories using the
+      FSFS back-end, then then reload the data into the new repositories.
+      Instructions for performing these operations can be found at <ulink
+      url="http://svnbook.red-bean.com/en/1.1/ch05s03.html#svn-ch-5-sect-3.5"/>.
+      </para>
+    </note> -->
+
+    <bridgehead renderas="sect3">Subversion Server Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para><xref linkend="subversion"/> and
+    <xref linkend="openssh"/></para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Setting up a Subversion Server.</title>
+
+    <para>The following instructions will install a
+    <application>Subversion</application> server, which will be set up
+    to use <application>OpenSSH</application> as the secure remote access
+    method, with <command>svnserve</command> available for anonymous
+    access.</para>
+
+    <para>Configuration of the <application>Subversion</application> server
+    consists of the following steps:</para>
+
+    <sect3>
+      <title>1. Setup Users, Groups, and Permissions</title>
+
+      <para>You'll need to be user
+      <systemitem class='username'>root</systemitem> for the initial portion of
+      configuration. Create the <systemitem class="username">svn</systemitem>
+      user and group with the following commands:</para>
+
+<screen role="root"><userinput>groupadd -g 56 svn &amp;&amp;
+useradd -c "SVN Owner" -d /home/svn -m -g svn -s /bin/false -u 56 svn</userinput></screen>
+
+      <para>If you plan to have multiple repositories, you should have a
+      group dedicated to each repository for ease of administration. Create
+      the <systemitem class="groupname">svntest</systemitem> group for the test
+      repository and add the <systemitem class="username">svn</systemitem>
+      user to that group with the following commands:</para>
+
+<screen role="root"><userinput>groupadd -g 57 svntest &amp;&amp;
+usermod -G svntest -a svn</userinput></screen>
+
+    </sect3>
+
+    <sect3>
+      <title>2. Create a Subversion repository.</title>
+
+      <para>With subversion-1.1.0 and greater, a new type of repository
+      data-store is available, FSFS. There is a tradeoff for speed with
+      the new backend, however, the repository can now be placed on a
+      network mount, and any corruption does not require an admin to
+      recover the repository.  For more information and comparison between
+      FSFS and BDB, see <ulink
+      url="http://svnbook.red-bean.com/svnbook-1.1/ch05.html#svn-ch-5-sect-1.2.A"/>.
+      </para>
+
+      <para>Create a new <application>Subversion</application> repository with
+      the following commands:</para>
+
+<screen role="root"><userinput>install -v -m 0755 -d /srv/svn &amp;&amp;
+install -v -m 0755 -o svn -g svn -d /srv/svn/repositories &amp;&amp;
+svnadmin create --fs-type fsfs /srv/svn/repositories/svntest</userinput></screen>
+
+      <para>Now that the repository is created, it should be populated with
+      with something useful. You'll need to have a predefined directory
+      layout set up exactly as you want your repository to look. For
+      example, here is a sample BLFS layout setup with a root of
+      <filename>svntest/</filename>. You'll need to setup a directory
+      tree similar to the following:</para>
+
+<screen><literal>svntest/            # The name of the repository
+   trunk/           # Contains the existing source tree
+      BOOK/
+      bootscripts/
+      edguide/
+      patches/
+      scripts/
+   branches/        # Needed for additional branches
+   tags/            # Needed for tagging release points</literal></screen>
+
+      <para>Once you've created your directory layout as shown above, you
+      are ready to do the initial import:</para>
+
+<screen role="root"><userinput>svn import -m "Initial import." \
+    <replaceable>&lt;/path/to/source/tree&gt;</replaceable>      \
+    file:///srv/svn/repositories/svntest</userinput></screen>
+
+      <para>Now change owner and group information on the
+      repository, and add an unprivileged user to the
+      <systemitem class="groupname">svn</systemitem> and
+      <systemitem class="groupname">svntest</systemitem> groups:</para>
+
+<screen role="root"><userinput>chown -R svn:svntest /srv/svn/repositories/svntest    &amp;&amp;
+chmod -R g+w         /srv/svn/repositories/svntest    &amp;&amp;
+chmod g+s            /srv/svn/repositories/svntest/db &amp;&amp;
+usermod -G svn,svntest -a <replaceable>&lt;username&gt;</replaceable></userinput></screen>
+
+      <para><systemitem class="groupname">svntest</systemitem> is the group
+      assigned to the svntest repository. As mentioned earlier, this eases
+      administration of multiple repositories when using
+      <application>OpenSSH</application> for authentication. Going forward,
+      you'll need to add your unprivileged user, and any additional users that
+      you wish to have write access to the repository, to the
+      <systemitem class="groupname">svn</systemitem> and
+      <systemitem class="groupname">svntest</systemitem> groups.</para>
+
+      <para>In addition, you'll notice that the new repository's
+      <filename>db</filename> directory is set-groupID. If the reasoning is
+      not immediately obvious, when using any external authentication method
+      (such as <command>ssh</command>), the sticky bit is set so that all
+      new files will be owned by the user, but group of
+      <systemitem class="groupname">svntest</systemitem>. Anyone in the
+      <systemitem class="groupname">svntest</systemitem> group can create
+      files, but still give the entire group write access to those
+      files. This avoids locking out other users from the repository.</para>
+
+      <para>Now, return to an unprivileged user account, and take a
+      look at the new repository using <command>svnlook</command>:</para>
+
+<screen><userinput>svnlook tree /srv/svn/repositories/svntest/</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>
+
+    <sect3>
+      <title>3. Configure the Server</title>
+
+      <para>As mentioned previously, these instructions will configure the
+      server to use only <command>ssh</command> for write access to the
+      repository and to provide anonymous access using
+      <command>svnserve</command>. There are several other ways to provide
+      access to the repository. These additional configurations are best
+      explained at <ulink url="http://svnbook.red-bean.com/"/>.</para>
+
+      <para>Access configuration needs to be done for each repository.
+      Create the <filename>svnserve.conf</filename> file for the svntest
+      repository using the following commands:</para>
+
+<screen role="root"><userinput>cp /srv/svn/repositories/svntest/conf/svnserve.conf \
+   /srv/svn/repositories/svntest/conf/svnserve.conf.default &amp;&amp;
+
+cat &gt; /srv/svn/repositories/svntest/conf/svnserve.conf &lt;&lt; "EOF"
+<literal>[general]
+anon-access = read
+auth-access = write</literal>
+EOF</userinput></screen>
+
+      <para>There is not a lot to the configuration file at all. You'll
+      notice that only the general section is required. Take a look at the
+      <filename>svnserve.conf.default</filename> file for information on using
+      <command>svnserve</command>'s built-in authentication method.</para>
+
+    </sect3>
+
+    <sect3 id="svnserver-init">
+      <title>4. Starting the Server</title>
+<!--
+      <para>There are a couple of ways to start <command>svnserve</command>.
+      The most common way is to start it as an <command>inetd</command> or
+      <command>xinetd</command> process. Alternately, you can use a
+      bootscript to start the service at startup.</para>
+
+      <note>
+        <para>If you do not wish to provide anonymous access to your svn
+        repositories or use <command>svnserve</command>'s built-in
+        authentication, you do not need to run
+        <command>svnserve</command>.</para>
+      </note>
+
+      <para>If you use <command>inetd</command>, add a line to
+      <filename>/etc/inetd.conf</filename> using the following
+      commands:</para>
+
+      <indexterm zone="svnserver svnserver-init">
+        <primary sortas="e-etc-inetd.conf">/etc/inetd.conf</primary>
+      </indexterm>
+
+<screen role="root"><userinput>cat &gt;&gt; /etc/inetd.conf &lt;&lt; "EOF"
+<literal>svn stream tcp nowait svn /usr/bin/svnserve svnserve -i</literal>
+EOF</userinput></screen>
+
+      <para>If you use <command>xinetd</command>, the following command will
+      create the <application>Subversion</application> server file as
+      <filename>/etc/xinetd.d/svn</filename>:</para>
+
+      <indexterm zone="svnserver svnserver-init ">
+        <primary sortas="e-etc-xinetd.d-svn">/etc/xinetd.d/svn</primary>
+      </indexterm>
+
+<screen role="root"><userinput>cat &gt;&gt; /etc/xinetd.d/svn &lt;&lt; "EOF"
+<literal># Begin /etc/xinetd.d/svn
+
+service svn
+{
+        port                    = 3690
+        socket_type             = stream
+        protocol                = tcp
+        wait                    = no
+        user                    = svn
+        server                  = /usr/bin/svnserve
+        server_args             = -i -r /srv/svn/repositories
+}
+
+# End /etc/xinetd.d/svn</literal>
+EOF</userinput></screen> -->
+
+      <para>
+        To start the <command>svnserve</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="svnserver svnserver-init">
+        <primary sortas="f-svnserve">svnserve</primary>
+      </indexterm>
+
+<screen role="root"><userinput>make install-svnserve</userinput></screen>
+
+      <para>Additionally, the instructions above require that svn server
+      uses <command>umask 002</command> so that all new files will
+      be writable by owner and group. This can be achieved by creating
+      a systemd unit override file by running the following command:</para>
+
+<screen role="root"><userinput>mkdir -p /etc/systemd/system/svnserve.service.d
+echo "UMask=0002" > /etc/systemd/system/svnserve.service.d/99-user.conf</userinput></screen>
+
+      <para>Options which are passed to <command>svnserve</command> daemon
+      can be changed in <filename>/etc/default/svnserve</filename>.</para>
+
+    </sect3>
+
+  </sect2>
+
+</sect1>
Index: packages.ent
===================================================================
--- packages.ent	(revision 14ba5f44e63d70830e1827b8a4df93417c45f815)
+++ packages.ent	(revision 8cf08a1124bf7befb69d69cb3f90e4b9346bc9d7)
@@ -289,4 +289,5 @@
 <!ENTITY npapi-sdk-version            "0.27.2">
 <!ENTITY php-version                  "5.6.12">
+<!ENTITY pyatspi2-version             "2.16.0">
 <!ENTITY python2-version              "2.7.10">
 <!ENTITY python3-version              "3.5.0">
@@ -352,5 +353,9 @@
 
 <!-- Python module versions used in the Python Modules instructions -->
+<!ENTITY Beaker-version               "1.7.0">
 <!ENTITY dbus-python-version          "1.2.0">
+<!ENTITY Jinja2-version               "2.7.3">
+<!ENTITY Mako-version                 "1.0.1">
+<!ENTITY MarkupSafe-version           "0.23">
 <!ENTITY py2cairo-version             "1.10.0">
 <!ENTITY pycairo-version              "1.10.0">
@@ -359,4 +364,6 @@
 <!ENTITY pygtk-version                "2.24.0">
 <!ENTITY pyxdg-version                "0.25">
+<!ENTITY PyYAML-version               "3.11">
+<!ENTITY setuptools-version           "17.1.1">
 
 <!-- Part IV -->
Index: systemd.ent
===================================================================
--- systemd.ent	(revision 14ba5f44e63d70830e1827b8a4df93417c45f815)
+++ systemd.ent	(revision 8cf08a1124bf7befb69d69cb3f90e4b9346bc9d7)
@@ -20,5 +20,5 @@
 <!--<!ENTITY libxkbcommon-version         "0.5.0">-->
 <!--<!ENTITY ModemManager-version         "1.4.10">-->
-<!ENTITY pyatspi2-version             "2.16.0">
+<!-- <!ENTITY pyatspi2-version             "2.16.0">-->
 <!--<!ENTITY qtchooser-version            "39">-->
 <!ENTITY sound-theme-freedesktop-version "0.8">
@@ -28,5 +28,5 @@
 <!--<!ENTITY weston-version               "1.8.0">-->
 <!--<!ENTITY yaml-version                 "0.1.6">-->
-
+<!--
 <!ENTITY Beaker-version               "1.7.0">
 <!ENTITY Jinja2-version               "2.7.3">
@@ -35,5 +35,5 @@
 <!ENTITY setuptools-version           "17.1.1">
 <!ENTITY PyYAML-version               "3.11">
-
+-->
 <!ENTITY % kde5-package-entities SYSTEM      "kde5/kde5.ent">
 %kde5-package-entities;
