Index: general.ent
===================================================================
--- general.ent	(revision 6d15c62929a1239f9320aa1855925f43d72bea01)
+++ general.ent	(revision 08f1ff78b1f54da166531ce583bb8c8ada84af80)
@@ -4,5 +4,5 @@
 -->
 
-<!ENTITY day          "03">                   <!-- Always 2 digits -->
+<!ENTITY day          "04">                   <!-- Always 2 digits -->
 <!ENTITY month        "11">                   <!-- Always 2 digits -->
 <!ENTITY year         "2011">
@@ -10,5 +10,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "svn-&year;&month;&day;">
-<!ENTITY releasedate  "November 3rd, &year;">
+<!ENTITY releasedate  "November 4th, &year;">
 <!-- <!ENTITY releasedate  "November &day;st, &year;"> -->
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
@@ -159,5 +159,5 @@
 <!ENTITY libgtkhtml-version           "2.11.1">
 <!ENTITY GLib-version                 "1.2.10">
-<!ENTITY glib2-version                "2.24.2">
+<!ENTITY glib2-version                "2.31.0">
 <!ENTITY glibmm-version               "2.24.2">
 <!ENTITY libidl-version               "0.8.14">
@@ -313,5 +313,5 @@
 <!ENTITY lzma-utils-version           "4.32.7">
 -->
-<!ENTITY pkgconfig-version            "0.23">
+<!ENTITY pkgconfig-version            "0.26">
 
 <!-- Chapter 12 -->
Index: general/genlib/glib2.xml
===================================================================
--- general/genlib/glib2.xml	(revision 6d15c62929a1239f9320aa1855925f43d72bea01)
+++ general/genlib/glib2.xml	(revision 08f1ff78b1f54da166531ce583bb8c8ada84af80)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY glib2-download-http "&gnome-download-http;/glib/2.24/glib-&glib2-version;.tar.bz2">
-  <!ENTITY glib2-download-ftp  "ftp://ftp.gtk.org/pub/glib/2.24/glib-&glib2-version;.tar.bz2">
-  <!ENTITY glib2-md5sum        "8a6e45d7840460ed84288ebfd75782d4">
-  <!ENTITY glib2-size          "5.3 MB">
-  <!ENTITY glib2-buildsize     "106 MB">
+  <!ENTITY glib2-download-http "&gnome-download-http;/glib/2.31/glib-&glib2-version;.tar.bz2">
+  <!ENTITY glib2-download-ftp  "ftp://ftp.gtk.org/pub/glib/2.31/glib-&glib2-version;.tar.bz2">
+  <!ENTITY glib2-md5sum        "3806d113305cdb5193174de5d354294e">
+  <!ENTITY glib2-size          "5.6 MB">
+  <!ENTITY glib2-buildsize     "179 MB">
   <!ENTITY glib2-time          "1.5 SBU (additional 4.0 SBU to run the test suite)">
 ]>
@@ -35,4 +35,6 @@
     event loop, threads, dynamic loading, and an object system.</para>
 
+    &lfs70_checked;
+
     <!-- Compiled against PCRE, Python, and desktop-file-utils.
          1 test failed (regex) -->
@@ -62,6 +64,8 @@
     <bridgehead renderas="sect3">GLib Dependencies</bridgehead>
 
-    <!-- <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="pkgconfig"/></para> -->
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="libffi"/> and ><xref linkend="python"/>
+    <!--<para role="required"><xref linkend="pkgconfig"/> -->
+    </para> 
 
     <!-- This should be discussed as the instructions in the tarball give
@@ -72,17 +76,14 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="attr"/>,
-    <xref linkend="gamin"/>, and
+    <para role="optional"><xref linkend="attr"/>
+    <!-- <xref linkend="gamin"/>, -->and
     <xref linkend="gtk-doc"/></para>
 
+    <!-- Couldn't find this 
     <para><application>Gamin</application> requires
     <application>GLib</application> in order to compile; therefore, you must
     first install <application>GLib</application>, then compile
     <application>Gamin</application>, and recompile
-    <application>GLib</application> against it.</para>
-
-    <bridgehead renderas="sect4">Optional Runtime Dependency for the
-    <command>gtester-report</command> program</bridgehead>
-    <para role="optional"><xref linkend="python"/></para>
+    <application>GLib</application> against it.</para> -->
 
     <bridgehead renderas="sect4">Additional Runtime Dependencies</bridgehead>
@@ -107,6 +108,7 @@
     <!-- This should be discussed as the instructions in the tarball give
          many reasons why the internal PCRE should be used -->
-<screen><userinput>./configure --prefix=/usr \
-            --with-pcre=system &amp;&amp;
+<screen><userinput>PCRE_LIBS=-lpcre  PCRE_CFLAGS=" "                                \
+LIBFFI_LIBS=-lffi LIBFFI_CFLAGS=-I/usr/lib/libffi-3.0.10/include \    
+./configure --prefix=/usr --with-pcre=system &amp;&amp;
 make</userinput></screen>
 
@@ -121,5 +123,5 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
-chmod -v 755 /usr/bin/gtester-report</userinput></screen>
+ln -v -sfn ../../lib/glib-2.0/include/glibconfig.h /usr/include/glib-2.0/glibconfig.h</userinput></screen>
 
     <para>You should now install <xref linkend="desktop-file-utils"/> and proceed to
@@ -132,4 +134,13 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para>PCRE_* and LIBFFI_*: <application>Glib</application> is a prerequsite
+    for <application>pkg_config</application>, but it wants to use
+    <application>pkg_config</application> during the build process.  These
+    environment variables work around not having
+    <application>pkg_config</application> available.</para>
+
+    <para><command>ln -v -sfn ... glibconfig.h</command>: Place a link to an
+    architecture dependent header file where programs can find it.</para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -142,8 +153,4 @@
     <application>PCRE</application> library instead of an internal
     version.</para>
-
-    <!-- Not required any longer; static libs are not installed by default
-    <para><parameter>-disable-static</parameter>: prevent static libraries
-    being built and installed.</para> -->
 
   </sect2>
Index: general/genlib/libffi.xml
===================================================================
--- general/genlib/libffi.xml	(revision 6d15c62929a1239f9320aa1855925f43d72bea01)
+++ general/genlib/libffi.xml	(revision 08f1ff78b1f54da166531ce583bb8c8ada84af80)
@@ -35,5 +35,5 @@
     description at run time.</para>
 
-    &lfs65_checked;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/genutils/genutils.xml
===================================================================
--- general/genutils/genutils.xml	(revision 6d15c62929a1239f9320aa1855925f43d72bea01)
+++ general/genutils/genutils.xml	(revision 08f1ff78b1f54da166531ce583bb8c8ada84af80)
@@ -45,4 +45,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rarian.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ggz-client-libs.xml"/>
 
 </chapter>
Index: general/genutils/ggz-client-libs.xml
===================================================================
--- general/genutils/ggz-client-libs.xml	(revision 08f1ff78b1f54da166531ce583bb8c8ada84af80)
+++ general/genutils/ggz-client-libs.xml	(revision 08f1ff78b1f54da166531ce583bb8c8ada84af80)
@@ -0,0 +1,174 @@
+<?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 ggz-client-libs-download-http "http://mirrors.ibiblio.org/pub/mirrors/ggzgamingzone/ggz/&ggz-client-libs-version;/ggz-client-libs-&ggz-client-libs-version;.tar.gz">
+  <!ENTITY ggz-client-libs-download-ftp  "ftp://ftp.belnet.be/packages/ggzgamingzone/ggz/&ggz-client-libs-version;/ggz-client-libs-&ggz-client-libs-version;.tar.gz">
+  <!ENTITY ggz-client-libs-md5sum        "299eaa93721b1d867b5bf7dc6ac764b0">
+  <!ENTITY ggz-client-libs-size          "600 KB">
+  <!ENTITY ggz-client-libs-buildsize     "8 MB">
+  <!ENTITY ggz-client-libs-time          "0.2 SBU">
+]>
+
+<sect1 id="ggz-client-libs" xreflabel="ggz-client-libs-&ggz-client-libs-version;">
+  <?dbhtml filename="ggz-client-libs.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>ggz-client-libs-&ggz-client-libs-version;</title>
+
+  <indexterm zone="ggz-client-libs">
+    <primary sortas="a-ggz-client-libs">ggz-client-libs</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to ggz-client-libs</title>
+
+    <para>The <application>ggz-client-libs</application> package provides the
+    common procedures and utilities required to run the GGZ client and games.
+    The routines are shared by other modules in order to ease coding and promote
+    compatibility and stability.</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&ggz-client-libs-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&ggz-client-libs-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &ggz-client-libs-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &ggz-client-libs-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &ggz-client-libs-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &ggz-client-libs-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">ggz-client-libs Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="expat"/> and
+    <xref linkend="libggz"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/ggz-client-libs"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of ggz-client-libs</title>
+
+    <para>Install <application>ggz-client-libs</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc &amp;&amp;
+make</userinput></screen>
+
+    <para>To test the results, issue: <command>make check</command>.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>ggz, ggz-config, ggz-wrapper, and ggzwrap</seg>
+        <seg>libggzcore.{so,a} and libggzmod.{so,a}</seg>
+        <seg>/usr/lib/ggz</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="ggz">
+        <term><command>ggz</command></term>
+        <listitem>
+          <para>is the GGZ Gaming Zone core client selector.</para>
+          <indexterm zone="ggz-client-libs ggz">
+            <primary sortas="b-ggz">ggz</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ggz-config">
+        <term><command>ggz-config</command></term>
+        <listitem>
+          <para>is the GGZ Gaming Zone configuration manager.</para>
+          <indexterm zone="ggz-client-libs ggz-config">
+            <primary sortas="b-ggz-config">ggz-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ggz-wrapper">
+        <term><command>ggz-wrapper</command></term>
+        <listitem>
+          <para>is the GGZ Gaming Zone command line core client.</para>
+          <indexterm zone="ggz-client-libs ggz-wrapper">
+            <primary sortas="b-ggz-wrapper">ggz-wrapper</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ggzwrap">
+        <term><command>ggzwrap</command></term>
+        <listitem>
+          <para>is the GGZ Gaming Zone game client wrapper.</para>
+          <indexterm zone="ggz-client-libs ggzwrap">
+            <primary sortas="b-ggzwrap">ggzwrap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libggzcore">
+        <term><filename class='libraryfile'>libggzcore.{so,a}</filename></term>
+        <listitem>
+          <para>handles the connection of a client application to the GGZ
+          server.</para>
+          <indexterm zone="ggz-client-libs libggzcore">
+            <primary sortas="c-libggzcore">libggzcore.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libggzmod">
+        <term><filename class='libraryfile'>libggzmod.{so,a}</filename></term>
+        <listitem>
+          <para>facilitates the messaging from and to a GGZ core client in a
+          game client.</para>
+          <indexterm zone="ggz-client-libs libggzmod">
+            <primary sortas="c-libggzmod">libggzmod.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/prog/cmake.xml
===================================================================
--- general/prog/cmake.xml	(revision 08f1ff78b1f54da166531ce583bb8c8ada84af80)
+++ general/prog/cmake.xml	(revision 08f1ff78b1f54da166531ce583bb8c8ada84af80)
@@ -0,0 +1,175 @@
+<?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/v2.8/cmake-&cmake-version;.tar.gz">
+  <!ENTITY cmake-download-ftp  " ">
+  <!ENTITY cmake-md5sum        "2147da452fd9212bb9b4542a9eee9d5b">
+  <!ENTITY cmake-size          "5.3 MB">
+  <!ENTITY cmake-buildsize     "303 MB (including tests)">
+  <!ENTITY cmake-time          "4.1 SBU (including 2.5 SBU test time)">
+]>
+
+<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 <filename>Makefile</filename>s. It is a successor of the auto-generated
+    <command>configure</command> script.</para>
+
+    &lfs70_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">Required</bridgehead>
+    <para role="required">
+      <xref linkend="curl"/>, 
+      <xref linkend="libarchive"/>, and 
+      <xref linkend="expat"/>
+    </para>
+
+    <bridgehead renderas="sect4">Options</bridgehead>
+    <para role="optional">
+      <xref linkend="subversion"/> (for testing)
+    </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 \
+            --docdir=/share/doc/cmake-&cmake-version; &amp;&amp;
+make</userinput></screen>
+
+    <para>To test the results, issue: <userinput>make test</userinput>.
+    The SVN test may fail.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><option>--system-libs</option>: This option forces the build system
+    to link against <application>Zlib</application>, <application>Bzip2</application>, 
+    <application>cURL</application> and <application>Expat</application> installed 
+    on the system.</para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>ctest, cpack, ccmake, and cmake</seg>
+        <seg>None</seg>
+        <seg>/usr/share/cmake-&cmake-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="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>
+
+      <varlistentry id="cpack">
+        <term><command>cpack</command></term>
+        <listitem>
+          <para>is the CMake packaging program.</para>
+          <indexterm zone="cmake cpack">
+            <primary sortas="b-cpack">cpack</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ccmake">
+        <term><command>ccmake</command></term>
+        <listitem>
+          <para>is a curses based interactive frontend to cmake.</para>
+          <indexterm zone="cmake ccmake">
+            <primary sortas="b-ccmake">ccmake</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="c_make">
+        <term><command>cmake</command></term>
+        <listitem>
+          <para>is the makefile generator.</para>
+          <indexterm zone="cmake c_make">
+            <primary sortas="b-cmake">cmake</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/prog/cvs.xml
===================================================================
--- general/prog/cvs.xml	(revision 08f1ff78b1f54da166531ce583bb8c8ada84af80)
+++ general/prog/cvs.xml	(revision 08f1ff78b1f54da166531ce583bb8c8ada84af80)
@@ -0,0 +1,272 @@
+<?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 cvs-download-http "http://ftp.gnu.org/non-gnu/cvs/source/stable/&cvs-version;/cvs-&cvs-version;.tar.bz2">
+  <!ENTITY cvs-download-ftp  "ftp://ftp.gnu.org/non-gnu/cvs/source/stable/&cvs-version;/cvs-&cvs-version;.tar.bz2">
+  <!ENTITY cvs-md5sum        "0213ea514e231559d6ff8f80a34117f0">
+  <!ENTITY cvs-size          "2.9 MB">
+  <!ENTITY cvs-buildsize     "32.3 MB">
+  <!ENTITY cvs-time          "0.3 SBU (additional ~20 SBU to run the test suite)">
+]>
+
+<sect1 id="cvs" xreflabel="CVS-&cvs-version;">
+  <?dbhtml filename="cvs.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>CVS-&cvs-version;</title>
+
+  <indexterm zone="cvs">
+    <primary sortas="a-CVS">CVS</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to CVS</title>
+
+    <para><application>CVS</application> is the Concurrent Versions System.
+    This is a version control system useful for projects using a central
+    repository to hold files and then track all changes made to those files.
+    These instructions install the client used to manipulate the repository,
+    creation of a repository is covered at <xref linkend="cvsserver"/>.</para>
+
+    <para>&lfssvn_checked;20101029&lfssvn_checked2;</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&cvs-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&cvs-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &cvs-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &cvs-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &cvs-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &cvs-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Recommended patch: <ulink
+        url="&patch-root;/cvs-&cvs-version;-zlib-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">CVS Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><!-- <xref linkend="gdbm"/>, -->
+    <xref linkend="tcsh"/>,
+    <xref linkend="openssh"/>,
+    <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>,
+    <xref linkend="mitkrb"/> or <xref linkend="heimdal"/>
+    (for the GSSAPI libraries),
+    <xref linkend="gs"/><!-- or <xref linkend="espgs"/> -->, and
+    an <xref linkend="server-mail"/> (that provides a
+    <command>sendmail</command> command)</para>
+
+    <para><application>CVS</application> will invoke a default text editor to
+    create a commit message if the <parameter>-m "Commit message"</parameter>
+    parameter was not used when changes are committed to a repository.
+    <application>CVS</application> looks for the following text editors, in the
+    order shown below, during configuration to determine the default. This
+    default can always be overridden by the <envar>CVSEDITOR</envar> or
+    <envar>EDITOR</envar> environment variables and can be specified directly
+    by passing the <option>--with-editor=<replaceable>&lt;desired text
+    editor&gt;</replaceable></option> parameter to the
+    <command>configure</command> script.</para>
+
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para><xref linkend="vim"/></para>
+      </listitem>
+      <listitem>
+        <para><xref linkend="emacs"/></para>
+      </listitem>
+      <listitem>
+        <para><xref linkend="nano"/></para>
+      </listitem>
+      <listitem>
+        <para><xref linkend="pine"/> (for Pico)</para>
+      </listitem>
+    </itemizedlist>
+
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/cvs"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of CVS</title>
+
+    <para>By default <application>CVS</application> is statically linked
+    against the <application>Zlib</application> library included in its source
+    tree. This makes it exposed to possible security vulnerabilities in that
+    library. If you want to modify <application>CVS</application> to use the
+    system shared <application>Zlib</application> library, apply the following
+    patch:</para>
+
+<screen><userinput>patch -Np1 -i ../cvs-&cvs-version;-zlib-1.patch</userinput></screen>
+
+    <para>Install <application>CVS</application> by running
+    the following commands:</para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+    <para>If you have <xref linkend="tetex"/> or <xref linkend="texlive"/>
+    installed and wish to create DVI, Postscript, HTML or text docs from the
+    documentation source files, issue the following command:</para>
+
+<screen><userinput>make -C doc html txt dvi ps</userinput></screen>
+
+    <para>To test the results, issue: <command>make check</command>. This will
+    take quite a while. If you don't have <command>rsh</command> configured for
+    access to the host you are building on (or you didn't pass the
+    <option>--with-rsh=</option> parameter to the <command>configure</command>
+    script, some tests may fail. If you passed the
+    <option>--with-rsh=ssh</option> parameter to enable <command>ssh</command>
+    as the default remote shell program, you'll need to issue the following
+    command so that the tests will complete without any failures:</para>
+
+<screen><userinput>sed -e 's/rsh};/ssh};/' \
+    -e 's/g=rw,o=r$/g=r,o=r/' \
+    -i src/sanity.sh</userinput></screen>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role='root'><userinput>make install &amp;&amp;
+install -v -m755 -d /usr/share/doc/cvs-&cvs-version; &amp;&amp;
+install -v -m644 FAQ README /usr/share/doc/cvs-&cvs-version; &amp;&amp;
+install -v -m644 doc/*.pdf /usr/share/doc/cvs-&cvs-version;</userinput></screen>
+
+    <para>If you created any additional documentation, install it by issuing
+    the following commands as the
+    <systemitem class="username">root</systemitem> user:</para>
+
+<screen role='root'><userinput>install -v -m644 doc/*.{ps,dvi,txt} /usr/share/doc/cvs-&cvs-version; &amp;&amp;
+install -v -m755 -d /usr/share/doc/cvs-&cvs-version;/html/cvs{,client} &amp;&amp;
+install -v -m644 doc/cvs.html/* \
+                 /usr/share/doc/cvs-&cvs-version;/html/cvs &amp;&amp;
+install -v -m644 doc/cvsclient.html/* \
+                 /usr/share/doc/cvs-&cvs-version;/html/cvsclient</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring CVS</title>
+
+    <sect3 id="cvs-config">
+      <title>Config Files</title>
+
+      <para><filename>~/.cvsrc</filename>, <filename>~/.cvswrappers</filename>,
+      and <filename>~/.cvspass</filename>.</para>
+
+      <indexterm zone="cvs cvs-config">
+        <primary sortas="e-AA.cvsrc">~/.cvsrc</primary>
+      </indexterm>
+
+      <indexterm zone="cvs cvs-config">
+        <primary sortas="e-AA.cvswrappers">~/.cvswrappers</primary>
+      </indexterm>
+
+      <indexterm zone="cvs cvs-config">
+        <primary sortas="e-AA.cvspass">~/.cvspass</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para><filename>~/.cvsrc</filename> is the main
+      <application>CVS</application> configuration file.
+      This file is used by users to specify defaults for different
+      <command>cvs</command> commands. For example, to make all
+      <command>cvs diff</command> commands run with <option>-u</option>, a user
+      would add <option>diff -u</option> to their <filename>.cvsrc</filename>
+      file.</para>
+
+      <para><filename>~/.cvswrappers</filename> specifies wrappers to be used in
+      addition to those specified in the <filename>CVSROOT/cvswrappers</filename>
+      file in the repository.</para>
+
+      <para><filename>~/.cvspass</filename> contains passwords used to complete
+      logins to servers.</para>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>cvs, cvsbug, and rcs2log</seg>
+        <seg>None</seg>
+        <seg>/usr/share/cvs and /usr/share/doc/cvs-&cvs-version;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="cvs-prog">
+        <term><command>cvs</command></term>
+        <listitem>
+          <para>is the main program file for the concurrent versions system.</para>
+          <indexterm zone="cvs cvs-prog">
+            <primary sortas="b-cvs">cvs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cvsbug">
+        <term><command>cvsbug</command></term>
+        <listitem>
+          <para>is used to send problem reports about <application>CVS</application>
+          to a central support site.</para>
+          <indexterm zone="cvs cvsbug">
+            <primary sortas="b-cvsbug">cvsbug</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rcs2log">
+        <term><command>rcs2log</command></term>
+        <listitem>
+          <para>is a symlink to the contributed RCS to Change Log
+          generator.</para>
+          <indexterm zone="cvs rcs2log">
+            <primary sortas="b-rcs2log">rcs2log</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/prog/pdl.xml
===================================================================
--- general/prog/pdl.xml	(revision 6d15c62929a1239f9320aa1855925f43d72bea01)
+++ general/prog/pdl.xml	(revision 08f1ff78b1f54da166531ce583bb8c8ada84af80)
@@ -107,10 +107,10 @@
     to install a <application>GCC</application>-3.4.6 compiler on the
     <ulink url="&blfs-wiki;/gcc3">BLFS
-    Wiki</ulink>. Alternatively, if you have a need to install
+    Wiki</ulink>. <!-- Alternatively, if you have a need to install
     <xref linkend="gcc3"/>, you can add the Fortran compiler to the list of
     compilers installed in those instructions. Don't forget to put the
     directory containing the <command>{g,f}77</command> commands at the
     beginning of your <envar>PATH</envar> environment variable before
-    beginning the compilation.</para>
+    beginning the compilation.--> </para>
 
     <bridgehead renderas="sect4">PDL::NiceSlice</bridgehead>
Index: general/prog/pkgconfig.xml
===================================================================
--- general/prog/pkgconfig.xml	(revision 08f1ff78b1f54da166531ce583bb8c8ada84af80)
+++ general/prog/pkgconfig.xml	(revision 08f1ff78b1f54da166531ce583bb8c8ada84af80)
@@ -0,0 +1,155 @@
+<?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 pkgconfig-download-http "http://pkgconfig.freedesktop.org/releases/pkg-config-&pkgconfig-version;.tar.gz">
+  <!ENTITY pkgconfig-download-ftp  "&gentoo-ftp-repo;/pkg-config-&pkgconfig-version;.tar.gz">
+  <!ENTITY pkgconfig-md5sum        "47525c26a9ba7ba14bf85e01509a7234">
+  <!ENTITY pkgconfig-size          "392 KB">
+  <!ENTITY pkgconfig-buildsize     "3 MB">
+  <!ENTITY pkgconfig-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="pkgconfig" xreflabel="pkg-config-&pkgconfig-version;">
+  <?dbhtml filename="pkgconfig.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>pkg-config-&pkgconfig-version;</title>
+
+  <indexterm zone="pkgconfig">
+    <primary sortas="a-Pkg-config">Pkg-config</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to pkg-config</title>
+
+    <para>The <application>pkg-config</application> package contains a tool for
+    passing the include path and/or library paths to build tools during the
+    <command>configure</command> and <command>make</command> file
+    execution.</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&pkgconfig-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&pkgconfig-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &pkgconfig-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &pkgconfig-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &pkgconfig-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &pkgconfig-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Pkg-config Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="GLib"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/pkgconfig"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of pkg-config</title>
+
+    <para>Fix a problem with one of Pkg-config's tests:</para>
+
+<screen><userinput>sed -i -e '21s/EXPECT_RETURN=1/EXPECT_RETURN=0/' check/check-cmd-options</userinput></screen>
+
+    <para>Install <application>pkg-config</application> by running the
+    following commands:</para>
+
+<screen><userinput>GLIB_LIBS=-lglib-2.0  GLIB_CFLAGS=-I/usr/include/glib-2.0  \
+./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+    <note><para>The make phase is known to fail if the configure option
+    '<option>--with-installed-popt</option>' is used with <xref
+    linkend="popt"/>.</para></note>
+
+    <para>To test the results, issue: <command>make check</command>. The
+    <quote>check-requires-private</quote> test has been known to fail for
+    undetermined reasons.</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>--with-installed-glib</parameter>: This parameter causes
+    the package to use the installed glib2. This is to get rid of the internally used
+    glib-1.</para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring pkg-config</title>
+
+    <para>The default setting for <envar>PKG_CONFIG_PATH</envar> is <filename
+    class='directory'>/usr/lib/pkgconfig:/usr/share/pkgconfig</filename>
+    because of the prefix used to install
+    <application>pkg-config</application>. You may add to
+    <envar>PKG_CONFIG_PATH</envar> by exporting additional paths on your system
+    where <filename class='extension'>.pc</filename> files are installed. Note
+    that <envar>PKG_CONFIG_PATH</envar> is only needed when compiling packages,
+    not during run-time.</para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>pkg-config</seg>
+        <seg>None</seg>
+        <seg>None</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="pkg-config">
+        <term><command>pkg-config</command></term>
+        <listitem>
+          <para>returns meta information for the specified library or
+          package.</para>
+          <indexterm zone="pkgconfig pkg-config">
+            <primary sortas="b-pkg-config">pkg-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/prog/prog.xml
===================================================================
--- general/prog/prog.xml	(revision 6d15c62929a1239f9320aa1855925f43d72bea01)
+++ general/prog/prog.xml	(revision 08f1ff78b1f54da166531ce583bb8c8ada84af80)
@@ -23,4 +23,6 @@
   system's development capabilities.</para>
 
+  <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="dejagnu.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="doxygen.xml"/>
@@ -28,5 +30,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcc3.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcc3.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="guile.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="icedtea6.xml"/>
@@ -38,8 +40,10 @@
   <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.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconfig.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.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="subversion.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="tcl.xml"/>
Index: general/prog/subversion.xml
===================================================================
--- general/prog/subversion.xml	(revision 08f1ff78b1f54da166531ce583bb8c8ada84af80)
+++ general/prog/subversion.xml	(revision 08f1ff78b1f54da166531ce583bb8c8ada84af80)
@@ -0,0 +1,399 @@
+<?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://archive.apache.org/dist/subversion/subversion-&subversion-version;.tar.bz2">
+  <!ENTITY subversion-download-ftp  " ">
+  <!ENTITY subversion-md5sum        "8a4fa74385df85a9702141b6b68b8307">
+  <!ENTITY subversion-size          "5.7 MB">
+
+  <!ENTITY subversion-buildsize     "153 MB (additional 119 MB to install all bindings and 750 MB to run all test suites)">
+  <!ENTITY subversion-time          "1.6 SBU (add 2.7 SBU for bindings and 7.1 SBU to run test suites)">
+]>
+
+<sect1 id="subversion" xreflabel="Subversion-&subversion-version;">
+  <?dbhtml filename="subversion.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</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>
+
+    &lfs70_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="sqlite"/>, and
+    <xref linkend="apache"/> (for the
+    <application>APR</application> only) or
+    <ulink url="http://apr.apache.org/">Apache Portable Runtime</ulink></para>
+
+    <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>Berkeley DB</application>
+    linked into the <application>APR-util</application> library. There is
+    information in the <xref linkend="apache"/> instructions that shows the
+    required parameters to pass to the <command>configure</command> script when
+    building any of the <application>APR-util</application> packages.</para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="python"/> (required to run the test suite),
+    <xref linkend="db"/>,
+    <xref linkend="sqlite"/>,
+    <xref linkend="cyrus-sasl"/>,
+    <xref linkend="openssl"/>,
+    <xref linkend="dbus-glib"/>,
+    <xref linkend="gnome-keyring"/>,
+    KWallet from KDE4,
+    <xref linkend="apache"/> (if you have <application>Apache Portable
+    Runtime</application> installed), and
+    <xref linkend="neon"/> or
+    <ulink url="http://code.google.com/p/serf/">serf</ulink></para>
+
+    <bridgehead renderas="sect4">Optional to Build the Java Bindings</bridgehead>
+    <para role="optional">One of <xref linkend="icedtea6"/>, 
+    <xref linkend="jdk"/>,
+    <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>
+
+    <bridgehead renderas="sect4">Optional to Build the SWIG Bindings</bridgehead>
+    <para role="optional"><ulink url="http://www.swig.org">SWIG</ulink>**,
+    <xref linkend="python"/>, and
+    <xref linkend="ruby"/></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 &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 passed the <option>--enable-javahl</option> parameter to
+    <command>configure</command> and wish to build the Java bindings, issue
+    the following command:</para>
+
+<screen><userinput>make javahl</userinput></screen>
+
+    <para>If you have the necessary dependencies installed and you wish to
+    build the <application>Perl</application>,
+    <application>Python</application> and/or
+    <application>Ruby</application> bindings, issue any or all of the following
+    commands:</para>
+
+<screen><userinput>make swig-pl &amp;&amp;
+make swig-py &amp;&amp;
+make swig-rb</userinput></screen>
+
+    <para>To test the results, issue: <command>make check</command>.</para>
+
+    <para>To test the results of the Java bindings build, issue
+    <command>make check-javahl</command>. Note you must have the
+    <application>JUnit</application> testing framework installed.</para>
+
+    <para>To test the results of any or all of the
+    <application>SWIG</application> bindings, you can use the following
+    commands:</para>
+
+<screen><userinput>make check-swig-pl &amp;&amp;
+make check-swig-py &amp;&amp;
+make check-swig-rb</userinput></screen>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role='root'><userinput>make 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>
+
+    <para>If you built the Java bindings, issue the following command
+    as the <systemitem class="username">root</systemitem> user to install
+    them:</para>
+
+<screen role='root'><userinput>make install-javahl</userinput></screen>
+
+    <para>If you built any of the <application>SWIG</application> bindings,
+    issue any or all of the following commands as the
+    <systemitem class="username">root</systemitem> user to install them:</para>
+
+<screen role='root'><userinput>make install-swig-pl &amp;&amp;
+make install-swig-py &amp;&amp;
+make install-swig-rb</userinput></screen>
+
+    <para>In order for <application>Python</application> to automatically
+    discover the bindings, add
+    <filename class='directory'>/usr/lib/svn-python</filename> to the
+    <envar>PYTHONPATH</envar> environment variable to the system or
+    personal profiles.</para>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><option>--with-apr=<replaceable>&lt;prefix&gt;</replaceable>
+    --with-apr-util=<replaceable>&lt;prefix&gt;</replaceable></option>:
+    These options should be used if you wish to use the system-installed
+    version of the <application>APR</application>. Ensure you identify the
+    correct installation prefix.</para>
+
+    <para><option>--with-apxs=/usr/sbin/apxs</option>: This option should be
+    used to identify the system-installed version of the
+    <command>apxs</command> command installed during the
+    <application>Apache HTTPD</application> installation as
+    <command>apxs</command> might not be in an unprivileged user's
+    <envar>PATH</envar> and won't be properly discovered.</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, svnserve, svnsync and
+        svnversion</seg>
+        <seg>libsvn*.{so,a} and optionally, a Java library, the mod_dav_svn.so,
+        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;/i686-linux/auto/SVN (optional),
+        /usr/lib/perl5/site_perl/&lfs-perl-version;/i686-linux/SVN (optional),
+        /usr/lib/ruby/site_ruby/x.x/i686-linux/svn (optional),
+        /usr/lib/svn-javahl (optional),
+        /usr/lib/svn-python (optional) and
+        /usr/share/doc/subversion-&subversion-version;</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="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="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="neon-config-svn">
+        <term><command>neon-config</command></term>
+        <listitem>
+          <para>is a script which provides information about an installed
+          copy of the <application>neon</application> library.</para>
+          <indexterm zone="subversion neon-config">
+            <primary sortas="b-neon-config">neon-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libsvn_star">
+        <term><filename class='libraryfile'>libsvn_*.{so,a}</filename></term>
+        <listitem>
+          <para>are the support libraries used by the
+          <application>Subversion</application> programs.</para>
+          <indexterm zone="subversion libsvn_star">
+            <primary sortas="c-libsvn_star">libsvn_*.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libneon-svn">
+        <term><filename class='libraryfile'>libneon.{so,a}</filename></term>
+        <listitem>
+          <para>is used as a high-level interface to common
+          HTTP and WebDAV methods.</para>
+          <indexterm zone="subversion libneon">
+            <primary sortas="c-libneon">libneon.{so,a}</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: neral/sysutils/cmake.xml
===================================================================
--- general/sysutils/cmake.xml	(revision 6d15c62929a1239f9320aa1855925f43d72bea01)
+++ 	(revision )
@@ -1,175 +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/v2.8/cmake-&cmake-version;.tar.gz">
-  <!ENTITY cmake-download-ftp  " ">
-  <!ENTITY cmake-md5sum        "2147da452fd9212bb9b4542a9eee9d5b">
-  <!ENTITY cmake-size          "5.3 MB">
-  <!ENTITY cmake-buildsize     "303 MB (including tests)">
-  <!ENTITY cmake-time          "4.1 SBU (including 2.5 SBU test time)">
-]>
-
-<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 <filename>Makefile</filename>s. It is a successor of the auto-generated
-    <command>configure</command> script.</para>
-
-    &lfs67_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">Required</bridgehead>
-    <para role="required">
-      <xref linkend="curl"/>, 
-      <xref linkend="libarchive"/>, and 
-      <xref linkend="expat"/>
-    </para>
-
-    <bridgehead renderas="sect4">Options</bridgehead>
-    <para role="optional">
-      <xref linkend="subversion"/> (for testing)
-    </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 \
-            --docdir=/share/doc/cmake-&cmake-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue: <userinput>make test</userinput>.
-    The SVN test may fail.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><option>--system-libs</option>: This option forces the build system
-    to link against <application>Zlib</application>, <application>Bzip2</application>, 
-    <application>cURL</application> and <application>Expat</application> installed 
-    on the system.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>ctest, cpack, ccmake, and cmake</seg>
-        <seg>None</seg>
-        <seg>/usr/share/cmake-&cmake-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="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>
-
-      <varlistentry id="cpack">
-        <term><command>cpack</command></term>
-        <listitem>
-          <para>is the CMake packaging program.</para>
-          <indexterm zone="cmake cpack">
-            <primary sortas="b-cpack">cpack</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ccmake">
-        <term><command>ccmake</command></term>
-        <listitem>
-          <para>is a curses based interactive frontend to cmake.</para>
-          <indexterm zone="cmake ccmake">
-            <primary sortas="b-ccmake">ccmake</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="c_make">
-        <term><command>cmake</command></term>
-        <listitem>
-          <para>is the makefile generator.</para>
-          <indexterm zone="cmake c_make">
-            <primary sortas="b-cmake">cmake</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/sysutils/pkgconfig.xml
===================================================================
--- general/sysutils/pkgconfig.xml	(revision 6d15c62929a1239f9320aa1855925f43d72bea01)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY pkgconfig-download-http "http://pkgconfig.freedesktop.org/releases/pkg-config-&pkgconfig-version;.tar.gz">
-  <!ENTITY pkgconfig-download-ftp  "&gentoo-ftp-repo;/pkg-config-&pkgconfig-version;.tar.gz">
-  <!-- <!ENTITY pkgconfig-download-ftp "&gnome-download-ftp;/pkgconfig/&pkgconfig-version;/pkgconfig-&pkgconfig-version;.tar.gz"> -->
-  <!ENTITY pkgconfig-md5sum        "d922a88782b64441d06547632fd85744">
-  <!ENTITY pkgconfig-size          "1.0 MB">
-  <!ENTITY pkgconfig-buildsize     "12 MB">
-  <!ENTITY pkgconfig-time          "0.3 SBU">
-]>
-
-<sect1 id="pkgconfig" xreflabel="pkg-config-&pkgconfig-version;">
-  <?dbhtml filename="pkgconfig.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>pkg-config-&pkgconfig-version;</title>
-
-  <indexterm zone="pkgconfig">
-    <primary sortas="a-Pkg-config">Pkg-config</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to pkg-config</title>
-
-    <para>The <application>pkg-config</application> package contains a tool for
-    passing the include path and/or library paths to build tools during the
-    <command>configure</command> and <command>make</command> file
-    execution.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&pkgconfig-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&pkgconfig-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &pkgconfig-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &pkgconfig-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &pkgconfig-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &pkgconfig-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Pkg-config Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="GLib"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/pkgconfig"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of pkg-config</title>
-
-    <para>Install <application>pkg-config</application> by running the
-    following commands:</para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>. The
-    <quote>check-requires-private</quote> test has been known to fail for
-    undetermined reasons.</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>--with-installed-glib</parameter>: This parameter causes
-    the package to use the installed glib2. This is to get rid of the internally used
-    glib-1.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring pkg-config</title>
-
-    <para>The default setting for <envar>PKG_CONFIG_PATH</envar> is
-    <filename
-    class='directory'>/usr/lib/pkgconfig:/usr/share/pkgconfig</filename>
-    because of the prefix used to install
-    <application>pkg-config</application>. You may add
-    to <envar>PKG_CONFIG_PATH</envar> by exporting additional paths on your
-    system where <filename class='extension'>.pc</filename> files are
-    installed. Note that <envar>PKG_CONFIG_PATH</envar> is only needed when
-    compiling packages, not during run-time.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>pkg-config</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pkg-config">
-        <term><command>pkg-config</command></term>
-        <listitem>
-          <para>returns meta information for the specified library or
-          package.</para>
-          <indexterm zone="pkgconfig pkg-config">
-            <primary sortas="b-pkg-config">pkg-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/sysutils.xml
===================================================================
--- general/sysutils/sysutils.xml	(revision 6d15c62929a1239f9320aa1855925f43d72bea01)
+++ general/sysutils/sysutils.xml	(revision 08f1ff78b1f54da166531ce583bb8c8ada84af80)
@@ -48,7 +48,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gvfs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libarchive.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="cmake.xml"/> -->
   <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lzma-utils.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconfig.xml"/>
+  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconfig.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="raptor.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rasqal.xml"/>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 6d15c62929a1239f9320aa1855925f43d72bea01)
+++ introduction/welcome/changelog.xml	(revision 08f1ff78b1f54da166531ce583bb8c8ada84af80)
@@ -41,4 +41,22 @@
 
 -->
+
+    <listitem>
+      <para>November 4th, 2011</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - More package reorganization.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Remove gcc3.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to pkg-config-0.26.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to glib-2.31.0.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
Index: tworking/netprogs/cvs.xml
===================================================================
--- networking/netprogs/cvs.xml	(revision 6d15c62929a1239f9320aa1855925f43d72bea01)
+++ 	(revision )
@@ -1,272 +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 cvs-download-http "http://ftp.gnu.org/non-gnu/cvs/source/stable/&cvs-version;/cvs-&cvs-version;.tar.bz2">
-  <!ENTITY cvs-download-ftp  "ftp://ftp.gnu.org/non-gnu/cvs/source/stable/&cvs-version;/cvs-&cvs-version;.tar.bz2">
-  <!ENTITY cvs-md5sum        "0213ea514e231559d6ff8f80a34117f0">
-  <!ENTITY cvs-size          "2.9 MB">
-  <!ENTITY cvs-buildsize     "32.3 MB">
-  <!ENTITY cvs-time          "0.3 SBU (additional ~20 SBU to run the test suite)">
-]>
-
-<sect1 id="cvs" xreflabel="CVS-&cvs-version;">
-  <?dbhtml filename="cvs.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>CVS-&cvs-version;</title>
-
-  <indexterm zone="cvs">
-    <primary sortas="a-CVS">CVS</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to CVS</title>
-
-    <para><application>CVS</application> is the Concurrent Versions System.
-    This is a version control system useful for projects using a central
-    repository to hold files and then track all changes made to those files.
-    These instructions install the client used to manipulate the repository,
-    creation of a repository is covered at <xref linkend="cvsserver"/>.</para>
-
-    <para>&lfssvn_checked;20101029&lfssvn_checked2;</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&cvs-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&cvs-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &cvs-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &cvs-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &cvs-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &cvs-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Recommended patch: <ulink
-        url="&patch-root;/cvs-&cvs-version;-zlib-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">CVS Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><!-- <xref linkend="gdbm"/>, -->
-    <xref linkend="tcsh"/>,
-    <xref linkend="openssh"/>,
-    <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>,
-    <xref linkend="mitkrb"/> or <xref linkend="heimdal"/>
-    (for the GSSAPI libraries),
-    <xref linkend="gs"/><!-- or <xref linkend="espgs"/> -->, and
-    an <xref linkend="server-mail"/> (that provides a
-    <command>sendmail</command> command)</para>
-
-    <para><application>CVS</application> will invoke a default text editor to
-    create a commit message if the <parameter>-m "Commit message"</parameter>
-    parameter was not used when changes are committed to a repository.
-    <application>CVS</application> looks for the following text editors, in the
-    order shown below, during configuration to determine the default. This
-    default can always be overridden by the <envar>CVSEDITOR</envar> or
-    <envar>EDITOR</envar> environment variables and can be specified directly
-    by passing the <option>--with-editor=<replaceable>&lt;desired text
-    editor&gt;</replaceable></option> parameter to the
-    <command>configure</command> script.</para>
-
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para><xref linkend="vim"/></para>
-      </listitem>
-      <listitem>
-        <para><xref linkend="emacs"/></para>
-      </listitem>
-      <listitem>
-        <para><xref linkend="nano"/></para>
-      </listitem>
-      <listitem>
-        <para><xref linkend="pine"/> (for Pico)</para>
-      </listitem>
-    </itemizedlist>
-
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/cvs"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of CVS</title>
-
-    <para>By default <application>CVS</application> is statically linked
-    against the <application>Zlib</application> library included in its source
-    tree. This makes it exposed to possible security vulnerabilities in that
-    library. If you want to modify <application>CVS</application> to use the
-    system shared <application>Zlib</application> library, apply the following
-    patch:</para>
-
-<screen><userinput>patch -Np1 -i ../cvs-&cvs-version;-zlib-1.patch</userinput></screen>
-
-    <para>Install <application>CVS</application> by running
-    the following commands:</para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>If you have <xref linkend="tetex"/> or <xref linkend="texlive"/>
-    installed and wish to create DVI, Postscript, HTML or text docs from the
-    documentation source files, issue the following command:</para>
-
-<screen><userinput>make -C doc html txt dvi ps</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>. This will
-    take quite a while. If you don't have <command>rsh</command> configured for
-    access to the host you are building on (or you didn't pass the
-    <option>--with-rsh=</option> parameter to the <command>configure</command>
-    script, some tests may fail. If you passed the
-    <option>--with-rsh=ssh</option> parameter to enable <command>ssh</command>
-    as the default remote shell program, you'll need to issue the following
-    command so that the tests will complete without any failures:</para>
-
-<screen><userinput>sed -e 's/rsh};/ssh};/' \
-    -e 's/g=rw,o=r$/g=r,o=r/' \
-    -i src/sanity.sh</userinput></screen>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role='root'><userinput>make install &amp;&amp;
-install -v -m755 -d /usr/share/doc/cvs-&cvs-version; &amp;&amp;
-install -v -m644 FAQ README /usr/share/doc/cvs-&cvs-version; &amp;&amp;
-install -v -m644 doc/*.pdf /usr/share/doc/cvs-&cvs-version;</userinput></screen>
-
-    <para>If you created any additional documentation, install it by issuing
-    the following commands as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role='root'><userinput>install -v -m644 doc/*.{ps,dvi,txt} /usr/share/doc/cvs-&cvs-version; &amp;&amp;
-install -v -m755 -d /usr/share/doc/cvs-&cvs-version;/html/cvs{,client} &amp;&amp;
-install -v -m644 doc/cvs.html/* \
-                 /usr/share/doc/cvs-&cvs-version;/html/cvs &amp;&amp;
-install -v -m644 doc/cvsclient.html/* \
-                 /usr/share/doc/cvs-&cvs-version;/html/cvsclient</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring CVS</title>
-
-    <sect3 id="cvs-config">
-      <title>Config Files</title>
-
-      <para><filename>~/.cvsrc</filename>, <filename>~/.cvswrappers</filename>,
-      and <filename>~/.cvspass</filename>.</para>
-
-      <indexterm zone="cvs cvs-config">
-        <primary sortas="e-AA.cvsrc">~/.cvsrc</primary>
-      </indexterm>
-
-      <indexterm zone="cvs cvs-config">
-        <primary sortas="e-AA.cvswrappers">~/.cvswrappers</primary>
-      </indexterm>
-
-      <indexterm zone="cvs cvs-config">
-        <primary sortas="e-AA.cvspass">~/.cvspass</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para><filename>~/.cvsrc</filename> is the main
-      <application>CVS</application> configuration file.
-      This file is used by users to specify defaults for different
-      <command>cvs</command> commands. For example, to make all
-      <command>cvs diff</command> commands run with <option>-u</option>, a user
-      would add <option>diff -u</option> to their <filename>.cvsrc</filename>
-      file.</para>
-
-      <para><filename>~/.cvswrappers</filename> specifies wrappers to be used in
-      addition to those specified in the <filename>CVSROOT/cvswrappers</filename>
-      file in the repository.</para>
-
-      <para><filename>~/.cvspass</filename> contains passwords used to complete
-      logins to servers.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>cvs, cvsbug, and rcs2log</seg>
-        <seg>None</seg>
-        <seg>/usr/share/cvs and /usr/share/doc/cvs-&cvs-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cvs-prog">
-        <term><command>cvs</command></term>
-        <listitem>
-          <para>is the main program file for the concurrent versions system.</para>
-          <indexterm zone="cvs cvs-prog">
-            <primary sortas="b-cvs">cvs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cvsbug">
-        <term><command>cvsbug</command></term>
-        <listitem>
-          <para>is used to send problem reports about <application>CVS</application>
-          to a central support site.</para>
-          <indexterm zone="cvs cvsbug">
-            <primary sortas="b-cvsbug">cvsbug</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rcs2log">
-        <term><command>rcs2log</command></term>
-        <listitem>
-          <para>is a symlink to the contributed RCS to Change Log
-          generator.</para>
-          <indexterm zone="cvs rcs2log">
-            <primary sortas="b-rcs2log">rcs2log</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netprogs/ggz-client-libs.xml
===================================================================
--- networking/netprogs/ggz-client-libs.xml	(revision 6d15c62929a1239f9320aa1855925f43d72bea01)
+++ 	(revision )
@@ -1,174 +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 ggz-client-libs-download-http "http://mirrors.ibiblio.org/pub/mirrors/ggzgamingzone/ggz/&ggz-client-libs-version;/ggz-client-libs-&ggz-client-libs-version;.tar.gz">
-  <!ENTITY ggz-client-libs-download-ftp  "ftp://ftp.belnet.be/packages/ggzgamingzone/ggz/&ggz-client-libs-version;/ggz-client-libs-&ggz-client-libs-version;.tar.gz">
-  <!ENTITY ggz-client-libs-md5sum        "299eaa93721b1d867b5bf7dc6ac764b0">
-  <!ENTITY ggz-client-libs-size          "600 KB">
-  <!ENTITY ggz-client-libs-buildsize     "8 MB">
-  <!ENTITY ggz-client-libs-time          "0.2 SBU">
-]>
-
-<sect1 id="ggz-client-libs" xreflabel="ggz-client-libs-&ggz-client-libs-version;">
-  <?dbhtml filename="ggz-client-libs.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>ggz-client-libs-&ggz-client-libs-version;</title>
-
-  <indexterm zone="ggz-client-libs">
-    <primary sortas="a-ggz-client-libs">ggz-client-libs</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ggz-client-libs</title>
-
-    <para>The <application>ggz-client-libs</application> package provides the
-    common procedures and utilities required to run the GGZ client and games.
-    The routines are shared by other modules in order to ease coding and promote
-    compatibility and stability.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&ggz-client-libs-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&ggz-client-libs-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &ggz-client-libs-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &ggz-client-libs-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &ggz-client-libs-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &ggz-client-libs-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">ggz-client-libs Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="expat"/> and
-    <xref linkend="libggz"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/ggz-client-libs"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ggz-client-libs</title>
-
-    <para>Install <application>ggz-client-libs</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>ggz, ggz-config, ggz-wrapper, and ggzwrap</seg>
-        <seg>libggzcore.{so,a} and libggzmod.{so,a}</seg>
-        <seg>/usr/lib/ggz</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ggz">
-        <term><command>ggz</command></term>
-        <listitem>
-          <para>is the GGZ Gaming Zone core client selector.</para>
-          <indexterm zone="ggz-client-libs ggz">
-            <primary sortas="b-ggz">ggz</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ggz-config">
-        <term><command>ggz-config</command></term>
-        <listitem>
-          <para>is the GGZ Gaming Zone configuration manager.</para>
-          <indexterm zone="ggz-client-libs ggz-config">
-            <primary sortas="b-ggz-config">ggz-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ggz-wrapper">
-        <term><command>ggz-wrapper</command></term>
-        <listitem>
-          <para>is the GGZ Gaming Zone command line core client.</para>
-          <indexterm zone="ggz-client-libs ggz-wrapper">
-            <primary sortas="b-ggz-wrapper">ggz-wrapper</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ggzwrap">
-        <term><command>ggzwrap</command></term>
-        <listitem>
-          <para>is the GGZ Gaming Zone game client wrapper.</para>
-          <indexterm zone="ggz-client-libs ggzwrap">
-            <primary sortas="b-ggzwrap">ggzwrap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libggzcore">
-        <term><filename class='libraryfile'>libggzcore.{so,a}</filename></term>
-        <listitem>
-          <para>handles the connection of a client application to the GGZ
-          server.</para>
-          <indexterm zone="ggz-client-libs libggzcore">
-            <primary sortas="c-libggzcore">libggzcore.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libggzmod">
-        <term><filename class='libraryfile'>libggzmod.{so,a}</filename></term>
-        <listitem>
-          <para>facilitates the messaging from and to a GGZ core client in a
-          game client.</para>
-          <indexterm zone="ggz-client-libs libggzmod">
-            <primary sortas="c-libggzmod">libggzmod.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: networking/netprogs/netprogs.xml
===================================================================
--- networking/netprogs/netprogs.xml	(revision 6d15c62929a1239f9320aa1855925f43d72bea01)
+++ networking/netprogs/netprogs.xml	(revision 08f1ff78b1f54da166531ce583bb8c8ada84af80)
@@ -21,5 +21,5 @@
   are support programs for daemons that you may have running on your machine.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cvs.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="inetutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ncftp.xml"/>
@@ -34,9 +34,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rsync.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="samba3-client.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="tcpwrappers.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="tcpwrappers.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wget.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wireless-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ggz-client-libs.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ggz-client-libs.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="othernetprogs.xml"/>
 
Index: tworking/netprogs/subversion.xml
===================================================================
--- networking/netprogs/subversion.xml	(revision 6d15c62929a1239f9320aa1855925f43d72bea01)
+++ 	(revision )
@@ -1,399 +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://archive.apache.org/dist/subversion/subversion-&subversion-version;.tar.bz2">
-  <!ENTITY subversion-download-ftp  " ">
-  <!ENTITY subversion-md5sum        "8a4fa74385df85a9702141b6b68b8307">
-  <!ENTITY subversion-size          "5.7 MB">
-
-  <!ENTITY subversion-buildsize     "153 MB (additional 119 MB to install all bindings and 750 MB to run all test suites)">
-  <!ENTITY subversion-time          "1.6 SBU (add 2.7 SBU for bindings and 7.1 SBU to run test suites)">
-]>
-
-<sect1 id="subversion" xreflabel="Subversion-&subversion-version;">
-  <?dbhtml filename="subversion.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</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>
-
-    &lfs70_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="sqlite"/>, and
-    <xref linkend="apache"/> (for the
-    <application>APR</application> only) or
-    <ulink url="http://apr.apache.org/">Apache Portable Runtime</ulink></para>
-
-    <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>Berkeley DB</application>
-    linked into the <application>APR-util</application> library. There is
-    information in the <xref linkend="apache"/> instructions that shows the
-    required parameters to pass to the <command>configure</command> script when
-    building any of the <application>APR-util</application> packages.</para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="python"/> (required to run the test suite),
-    <xref linkend="db"/>,
-    <xref linkend="sqlite"/>,
-    <xref linkend="cyrus-sasl"/>,
-    <xref linkend="openssl"/>,
-    <xref linkend="dbus-glib"/>,
-    <xref linkend="gnome-keyring"/>,
-    KWallet from KDE4,
-    <xref linkend="apache"/> (if you have <application>Apache Portable
-    Runtime</application> installed), and
-    <xref linkend="neon"/> or
-    <ulink url="http://code.google.com/p/serf/">serf</ulink></para>
-
-    <bridgehead renderas="sect4">Optional to Build the Java Bindings</bridgehead>
-    <para role="optional">One of <xref linkend="icedtea6"/>, 
-    <xref linkend="jdk"/>,
-    <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>
-
-    <bridgehead renderas="sect4">Optional to Build the SWIG Bindings</bridgehead>
-    <para role="optional"><ulink url="http://www.swig.org">SWIG</ulink>**,
-    <xref linkend="python"/>, and
-    <xref linkend="ruby"/></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 &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 passed the <option>--enable-javahl</option> parameter to
-    <command>configure</command> and wish to build the Java bindings, issue
-    the following command:</para>
-
-<screen><userinput>make javahl</userinput></screen>
-
-    <para>If you have the necessary dependencies installed and you wish to
-    build the <application>Perl</application>,
-    <application>Python</application> and/or
-    <application>Ruby</application> bindings, issue any or all of the following
-    commands:</para>
-
-<screen><userinput>make swig-pl &amp;&amp;
-make swig-py &amp;&amp;
-make swig-rb</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>To test the results of the Java bindings build, issue
-    <command>make check-javahl</command>. Note you must have the
-    <application>JUnit</application> testing framework installed.</para>
-
-    <para>To test the results of any or all of the
-    <application>SWIG</application> bindings, you can use the following
-    commands:</para>
-
-<screen><userinput>make check-swig-pl &amp;&amp;
-make check-swig-py &amp;&amp;
-make check-swig-rb</userinput></screen>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role='root'><userinput>make 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>
-
-    <para>If you built the Java bindings, issue the following command
-    as the <systemitem class="username">root</systemitem> user to install
-    them:</para>
-
-<screen role='root'><userinput>make install-javahl</userinput></screen>
-
-    <para>If you built any of the <application>SWIG</application> bindings,
-    issue any or all of the following commands as the
-    <systemitem class="username">root</systemitem> user to install them:</para>
-
-<screen role='root'><userinput>make install-swig-pl &amp;&amp;
-make install-swig-py &amp;&amp;
-make install-swig-rb</userinput></screen>
-
-    <para>In order for <application>Python</application> to automatically
-    discover the bindings, add
-    <filename class='directory'>/usr/lib/svn-python</filename> to the
-    <envar>PYTHONPATH</envar> environment variable to the system or
-    personal profiles.</para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><option>--with-apr=<replaceable>&lt;prefix&gt;</replaceable>
-    --with-apr-util=<replaceable>&lt;prefix&gt;</replaceable></option>:
-    These options should be used if you wish to use the system-installed
-    version of the <application>APR</application>. Ensure you identify the
-    correct installation prefix.</para>
-
-    <para><option>--with-apxs=/usr/sbin/apxs</option>: This option should be
-    used to identify the system-installed version of the
-    <command>apxs</command> command installed during the
-    <application>Apache HTTPD</application> installation as
-    <command>apxs</command> might not be in an unprivileged user's
-    <envar>PATH</envar> and won't be properly discovered.</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, svnserve, svnsync and
-        svnversion</seg>
-        <seg>libsvn*.{so,a} and optionally, a Java library, the mod_dav_svn.so,
-        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;/i686-linux/auto/SVN (optional),
-        /usr/lib/perl5/site_perl/&lfs-perl-version;/i686-linux/SVN (optional),
-        /usr/lib/ruby/site_ruby/x.x/i686-linux/svn (optional),
-        /usr/lib/svn-javahl (optional),
-        /usr/lib/svn-python (optional) and
-        /usr/share/doc/subversion-&subversion-version;</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="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="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="neon-config-svn">
-        <term><command>neon-config</command></term>
-        <listitem>
-          <para>is a script which provides information about an installed
-          copy of the <application>neon</application> library.</para>
-          <indexterm zone="subversion neon-config">
-            <primary sortas="b-neon-config">neon-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libsvn_star">
-        <term><filename class='libraryfile'>libsvn_*.{so,a}</filename></term>
-        <listitem>
-          <para>are the support libraries used by the
-          <application>Subversion</application> programs.</para>
-          <indexterm zone="subversion libsvn_star">
-            <primary sortas="c-libsvn_star">libsvn_*.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libneon-svn">
-        <term><filename class='libraryfile'>libneon.{so,a}</filename></term>
-        <listitem>
-          <para>is used as a high-level interface to common
-          HTTP and WebDAV methods.</para>
-          <indexterm zone="subversion libneon">
-            <primary sortas="c-libneon">libneon.{so,a}</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: tworking/netprogs/tcpwrappers.xml
===================================================================
--- networking/netprogs/tcpwrappers.xml	(revision 6d15c62929a1239f9320aa1855925f43d72bea01)
+++ 	(revision )
@@ -1,246 +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 tcpwrappers-download-http "http://files.ichilton.co.uk/nfs/tcp_wrappers_&tcpwrappers-version;.tar.gz">
-  <!ENTITY tcpwrappers-download-ftp  "ftp://ftp.porcupine.org/pub/security/tcp_wrappers_&tcpwrappers-version;.tar.gz">
-  <!ENTITY tcpwrappers-md5sum        "e6fa25f71226d090f34de3f6b122fb5a">
-  <!ENTITY tcpwrappers-size          "97 KB">
-  <!ENTITY tcpwrappers-buildsize     "1.09 MB">
-  <!ENTITY tcpwrappers-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="tcpwrappers" xreflabel="TCP Wrapper-&tcpwrappers-version;">
-  <?dbhtml filename="tcpwrappers.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>TCP Wrapper-&tcpwrappers-version;</title>
-
-  <indexterm zone="tcpwrappers">
-   <primary sortas="a-TCP Wrapper">TCP Wrapper</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to TCP Wrapper</title>
-
-      <para>The <application>TCP Wrapper</application> package provides daemon
-      wrapper programs that report the name of the client requesting network
-      services and the requested service.</para>
-
-    &lfs67_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&tcpwrappers-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&tcpwrappers-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &tcpwrappers-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &tcpwrappers-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &tcpwrappers-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &tcpwrappers-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required Patch (Fixes some build issues and adds building a
-        shared library): <ulink
-        url="&patch-root;/tcp_wrappers-&tcpwrappers-version;-shared_lib_plus_plus-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/tcpwrappers"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of TCP Wrapper</title>
-
-    <para>Install <application>TCP Wrapper</application> with the following
-    commands:</para>
-
-<screen><userinput>patch -Np1 -i ../tcp_wrappers-&tcpwrappers-version;-shared_lib_plus_plus-1.patch &amp;&amp;
-sed -i -e "s,^extern char \*malloc();,/* &amp; */," scaffold.c &amp;&amp;
-make REAL_DAEMON_DIR=/usr/sbin STYLE=-DPROCESS_OPTIONS linux</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed -i -e ... scaffold.c</command>: This command removes an
-    obsolete C declaration which causes the build to fail if using
-    <application>GCC &gt;= 3.4.x</application>.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring TCP Wrapper</title>
-
-    <sect3 id="tcpwrappers-config">
-      <title>Config Files</title>
-
-      <para><filename>/etc/hosts.allow</filename> and
-      <filename>/etc/hosts.deny</filename></para>
-
-      <indexterm zone="tcpwrappers tcpwrappers-config">
-        <primary sortas="e-etc-hosts.allow">/etc/hosts.allow</primary>
-      </indexterm>
-
-      <indexterm zone="tcpwrappers tcpwrappers-config">
-        <primary sortas="e-etc-hosts.deny">/etc/hosts.deny</primary>
-      </indexterm>
-
-      <para>File protections: the wrapper, all files used by the wrapper,
-      and all directories in the path leading to those files, should be
-      accessible but not writable for unprivileged users (mode 755 or mode
-      555). Do not install the wrapper set-uid.</para>
-
-      <para>As the <systemitem class="username">root</systemitem> user,
-      perform the following edits on the
-      <filename>/etc/inetd.conf</filename> configuration file:</para>
-
-      <indexterm zone="tcpwrappers tcpwrappers-config">
-        <primary sortas="e-etc-inetd.conf">/etc/inetd.conf</primary>
-      </indexterm>
-
-<screen><literal>finger stream tcp nowait nobody /usr/sbin/in.fingerd in.fingerd</literal></screen>
-
-      <para>becomes:</para>
-
-<screen><literal>finger stream tcp nowait nobody /usr/sbin/tcpd in.fingerd</literal></screen>
-
-      <note>
-        <para>The <command>finger</command> server is used as an example here.</para>
-      </note>
-
-      <para>Similar changes must be made if <application>xinetd</application> is
-      used, with the emphasis being on calling <command>/usr/sbin/tcpd</command>
-      instead of calling the service daemon directly, and passing the name of the
-      service daemon to <command>tcpd</command>.</para>
-
-      <indexterm zone="tcpwrappers tcpwrappers-config">
-        <primary sortas="e-etc-xinetd.conf">/etc/xinetd.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>tcpd, tcpdchk, tcpdmatch, try-from, and safe_finger</seg>
-        <seg>libwrap.{so,a}</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="tcpd">
-        <term><command>tcpd</command></term>
-        <listitem>
-          <para>is the main access control daemon for all Internet services,
-          which <command>inetd</command> or <command>xinetd</command>
-          will run instead of running the requested service daemon.</para>
-          <indexterm zone="tcpwrappers tcpd">
-            <primary sortas="b-tcpd">tcpd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tcpdchk">
-        <term><command>tcpdchk</command></term>
-        <listitem>
-          <para>is a tool to examine a <command>tcpd</command> wrapper
-          configuration and report problems with it.</para>
-          <indexterm zone="tcpwrappers tcpdchk">
-            <primary sortas="b-tcpdchk">tcpdchk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tcpdmatch">
-        <term><command>tcpdmatch</command></term>
-        <listitem>
-          <para>is used to predict how the TCP wrapper
-          would handle a specific request for a service.</para>
-          <indexterm zone="tcpwrappers tcpdmatch">
-            <primary sortas="b-tcpdmatch">tcpdmatch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="try-from">
-        <term><command>try-from</command></term>
-        <listitem>
-          <para>can be called via a remote shell command to find out if the
-          host name and address are properly recognized.</para>
-          <indexterm zone="tcpwrappers try-from">
-            <primary sortas="b-try-from">try-from</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="safe_finger">
-        <term><command>safe_finger</command></term>
-        <listitem>
-          <para>is a wrapper for the <command>finger</command> utility, to
-          provide automatic reverse name lookups.</para>
-          <indexterm zone="tcpwrappers safe_finger">
-            <primary sortas="b-safe_finger">safe_finger</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwrap">
-        <term><filename class='libraryfile'>libwrap.{so,a}</filename></term>
-        <listitem>
-          <para>contains the API functions required by
-          the <application>TCP Wrapper</application> programs as well as other programs
-          to become <quote><application>TCP Wrapper</application>-aware</quote>.</para>
-          <indexterm zone="tcpwrappers libwrap">
-            <primary sortas="c-libwrap">libwrap.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: postlfs/security/security.xml
===================================================================
--- postlfs/security/security.xml	(revision 6d15c62929a1239f9320aa1855925f43d72bea01)
+++ postlfs/security/security.xml	(revision 08f1ff78b1f54da166531ce583bb8c8ada84af80)
@@ -40,29 +40,30 @@
   "signatures" and compares for files that have been changed.</para>
 
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="acl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="consolekit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cracklib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cyrus-sasl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iptables.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="firewalling.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnupg.xml"/> 
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnupg2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gpgme.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="heimdal.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mitkrb.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nss.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openssh.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openssl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cacerts.xml"/> 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnutls.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openssh.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cracklib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="linux-pam.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iptables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="firewalling.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnupg.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnupg2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gpgme.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tripwire.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="heimdal.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mitkrb.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cyrus-sasl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="stunnel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sudo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nss.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="policykit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="polkit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="polkit-gnome.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="consolekit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="attr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="acl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="stunnel.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sudo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tcpwrappers.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tripwire.xml"/>
 
 </chapter>
Index: postlfs/security/tcpwrappers.xml
===================================================================
--- postlfs/security/tcpwrappers.xml	(revision 08f1ff78b1f54da166531ce583bb8c8ada84af80)
+++ postlfs/security/tcpwrappers.xml	(revision 08f1ff78b1f54da166531ce583bb8c8ada84af80)
@@ -0,0 +1,246 @@
+<?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 tcpwrappers-download-http "http://files.ichilton.co.uk/nfs/tcp_wrappers_&tcpwrappers-version;.tar.gz">
+  <!ENTITY tcpwrappers-download-ftp  "ftp://ftp.porcupine.org/pub/security/tcp_wrappers_&tcpwrappers-version;.tar.gz">
+  <!ENTITY tcpwrappers-md5sum        "e6fa25f71226d090f34de3f6b122fb5a">
+  <!ENTITY tcpwrappers-size          "97 KB">
+  <!ENTITY tcpwrappers-buildsize     "1.09 MB">
+  <!ENTITY tcpwrappers-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="tcpwrappers" xreflabel="TCP Wrapper-&tcpwrappers-version;">
+  <?dbhtml filename="tcpwrappers.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>TCP Wrapper-&tcpwrappers-version;</title>
+
+  <indexterm zone="tcpwrappers">
+   <primary sortas="a-TCP Wrapper">TCP Wrapper</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to TCP Wrapper</title>
+
+      <para>The <application>TCP Wrapper</application> package provides daemon
+      wrapper programs that report the name of the client requesting network
+      services and the requested service.</para>
+
+    &lfs67_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&tcpwrappers-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&tcpwrappers-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &tcpwrappers-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &tcpwrappers-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &tcpwrappers-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &tcpwrappers-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Required Patch (Fixes some build issues and adds building a
+        shared library): <ulink
+        url="&patch-root;/tcp_wrappers-&tcpwrappers-version;-shared_lib_plus_plus-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/tcpwrappers"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of TCP Wrapper</title>
+
+    <para>Install <application>TCP Wrapper</application> with the following
+    commands:</para>
+
+<screen><userinput>patch -Np1 -i ../tcp_wrappers-&tcpwrappers-version;-shared_lib_plus_plus-1.patch &amp;&amp;
+sed -i -e "s,^extern char \*malloc();,/* &amp; */," scaffold.c &amp;&amp;
+make REAL_DAEMON_DIR=/usr/sbin STYLE=-DPROCESS_OPTIONS linux</userinput></screen>
+
+    <para>This package does not come with a test suite.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><command>sed -i -e ... scaffold.c</command>: This command removes an
+    obsolete C declaration which causes the build to fail if using
+    <application>GCC &gt;= 3.4.x</application>.</para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring TCP Wrapper</title>
+
+    <sect3 id="tcpwrappers-config">
+      <title>Config Files</title>
+
+      <para><filename>/etc/hosts.allow</filename> and
+      <filename>/etc/hosts.deny</filename></para>
+
+      <indexterm zone="tcpwrappers tcpwrappers-config">
+        <primary sortas="e-etc-hosts.allow">/etc/hosts.allow</primary>
+      </indexterm>
+
+      <indexterm zone="tcpwrappers tcpwrappers-config">
+        <primary sortas="e-etc-hosts.deny">/etc/hosts.deny</primary>
+      </indexterm>
+
+      <para>File protections: the wrapper, all files used by the wrapper,
+      and all directories in the path leading to those files, should be
+      accessible but not writable for unprivileged users (mode 755 or mode
+      555). Do not install the wrapper set-uid.</para>
+
+      <para>As the <systemitem class="username">root</systemitem> user,
+      perform the following edits on the
+      <filename>/etc/inetd.conf</filename> configuration file:</para>
+
+      <indexterm zone="tcpwrappers tcpwrappers-config">
+        <primary sortas="e-etc-inetd.conf">/etc/inetd.conf</primary>
+      </indexterm>
+
+<screen><literal>finger stream tcp nowait nobody /usr/sbin/in.fingerd in.fingerd</literal></screen>
+
+      <para>becomes:</para>
+
+<screen><literal>finger stream tcp nowait nobody /usr/sbin/tcpd in.fingerd</literal></screen>
+
+      <note>
+        <para>The <command>finger</command> server is used as an example here.</para>
+      </note>
+
+      <para>Similar changes must be made if <application>xinetd</application> is
+      used, with the emphasis being on calling <command>/usr/sbin/tcpd</command>
+      instead of calling the service daemon directly, and passing the name of the
+      service daemon to <command>tcpd</command>.</para>
+
+      <indexterm zone="tcpwrappers tcpwrappers-config">
+        <primary sortas="e-etc-xinetd.conf">/etc/xinetd.conf</primary>
+      </indexterm>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>tcpd, tcpdchk, tcpdmatch, try-from, and safe_finger</seg>
+        <seg>libwrap.{so,a}</seg>
+        <seg>None</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="tcpd">
+        <term><command>tcpd</command></term>
+        <listitem>
+          <para>is the main access control daemon for all Internet services,
+          which <command>inetd</command> or <command>xinetd</command>
+          will run instead of running the requested service daemon.</para>
+          <indexterm zone="tcpwrappers tcpd">
+            <primary sortas="b-tcpd">tcpd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="tcpdchk">
+        <term><command>tcpdchk</command></term>
+        <listitem>
+          <para>is a tool to examine a <command>tcpd</command> wrapper
+          configuration and report problems with it.</para>
+          <indexterm zone="tcpwrappers tcpdchk">
+            <primary sortas="b-tcpdchk">tcpdchk</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="tcpdmatch">
+        <term><command>tcpdmatch</command></term>
+        <listitem>
+          <para>is used to predict how the TCP wrapper
+          would handle a specific request for a service.</para>
+          <indexterm zone="tcpwrappers tcpdmatch">
+            <primary sortas="b-tcpdmatch">tcpdmatch</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="try-from">
+        <term><command>try-from</command></term>
+        <listitem>
+          <para>can be called via a remote shell command to find out if the
+          host name and address are properly recognized.</para>
+          <indexterm zone="tcpwrappers try-from">
+            <primary sortas="b-try-from">try-from</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="safe_finger">
+        <term><command>safe_finger</command></term>
+        <listitem>
+          <para>is a wrapper for the <command>finger</command> utility, to
+          provide automatic reverse name lookups.</para>
+          <indexterm zone="tcpwrappers safe_finger">
+            <primary sortas="b-safe_finger">safe_finger</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libwrap">
+        <term><filename class='libraryfile'>libwrap.{so,a}</filename></term>
+        <listitem>
+          <para>contains the API functions required by
+          the <application>TCP Wrapper</application> programs as well as other programs
+          to become <quote><application>TCP Wrapper</application>-aware</quote>.</para>
+          <indexterm zone="tcpwrappers libwrap">
+            <primary sortas="c-libwrap">libwrap.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
