Index: archive/acl.xml
===================================================================
--- archive/acl.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
+++ archive/acl.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -0,0 +1,227 @@
+<?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 acl-download-http "http://download.savannah.gnu.org/releases/acl/acl-&acl-version;.src.tar.gz">
+  <!ENTITY acl-download-ftp  " ">
+  <!ENTITY acl-md5sum        "a61415312426e9c2212bd7dc7929abda">
+  <!ENTITY acl-size          "384 KB">
+  <!ENTITY acl-buildsize     "9.1 MB">
+  <!ENTITY acl-time          "0.1 SBU">
+]>
+
+<sect1 id="acl" xreflabel="acl-&acl-version;">
+  <?dbhtml filename="acl.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>acl-&acl-version;</title>
+
+  <indexterm zone="acl">
+    <primary sortas="a-acl">acl</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to acl</title>
+
+    <para>The <application>acl</application> package contains utilities to
+    administer Access Control Lists, which are used to define more fine-grained
+    discretionary access rights for files and directories.</para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&acl-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&acl-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &acl-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &acl-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &acl-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &acl-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">acl Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="attr"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/acl"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of acl</title>
+
+    <para>Install <application>acl</application> by running the following
+    commands:</para>
+
+<screen><userinput>sed -i -e 's|/@pkg_name@|&amp;-@pkg_version@|' \
+     include/builddefs.in &amp;&amp;
+
+INSTALL_USER=root  \
+INSTALL_GROUP=root \
+./configure --prefix=/usr --libexecdir=/usr/lib --disable-static &amp;&amp;
+make</userinput></screen>
+
+    <para>For meaningful results, the tests need to be carried out on a file
+    system that supports extended attributes. It is also required that
+    <application>Coreutils</application> is re-installed after
+    <application>acl</application> is installed so that the extra acl bit
+    displays correctly on a <command>ls</command> command.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<!-- Package uses DIST_ROOT instead of DESTDIR -->
+<screen role="root"><userinput>make install install-dev install-lib             &amp;&amp;
+chmod -v 755 /usr/lib/libacl.so                  &amp;&amp;
+mv -v /usr/lib/libacl.so.* /lib                  &amp;&amp;
+ln -sfv ../../lib/libacl.so.1 /usr/lib/libacl.so &amp;&amp;
+install -v -m644 doc/*.txt /usr/share/doc/acl-&acl-version;</userinput></screen>
+
+    <para>You should now re-install <application><ulink
+    url="&lfs-root;/chapter06/coreutils.html">Coreutils</ulink>
+    </application> and proceed to run the test suite.</para>
+
+    <para>There are three sets of tests that come with this package. The local
+    partition where the tests are run must be mounted with acl configured as
+    described below.  Additionally, the users <systemitem
+    class="username">bin</systemitem> and <systemitem
+    class="username">daemon</systemitem> must be created or modified to have a
+    proper shell and home directory and the group <systemitem
+    class="groupname">daemon</systemitem> must be a member of the <systemitem
+    class="groupname">bin</systemitem> group.  The kernel must also be
+    configured with the appropriate ACL options (there are nine different
+    options).</para>
+    
+    <para>To run the standard tests run <command>make tests </command>.  As
+    <systemitem class="username">root</systemitem> user, run <command>make
+    root-tests</command>.</para>
+
+    <para>The third set of tests are Network File System (NFS) specific.  See
+    the contents of the test files in the test/nfs/ directory for the setup
+    requirements.</para>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><command>sed -i ... include/builddefs.in</command>: This command
+    modifies the documentation directory so that it is a versioned
+    directory.</para>
+
+    <para><command>--libexecdir=/usr/lib</command>: This switch ensures that
+    <filename class="libraryfile">libacl.la</filename> is installed in the correct
+    directory, and that a spurious
+    <filename class="libraryfile">libacl.so</filename> symlink is not created in
+    <filename class="directory">/usr/libexec/</filename>.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring acl</title>
+    <sect3><title>Configuration Information</title>
+
+      <para>There is no configuration to <application>acl</application> itself,
+      but to get any use out of <application>acl</application>, a filesystem
+      needs to support access control lists.</para>
+
+      <para>One way to achieve this is to add the acl option to an ext3
+      filesystem in the <filename>/etc/fstab</filename> file as shown
+      below:</para>
+
+<screen># file system  mount-point  type   options                 dump  fsck
+#                                                                order
+
+/dev/sda1      /            ext3   defaults,acl,user_xattr 0     2</screen>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>chacl, getfacl, and setfacl</seg>
+        <seg>libacl.{so,a}</seg>
+        <seg>/usr/{include/acl,share/doc/acl-&acl-version;}</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="chacl">
+        <term><command>chacl</command></term>
+        <listitem>
+          <para>changes the access control list of a file or directory.</para>
+          <indexterm zone="acl chacl">
+            <primary sortas="b-chacl">chacl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="getfacl">
+        <term><command>getfacl</command></term>
+        <listitem>
+          <para>gets file access control lists.</para>
+          <indexterm zone="acl getfacl">
+            <primary sortas="b-getfacl">getfacl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="setfacl">
+        <term><command>setfacl</command></term>
+        <listitem>
+          <para>sets file access control lists.</para>
+          <indexterm zone="acl setfacl">
+            <primary sortas="b-setfacl">setfacl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libacl">
+        <term><filename class='libraryfile'>libacl.{so,a}</filename></term>
+        <listitem>
+          <para>contains the <application>acl</application> API functions.</para>
+          <indexterm zone="acl libacl">
+            <primary sortas="c-libacl">libacl.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/attr.xml
===================================================================
--- archive/attr.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
+++ archive/attr.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -0,0 +1,190 @@
+<?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 attr-download-http "http://download.savannah.gnu.org/releases/attr/attr-&attr-version;.src.tar.gz">
+  <!ENTITY attr-download-ftp  " ">
+  <!ENTITY attr-md5sum        "84f58dec00b60f2dc8fd1c9709291cc7">
+  <!ENTITY attr-size          "336 KB">
+  <!ENTITY attr-buildsize     "3.5 MB">
+  <!ENTITY attr-time          "0.1 SBU">
+]>
+
+<sect1 id="attr" xreflabel="attr-&attr-version;">
+  <?dbhtml filename="attr.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>attr-&attr-version;</title>
+
+  <indexterm zone="attr">
+    <primary sortas="a-attr">attr</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to attr</title>
+
+    <para>The <application>attr</application> package contains utilities to
+    administer the extended attributes on filesystem objects.</para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&attr-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&attr-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &attr-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &attr-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &attr-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &attr-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/attr"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of attr</title>
+
+    <para>Install <application>attr</application> by running the following
+    commands:</para>
+
+<screen><userinput>sed -i -e 's|/@pkg_name@|&amp;-@pkg_version@|' include/builddefs.in &amp;&amp;
+
+INSTALL_USER=root  \
+INSTALL_GROUP=root \
+./configure --prefix=/usr --disable-static &amp;&amp;
+make</userinput></screen>
+
+    <para>There are three sets of tests that come with this package. Issue the
+    following to execute all three:
+    <command>make tests root-tests ext-tests</command>.  For meaningful results,
+    the tests need to be carried out on a file system that supports extended
+    attributes.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<!-- Package uses DIST_ROOT instead of DESTDIR -->
+<screen role="root"><userinput>make install install-dev install-lib &amp;&amp;
+chmod -v 755 /usr/lib/libattr.so &amp;&amp;
+mv -v /usr/lib/libattr.so.* /lib &amp;&amp;
+ln -sfv ../../lib/libattr.so.1 /usr/lib/libattr.so</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><command>sed ... include/builddefs.in</command>: This command
+    modifies the documentation directory so that it is a versioned
+    directory.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring attr</title>
+    <sect3><title>Configuration Information</title>
+
+      <para>There is no configuration to <application>attr</application> itself,
+      but to get any use out of <application>attr</application>, a filesystem
+      needs to support extended attributes.</para>
+
+      <para>One way to achieve this is to add the user_xattr option to an ext3
+      filesystem in the <filename>/etc/fstab</filename> file as shown
+      below:</para>
+
+<screen># file system  mount-point  type   options                 dump  fsck
+#                                                                order
+
+/dev/sda1      /            ext3   defaults,acl,user_xattr 0     2</screen>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>attr, getfattr, and setfattr</seg>
+        <seg>libattr.so</seg>
+        <seg>/usr/{include/attr,share/doc/attr-&attr-version;}</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="attr-prog">
+        <term><command>attr</command></term>
+        <listitem>
+          <para>extends attributes on filesystem objects.</para>
+          <indexterm zone="attr attr">
+            <primary sortas="b-attr">attr</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="getfattr">
+        <term><command>getfattr</command></term>
+        <listitem>
+          <para>gets the extended attributes of filesystem objects.</para>
+          <indexterm zone="attr getfattr">
+            <primary sortas="b-getfattr">getfattr</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="setfattr">
+        <term><command>setfattr</command></term>
+        <listitem>
+          <para>sets the extended attributes of filesystem objects.</para>
+          <indexterm zone="attr setfattr">
+            <primary sortas="b-setfattr">setfattr</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libattr">
+        <term><filename class='libraryfile'>libattr.so</filename></term>
+        <listitem>
+          <para>contains the <application>attr</application> API functions.</para>
+          <indexterm zone="attr libattr">
+            <primary sortas="c-libattr">libattr.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/expat.xml
===================================================================
--- archive/expat.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
+++ archive/expat.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY expat-download-http "&sourceforge-repo;/expat/expat-&expat-version;.tar.gz">
+  <!ENTITY expat-download-ftp  " ">
+  <!ENTITY expat-md5sum        "dd7dab7a5fea97d2a6a43f511449b7cd">
+  <!ENTITY expat-size          "552 KB">
+  <!ENTITY expat-buildsize     "6.0 MB">
+  <!ENTITY expat-time          "0.1 SBU">
+]>
+
+<sect1 id="expat" xreflabel="expat-&expat-version;">
+  <?dbhtml filename="expat.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Expat-&expat-version;</title>
+
+  <indexterm zone="expat">
+    <primary sortas="a-Expat">Expat</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Expat</title>
+
+    <para>The <application>Expat</application> package contains a stream oriented
+    C library for parsing XML.</para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&expat-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&expat-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &expat-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &expat-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &expat-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &expat-time;</para>
+      </listitem>
+    </itemizedlist>
+
+<!--
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Required patch: <ulink
+        url="&patch-root;/expat-&expat-version;-fixes-3.patch"/></para>
+      </listitem>
+    </itemizedlist>
+-->
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/expat"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Expat</title>
+
+    <para>Install <application>Expat</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+make</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/expat-&expat-version; &amp;&amp;
+install -v -m644 doc/*.{html,png,css} /usr/share/doc/expat-&expat-version;</userinput></screen>
+
+    <para>To test the results, issue: <command>make check</command> as an
+    unprivileged user. Note this must be done after the package is
+    installed.</para>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/static-libraries.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>xmlwf</seg>
+        <seg>libexpat.so</seg>
+        <seg>/usr/share/doc/expat-&expat-version;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="xmlwf">
+        <term><command>xmlwf</command></term>
+        <listitem>
+          <para>is a non-validating utility to check whether or not
+          XML documents are well formed.</para>
+          <indexterm zone="expat xmlwf">
+            <primary sortas="b-xmlwf">xmlwf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libexpat">
+        <term><filename class='libraryfile'>libexpat.so</filename></term>
+        <listitem>
+          <para>contains API functions for parsing XML.</para>
+          <indexterm zone="expat libexpat">
+            <primary sortas="c-libexpat">libexpat.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/gperf.xml
===================================================================
--- archive/gperf.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
+++ archive/gperf.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -0,0 +1,152 @@
+<?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 gperf-download-http "http://ftp.gnu.org/gnu/gperf/gperf-&gperf-version;.tar.gz">
+  <!ENTITY gperf-download-ftp  "ftp://ftp.gnu.org/gnu/gperf/gperf-&gperf-version;.tar.gz">
+  <!ENTITY gperf-md5sum        "c1f1db32fb6598d6a93e6e88796a8632">
+  <!ENTITY gperf-size          "968 KB">
+  <!ENTITY gperf-buildsize     "6.5 MB">
+  <!ENTITY gperf-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="gperf" xreflabel="Gperf-&gperf-version;">
+  <?dbhtml filename="gperf.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Gperf-&gperf-version;</title>
+
+  <indexterm zone="gperf">
+    <primary sortas="a-Gperf">Gperf</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Gperf</title>
+
+    <para><application>Gperf</application> generates a perfect hash function
+    from a key set.</para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&gperf-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&gperf-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &gperf-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &gperf-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &gperf-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &gperf-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gperf"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Gperf</title>
+
+    <para>Install <application>Gperf</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/gperf-&gperf-version; &amp;&amp;
+make</userinput></screen>
+
+<!--  gperf.texi is broken.  Fixing the texi file breaks 'make install'
+      without TeXlive installed.
+    <para>If desired, create a text version of the documentation by issuing
+    the following command:</para>
+
+<screen><userinput>makeinfo -o doc/gperf.txt - -plaintext doc/gperf.texi</userinput></screen>
+-->
+
+    <para>To test the results, issue: <command>make check</command>. There
+    should be no output from the <command>diff</command> commands.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install &amp;&amp;
+<!--install -m644 -v doc/gperf.{dvi,ps,pdf,txt} \ -->
+install -m644 -v doc/gperf.{dvi,ps,pdf} \
+                 /usr/share/doc/gperf-&gperf-version; &amp;&amp;
+
+pushd /usr/share/info &amp;&amp;
+  rm -v dir &amp;&amp;
+  for FILENAME in *; do
+    install-info $FILENAME dir 2>/dev/null
+  done &amp;&amp;
+popd</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+<!--
+    <para><command>install -m644 -v doc/gperf.{dvi,ps,pdf,txt} ...</command>:
+    This command installs documentation. Modify the command (remove ',txt') if
+    you did not build the text version.</para>
+-->
+
+    <para><command>install -m644 -v doc/gperf.{dvi,ps,pdf} ...</command>:
+    This command installs documentation.</para>
+
+    <para><command>pushd ... popd</command>: This set of commands rebuilds the
+    <filename>/usr/share/info/dir</filename> file as the installation failed
+    to do so.</para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>gperf</seg>
+        <seg>None</seg>
+        <seg>/usr/share/doc/gperf-&gperf-version;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="gperf-prog">
+        <term><command>gperf</command></term>
+        <listitem>
+          <para>generates a perfect hash function from a key set.</para>
+          <indexterm zone="gperf gperf-prog">
+            <primary sortas="b-gperf">gperf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/intltool.xml
===================================================================
--- archive/intltool.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
+++ archive/intltool.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -0,0 +1,210 @@
+<?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 intltool-download-http "http://launchpad.net/intltool/trunk/&intltool-version;/+download/intltool-&intltool-version;.tar.gz">
+  <!ENTITY intltool-download-ftp  " ">
+  <!ENTITY intltool-md5sum        "23fbd879118253cb99aeac067da5f591">
+  <!ENTITY intltool-size          "188 KB">
+  <!ENTITY intltool-buildsize     "1.4 MB">
+  <!ENTITY intltool-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="intltool" xreflabel="Intltool-&intltool-version;">
+  <?dbhtml filename="intltool.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Intltool-&intltool-version;</title>
+
+  <indexterm zone="intltool">
+    <primary sortas="a-Intltool">Intltool</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Intltool</title>
+
+    <para>
+      The <application>Intltool</application> is an internationalization
+      tool used for extracting translatable strings from source files,
+      collecting the extracted strings with messages from traditional
+      source files (<filename class="directory">&lt;source
+      directory&gt;/&lt;package&gt;/po</filename>) and merging the
+      translations into <filename>.xml</filename>,
+      <filename>.desktop</filename> and <filename>.oaf</filename> files.
+    </para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&intltool-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&intltool-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &intltool-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &intltool-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &intltool-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &intltool-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Intltool Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="perl-xml-parser"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/intltool"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Intltool</title>
+
+    <para>
+      Install <application>Intltool</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install &amp;&amp;
+install -v -m644 -D doc/I18N-HOWTO \
+    /usr/share/doc/intltool-&intltool-version;/I18N-HOWTO</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          intltool-extract, intltool-merge, intltool-prepare,
+          intltool-update and intltoolize
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /usr/share/doc/intltool-&intltool-version; and
+          /usr/share/intltool
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="intltoolize">
+        <term><command>intltoolize</command></term>
+        <listitem>
+          <para>
+            prepares a package to use
+            <application>intltool</application>.
+          </para>
+          <indexterm zone="intltool intltoolize">
+            <primary sortas="b-intltoolize">intltoolize</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="intltool-extract">
+        <term><command>intltool-extract</command></term>
+        <listitem>
+          <para>
+            generates header files that can be read by
+            <command>gettext</command>.
+          </para>
+          <indexterm zone="intltool intltool-extract">
+            <primary sortas="b-intltool-extract">intltool-extract</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="intltool-merge">
+        <term><command>intltool-merge</command></term>
+        <listitem>
+          <para>
+            merges translated strings into various file types.
+          </para>
+          <indexterm zone="intltool intltool-merge">
+            <primary sortas="b-intltool-merge">intltool-merge</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="intltool-prepare">
+        <term><command>intltool-prepare</command></term>
+        <listitem>
+          <para>
+            updates pot files and merges them with translation files.
+          </para>
+          <indexterm zone="intltool intltool-prepare">
+            <primary sortas="b-intltool-prepare">intltool-prepare</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="intltool-update">
+        <term><command>intltool-update</command></term>
+        <listitem>
+          <para>
+            updates the <filename>po</filename> template files and merges
+            them with the translations.
+          </para>
+          <indexterm zone="intltool intltool-update">
+            <primary sortas="b-intltool-update">intltool-update</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/genlib/apr-util.xml
===================================================================
--- general/genlib/apr-util.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ general/genlib/apr-util.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -89,5 +89,4 @@
     <para role="optional">
       <xref linkend="db"/>,
-      <xref linkend="expat"/>,
       <ulink url="http://www.freetds.org/">FreeTDS</ulink>,
       <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
Index: general/genlib/dbus-glib.xml
===================================================================
--- general/genlib/dbus-glib.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ general/genlib/dbus-glib.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -76,5 +76,4 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="expat"/> and
       <xref linkend="glib2"/>
     </para>
Index: neral/genlib/expat.xml
===================================================================
--- general/genlib/expat.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ 	(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 expat-download-http "&sourceforge-repo;/expat/expat-&expat-version;.tar.gz">
-  <!ENTITY expat-download-ftp  " ">
-  <!ENTITY expat-md5sum        "dd7dab7a5fea97d2a6a43f511449b7cd">
-  <!ENTITY expat-size          "552 KB">
-  <!ENTITY expat-buildsize     "6.0 MB">
-  <!ENTITY expat-time          "0.1 SBU">
-]>
-
-<sect1 id="expat" xreflabel="expat-&expat-version;">
-  <?dbhtml filename="expat.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Expat-&expat-version;</title>
-
-  <indexterm zone="expat">
-    <primary sortas="a-Expat">Expat</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Expat</title>
-
-    <para>The <application>Expat</application> package contains a stream oriented
-    C library for parsing XML.</para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&expat-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&expat-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &expat-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &expat-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &expat-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &expat-time;</para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/expat-&expat-version;-fixes-3.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/expat"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Expat</title>
-
-    <para>Install <application>Expat</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</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/expat-&expat-version; &amp;&amp;
-install -v -m644 doc/*.{html,png,css} /usr/share/doc/expat-&expat-version;</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command> as an
-    unprivileged user. Note this must be done after the package is
-    installed.</para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>xmlwf</seg>
-        <seg>libexpat.so</seg>
-        <seg>/usr/share/doc/expat-&expat-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xmlwf">
-        <term><command>xmlwf</command></term>
-        <listitem>
-          <para>is a non-validating utility to check whether or not
-          XML documents are well formed.</para>
-          <indexterm zone="expat xmlwf">
-            <primary sortas="b-xmlwf">xmlwf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libexpat">
-        <term><filename class='libraryfile'>libexpat.so</filename></term>
-        <listitem>
-          <para>contains API functions for parsing XML.</para>
-          <indexterm zone="expat libexpat">
-            <primary sortas="c-libexpat">libexpat.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ general/genlib/genlib.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -52,5 +52,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="enchant.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="exempi.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expat.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glib2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glibmm.xml"/>
Index: general/genlib/glib2.xml
===================================================================
--- general/genlib/glib2.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ general/genlib/glib2.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -88,5 +88,4 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="attr"/>,
       <xref linkend="elfutils"/>,
       <ulink url="ftp://oss.sgi.com/projects/fam/download/stable/">FAM library</ulink>, and
Index: general/genlib/libarchive.xml
===================================================================
--- general/genlib/libarchive.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ general/genlib/libarchive.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -41,6 +41,6 @@
       <listitem>
         <para>
-Download (HTTP): <ulink url="&libarchive-download-http;"/>
-</para>
+          Download (HTTP): <ulink url="&libarchive-download-http;"/>
+         </para>
       </listitem>
       <listitem>
@@ -75,8 +75,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="acl"/>,
-      <xref linkend="attr"/>,
-      <xref linkend="libxml2"/> or
-      <xref linkend="expat"/>,
+      <xref linkend="libxml2"/>,
       <xref linkend="LZO"/>, and
       <xref linkend="nettle"/> or
Index: general/genlib/libgcrypt.xml
===================================================================
--- general/genlib/libgcrypt.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ general/genlib/libgcrypt.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -84,5 +84,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="libcap"/> and
+      <xref linkend="libcap-pam"/> and
       <xref linkend="pth"/>
     </para>
Index: general/genlib/libgsf.xml
===================================================================
--- general/genlib/libgsf.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ general/genlib/libgsf.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -76,6 +76,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="glib2"/>,
-      <xref linkend="intltool"/> and
+      <xref linkend="glib2"/> and
       <xref linkend="libxml2"/>
     </para>
Index: general/genlib/ptlib.xml
===================================================================
--- general/genlib/ptlib.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ general/genlib/ptlib.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -87,6 +87,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="expat"/>, and
+      <xref linkend="alsa-lib"/> and
       <xref linkend="openssl"/>
     </para>
Index: general/genutils/appdata-tools.xml
===================================================================
--- general/genutils/appdata-tools.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ general/genutils/appdata-tools.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -75,6 +75,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gdk-pixbuf"/>,
-      <xref linkend="intltool"/>, and
+      <xref linkend="gdk-pixbuf"/> and
       <xref linkend="libsoup"/>
     </para>
Index: general/genutils/genutils.xml
===================================================================
--- general/genutils/genutils.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ general/genutils/genutils.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -24,5 +24,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="compface.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="desktop-file-utils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="graphviz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk-doc.xml"/>
@@ -31,5 +30,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="icon-naming-utils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="imagemagick.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intltool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iso-codes.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lsof.xml"/>
Index: neral/genutils/gperf.xml
===================================================================
--- general/genutils/gperf.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ 	(revision )
@@ -1,152 +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 gperf-download-http "http://ftp.gnu.org/gnu/gperf/gperf-&gperf-version;.tar.gz">
-  <!ENTITY gperf-download-ftp  "ftp://ftp.gnu.org/gnu/gperf/gperf-&gperf-version;.tar.gz">
-  <!ENTITY gperf-md5sum        "c1f1db32fb6598d6a93e6e88796a8632">
-  <!ENTITY gperf-size          "968 KB">
-  <!ENTITY gperf-buildsize     "6.5 MB">
-  <!ENTITY gperf-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="gperf" xreflabel="Gperf-&gperf-version;">
-  <?dbhtml filename="gperf.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Gperf-&gperf-version;</title>
-
-  <indexterm zone="gperf">
-    <primary sortas="a-Gperf">Gperf</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gperf</title>
-
-    <para><application>Gperf</application> generates a perfect hash function
-    from a key set.</para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gperf-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gperf-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gperf-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gperf-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gperf-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gperf-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gperf"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gperf</title>
-
-    <para>Install <application>Gperf</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/gperf-&gperf-version; &amp;&amp;
-make</userinput></screen>
-
-<!--  gperf.texi is broken.  Fixing the texi file breaks 'make install'
-      without TeXlive installed.
-    <para>If desired, create a text version of the documentation by issuing
-    the following command:</para>
-
-<screen><userinput>makeinfo -o doc/gperf.txt - -plaintext doc/gperf.texi</userinput></screen>
--->
-
-    <para>To test the results, issue: <command>make check</command>. There
-    should be no output from the <command>diff</command> commands.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-<!--install -m644 -v doc/gperf.{dvi,ps,pdf,txt} \ -->
-install -m644 -v doc/gperf.{dvi,ps,pdf} \
-                 /usr/share/doc/gperf-&gperf-version; &amp;&amp;
-
-pushd /usr/share/info &amp;&amp;
-  rm -v dir &amp;&amp;
-  for FILENAME in *; do
-    install-info $FILENAME dir 2>/dev/null
-  done &amp;&amp;
-popd</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-<!--
-    <para><command>install -m644 -v doc/gperf.{dvi,ps,pdf,txt} ...</command>:
-    This command installs documentation. Modify the command (remove ',txt') if
-    you did not build the text version.</para>
--->
-
-    <para><command>install -m644 -v doc/gperf.{dvi,ps,pdf} ...</command>:
-    This command installs documentation.</para>
-
-    <para><command>pushd ... popd</command>: This set of commands rebuilds the
-    <filename>/usr/share/info/dir</filename> file as the installation failed
-    to do so.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>gperf</seg>
-        <seg>None</seg>
-        <seg>/usr/share/doc/gperf-&gperf-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gperf-prog">
-        <term><command>gperf</command></term>
-        <listitem>
-          <para>generates a perfect hash function from a key set.</para>
-          <indexterm zone="gperf gperf-prog">
-            <primary sortas="b-gperf">gperf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genutils/graphviz.xml
===================================================================
--- general/genutils/graphviz.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ general/genutils/graphviz.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -79,5 +79,4 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="expat"/>,
       <xref linkend="freetype2"/>,
       <xref linkend="fontconfig"/>,
Index: neral/genutils/intltool.xml
===================================================================
--- general/genutils/intltool.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ 	(revision )
@@ -1,210 +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 intltool-download-http "http://launchpad.net/intltool/trunk/&intltool-version;/+download/intltool-&intltool-version;.tar.gz">
-  <!ENTITY intltool-download-ftp  " ">
-  <!ENTITY intltool-md5sum        "23fbd879118253cb99aeac067da5f591">
-  <!ENTITY intltool-size          "188 KB">
-  <!ENTITY intltool-buildsize     "1.4 MB">
-  <!ENTITY intltool-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="intltool" xreflabel="Intltool-&intltool-version;">
-  <?dbhtml filename="intltool.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Intltool-&intltool-version;</title>
-
-  <indexterm zone="intltool">
-    <primary sortas="a-Intltool">Intltool</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Intltool</title>
-
-    <para>
-      The <application>Intltool</application> is an internationalization
-      tool used for extracting translatable strings from source files,
-      collecting the extracted strings with messages from traditional
-      source files (<filename class="directory">&lt;source
-      directory&gt;/&lt;package&gt;/po</filename>) and merging the
-      translations into <filename>.xml</filename>,
-      <filename>.desktop</filename> and <filename>.oaf</filename> files.
-    </para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&intltool-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&intltool-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &intltool-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &intltool-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &intltool-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &intltool-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Intltool Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="perl-xml-parser"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/intltool"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Intltool</title>
-
-    <para>
-      Install <application>Intltool</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -m644 -D doc/I18N-HOWTO \
-    /usr/share/doc/intltool-&intltool-version;/I18N-HOWTO</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          intltool-extract, intltool-merge, intltool-prepare,
-          intltool-update and intltoolize
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/doc/intltool-&intltool-version; and
-          /usr/share/intltool
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="intltoolize">
-        <term><command>intltoolize</command></term>
-        <listitem>
-          <para>
-            prepares a package to use
-            <application>intltool</application>.
-          </para>
-          <indexterm zone="intltool intltoolize">
-            <primary sortas="b-intltoolize">intltoolize</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="intltool-extract">
-        <term><command>intltool-extract</command></term>
-        <listitem>
-          <para>
-            generates header files that can be read by
-            <command>gettext</command>.
-          </para>
-          <indexterm zone="intltool intltool-extract">
-            <primary sortas="b-intltool-extract">intltool-extract</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="intltool-merge">
-        <term><command>intltool-merge</command></term>
-        <listitem>
-          <para>
-            merges translated strings into various file types.
-          </para>
-          <indexterm zone="intltool intltool-merge">
-            <primary sortas="b-intltool-merge">intltool-merge</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="intltool-prepare">
-        <term><command>intltool-prepare</command></term>
-        <listitem>
-          <para>
-            updates pot files and merges them with translation files.
-          </para>
-          <indexterm zone="intltool intltool-prepare">
-            <primary sortas="b-intltool-prepare">intltool-prepare</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="intltool-update">
-        <term><command>intltool-update</command></term>
-        <listitem>
-          <para>
-            updates the <filename>po</filename> template files and merges
-            them with the translations.
-          </para>
-          <indexterm zone="intltool intltool-update">
-            <primary sortas="b-intltool-update">intltool-update</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genutils/pinentry.xml
===================================================================
--- general/genutils/pinentry.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ general/genutils/pinentry.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -71,5 +71,5 @@
     <para role="optional">
       <xref linkend="gtk2"/>,
-      <xref linkend="libcap"/> and
+      <xref linkend="libcap-pam"/> and
       <xref linkend="qt4"/>
     </para>
Index: general/genutils/shared-mime-info.xml
===================================================================
--- general/genutils/shared-mime-info.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ general/genutils/shared-mime-info.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -78,6 +78,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="glib2"/>,
-      <xref linkend="intltool"/>, and
+      <xref linkend="glib2"/> and
       <xref linkend="libxml2"/>
     </para>
Index: general/graphlib/exiv2.xml
===================================================================
--- general/graphlib/exiv2.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ general/graphlib/exiv2.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -70,11 +70,4 @@
       </listitem>
     </itemizedlist>
-
-    <bridgehead renderas="sect3">Exiv2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="expat"/>
-    </para>
 
     <para condition="html" role="usernotes">User Notes:
Index: general/graphlib/fontconfig.xml
===================================================================
--- general/graphlib/fontconfig.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ general/graphlib/fontconfig.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -77,12 +77,11 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="freetype2"/> and either
-      <xref linkend="expat"/> or
-      <xref linkend="libxml2"/>
+      <xref linkend="freetype2"/> 
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="docbook-utils"/>
+      <xref linkend="docbook-utils"/> and
+      <xref linkend="libxml2"/>
     </para>
 
Index: general/prog/cmake.xml
===================================================================
--- general/prog/cmake.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ general/prog/cmake.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -89,7 +89,6 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="curl"/>,
-      <xref linkend="libarchive"/> and
-      <xref linkend="expat"/>
+      <xref linkend="curl"/> and
+      <xref linkend="libarchive"/> 
     </para>
 
Index: general/prog/gdb.xml
===================================================================
--- general/prog/gdb.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ general/prog/gdb.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -79,6 +79,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="dejagnu"/> (for tests),
-      <xref linkend="expat"/> and
+      <xref linkend="dejagnu"/> (for tests) and
       <xref linkend="python2"/>
     </para>
Index: general/prog/git.xml
===================================================================
--- general/prog/git.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ general/prog/git.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -109,6 +109,5 @@
       <xref linkend="curl"/> (needed to use <application>Git</application> over http,
       https, ftp or ftps),
-      <xref linkend="expat"/>,
-      <xref linkend="openssl"/> and
+      <xref linkend="openssl"/>, and
       <xref linkend="python2"/>
     </para>
Index: general/prog/openjdk.xml
===================================================================
--- general/prog/openjdk.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ general/prog/openjdk.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -252,5 +252,4 @@
       <xref linkend="alsa-lib"/>,
       <xref linkend="apache-ant"/>,
-      <xref linkend="attr"/>,
       <xref linkend="cacerts"/>,
       <xref linkend="cpio"/>,
Index: general/prog/perl-modules.xml
===================================================================
--- general/prog/perl-modules.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ general/prog/perl-modules.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -637,4 +637,5 @@
 
     <!-- XML::Parser -->
+    <!--
     <bridgehead renderas="sect3" id="perl-xml-parser"
     xreflabel="XML::Parser-&XML-Parser-version;">
@@ -673,5 +674,5 @@
       </listitem>
     </itemizedlist>
-
+    -->
     <!-- XML::Simple -->
     <bridgehead renderas="sect3" id="perl-xml-simple"
@@ -722,5 +723,5 @@
               (Note: this package does not support parallel build)
             </para>
-            <itemizedlist>
+            <!--<itemizedlist>
               <listitem>
                 <para>
@@ -728,5 +729,5 @@
                 </para>
               </listitem>
-            </itemizedlist>
+            </itemizedlist> -->
           </listitem>
           <listitem>
Index: general/prog/php.xml
===================================================================
--- general/prog/php.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ general/prog/php.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -81,5 +81,4 @@
     <xref linkend="aspell"/>,
     <xref linkend="enchant"/>,
-    <xref linkend="expat"/> (deprecated alternative to <xref linkend="libxml2"/>),
     <ulink url="http://www.ossp.org/pkg/lib/mm/">OSSP mm</ulink>,
     <ulink url="http://www.net-snmp.org/">Net-SNMP</ulink>,
Index: general/prog/python2.xml
===================================================================
--- general/prog/python2.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ general/prog/python2.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -115,5 +115,4 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="expat"/> and
       <xref linkend="libffi"/>
     </para>
@@ -188,6 +187,5 @@
     <para>
       <option>--with-system-expat</option>: This switch enables linking against
-      system version of <application>Expat</application>. Remove if you have
-      not installed <xref linkend="expat"/>.
+      system version of <application>Expat</application>. 
     </para>
 
Index: general/prog/python3.xml
===================================================================
--- general/prog/python3.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ general/prog/python3.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -103,5 +103,4 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="expat"/> and
       <xref linkend="libffi"/>
     </para>
@@ -194,6 +193,5 @@
     <para>
       <option>--with-system-expat</option>: This switch enables linking against
-      system version of <application>Expat</application>. Remove if you have
-      not installed recommended dependency <xref linkend="expat"/>.
+      system version of <application>Expat</application>. 
     </para>
 
Index: general/sysutils/colord.xml
===================================================================
--- general/sysutils/colord.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ general/sysutils/colord.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -79,5 +79,4 @@
     <para role="required">
       <xref linkend="glib2"/>,
-      <xref linkend="intltool"/>,
       <xref linkend="lcms2"/>, and
       <xref linkend="sqlite"/>
Index: general/sysutils/strigi.xml
===================================================================
--- general/sysutils/strigi.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ general/sysutils/strigi.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -63,20 +63,20 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="cmake"/> and
-    <xref linkend="expat"/> or <xref linkend="libxml2"/>
+      <xref linkend="cmake"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-    <xref linkend="qt4"/> 
+      <xref linkend="qt4"/> 
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-    <xref linkend="ffmpeg"/>,
-    <xref linkend="exiv2"/>,
-    <ulink url="http://sourceforge.net/projects/clucene/files/clucene-core-stable/">
-       CLucene version 0.9x</ulink> , and
-    <ulink url="http://logging.apache.org/log4cxx/">log4cxx</ulink>
+      <xref linkend="ffmpeg"/>,
+      <xref linkend="exiv2"/>,
+      <xref linkend="libxml2"/>,
+      <ulink url="http://sourceforge.net/projects/clucene/files/clucene-core-stable/">
+         CLucene version 0.9x</ulink> , and
+      <ulink url="http://logging.apache.org/log4cxx/">log4cxx</ulink>
     </para>
 
Index: general/sysutils/udev-extras.xml
===================================================================
--- general/sysutils/udev-extras.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ general/sysutils/udev-extras.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -81,13 +81,7 @@
     <para role="required">
       <ulink url="http://anduin.linuxfromscratch.org/sources/other/"/>
-      (match the udev-lfs-???.tar.bz2 tarball version to the systemd version used in LFS).
-      <xref linkend="glib2"/> (for the gudev library),
-      <xref linkend="gperf"/> (for keymap), and
+      (match the udev-lfs-???.tar.bz2 tarball version to the systemd version used in LFS),
+      <xref linkend="glib2"/> (for the gudev library), and
       <xref linkend="gobject-introspection"/> (for gir-data, needed for Gnome)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="acl"/>
     </para>
 
Index: general/sysutils/udisks2.xml
===================================================================
--- general/sysutils/udisks2.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ general/sysutils/udisks2.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -77,5 +77,4 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="acl"/>,
       <xref linkend="libatasmart"/>,
       <xref linkend="libxslt"/>,
Index: general/sysutils/upower.xml
===================================================================
--- general/sysutils/upower.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ general/sysutils/upower.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -78,5 +78,4 @@
     <para role="required">
       <xref linkend="dbus-glib"/>,
-      <xref linkend="intltool"/>,
       <xref linkend="libusb"/>,
       <xref linkend="polkit"/>, and
Index: gnome/platform/gconf.xml
===================================================================
--- gnome/platform/gconf.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ gnome/platform/gconf.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -76,6 +76,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="intltool"/> and
+      <xref linkend="dbus-glib"/> and
       <xref linkend="libxml2"/>
     </para>
Index: gnome/platform/gcr.xml
===================================================================
--- gnome/platform/gcr.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ gnome/platform/gcr.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -78,5 +78,4 @@
     <para role="required">
       <xref linkend="glib2"/>,
-      <xref linkend="intltool"/>,
       <xref linkend="libgcrypt"/>,
       <xref linkend="libtasn1"/>, and
Index: gnome/platform/gnome-icon-theme.xml
===================================================================
--- gnome/platform/gnome-icon-theme.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ gnome/platform/gnome-icon-theme.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -84,6 +84,5 @@
       <xref linkend="gtk2"/>,
       <xref linkend="hicolor-icon-theme"/>,
-      <xref linkend="icon-naming-utils"/>, 
-      <xref linkend="intltool"/>, and
+      <xref linkend="icon-naming-utils"/>, and
       <xref linkend="perl-xml-simple"/>
     </para>
Index: gnome/platform/gnome-video-effects.xml
===================================================================
--- gnome/platform/gnome-video-effects.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ gnome/platform/gnome-video-effects.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -75,9 +75,4 @@
     <bridgehead renderas="sect3">GNOME Video Effects Dependencies</bridgehead>
 
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="intltool"/>
-    </para>
-
     <para condition="html" role="usernotes">User Notes:
       <ulink url="&blfs-wiki;/gnome-video-effects"/>
Index: gnome/platform/gsettings-desktop-schemas.xml
===================================================================
--- gnome/platform/gsettings-desktop-schemas.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ gnome/platform/gsettings-desktop-schemas.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -78,6 +78,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="glib2"/> and
-      <xref linkend="intltool"/>
+      <xref linkend="glib2"/>
     </para>
 
Index: gnome/platform/gvfs.xml
===================================================================
--- gnome/platform/gvfs.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ gnome/platform/gvfs.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -76,6 +76,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="glib2"/> and
-      <xref linkend="intltool"/>
+      <xref linkend="glib2"/>
     </para>
 
Index: gnome/platform/libgtop.xml
===================================================================
--- gnome/platform/libgtop.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ gnome/platform/libgtop.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -75,6 +75,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="glib2"/>,
-      <xref linkend="intltool"/> and
+      <xref linkend="glib2"/> and
       <xref linkend="xorg7-lib"/>
     </para>
Index: gnome/platform/notification-daemon.xml
===================================================================
--- gnome/platform/notification-daemon.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ gnome/platform/notification-daemon.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -77,8 +77,6 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gtk3"/>,
-      <xref linkend="intltool"/> and
-      <xref linkend="libcanberra"/>
-      (Built with <xref linkend="gtk3"/> support).
+      <xref linkend="gtk3"/> and
+      <xref linkend="libcanberra"/> (Built with <xref linkend="gtk3"/> support).
     </para>
 
Index: gnome/platform/totem-pl-parser.xml
===================================================================
--- gnome/platform/totem-pl-parser.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ gnome/platform/totem-pl-parser.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -78,6 +78,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gmime"/>,
-      <xref linkend="intltool"/>, and
+      <xref linkend="gmime"/> and
       <xref linkend="libsoup"/>
     </para>
Index: gnome/platform/yelp-xsl.xml
===================================================================
--- gnome/platform/yelp-xsl.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ gnome/platform/yelp-xsl.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -78,6 +78,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="libxslt"/>,
-      <xref linkend="intltool"/>, and
+      <xref linkend="libxslt"/> and
       <xref linkend="itstool"/>
     </para>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ introduction/welcome/changelog.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -49,4 +49,13 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Remove XML::Parser from perl modules.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Archive acl, attr, intltool, expat, gperf.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Synchronize libcap with LFS.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Synchronize D-Bus with LFS.  Also fixes
           <ulink url="&blfs-ticket-root;4977">#4977</ulink>.</para>
Index: kde/core/kdelibs.xml
===================================================================
--- kde/core/kdelibs.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ kde/core/kdelibs.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -98,5 +98,4 @@
       <xref linkend="avahi"/>,
       <xref linkend="openssl"/>,
-      <xref linkend="acl"/>,
       <xref linkend="aspell"/>,
       <xref linkend="enchant"/>,
Index: lxde/desktop/lxmenu-data.xml
===================================================================
--- lxde/desktop/lxmenu-data.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ lxde/desktop/lxmenu-data.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -72,11 +72,4 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">LXMenu Data Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="intltool"/>
-    </para>
-
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/lxmenu-data"/>
Index: multimedia/cdwriteutils/libisoburn.xml
===================================================================
--- multimedia/cdwriteutils/libisoburn.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ multimedia/cdwriteutils/libisoburn.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -86,6 +86,4 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para>
-      <xref linkend="acl"/>,
-      <xref linkend="attr"/>,
       <xref linkend="doxygen"/> (to generate HTML documentation) and
       <xref linkend="tk"/> (for <command>xorriso-tcltk</command>)
Index: multimedia/cdwriteutils/libisofs.xml
===================================================================
--- multimedia/cdwriteutils/libisofs.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ multimedia/cdwriteutils/libisofs.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -71,12 +71,4 @@
       </listitem>
     </itemizedlist>
-
-    <bridgehead renderas="sect3">libisofs Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para>
-      <xref linkend="acl"/> and
-      <xref linkend="attr"/>
-    </para>
 
     <para condition="html" role="usernotes">
Index: multimedia/libdriv/gst-plugins-base.xml
===================================================================
--- multimedia/libdriv/gst-plugins-base.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ multimedia/libdriv/gst-plugins-base.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -120,6 +120,5 @@
     <para role="optional">
       <xref linkend="gtk-doc"/> and
-      <xref linkend="python2"/> (compiled against an XML parser such as
-      <xref linkend="expat"/>).
+      <xref linkend="python2"/> 
     </para>
 
Index: multimedia/libdriv/gst-plugins-good.xml
===================================================================
--- multimedia/libdriv/gst-plugins-good.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ multimedia/libdriv/gst-plugins-good.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -134,6 +134,5 @@
     <para role="optional">
       <xref linkend="gtk-doc"/> and
-      <xref linkend="python2"/> (compiled against an XML parser such as
-      <xref linkend=" expat"/>)
+      <xref linkend="python2"/> 
     </para>
 
Index: multimedia/libdriv/gst-plugins-ugly.xml
===================================================================
--- multimedia/libdriv/gst-plugins-ugly.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ multimedia/libdriv/gst-plugins-ugly.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -129,6 +129,5 @@
     <para role="optional">
       <xref linkend="gtk-doc"/> and
-      <xref linkend="python2"/> (compiled against an XML parser such as
-      <xref linkend=" expat"/>)
+      <xref linkend="python2"/>
     </para>
 
Index: multimedia/libdriv/gstreamer.xml
===================================================================
--- multimedia/libdriv/gstreamer.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ multimedia/libdriv/gstreamer.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -106,6 +106,5 @@
     <para role="optional">
       <xref linkend="gtk-doc"/> and
-      <xref linkend="python2"/> (compiled against an XML Parser such as
-      <xref linkend="expat"/>).
+      <xref linkend="python2"/> 
     </para>
 
Index: multimedia/libdriv/libmusicbrainz.xml
===================================================================
--- multimedia/libdriv/libmusicbrainz.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ multimedia/libdriv/libmusicbrainz.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -76,10 +76,8 @@
     <bridgehead renderas="sect3">libmusicbrainz Dependencies</bridgehead>
 
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="optional"><xref linkend="expat"/></para>
-
-    <bridgehead renderas="sect4">Optional to Build the Python
-    Bindings</bridgehead>
-    <para role="optional"><xref linkend="python2"/></para>
+    <bridgehead renderas="sect4">Optional to Build the Python Bindings</bridgehead>
+    <para role="optional">
+      <xref linkend="python2"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
Index: multimedia/libdriv/pulseaudio.xml
===================================================================
--- multimedia/libdriv/pulseaudio.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ multimedia/libdriv/pulseaudio.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -80,6 +80,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="intltool"/>,
-      <xref linkend="json-c"/>, and
+      <xref linkend="json-c"/> and
       <xref linkend="libsndfile"/>
     </para>
@@ -89,5 +88,5 @@
       <xref linkend="alsa-lib"/>,
       <xref linkend="glib2"/>,
-      <xref linkend="libcap"/>,
+      <xref linkend="libcap-pam"/>,
       <xref linkend="openssl"/>,
       <xref linkend="speex"/> and
Index: networking/netlibs/neon.xml
===================================================================
--- networking/netlibs/neon.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ networking/netlibs/neon.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -73,10 +73,4 @@
     <bridgehead renderas="sect3">neon Dependencies</bridgehead>
 
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libxml2"/> or
-      <xref linkend="expat"/>
-    </para>
-
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
@@ -88,6 +82,7 @@
     <para role="optional">
       <ulink url="http://code.google.com/p/libproxy/">libproxy</ulink>,
-      <xref linkend="mitkrb"/> and
-      <ulink url="http://www.manyfish.co.uk/pakchois/">pakchois</ulink>
+      <xref linkend="mitkrb"/>,
+      <ulink url="http://www.manyfish.co.uk/pakchois/">pakchois</ulink>, and
+      <xref linkend="libxml2"/>
     </para>
 
Index: networking/netprogs/cifsutils.xml
===================================================================
--- networking/netprogs/cifsutils.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ networking/netprogs/cifsutils.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -67,5 +67,5 @@
       <xref linkend="samba"/>, and
       <ulink url="http://people.redhat.com/sgrubb/libcap-ng/">libcap-ng</ulink> or
-      <xref linkend="libcap"/>
+      <xref linkend="libcap-pam"/>
     </para>
 
Index: networking/netprogs/nfs-utils.xml
===================================================================
--- networking/netprogs/nfs-utils.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ networking/netprogs/nfs-utils.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -74,5 +74,5 @@
       <ulink url="http://www.citi.umich.edu/projects/nfsv4/linux/">libgssapi</ulink>, and
       <ulink url="http://www.citi.umich.edu/projects/nfsv4/linux/">librpcsecgss</ulink> (for GSS and RPC security support) and
-      <xref linkend="libcap"/>
+      <xref linkend="libcap-pam"/>
     </para>
 
Index: networking/netprogs/ntp.xml
===================================================================
--- networking/netprogs/ntp.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ networking/netprogs/ntp.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -61,12 +61,8 @@
     <bridgehead renderas="sect3">ntp Dependencies</bridgehead>
 
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libcap"/>
-    </para>
-
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="openssl"/> and
+      <xref linkend="libcap-pam"/>,
+      <xref linkend="openssl"/>, and
       <ulink url="http://www.thrysoee.dk/editline/">libedit</ulink>
     </para>
Index: networking/netprogs/rsync.xml
===================================================================
--- networking/netprogs/rsync.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ networking/netprogs/rsync.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -63,10 +63,4 @@
     <para role="recommended">
       <xref linkend="popt"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="attr"/> and
-      <xref linkend="acl"/>
     </para>
 
Index: networking/netprogs/samba.xml
===================================================================
--- networking/netprogs/samba.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ networking/netprogs/samba.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -77,5 +77,4 @@
       <xref linkend="openldap"/>,
       <ulink url="https://people.gnome.org/~veillard/gamin/">Gamin</ulink>,
-      <xref linkend="acl"/>,
       <xref linkend="xfsprogs"/>,
       <xref linkend="mitkrb"/>,
@@ -83,5 +82,5 @@
       <ulink url="http://tdb.samba.org/">tdb</ulink>,
       <ulink url="http://ctdb.samba.org/">ctdb</ulink>,
-      <xref linkend="libcap"/>,
+      <xref linkend="libcap-pam"/>,
       <ulink url="http://www.nongnu.org/libunwind/">libunwind</ulink>,
       <xref linkend="avahi"/>,
Index: networking/netutils/avahi.xml
===================================================================
--- networking/netutils/avahi.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ networking/netutils/avahi.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -75,6 +75,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="glib2"/> and
-      <xref linkend="intltool"/>
+      <xref linkend="glib2"/> 
     </para>
 
Index: networking/netutils/bind-utils.xml
===================================================================
--- networking/netutils/bind-utils.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ networking/netutils/bind-utils.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -67,5 +67,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="libcap"/>,
+      <xref linkend="libcap-pam"/>,
       <xref linkend="libxml2"/>, and
       <xref linkend="openssl"/>
Index: networking/netutils/networkmanager.xml
===================================================================
--- networking/netutils/networkmanager.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ networking/netutils/networkmanager.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -81,5 +81,4 @@
     <para role="required">
       <xref linkend="dbus-glib"/>,
-      <xref linkend="intltool"/>,
       <xref linkend="libnl"/>,
       <xref linkend="nss"/>, and
Index: stlfs/security/acl.xml
===================================================================
--- postlfs/security/acl.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ 	(revision )
@@ -1,227 +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 acl-download-http "http://download.savannah.gnu.org/releases/acl/acl-&acl-version;.src.tar.gz">
-  <!ENTITY acl-download-ftp  " ">
-  <!ENTITY acl-md5sum        "a61415312426e9c2212bd7dc7929abda">
-  <!ENTITY acl-size          "384 KB">
-  <!ENTITY acl-buildsize     "9.1 MB">
-  <!ENTITY acl-time          "0.1 SBU">
-]>
-
-<sect1 id="acl" xreflabel="acl-&acl-version;">
-  <?dbhtml filename="acl.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>acl-&acl-version;</title>
-
-  <indexterm zone="acl">
-    <primary sortas="a-acl">acl</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to acl</title>
-
-    <para>The <application>acl</application> package contains utilities to
-    administer Access Control Lists, which are used to define more fine-grained
-    discretionary access rights for files and directories.</para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&acl-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&acl-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &acl-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &acl-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &acl-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &acl-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">acl Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="attr"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/acl"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of acl</title>
-
-    <para>Install <application>acl</application> by running the following
-    commands:</para>
-
-<screen><userinput>sed -i -e 's|/@pkg_name@|&amp;-@pkg_version@|' \
-     include/builddefs.in &amp;&amp;
-
-INSTALL_USER=root  \
-INSTALL_GROUP=root \
-./configure --prefix=/usr --libexecdir=/usr/lib --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>For meaningful results, the tests need to be carried out on a file
-    system that supports extended attributes. It is also required that
-    <application>Coreutils</application> is re-installed after
-    <application>acl</application> is installed so that the extra acl bit
-    displays correctly on a <command>ls</command> command.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<!-- Package uses DIST_ROOT instead of DESTDIR -->
-<screen role="root"><userinput>make install install-dev install-lib             &amp;&amp;
-chmod -v 755 /usr/lib/libacl.so                  &amp;&amp;
-mv -v /usr/lib/libacl.so.* /lib                  &amp;&amp;
-ln -sfv ../../lib/libacl.so.1 /usr/lib/libacl.so &amp;&amp;
-install -v -m644 doc/*.txt /usr/share/doc/acl-&acl-version;</userinput></screen>
-
-    <para>You should now re-install <application><ulink
-    url="&lfs-root;/chapter06/coreutils.html">Coreutils</ulink>
-    </application> and proceed to run the test suite.</para>
-
-    <para>There are three sets of tests that come with this package. The local
-    partition where the tests are run must be mounted with acl configured as
-    described below.  Additionally, the users <systemitem
-    class="username">bin</systemitem> and <systemitem
-    class="username">daemon</systemitem> must be created or modified to have a
-    proper shell and home directory and the group <systemitem
-    class="groupname">daemon</systemitem> must be a member of the <systemitem
-    class="groupname">bin</systemitem> group.  The kernel must also be
-    configured with the appropriate ACL options (there are nine different
-    options).</para>
-    
-    <para>To run the standard tests run <command>make tests </command>.  As
-    <systemitem class="username">root</systemitem> user, run <command>make
-    root-tests</command>.</para>
-
-    <para>The third set of tests are Network File System (NFS) specific.  See
-    the contents of the test files in the test/nfs/ directory for the setup
-    requirements.</para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed -i ... include/builddefs.in</command>: This command
-    modifies the documentation directory so that it is a versioned
-    directory.</para>
-
-    <para><command>--libexecdir=/usr/lib</command>: This switch ensures that
-    <filename class="libraryfile">libacl.la</filename> is installed in the correct
-    directory, and that a spurious
-    <filename class="libraryfile">libacl.so</filename> symlink is not created in
-    <filename class="directory">/usr/libexec/</filename>.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring acl</title>
-    <sect3><title>Configuration Information</title>
-
-      <para>There is no configuration to <application>acl</application> itself,
-      but to get any use out of <application>acl</application>, a filesystem
-      needs to support access control lists.</para>
-
-      <para>One way to achieve this is to add the acl option to an ext3
-      filesystem in the <filename>/etc/fstab</filename> file as shown
-      below:</para>
-
-<screen># file system  mount-point  type   options                 dump  fsck
-#                                                                order
-
-/dev/sda1      /            ext3   defaults,acl,user_xattr 0     2</screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>chacl, getfacl, and setfacl</seg>
-        <seg>libacl.{so,a}</seg>
-        <seg>/usr/{include/acl,share/doc/acl-&acl-version;}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="chacl">
-        <term><command>chacl</command></term>
-        <listitem>
-          <para>changes the access control list of a file or directory.</para>
-          <indexterm zone="acl chacl">
-            <primary sortas="b-chacl">chacl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="getfacl">
-        <term><command>getfacl</command></term>
-        <listitem>
-          <para>gets file access control lists.</para>
-          <indexterm zone="acl getfacl">
-            <primary sortas="b-getfacl">getfacl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setfacl">
-        <term><command>setfacl</command></term>
-        <listitem>
-          <para>sets file access control lists.</para>
-          <indexterm zone="acl setfacl">
-            <primary sortas="b-setfacl">setfacl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libacl">
-        <term><filename class='libraryfile'>libacl.{so,a}</filename></term>
-        <listitem>
-          <para>contains the <application>acl</application> API functions.</para>
-          <indexterm zone="acl libacl">
-            <primary sortas="c-libacl">libacl.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: stlfs/security/attr.xml
===================================================================
--- postlfs/security/attr.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ 	(revision )
@@ -1,190 +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 attr-download-http "http://download.savannah.gnu.org/releases/attr/attr-&attr-version;.src.tar.gz">
-  <!ENTITY attr-download-ftp  " ">
-  <!ENTITY attr-md5sum        "84f58dec00b60f2dc8fd1c9709291cc7">
-  <!ENTITY attr-size          "336 KB">
-  <!ENTITY attr-buildsize     "3.5 MB">
-  <!ENTITY attr-time          "0.1 SBU">
-]>
-
-<sect1 id="attr" xreflabel="attr-&attr-version;">
-  <?dbhtml filename="attr.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>attr-&attr-version;</title>
-
-  <indexterm zone="attr">
-    <primary sortas="a-attr">attr</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to attr</title>
-
-    <para>The <application>attr</application> package contains utilities to
-    administer the extended attributes on filesystem objects.</para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&attr-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&attr-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &attr-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &attr-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &attr-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &attr-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/attr"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of attr</title>
-
-    <para>Install <application>attr</application> by running the following
-    commands:</para>
-
-<screen><userinput>sed -i -e 's|/@pkg_name@|&amp;-@pkg_version@|' include/builddefs.in &amp;&amp;
-
-INSTALL_USER=root  \
-INSTALL_GROUP=root \
-./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>There are three sets of tests that come with this package. Issue the
-    following to execute all three:
-    <command>make tests root-tests ext-tests</command>.  For meaningful results,
-    the tests need to be carried out on a file system that supports extended
-    attributes.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<!-- Package uses DIST_ROOT instead of DESTDIR -->
-<screen role="root"><userinput>make install install-dev install-lib &amp;&amp;
-chmod -v 755 /usr/lib/libattr.so &amp;&amp;
-mv -v /usr/lib/libattr.so.* /lib &amp;&amp;
-ln -sfv ../../lib/libattr.so.1 /usr/lib/libattr.so</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed ... include/builddefs.in</command>: This command
-    modifies the documentation directory so that it is a versioned
-    directory.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring attr</title>
-    <sect3><title>Configuration Information</title>
-
-      <para>There is no configuration to <application>attr</application> itself,
-      but to get any use out of <application>attr</application>, a filesystem
-      needs to support extended attributes.</para>
-
-      <para>One way to achieve this is to add the user_xattr option to an ext3
-      filesystem in the <filename>/etc/fstab</filename> file as shown
-      below:</para>
-
-<screen># file system  mount-point  type   options                 dump  fsck
-#                                                                order
-
-/dev/sda1      /            ext3   defaults,acl,user_xattr 0     2</screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>attr, getfattr, and setfattr</seg>
-        <seg>libattr.so</seg>
-        <seg>/usr/{include/attr,share/doc/attr-&attr-version;}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="attr-prog">
-        <term><command>attr</command></term>
-        <listitem>
-          <para>extends attributes on filesystem objects.</para>
-          <indexterm zone="attr attr">
-            <primary sortas="b-attr">attr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="getfattr">
-        <term><command>getfattr</command></term>
-        <listitem>
-          <para>gets the extended attributes of filesystem objects.</para>
-          <indexterm zone="attr getfattr">
-            <primary sortas="b-getfattr">getfattr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setfattr">
-        <term><command>setfattr</command></term>
-        <listitem>
-          <para>sets the extended attributes of filesystem objects.</para>
-          <indexterm zone="attr setfattr">
-            <primary sortas="b-setfattr">setfattr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libattr">
-        <term><filename class='libraryfile'>libattr.so</filename></term>
-        <listitem>
-          <para>contains the <application>attr</application> API functions.</para>
-          <indexterm zone="attr libattr">
-            <primary sortas="c-libattr">libattr.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: postlfs/security/consolekit.xml
===================================================================
--- postlfs/security/consolekit.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ postlfs/security/consolekit.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -77,5 +77,4 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="acl"/>,
       <xref linkend="dbus-glib"/> and
       <xref linkend="xorg7-lib"/>
Index: postlfs/security/libcap.xml
===================================================================
--- postlfs/security/libcap.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ postlfs/security/libcap.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="libcap" xreflabel="libcap-&libcap-version;">
+<sect1 id="libcap-pam" xreflabel="libcap-&libcap-version; with PAM">
   <?dbhtml filename="libcap.html"?>
 
@@ -21,18 +21,16 @@
   </sect1info>
 
-  <title>libcap-&libcap-version;</title>
+  <title>libcap-&libcap-version; with PAM</title>
 
-  <indexterm zone="libcap">
-    <primary sortas="a-libcap">libcap</primary>
+  <indexterm zone="libcap-pam">
+    <primary sortas="a-libcap-pam">libcap</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to libcap</title>
+    <title>Introduction to libcap with PAM</title>
 
-    <para>The <application>libcap</application> package implements the
-    user-space interfaces to the POSIX 1003.1e capabilities available in Linux
-    kernels. These capabilities are a partitioning of the all powerful root
-    privilege into a set of distinct privileges.  </para>
-
+    <para>The <application>libcap</application> package was installed in 
+    LFS, but if PAM support is desired, it needs to be reinstalled after 
+    PAM is built.</para>
     &lfs75_checked;
 
@@ -62,7 +60,4 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="attr"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="linux-pam"/></para>
 
@@ -90,6 +85,4 @@
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<!-- dev note: make DESTDIR=<DESTDIR> prefix=/usr SBINDIR=<DESTDIR>/sbin PAM_LIBDIR=<DESTDIR>/lib RAISE_SETFCAP=no -->
 
 <screen role="root"><userinput>make prefix=/usr \
@@ -147,5 +140,5 @@
         <listitem>
           <para>is a shell wrapper to explore and constrain capability support.</para>
-          <indexterm zone="libcap capsh">
+          <indexterm zone="libcap-pam capsh">
             <primary sortas="b-capsh">capsh</primary>
           </indexterm>
@@ -157,5 +150,5 @@
         <listitem>
           <para>examines file capabilities.</para>
-          <indexterm zone="libcap getcap">
+          <indexterm zone="libcap-pam getcap">
             <primary sortas="b-getcap">getcap</primary>
           </indexterm>
@@ -167,5 +160,5 @@
         <listitem>
           <para>displays the capabilities on the queried process(es).</para>
-          <indexterm zone="libcap getpcaps">
+          <indexterm zone="libcap-pam getpcaps">
             <primary sortas="b-getpcaps">getpcaps</primary>
           </indexterm>
@@ -177,5 +170,5 @@
         <listitem>
           <para>sets file file capabilities.</para>
-          <indexterm zone="libcap setcap">
+          <indexterm zone="libcap-pam setcap">
             <primary sortas="b-setcap">setcap</primary>
           </indexterm>
@@ -187,5 +180,5 @@
         <listitem>
           <para>contains the <application>libcap</application> API functions.</para>
-          <indexterm zone="libcap libcap-lib">
+          <indexterm zone="libcap-pam libcap-lib">
             <primary sortas="c-libcap">libcap.{so,a}</primary>
           </indexterm>
Index: postlfs/security/polkit.xml
===================================================================
--- postlfs/security/polkit.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ postlfs/security/polkit.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -77,6 +77,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="glib2"/>,
-      <xref linkend="intltool"/> and
+      <xref linkend="glib2"/>, and
       <xref linkend="JS"/>
     </para>
Index: postlfs/security/security.xml
===================================================================
--- postlfs/security/security.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ postlfs/security/security.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -42,6 +42,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vulnerabilities.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="attr.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="consolekit.xml"/>
Index: postlfs/shells/zsh.xml
===================================================================
--- postlfs/shells/zsh.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ postlfs/shells/zsh.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -83,6 +83,6 @@
     <para role="optional">
       <ulink url="ftp://ftp.gnu.org/gnu/gdbm/">gdbm</ulink>,
-      <xref linkend="pcre"/> and
-      <xref linkend="libcap"/>
+      <xref linkend="pcre"/>, and
+      <xref linkend="libcap-pam"/>
     </para>
 
Index: postlfs/virtualization/qemu.xml
===================================================================
--- postlfs/virtualization/qemu.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ postlfs/virtualization/qemu.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -71,5 +71,4 @@
     <para role="optional">
       <xref linkend="alsa"/>,
-      <xref linkend="attr"/>,
       <xref linkend="check"/>,
       <xref linkend="curl"/>,
Index: pst/printing/cups.xml
===================================================================
--- pst/printing/cups.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ pst/printing/cups.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -106,5 +106,4 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="acl"/>,
       <xref linkend="gnutls"/> (if you have it installed, then
       <xref linkend="libgcrypt"/> is required) or <xref linkend="openssl"/>,
Index: pst/printing/gs.xml
===================================================================
--- pst/printing/gs.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ pst/printing/gs.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -106,5 +106,4 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="expat"/>,
       <xref linkend="freetype2"/>,
       <xref linkend="libjpeg"/>,
Index: pst/ps/a2ps.xml
===================================================================
--- pst/ps/a2ps.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ pst/ps/a2ps.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -81,7 +81,4 @@
     <bridgehead renderas="sect3">a2ps Dependencies</bridgehead>
 
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gperf"/></para>
-
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
Index: server/mail/dovecot.xml
===================================================================
--- server/mail/dovecot.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ server/mail/dovecot.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -79,5 +79,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="libcap"/>,
+      <xref linkend="libcap-pam"/>,
       <xref linkend="openssl"/>,
       <xref linkend="mitkrb"/> (for GSSAPI support),
Index: server/major/bind.xml
===================================================================
--- server/major/bind.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ server/major/bind.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -73,5 +73,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="libcap"/>,
+      <xref linkend="libcap-pam"/>,
       <xref linkend="libxml2"/>,
       <xref linkend="mitkrb"/>, and
Index: server/major/proftpd.xml
===================================================================
--- server/major/proftpd.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ server/major/proftpd.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -62,6 +62,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="acl"/>,
-      <xref linkend="libcap"/>,
+      <xref linkend="libcap-pam"/>,
       <xref linkend="linux-pam"/>,
       <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
Index: server/major/vsftpd.xml
===================================================================
--- server/major/vsftpd.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ server/major/vsftpd.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -63,5 +63,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="libcap"/>,
+      <xref linkend="libcap-pam"/>,
       <xref linkend="linux-pam"/>, and
       <xref linkend="openssl"/>
Index: server/other/unbound.xml
===================================================================
--- server/other/unbound.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ server/other/unbound.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -78,6 +78,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="expat"/>,
-      <xref linkend="ldns"/>, and
+      <xref linkend="ldns"/> and
       <xref linkend="openssl"/>
 <!-- broken?
Index: x/installing/mesalib.xml
===================================================================
--- x/installing/mesalib.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ x/installing/mesalib.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -97,7 +97,6 @@
     <para role="required">
       <xref linkend="libxml2"/>,
-      <xref linkend="xorg7-lib"/>,
-      <xref linkend="libdrm"/>, and
-      <xref linkend="expat"/>
+      <xref linkend="xorg7-lib"/>, and
+      <xref linkend="libdrm"/>
     </para>
 
Index: x/installing/xkeyboard-config.xml
===================================================================
--- x/installing/xkeyboard-config.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ x/installing/xkeyboard-config.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -77,5 +77,4 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="intltool"/> and
       <xref linkend="xorg7-lib"/>
     </para>
Index: x/lib/at-spi2-core.xml
===================================================================
--- x/lib/at-spi2-core.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ x/lib/at-spi2-core.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -79,6 +79,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="glib2"/>,
-      <xref linkend="intltool"/> and
+      <xref linkend="glib2"/> and
       <xref linkend="xorg7-lib"/>
     </para>
Index: x/lib/gtk-engines.xml
===================================================================
--- x/lib/gtk-engines.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ x/lib/gtk-engines.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -66,6 +66,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gtk2"/> and
-      <xref linkend="intltool"/>
+      <xref linkend="gtk2"/>
     </para>
 
Index: x/lib/webkitgtk.xml
===================================================================
--- x/lib/webkitgtk.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ x/lib/webkitgtk.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -86,5 +86,4 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gperf"/>,
       <xref linkend="gst-plugins-base"/>,
       <xref linkend="gtk2"/>,
Index: x/lib/webkitgtk2.xml
===================================================================
--- x/lib/webkitgtk2.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ x/lib/webkitgtk2.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -76,5 +76,4 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gperf"/>,
       <xref linkend="gst10-plugins-base"/>,
       <xref linkend="gtk3"/>,
Index: xfce/apps/gtksourceview2.xml
===================================================================
--- xfce/apps/gtksourceview2.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ xfce/apps/gtksourceview2.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -78,6 +78,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gtk2"/> and
-      <xref linkend="intltool"/>
+      <xref linkend="gtk2"/>
     </para>
 
Index: xfce/apps/vte2.xml
===================================================================
--- xfce/apps/vte2.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ xfce/apps/vte2.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -77,6 +77,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gtk2"/> and
-      <xref linkend="intltool"/>
+      <xref linkend="gtk2"/>
     </para>
 
Index: xfce/core/libwnck2.xml
===================================================================
--- xfce/core/libwnck2.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ xfce/core/libwnck2.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -77,6 +77,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gtk2"/> and
-      <xref linkend="intltool"/>
+      <xref linkend="gtk2"/> 
     </para>
 
Index: xfce/core/libxfce4util.xml
===================================================================
--- xfce/core/libxfce4util.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ xfce/core/libxfce4util.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -76,6 +76,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="glib2"/> and
-      <xref linkend="intltool"/>
+      <xref linkend="glib2"/> 
     </para>
 
Index: xfce/core/tumbler.xml
===================================================================
--- xfce/core/tumbler.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ xfce/core/tumbler.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -78,6 +78,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="dbus-glib"/> and
-      <xref linkend="intltool"/>
+      <xref linkend="dbus-glib"/>
     </para>
 
Index: xsoft/office/libreoffice.xml
===================================================================
--- xsoft/office/libreoffice.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ xsoft/office/libreoffice.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -134,5 +134,4 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gperf"/>,
       <xref linkend="perl-archive-zip"/>,
       <xref linkend="unzip"/>,
@@ -159,5 +158,4 @@
       <xref linkend="cups"/>,
       <xref linkend="curl"/>,
-      <xref linkend="expat"/>,
       <xref linkend="graphite2"/>,
       <xref linkend="gst-plugins-base"/> or
Index: xsoft/other/gimp.xml
===================================================================
--- xsoft/other/gimp.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ xsoft/other/gimp.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -128,7 +128,6 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gegl"/>,
-      <xref linkend="gtk2"/> and
-      <xref linkend="intltool"/>
+      <xref linkend="gegl"/> and
+      <xref linkend="gtk2"/> 
     </para>
 
Index: xsoft/other/gparted.xml
===================================================================
--- xsoft/other/gparted.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ xsoft/other/gparted.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -77,6 +77,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gtkmm2"/>,
-      <xref linkend="intltool"/> and
+      <xref linkend="gtkmm2"/> and
       <xref linkend="parted"/>
     </para>
Index: xsoft/other/inkscape.xml
===================================================================
--- xsoft/other/inkscape.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ xsoft/other/inkscape.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -116,5 +116,4 @@
     (for some of the Inkscape extensions)</bridgehead>
     <para role="optional">
-      <xref linkend="perl-xml-parser"/>,
       <ulink url="http://search.cpan.org/~tjmather/XML-XQL-0.68/lib/XML/XQL.pm">XML::XQL</ulink>
       and <ulink url="http://cheeseshop.python.org/pypi/lxml/">python-lxml</ulink>
Index: xsoft/other/pidgin.xml
===================================================================
--- xsoft/other/pidgin.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ xsoft/other/pidgin.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -77,6 +77,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gtk2"/> and
-      <xref linkend="perl-xml-parser"/>
+      <xref linkend="gtk2"/>
     </para>
 
@@ -108,5 +107,4 @@
       <xref linkend="gstreamer"/> (required for audio support),
       <ulink url="http://gtkspell.sourceforge.net/">Gtkspell</ulink>,
-      <xref linkend="intltool"/>,
       <xref linkend="libidn"/>,
       <ulink url="http://libgadu.net/">libgadu</ulink>,
Index: xsoft/other/transmission.xml
===================================================================
--- xsoft/other/transmission.xml	(revision 08de396369ddebabc17c83fc791cabab072635d7)
+++ xsoft/other/transmission.xml	(revision 56605b904c9ec85e0994403b5d27b263f2751ec0)
@@ -89,5 +89,4 @@
     <para role="required">
       <xref linkend="curl"/>,
-      <xref linkend="intltool"/>,
       <xref linkend="libevent"/>, and
       <xref linkend="openssl"/>
