Index: general/general.ent
===================================================================
--- general/general.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/general.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,65 @@
+<!ENTITY general SYSTEM "general.xml">
+
+<!-- General Libraries -->
+<!ENTITY general-genlib SYSTEM "genlib/genlib.xml">
+<!ENTITY % zlib SYSTEM "genlib/zlib/zlib.ent">
+<!ENTITY % openssl SYSTEM "genlib/openssl/openssl.ent">
+<!ENTITY % pcre SYSTEM "genlib/pcre/pcre.ent">
+<!ENTITY % xmllib SYSTEM "genlib/xmllib/xmllib.ent">
+<!ENTITY % popt SYSTEM "genlib/popt/popt.ent">
+<!ENTITY % libfam SYSTEM "genlib/libfam/libfam.ent">
+<!ENTITY % slang SYSTEM "genlib/slang/slang.ent">
+
+%zlib;
+%openssl;
+%pcre;
+%xmllib;
+%popt;
+%libfam;
+%slang;
+
+<!-- Graphics Libraries -->
+<!ENTITY general-graphlib SYSTEM "graphlib/graphlib.xml">
+<!ENTITY % lcms SYSTEM "graphlib/lcms/lcms.ent">
+<!ENTITY % libjpeg SYSTEM "graphlib/libjpeg/libjpeg.ent">
+<!ENTITY % libpng SYSTEM "graphlib/libpng/libpng.ent">
+<!ENTITY % libtiff SYSTEM "graphlib/libtiff/libtiff.ent">
+<!ENTITY % libungif SYSTEM "graphlib/libungif/libungif.ent">
+<!ENTITY % libmng SYSTEM "graphlib/libmng/libmng.ent">
+<!ENTITY % imlib SYSTEM "graphlib/imlib/imlib.ent">
+%lcms;
+%libjpeg;
+%libpng;
+%libtiff;
+%libungif;
+%libmng;
+%imlib;
+
+<!-- General Utilities -->
+<!ENTITY general-genutils SYSTEM "genutils/genutils.xml">
+<!ENTITY % bc SYSTEM "genutils/bc/bc.ent">
+%bc;
+
+<!-- System Utilities -->
+<!ENTITY general-sysutils SYSTEM "sysutils/sysutils.xml">
+<!ENTITY % gpm SYSTEM "sysutils/gpm/gpm.ent">
+<!ENTITY % fcron SYSTEM "sysutils/fcron/fcron.ent">
+<!ENTITY % hdparm SYSTEM "sysutils/hdparm/hdparm.ent">
+<!ENTITY % which SYSTEM "sysutils/which/which.ent">
+<!ENTITY % infozip SYSTEM "sysutils/infozip/infozip.ent">
+<!ENTITY % pccts SYSTEM "sysutils/pccts/pccts.ent">
+<!ENTITY % pciutils SYSTEM "sysutils/pciutils/pciutils.ent">
+<!ENTITY % pkgconfig SYSTEM "sysutils/pkgconfig/pkgconfig.ent">
+%gpm;
+%fcron;
+%hdparm;
+%which;
+%infozip;
+%pccts;
+%pciutils;
+%pkgconfig;
+
+<!-- Programming -->
+<!ENTITY general-prog SYSTEM "prog/prog.xml">
+<!ENTITY python SYSTEM "prog/python.xml">
+<!ENTITY jdk SYSTEM "prog/jdk.xml">
Index: general/general.xml
===================================================================
--- general/general.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ general/general.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,19 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
+<part id="general" xreflabel="General Libraries and Utilities">
+<?dbhtml filename="general.html" dir="general"?>
+<title>General Libraries and Utilities</title>
 
-<part id="general" xreflabel="General Libraries and Utilities">
-  <?dbhtml filename="general.html" dir="general"?>
-
-  <title>General Libraries and Utilities</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="genlib/genlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="graphlib/graphlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="genutils/genutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysutils/sysutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="prog/prog.xml"/>
+&general-genlib;
+&general-graphlib;
+&general-genutils;
+&general-sysutils;
+&general-prog;
 
 </part>
Index: general/genlib/abseil-cpp.xml
===================================================================
--- general/genlib/abseil-cpp.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,269 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 abseil-cpp-download-http "https://github.com/abseil/abseil-cpp/releases/download/&abseil-cpp-version;/abseil-cpp-&abseil-cpp-version;.tar.gz">
-  <!ENTITY abseil-cpp-md5sum        "f2c807858166b0a8ce4f679b17111335">
-  <!ENTITY abseil-cpp-size          "2.1 MB">
-  <!ENTITY abseil-cpp-buildsize     "31 MB">
-  <!ENTITY abseil-cpp-time          "0.8 SBU">
-]>
-
-<sect1 id="abseil-cpp" xreflabel="Abseil-cpp-&abseil-cpp-version;">
-  <?dbhtml filename="abseil-cpp.html"?>
-
-  <title>Abseil-cpp-&abseil-cpp-version;</title>
-
-  <indexterm zone="abseil-cpp">
-    <primary sortas="a-abseil-cpp">Abseil-cpp</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Abseil-cpp</title>
-
-    <para>
-      The <application>Abseil-cpp</application> package contains a series of
-      libraries designed to augment the C++ standard library.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&abseil-cpp-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &abseil-cpp-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &abseil-cpp-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &abseil-cpp-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &abseil-cpp-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Abseil-cpp Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Abseil-cpp</title>
-
-    <para>
-      Install <application>Abseil-cpp</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      -DABSL_PROPAGATE_CXX_STD=ON \
-      -DBUILD_SHARED_LIBS=ON      \
-      -GNinja ..                  &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DABSL_PROPAGATE_CXX_STD=ON</parameter>: This parameter
-      enables propagating C++ features to targets that link to this package's
-      libraries.
-    </para>
-
-    <para>
-      <parameter>-DBUILD_SHARED_LIBS=ON</parameter>: This parameter builds
-      shared versions of the libraries provided by this package instead of
-      static libraries.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libabsl_bad_any_cast_impl.so,
-          libabsl_bad_optional_access.so,
-          libabsl_bad_variant_access.so,
-          libabsl_base.so,
-          libabsl_city.so,
-          libabsl_civil_time.so,
-          libabsl_cord_internal.so,
-          libabsl_cord.so,
-          libabsl_cordz_functions.so,
-          libabsl_cordz_handle.so,
-          libabsl_cordz_info.so,
-          libabsl_cordz_sample_token.so,
-          libabsl_crc32c.so,
-          libabsl_crc_cord_state.so,
-          libabsl_crc_cpu_detect.so,
-          libabsl_crc_internal.so,
-          libabsl_debugging_internal.so,
-          libabsl_demangle_internal.so,
-          libabsl_die_if_null.so,
-          libabsl_examine_stack.so,
-          libabsl_exponential_biased.so,
-          libabsl_failure_signal_handler.so,
-          libabsl_flags_commandlineflag_internal.so,
-          libabsl_flags_commandlineflag.so,
-          libabsl_flags_config.so,
-          libabsl_flags_internal.so,
-          libabsl_flags_marshalling.so,
-          libabsl_flags_parse.so,
-          libabsl_flags_private_handle_accessor.so,
-          libabsl_flags_program_name.so,
-          libabsl_flags_reflection.so,
-          libabsl_flags_usage_internal.so,
-          libabsl_flags_usage.so,
-          libabsl_graphcycles_internal.so,
-          libabsl_hash.so,
-          libabsl_hashtablez_sampler.so,
-          libabsl_int128.so,
-          libabsl_kernel_timeout_internal.so,
-          libabsl_leak_check.so,
-          libabsl_log_entry.so,
-          libabsl_log_flags.so,
-          libabsl_log_globals.so,
-          libabsl_log_initalize.so,
-          libabsl_log_internal_check_op.so,
-          libabsl_log_internal_conditions.so,
-          libabsl_log_internal_fnmatch.so,
-          libabsl_log_internal_format.so,
-          libabsl_log_internal_globals.so,
-          libabsl_log_internal_log_sink_set.so,
-          libabsl_log_internal_message.so,
-          libabsl_log_internal_nullguard.so,
-          libabsl_log_internal_proto.so,
-          libabsl_log_severity.so,
-          libabsl_log_sink.so,
-          libabsl_low_level_hash.so,
-          libabsl_malloc_internal.so,
-          libabsl_periodic_sampler.so,
-          libabsl_random_distributions.so,
-          libabsl_random_internal_distribution_test_util.so,
-          libabsl_random_internal_platform.so,
-          libabsl_random_internal_pool_urbg.so,
-          libabsl_random_internal_randen_hwaes_impl.so,
-          libabsl_random_internal_randen_hwaes.so,
-          libabsl_random_internal_randen_slow.so,
-          libabsl_random_internal_randen.so,
-          libabsl_random_internal_seed_material.so,
-          libabsl_random_seed_gen_exception.so,
-          libabsl_random_seed_sequences.so,
-          libabsl_raw_hash_set.so,
-          libabsl_raw_logging_internal.so,
-          libabsl_scoped_set_env.so,
-          libabsl_spinlock_wait.so,
-          libabsl_stacktrace.so,
-          libabsl_statusor.so,
-          libabsl_status.so,
-          libabsl_strerror.so,
-          libabsl_str_format_internal.so,
-          libabsl_strings_internal.so,
-          libabsl_strings.so,
-          libabsl_string_view.so,
-          libabsl_symbolize.so,
-          libabsl_synchronization.so,
-          libabsl_throw_delegate.so,
-          libabsl_time.so,
-          libabsl_time_zone.so, and
-          libabsl_vlog_config_internal.so
-        </seg>
-        <seg>
-          /usr/include/absl,
-          /usr/lib/cmake/absl
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="PROGRAM1">
-        <term><command>PROGRAM1</command></term>
-        <listitem>
-          <para>
-            does this ..... (no period at the end)
-          </para>
-          <indexterm zone="TEMPLATE PROGRAM1">
-            <primary sortas="b-PROGRAM1">PROGRAM1</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="PROGRAM2">
-        <term><command>PROGRAM2</command></term>
-        <listitem>
-          <para>
-            does this ..... (no period at the end)
-          </para>
-          <indexterm zone="TEMPLATE PROGRAM2">
-            <primary sortas="b-PROGRAM2">PROGRAM2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libLIBRARY1">
-        <term><filename class="libraryfile">libLIBRARY1.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that ..... (no period at the end)
-          </para>
-          <indexterm zone="TEMPLATE libLIBRARY1">
-            <primary sortas="c-libLIBRARY1">libLIBRARY1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-    -->
-  </sect2>
-</sect1>
Index: general/genlib/appstream.xml
===================================================================
--- general/genlib/appstream.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,286 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 appstream-download-http "https://www.freedesktop.org/software/appstream/releases/AppStream-&appstream-version;.tar.xz">
-  <!ENTITY appstream-download-ftp  " ">
-  <!ENTITY appstream-md5sum        "00e749276887f816b6d68a7a150e6c97">
-  <!ENTITY appstream-size          "2.5 MB">
-  <!ENTITY appstream-buildsize     "27 MB">
-  <!ENTITY appstream-time          "0.2 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="appstream" xreflabel="AppStream-&appstream-version;">
-  <?dbhtml filename="appstream.html"?>
-
-  <title>AppStream-&appstream-version;</title>
-
-  <indexterm zone="appstream">
-    <primary sortas="a-appstream">AppStream</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to AppStream</title>
-
-    <para>
-      The <application>AppStream</application> package contains a library and
-      tool that is useful for retrieving software metadata and making it
-      easily accessible to programs which need it.
-    </para>
-
-    <!-- Remember to update the org.linuxfromscratch.lfs.xml file in
-         configuration section when tagging this.  -->
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&appstream-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&appstream-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &appstream-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &appstream-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &appstream-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &appstream-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">AppStream Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="curl"/>,
-      <phrase revision="sysv"><xref linkend="elogind"/>,</phrase>
-      <xref linkend="itstool"/>,
-      <xref linkend="libxml2"/>,
-      <xref linkend="libxmlb"/>, and
-      <xref linkend="libyaml"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gi-docgen"/>,
-      &qt5-deps;,
-      <xref linkend="qt6"/>,
-      <ulink url="https://github.com/openSUSE/daps">DAPS</ulink>, and
-      <ulink url="https://github.com/zvelo/libstemmer">libstemmer</ulink>
-    </para>
-
-    <!--  Only use this if you want to note something in the wiki
-    <para condition="html" role="usernotes">
-      Editor Notes: <ulink url="&blfs-wiki;/TEMPLATE"/>
-    </para>
-    -->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of AppStream</title>
-
-    <para>
-      Install <application>AppStream</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr       \
-            --buildtype=release \
-            -Dapidocs=false     \
-            -Dstemming=false    .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install &amp;&amp;
-mv -v /usr/share/doc/appstream{,-&appstream-version;}</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <parameter>-Dapidocs=false</parameter>: This switch disables building the
-      API documentation. Remove it if you have
-      <xref linkend="gi-docgen" role="nodep"/> installed and wish to
-      regenerate the API documentation.  When the API documentation is
-      not regenerated, a pre-built copy is installed anyway.
-    </para>
-
-    <para>
-      <parameter>-Dstemming=false</parameter>: This switch disables stemming
-      support. Remove this switch if you have
-      <ulink url="https://github.com/zvelo/libstemmer">libstemmer</ulink>
-      installed and want faster searches.
-    </para>
-    
-    <para>
-      <option>-Dqt5=true</option>: Use this option if you have &qt5-deps;
-      installed and you want to build support for Qt-5 applications into this
-      package.
-    </para>
-    
-    <para>
-      <option>-Dqt=true</option>: Use this option if you have
-      <xref linkend="qt6" role="nodep"/> installed and you want to build support
-      for Qt6 applications into this package. This option conflicts with
-      <option>-Dqt5=true</option>.
-    </para>
-
-  </sect2>
-  
-  <sect2 role="configuration">
-    <title>Configuring AppStream</title>
-
-    <sect3 id="appstream-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/usr/share/metainfo/org.linuxfromscratch.lfs.xml</filename>
-      </para>
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        <application>AppStream</application> expects an operating system
-        metainfo file describing the GNU/Linux distribution.  As the
-        &root; user, create the file describing LFS:
-      </para>
-
-      <indexterm zone="appstream appstream-config">
-        <primary sortas="e-usr-share-metainfo-org-linuxfromscratch-lfs-xml">
-          /usr/share/metainfo/org.linuxfromscratch.lfs.xml
-        </primary>
-      </indexterm>
-
-      <screen role="root"><userinput>install -vdm755 /usr/share/metainfo &amp;&amp;
-cat > /usr/share/metainfo/org.linuxfromscratch.lfs.xml &lt;&lt; EOF
-<literal>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;component type="operating-system"&gt;
-  &lt;id&gt;org.linuxfromscratch.lfs&lt;/id&gt;
-  &lt;name&gt;Linux From Scratch&lt;/name&gt;
-  &lt;summary&gt;A customized Linux system built entirely from source&lt;/summary&gt;
-  &lt;description&gt;
-    &lt;p&gt;
-      Linux From Scratch (LFS) is a project that provides you with
-      step-by-step instructions for building your own customized Linux
-      system entirely from source.
-    &lt;/p&gt;
-  &lt;/description&gt;
-  &lt;url type="homepage"&gt;https://www.linuxfromscratch.org/lfs/&lt;/url&gt;
-  &lt;metadata_license&gt;MIT&lt;/metadata_license&gt;
-  &lt;developer id='linuxfromscratch.org'&gt;
-    &lt;name&gt;The Linux From Scratch Editors&lt;/name&gt;
-  &lt;/developer&gt;
-
-  &lt;releases&gt;
-    &lt;release version="12.2" type="development" date="2024-09-01"&gt;
-      &lt;description&gt;
-        &lt;p&gt;The next release of Linux From Scratch.&lt;/p&gt;
-      &lt;/description&gt;
-    &lt;/release&gt;
-
-    &lt;release version="12.1" type="stable" date="2024-03-01"&gt;
-      &lt;description&gt;
-        &lt;p&gt;Now contains Binutils 2.42, GCC-13.2.0, Glibc-2.39, and Linux
-        kernel 6.7.&lt;/p&gt;
-      &lt;/description&gt;
-    &lt;/release&gt;
-  &lt;/releases&gt;
-&lt;/component&gt;</literal>
-EOF</userinput></screen>
-
-    </sect3>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          appstreamcli
-        </seg>
-        <seg>
-          libappstream.so
-        </seg>
-        <seg>
-          /usr/include/appstream,
-          /usr/share/doc/appstream-&version;, and
-          /usr/share/installed-tests/appstream
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="appstreamcli">
-        <term><command>appstreamcli</command></term>
-        <listitem>
-          <para>
-            queries information from AppStream metadata and from the AppStream
-            component index
-          </para>
-          <indexterm zone="appstream appstreamcli">
-            <primary sortas="b-appstreamcli">appstreamcli</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libappstream">
-        <term><filename class="libraryfile">libappstream.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that handle AppStream metadata queries and
-            request information from the AppStream component index
-          </para>
-          <indexterm zone="appstream libappstream">
-            <primary sortas="c-libappstream">libappstream.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: general/genlib/apr-util.xml
===================================================================
--- general/genlib/apr-util.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,210 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 apr-util-download-http
-           "https://archive.apache.org/dist/apr/apr-util-&apr-util-version;.tar.bz2">
-  <!ENTITY apr-util-download-ftp  " ">
-  <!ENTITY apr-util-md5sum        "b6e8c9b31d938fe5797ceb0d1ff2eb69">
-  <!ENTITY apr-util-size          "423 KB">
-  <!ENTITY apr-util-buildsize     "7.6 MB (add 1.4 MB for tests)">
-  <!ENTITY apr-util-time          "less than 0.1 SBU (add 0.3 SBU for tests)">
-]>
-
-<sect1 id="apr-util" xreflabel="Apr-Util-&apr-util-version;">
-  <?dbhtml filename="apr-util.html"?>
-
-
-  <title>Apr-Util-&apr-util-version;</title>
-
-  <indexterm zone="apr-util">
-    <primary sortas="a-Apr-Util">Apr-Util</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Apr Util</title>
-
-    <para>
-      The Apache Portable Runtime Utility Library provides a predictable and
-      consistent interface to underlying client library interfaces. This
-      application programming interface assures predictable if not identical
-      behavior regardless of which libraries are available on a given platform.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&apr-util-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&apr-util-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &apr-util-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &apr-util-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &apr-util-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &apr-util-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Apr Util Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="apr"/>
-    </para>
-<!--
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="openssl"/>
-    </para>
--->
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://www.freetds.org/">FreeTDS</ulink>,
-      <xref linkend="mariadb"/> or <ulink url="https://www.mysql.com/">MySQL</ulink>,
-      <xref linkend="openldap"/>,
-      <xref linkend="postgresql"/>,
-      <xref linkend="sqlite"/>,
-      <xref linkend="unixodbc"/>, and
-      &berkeley-db;
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Apr Util</title>
-
-    <para>
-      Install <application>Apr Util</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr       \
-            --with-apr=/usr     \
-            --with-gdbm=/usr    \
-            --with-openssl=/usr \
-            --with-crypto &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make -j1 test</command>.
-      One test, testdbm, is known to fail.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-gdbm=/usr</parameter>: This switch enables the
-      <filename class="libraryfile">apr_dbm_gdbm-1.so</filename> plugin.
-    </para>
-
-    <para>
-      <parameter>--with-openssl=/usr</parameter>
-      <parameter>--with-crypto</parameter>: These
-      switches enable the
-      <filename class="libraryfile">apr_crypto_openssl-1.so</filename>
-      plugin.
-    </para>
-
-    <para>
-      <option>--with-berkeley-db=/usr</option>: If you have installed
-      &berkeley-db;, use this switch to compile the
-      <filename class="libraryfile">apr_dbm_db-1.so</filename> plugin.
-    </para>
-
-    <para>
-      <option>--with-ldap</option>: If you have installed
-      <xref linkend="openldap"/>, use this switch to compile the
-      <filename class="libraryfile">apr_ldap.so</filename> plugin.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          apu-1-config
-        </seg>
-        <seg>
-          libaprutil-1.so
-        </seg>
-        <seg>
-          /usr/lib/apr-util-1
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="apu-1-config">
-        <term><command>apu-1-config</command></term>
-        <listitem>
-          <para>
-            is an APR-util script designed to allow easy command line access to
-            APR-util configuration parameters
-          </para>
-          <indexterm zone="apr-util apu-1-config">
-            <primary sortas="b-apu-1-config">apu-1-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libaprutil-1">
-        <term><filename class="libraryfile">libaprutil-1.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide a predictable and consistent
-            interface to underlying client library interfaces
-          </para>
-          <indexterm zone="apr-util libaprutil-1">
-            <primary sortas="c-libaprutil-1">libaprutil-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/apr.xml
===================================================================
--- general/genlib/apr.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,185 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 apr-download-http
-    "https://archive.apache.org/dist/apr/apr-&apr-version;.tar.bz2">
-  <!ENTITY apr-download-ftp  " ">
-  <!ENTITY apr-md5sum        "f8a62f3984898ba0ea8b6f26b851cb99">
-  <!ENTITY apr-size          "876 KB">
-  <!ENTITY apr-buildsize     "11 MB (additional 4 MB for the tests)">
-  <!ENTITY apr-time          "0.1 SBU (add 1.4 SBU for tests)">
-]>
-
-<sect1 id="apr" xreflabel="Apr-&apr-version;">
-  <?dbhtml filename="apr.html"?>
-
-
-  <title>Apr-&apr-version;</title>
-
-  <indexterm zone="apr">
-    <primary sortas="a-apr">Apr</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Apr</title>
-
-    <para>
-      The Apache Portable Runtime (APR) is a supporting library for the
-      Apache web server. It provides a set of application programming interfaces
-      (APIs) that map to the underlying Operating System (OS). Where the OS
-      doesn't support a particular function, APR will provide an emulation. Thus
-      programmers can use the APR to make a program portable across different
-      platforms.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&apr-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&apr-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &apr-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &apr-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &apr-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &apr-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Apr</title>
-
-<!--
-    <para>
-      First, fix a security issue:
-    </para>
-<!- -
-<screen><userinput>sed '/{306/a \
-\
-    if (xt-&gt;tm_mon &lt; 0 || xt-&gt;tm_mon &gt;= 12) \
-        return APR_EBADDATE;' -i time/unix/time.c</userinput></screen>
-- ->
-<screen><userinput>sed -e "/shift/i \
-\    if (xt-&gt;tm_mon &lt; 0 || xt-&gt;tm_mon &gt;= 12) return APR_EBADDATE;" \
-    -i time/unix/time.c</userinput></screen>
--->
-<!--
-    <para>
-      Fix an issue checking a location in a script template:
-    </para>
-<screen><userinput>sed -e '/^case "$0"/s;$0;$(readlink -f $0);' \
-    -i apr-config.in</userinput></screen>
--->
-    <para>
-      Install <application>Apr</application> by running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static \
-            --with-installbuilddir=/usr/share/apr-1/build &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>. <!-- teststr is
-      known to hang on some systems. - WORKS AS OF 1.6.5 (renodr) -->
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          apr-1-config
-        </seg>
-        <seg>
-          libapr-1.so
-        </seg>
-        <seg>
-          /usr/include/apr-1 and
-          /usr/share/apr-1
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="apr-1-config">
-        <term><command>apr-1-config</command></term>
-        <listitem>
-          <para>
-            is a shell script used to retrieve information about the apr
-            library in the system. It is typically used to compile and link
-            against the library
-          </para>
-          <indexterm zone="apr apr-1-config">
-            <primary sortas="b-apr-1-config">apr-1-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libapr-1">
-        <term><filename class="libraryfile">libapr-1.so</filename></term>
-        <listitem>
-          <para>
-            is the Apache Portable Runtime library
-          </para>
-          <indexterm zone="apr libapr-1">
-            <primary sortas="c-libapr-1">libapr-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/aspell.xml
===================================================================
--- general/genlib/aspell.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,380 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 aspell-download-http "&gnu-http;/aspell/aspell-&aspell-version;.tar.gz">
-  <!ENTITY aspell-download-ftp  " ">
-  <!ENTITY aspell-en-dict       "aspell6-en-2020.12.07-0">
-  <!ENTITY aspell-en-dict-url   "&gnu-http;/aspell/dict/en/&aspell-en-dict;.tar.bz2">
-  <!ENTITY aspell-md5sum        "187bd142f522ada555c7aa6b9cbf56e6">
-  <!ENTITY aspell-size          "3.4 MB">
-  <!ENTITY aspell-buildsize     "41 MB (Additional 8 MB for EN dictionary)">
-  <!ENTITY aspell-time          "0.4 SBU">
-]>
-
-<sect1 id="aspell" xreflabel="Aspell-&aspell-version;">
-  <?dbhtml filename="aspell.html"?>
-
-
-  <title>Aspell-&aspell-version;</title>
-
-  <indexterm zone="aspell">
-    <primary sortas="a-Aspell">Aspell</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Aspell</title>
-
-    <para>
-      The <application>Aspell</application> package contains an interactive
-      spell checking program and the <application>Aspell</application>
-      libraries. <application>Aspell</application> can either be used as a
-      library or as an independent spell checker.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&aspell-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&aspell-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &aspell-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &aspell-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &aspell-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &aspell-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <para>
-      You'll need to download at least one dictionary. The English dictionary
-      is given as an example below. Dictionaries in many other languages can be
-      found at <ulink url="&gnu-http;/aspell/dict"/>.
-    </para>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Aspell English dictionary: <ulink url="&aspell-en-dict-url;"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Aspell Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="which"/> (for the dictionaries)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Aspell</title>
-
-    <para>
-      Install <application>Aspell</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-ln -svfn aspell-0.60 /usr/lib/aspell &amp;&amp;
-
-install -v -m755 -d /usr/share/doc/aspell-&aspell-version;/aspell{,-dev}.html &amp;&amp;
-
-install -v -m644 manual/aspell.html/* \
-    /usr/share/doc/aspell-&aspell-version;/aspell.html &amp;&amp;
-
-install -v -m644 manual/aspell-dev.html/* \
-    /usr/share/doc/aspell-&aspell-version;/aspell-dev.html</userinput></screen>
-
-    <para>
-      If you do not plan to install <application>Ispell</application>, then copy
-      the wrapper script <command>ispell</command>:
-    </para>
-
-<screen role="root"><userinput>install -v -m 755 scripts/ispell /usr/bin/</userinput></screen>
-
-    <para>
-      If you do not plan to install <application>Spell</application>, then copy
-      the wrapper script <command>spell</command>:
-    </para>
-
-<screen role="root"><userinput>install -v -m 755 scripts/spell /usr/bin/</userinput></screen>
- </sect2>
-
- <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>ln -svfn aspell-0.60 /usr/lib/aspell</command>: This command is
-      useful for configuration of other applications, such as
-      <xref linkend="enchant"/>.
-    </para>
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Aspell</title>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        After <application>Aspell</application> is installed, you must set up at
-        least one dictionary. Install the English dictionary by running the
-        following commands:
-      </para>
-
-<screen><userinput>tar xf ../&aspell-en-dict;.tar.bz2 &amp;&amp;
-cd &aspell-en-dict;                &amp;&amp;
-
-./configure &amp;&amp;
-make</userinput></screen>
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-      <para>
-        Other dictionaries can be installed with the same instructions.
-      </para>
-    </sect3>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          aspell, aspell-import, precat, preunzip, prezip, prezip-bin,
-          pspell-config, run-with-aspell, word-list-compress and optionally,
-          ispell and spell.
-        </seg>
-        <seg>libaspell.so and libpspell.so</seg>
-        <seg>/usr/include/pspell and /usr/lib/aspell-0.60</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="aspell-prog">
-        <term><command>aspell</command></term>
-        <listitem>
-          <para>
-            is a utility that can function as an <command>ispell -a</command>
-            replacement, as an independent spell checker, as a test utility to
-            test out <application>Aspell</application> features, and as a
-            utility for managing dictionaries
-          </para>
-          <indexterm zone="aspell aspell-prog">
-            <primary sortas="b-aspell">aspell</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aspell-ispell">
-        <term><command>ispell</command></term>
-        <listitem>
-          <para>
-            is a wrapper around <command>aspell</command> to invoke it in
-            <command>ispell</command> compatible mode
-          </para>
-          <indexterm zone="aspell aspell-ispell">
-            <primary sortas="b-ispell">ispell</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aspell-spell">
-        <term><command>spell</command></term>
-        <listitem>
-          <para>
-            is a wrapper around <command>aspell</command> to invoke it in
-            <command>spell</command> compatible mode
-          </para>
-          <indexterm zone="aspell aspell-spell">
-            <primary sortas="b-spell">spell</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aspell-import">
-        <term><command>aspell-import</command></term>
-        <listitem>
-          <para>
-            imports old personal dictionaries into
-            <application>Aspell</application>
-          </para>
-          <indexterm zone="aspell aspell-import">
-            <primary sortas="b-aspell-import">aspell-import</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="precat">
-        <term><command>precat</command></term>
-        <listitem>
-          <para>
-            decompresses a <command>prezip</command>ped file to stdout
-          </para>
-          <indexterm zone="aspell precat">
-            <primary sortas="b-precat">precat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="preunzip">
-        <term><command>preunzip</command></term>
-        <listitem>
-          <para>
-            decompresses a <command>prezip</command>ped file
-          </para>
-          <indexterm zone="aspell preunzip">
-            <primary sortas="b-preunzip">preunzip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="prezip">
-        <term><command>prezip</command></term>
-        <listitem>
-          <para>
-            is a prefix delta compressor, used to compress sorted word lists or
-            other similar text files
-          </para>
-          <indexterm zone="aspell prezip">
-            <primary sortas="b-prezip">prezip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="prezip-bin">
-        <term><command>prezip-bin</command></term>
-        <listitem>
-          <para>
-            is called by the various wrapper scripts to perform the actual
-            compressing and decompressing
-          </para>
-          <indexterm zone="aspell prezip-bin">
-            <primary sortas="b-prezip-bin">prezip-bin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pspell-config">
-        <term><command>pspell-config</command></term>
-        <listitem>
-          <para>
-            displays information about the
-            <filename class="libraryfile">libpspell</filename> installation,
-            mostly for use in build scripts
-          </para>
-          <indexterm zone="aspell pspell-config">
-            <primary sortas="b-pspell-config">pspell-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="run-with-aspell">
-        <term><command>run-with-aspell</command></term>
-        <listitem>
-          <para>
-            is a script to help use <application>Aspell</application> as an
-            <command>ispell</command> replacement
-          </para>
-          <indexterm zone="aspell run-with-aspell">
-            <primary sortas="b-run-with-aspell">run-with-aspell</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="word-list-compress">
-        <term><command>word-list-compress</command></term>
-        <listitem>
-          <para>
-            compresses or decompresses sorted word lists for use with the
-            <application>Aspell</application> spell checker
-          </para>
-          <indexterm zone="aspell word-list-compress">
-            <primary sortas="b-word-list-compress">word-list-compress</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libaspell">
-        <term><filename class="libraryfile">libaspell.so</filename></term>
-        <listitem>
-          <para>
-            contains spell checking API functions
-          </para>
-          <indexterm zone="aspell libaspell">
-            <primary sortas="c-libaspell">libaspell.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpspell">
-        <term><filename class="libraryfile">libpspell.so</filename></term>
-        <listitem>
-          <para>
-            is an interface to the
-            <filename class="libraryfile">libaspell</filename> library. All the
-            spell checking functionality is now in
-            <filename class="libraryfile">libaspell</filename> but this library
-            is included for backward compatibility
-          </para>
-          <indexterm zone="aspell libpspell">
-            <primary sortas="c-libpspell">libpspell.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/genlib/boost.xml
===================================================================
--- general/genlib/boost.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,234 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 boost-download-http "https://github.com/boostorg/boost/releases/download/boost-&boost-version;/boost-&boost-dl-version;.tar.xz">
-  <!ENTITY boost-download-ftp  " ">
-  <!ENTITY boost-md5sum        "eff463ec1c67a8725fb3d2948abc5ca5">
-  <!ENTITY boost-size          "90 MB">
-  <!ENTITY boost-buildsize     "899 MB (197 MB installed)">
-  <!ENTITY boost-time          "1.8 SBU (Using parallelism=4; add 0.1 SBU for tests)">
-]>
-
-<sect1 id="boost" xreflabel="Boost-&boost-version;">
-  <?dbhtml filename="boost.html"?>
-
-  <title>boost-&boost-version;</title>
-
-  <indexterm zone="boost">
-    <primary sortas="a-Boost">Boost</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Boost</title>
-
-    <para>
-      <application>Boost</application> provides a set of free peer-reviewed
-      portable C++ source libraries. It includes libraries for linear algebra,
-      pseudorandom number generation, multithreading, image processing, regular
-      expressions and unit testing.
-    </para>
-
-    &lfs121_checked;
-
-    <note>
-      <para>
-        This package will extract to the 
-        <filename>boost-&boost-version;</filename>/ directory.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&boost-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&boost-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &boost-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &boost-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &boost-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &boost-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-    <!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Recommended patch, required to build <xref linkend="libreoffice"/>:
-          <ulink url="&patch-root;/boost-&boost-version;-gcc_10-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-    -->
-
-    <bridgehead renderas="sect3">Boost Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="which"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="icu"/> and
-      <ulink url="https://www.open-mpi.org/">Open MPI</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">Editor Notes:
-      <ulink url="&blfs-wiki;/boost"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Boost</title>
-
-    <para>
-      This package can be built with several jobs running in parallel. In
-      the instructions below, <parameter>&lt;N&gt;</parameter> stands for the
-      number of jobs. Install <application>Boost</application> by running the
-      following commands:
-    </para>
-
-
-<screen><userinput>./bootstrap.sh --prefix=/usr --with-python=python3 &amp;&amp;
-./b2 stage -j<replaceable>&lt;N&gt;</replaceable> threading=multi link=shared</userinput></screen>
-
-    <para>
-      To run Boost.Build's regression tests, issue
-      <command>pushd tools/build/test; python3 test_all.py; popd</command>.
-    </para>
-
-    <para>
-      To run every library's regression tests, issue <command>pushd status;
-      ../b2; popd</command>.  A few tests may fail. They take a very long time
-      (over 119 SBU at -j4) and use a very large amount of disk space
-      (46 GB). You should use the <parameter>-jN</parameter> switch to
-      speed them up.
-    </para>
-
-    <note>
-      <para>
-        Boost installs many versioned directories in /usr/lib/cmake.
-        If a new version of <application>Boost</application> is installed over a
-        previous version, the older cmake directories need to be
-        explicitly removed.  To do this, run as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>rm -rf /usr/lib/cmake/[Bb]oost*</userinput></screen>
-
-      <para>
-        before installing the new version.
-      </para>
-    </note>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<!-- dev note: ./b2 - -prefix=<DESTDIR>/usr install threading=multi link=shared -->
-
-<screen role="root"><userinput>./b2 install threading=multi link=shared</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-<!--
-    <para>
-      <command>sed -i '/#include ...</command>: This removes the inclusion
-      of <filename>boost/phoenix/stl/tuple.hpp</filename> from this header-only
-      library, allowing applications which use it to link using recent C++.
-    </para>
--->
-    <para>
-      <parameter>threading=multi</parameter>: This parameter ensures that
-      <application>Boost</application> is built with multithreading support.
-    </para>
-
-    <para>
-      <parameter>link=shared</parameter>: This parameter ensures that only
-      shared libraries are created, except for libboost_exception and
-      libboost_test_exec_monitor which are created as static. Most people
-      will not need the static libraries, and most programs using
-      <application>Boost</application> only use the headers. Omit
-      this parameter if you do need static libraries.
-    </para>
-
-    <para>
-      <parameter>--with-python=python3</parameter>: This switch ensures Python3
-      is used if Python2 is installed.
-    </para>
-
-    <para>
-       <option>-jN</option>: This switch may be added to the
-       <command>b2</command> command lines, to run up to N processes in
-       parallel.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libboost_atomic.so, libboost_charconv.so, libboost_chrono.so,
-          libboost_container.so, libboost_context.so, libboost_contract.so,
-          libboost_coroutine.so, libboost_date_time.so, libboost_exception.a,
-          libboost_fiber.so, libboost_filesystem.so, libboost_graph.so,
-          libboost_iostreams.so, libboost_json.so, libboost_locale.so,
-          libboost_log_setup.so, libboost_log.so, libboost_math_c99.so,
-          libboost_math_c99f.so, libboost_math_c99l.so, libboost_math_tr1.so,
-          libboost_math_tr1f.so, libboost_math_tr1l.so,
-          libboost_nowide.so, libboost_numpy3&python3-minor;.so,
-          libboost_prg_exec_monitor.so, libboost_program_options.so,
-          libboost_python3&python3-minor;.so, libboost_random.so,
-          libboost_regex.so, libboost_serialization.so,
-          libboost_stacktrace_addr2line.so, libboost_stacktrace_basic.so,
-          libboost_stacktrace_noop.so, libboost_system.so,
-          libboost_test_exec_monitor.a, libboost_thread.so, libboost_timer.so,
-          libboost_type_erasure.so, libboost_unit_test_framework.so,
-          libboost_url.so, libboost_wave.so, and libboost_wserialization.so
-        </seg>
-        <seg>
-          /usr/include/boost
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/brotli.xml
===================================================================
--- general/genlib/brotli.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,244 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 brotli-download-http "https://github.com/google/brotli/archive/v&brotli-version;/brotli-&brotli-version;.tar.gz">
-  <!ENTITY brotli-download-ftp  " ">
-  <!ENTITY brotli-md5sum        "3a6a3dba82a3604792d3cb0bd41bca60">
-  <!ENTITY brotli-size          "500 KB">
-  <!ENTITY brotli-buildsize     "33 MB (with python3 bindings)">
-  <!-- The python tests for this package are broken.  The tarball is missing a lot of test files -->
-  <!ENTITY brotli-time          "0.3 SBU (with python3 bindings; parallelism=4)">
-]>
-
-<sect1 id="brotli" xreflabel="Brotli-&brotli-version;">
-  <?dbhtml filename="brotli.html"?>
-
-
-  <title>brotli-&brotli-version;</title>
-
-  <indexterm zone="brotli">
-    <primary sortas="a-brotli">Brotli</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Brotli</title>
-
-    <para>
-      <application>Brotli</application> provides a general-purpose lossless
-      compression algorithm that compresses data using a combination of a
-      modern variant of the LZ77 algorithm, Huffman coding and 2nd order
-      context modeling. Its libraries are particularly used for WOFF2 fonts
-      on webpages.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&brotli-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&brotli-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &brotli-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &brotli-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &brotli-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &brotli-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Brotli Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <!--<xref linkend="pluggy"/> and-->
-      <!-- Pluggy is a required dependency of pytest -->
-      <xref linkend="pytest"/> (for testing Python3 bindings)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Brotli</title>
-
-    <para>
-      Install <application>brotli</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      ..  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-    </para>
-
-<!--  These are broken
-    <para>
-      The python tests are missing most of the necessary testdata files and
-      therefore 240 of 311 tests fail.
-      If you nevertheless wish to test the bindings, go back to the top-level directory and
-      issue: <command>python3 setup.py test</command>.
-    </para>
--->
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If desired, build the <application>Python3</application>
-      bindings:
-    </para>
-
-<screen><userinput>cd .. &amp;&amp;
-sed "/c\/.*\.[ch]'/d;\
-     /include_dirs=\[/\
-     i libraries=['brotlicommon','brotlidec','brotlienc']," \
-    -i setup.py &amp;&amp;
-&build-wheel-cmd; $PWD</userinput></screen>
-
-    <para>
-      Install the <application>Python3</application>
-      bindings as the &root; user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; Brotli</userinput></screen>
-
-    <!-- "131 passed in 2.76s" for me with 1.1.0 -->
-    <para>
-      To test the <application>Python3</application> binding, issue:
-      <command>pytest</command>.
-    </para>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <!-- https://github.com/google/brotli/issues/933 -->
-    <para>
-      <command>sed ... -i setup.py</command>: Stop
-      <filename>setup.py</filename> from rebuilding the entire package all
-      over again, use the already installed libraries for the
-      <application>Python3</application> binding instead.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          brotli
-        </seg>
-        <seg>
-          libbrotlicommon.so,
-          libbrotlidec.so, and
-          libbrotlienc.so
-        </seg>
-        <seg>
-          /usr/include/brotli and
-          /usr/lib/python&python3-majorver;/site-packages/Brotli-&brotli-version;.dist-info
-          (if you built and installed the Python3 bindings)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="brotli-prog">
-        <term><command>brotli</command></term>
-        <listitem>
-          <para>
-            can compress or decompress files, or test the integrity of
-            compressed files
-          </para>
-          <indexterm zone="brotli brotli-prog">
-            <primary sortas="b-brotli">brotli</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libbrotlicommon">
-        <term><filename class="libraryfile">libbrotlicommon{-static.a,.so}</filename></term>
-        <listitem>
-          <para>
-            is the Brotli common dictionary library
-          </para>
-          <indexterm zone="brotli libbrotlicommon">
-            <primary sortas="c-libbrotlicommon">libbrotlicommon{,-static.a,.so}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libbrotlidec">
-        <term><filename class="libraryfile">libbrotlidec{-static.a,.so}</filename></term>
-        <listitem>
-          <para>
-            is the Brotli decoder library
-          </para>
-          <indexterm zone="brotli libbrotlidec">
-            <primary sortas="c-libbrotlidec">libbrotlidec{,-static.a,.so}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libbrotlienc">
-        <term><filename class="libraryfile">libbrotlienc{-static.a,.so}</filename></term>
-        <listitem>
-          <para>
-            is the Brotli common encoder library
-          </para>
-          <indexterm zone="brotli libbrotlienc">
-            <primary sortas="c-libbrotlienc">libbrotlienc{,-static.a,.so}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/clucene.xml
===================================================================
--- general/genlib/clucene.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,156 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 clucene-download-http "&sourceforge-dl;/clucene/clucene-core-&clucene-version;.tar.gz">
-  <!ENTITY clucene-download-ftp  " ">
-  <!ENTITY clucene-md5sum        "48d647fbd8ef8889e5a7f422c1bfda94">
-  <!ENTITY clucene-size          "2.2 MB">
-  <!ENTITY clucene-buildsize     "78 MB">
-  <!ENTITY clucene-time          "0.8 SBU">
-]>
-
-<sect1 id="clucene" xreflabel="CLucene-&clucene-version;">
-  <?dbhtml filename="clucene.html"?>
-
-
-  <title>CLucene-&clucene-version;</title>
-
-  <indexterm zone="clucene">
-    <primary sortas="a-clucene">clucene</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to CLucene</title>
-
-    <para>
-      <application>CLucene</application> is a C++ version of Lucene, a
-      high performance text search engine.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&clucene-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&clucene-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &clucene-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &clucene-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &clucene-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &clucene-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Required patch: <ulink
-          url="&patch-root;/clucene-&clucene-version;-contribs_lib-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">CLucene Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="boost"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of CLucene</title>
-
-    <para>
-      Install <application>CLucene</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../clucene-&clucene-version;-contribs_lib-1.patch &amp;&amp;
-
-sed -i '/Misc.h/a #include &lt;ctime&gt;' src/core/CLucene/document/DateTools.cpp &amp;&amp;
-
-mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DBUILD_CONTRIBS_LIB=ON .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DBUILD_CONTRIBS_LIB=ON</parameter>: This cmake variable
-      enables building the CLucene contribs library necessary for running
-      applications that use language specific text analyzers like LibreOffice
-      for example.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>
-          libclucene-contribs-lib.so,
-          libclucene-core.so, and
-          libclucene-shared.so
-        </seg>
-        <seg>
-          /usr/include/CLucene and
-          /usr/lib/CLuceneConfig.cmake
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/dbus-glib.xml
===================================================================
--- general/genlib/dbus-glib.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,178 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 dbus-glib-download-http "https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-&dbus-glib-version;.tar.gz">
-  <!ENTITY dbus-glib-download-ftp  " ">
-  <!ENTITY dbus-glib-md5sum        "021e6c8a288df02c227e4aafbf7e7527">
-  <!ENTITY dbus-glib-size          "700 KB">
-  <!ENTITY dbus-glib-buildsize     "12 MB (with tests)">
-  <!ENTITY dbus-glib-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="dbus-glib" xreflabel="dbus-glib-&dbus-glib-version;">
-  <?dbhtml filename="dbus-glib.html"?>
-
-
-  <title>dbus-glib-&dbus-glib-version;</title>
-
-  <indexterm zone="dbus-glib">
-    <primary sortas="a-dbus-glib">dbus-glib</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to D-Bus GLib</title>
-
-    <para>
-      The <application>D-Bus GLib</application> package contains
-      <application>GLib</application> interfaces to the
-      <application>D-Bus</application> API.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&dbus-glib-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&dbus-glib-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &dbus-glib-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &dbus-glib-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &dbus-glib-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &dbus-glib-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">D-Bus GLib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dbus"/> and
-      <xref linkend="glib2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of D-Bus GLib</title>
-
-    <para>
-      Install <application>D-Bus GLib</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr     \
-            --sysconfdir=/etc \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>. Note that
-      more comprehensive tests can be run by following the same method used in
-      <application>D-Bus</application> instructions, which requires building the
-      package twice.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          dbus-binding-tool
-        </seg>
-        <seg>
-          libdbus-glib-1.so
-        </seg>
-        <seg>
-          /usr/share/gtk-doc/html/dbus-glib
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="glib-dbus-binding-tool">
-        <term><command>dbus-binding-tool</command></term>
-        <listitem>
-          <para>
-            is a tool used to interface with the D-Bus API
-          </para>
-          <indexterm zone="dbus-glib glib-dbus-binding-tool">
-            <primary sortas="b-dbus-binding-tool">dbus-binding-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libdbus-glib-1">
-        <term><filename class="libraryfile">libdbus-glib-1.so</filename></term>
-        <listitem>
-          <para>
-            contains <application>GLib</application> interface functions
-            to the <application>D-Bus</application> API
-          </para>
-          <indexterm zone="dbus-glib libdbus-glib-1">
-            <primary sortas="c-libdbus-glib-1">libdbus-glib-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/double-conversion.xml
===================================================================
--- general/genlib/double-conversion.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,162 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 double-conversion-download-http "https://github.com/google/double-conversion/archive/v&double-conversion-version;/double-conversion-&double-conversion-version;.tar.gz">
-  <!ENTITY double-conversion-download-ftp  " ">
-  <!ENTITY double-conversion-md5sum        "b344abb64084a4a1d98a43e67752989b">
-  <!ENTITY double-conversion-size          "6.7 MB">
-  <!ENTITY double-conversion-buildsize     "62 MB (with tests)">
-  <!ENTITY double-conversion-time          "0.1 SBU (with tests)">
-
-]>
-
-<sect1 id="double-conversion" xreflabel="double-conversion-&double-conversion-version;">
-  <?dbhtml filename="double-conversion.html"?>
-
-
-  <title>Double-conversion-&double-conversion-version;</title>
-
-  <indexterm zone="double-conversion">
-    <primary sortas="a-double-conversion">double-conversion</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Double-conversion</title>
-
-    <para>
-      The <application>Double-conversion</application> package contains a
-      library that facilitates binary-to-decimal and decimal-to-binary routines
-      for IEEE doubles.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&double-conversion-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&double-conversion-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &double-conversion-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &double-conversion-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &double-conversion-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &double-conversion-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Double-conversion Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Double-conversion</title>
-
-    <para>
-      Install <application>Double-conversion</application> by running the following
-      commands:
-    </para>
-
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DBUILD_SHARED_LIBS=ON      \
-      -DBUILD_TESTING=ON          \
-      ..                          &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DBUILD_SHARED_LIBS=ON</parameter>: This switch forces cmake to build
-      a shared version of the library instead of the static version.
-    </para>
-
-    <para>
-      <parameter>-DBUILD_TESTING=ON</parameter>: This switch builds the test programs.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libdouble-conversion.so
-        </seg>
-        <seg>
-          /usr/include/double-conversion
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libdouble-conversion">
-        <term><filename class="libraryfile">libdouble-conversion.so</filename></term>
-        <listitem>
-          <para>
-            provides binary-to-decimal and decimal-to-binary routines for IEEE doubles
-          </para>
-          <indexterm zone="double-conversion libdouble-conversion">
-            <primary sortas="c-libdouble-conversion">libdouble-conversion.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/genlib/duktape.xml
===================================================================
--- general/genlib/duktape.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,135 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 duktape-download-http "https://duktape.org/duktape-&duktape-version;.tar.xz">
-  <!ENTITY duktape-download-ftp  " ">
-  <!ENTITY duktape-md5sum        "b3200b02ab80125b694bae887d7c1ca6">
-  <!ENTITY duktape-size          "1003 KB">
-  <!ENTITY duktape-buildsize     "25 MB">
-  <!ENTITY duktape-time          "0.3 SBU">
-]>
-
-<sect1 id="duktape" xreflabel="duktape-&duktape-version;">
-  <?dbhtml filename="duktape.html"?>
-
-
-  <title>duktape-&duktape-version;</title>
-
-  <indexterm zone="duktape">
-    <primary sortas="a-duktape">duktape</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to duktape</title>
-
-    <para>
-      <application>duktape</application> is an embeddable Javascript
-      engine, with a focus on portability and compact footprint.
-    </para>
-
-    <!-- To editors: make sure polkit works with duktape before
-         tagging duktape.  -->
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&duktape-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&duktape-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &duktape-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &duktape-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &duktape-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &duktape-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of duktape</title>
-
-    <para>
-      Install <application>duktape</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>sed -i 's/-Os/-O2/' Makefile.sharedlibrary
-make -f Makefile.sharedlibrary INSTALL_PREFIX=/usr</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make -f Makefile.sharedlibrary INSTALL_PREFIX=/usr install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libduktape.so and libduktaped.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-    <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libduktape.so">
-        <term><filename class="libraryfile">libduktape.so</filename></term>
-        <listitem>
-          <para>
-            is an embeddable Javascript engine
-          </para>
-          <indexterm zone="duktape">
-            <primary sortas="c-duktape">libduktape.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/enchant.xml
===================================================================
--- general/genlib/enchant.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,261 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 enchant-download-http "https://github.com/AbiWord/enchant/releases/download/v&enchant-version;/enchant-&enchant-version;.tar.gz">
-  <!ENTITY enchant-download-ftp  " ">
-  <!ENTITY enchant-md5sum        "5da2afd6cf92027b4871824d4da4afbf">
-  <!ENTITY enchant-size          "5.5 MB">
-  <!ENTITY enchant-buildsize     "20 MB (add 63 MB for tests)">
-  <!ENTITY enchant-time          "0.1 SBU (add 0.8 SBU for tests)">
-]>
-
-<sect1 id="enchant" xreflabel="enchant-&enchant-version;">
-  <?dbhtml filename="enchant.html"?>
-
-
-  <title>enchant-&enchant-version;</title>
-
-  <indexterm zone="enchant">
-    <primary sortas="a-enchant">enchant</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to enchant</title>
-
-    <para>
-      The <application>enchant</application> package provides a generic
-      interface into various existing spell checking libraries.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&enchant-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&enchant-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &enchant-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &enchant-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &enchant-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &enchant-time;
-         </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">enchant Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="aspell"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="doxygen"/>,
-      <ulink url="http://hspell.ivrix.org.il/">Hspell</ulink>,
-      <ulink url="https://hunspell.github.io/">Hunspell</ulink>,
-      <ulink url="https://nuspell.github.io/">Nuspell</ulink>,
-      <ulink url="https://hunspell.github.io/">Voikko</ulink>, and
-      <ulink url="https://github.com/unittest-cpp/unittest-cpp/releases">
-        unittest-cpp</ulink> (required for tests)
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of enchant</title>
-
-    <para>
-      First, remove a generated file that causes the build to fail.
-      The file will be regenerated for the current system.
-    </para>
-
-<screen><userinput>rm -f src/api.c</userinput></screen>
-
-    <para>
-      Install <application>enchant</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static \
-            --docdir /usr/share/doc/enchant-&enchant-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To run tests, unittest-cpp must be installed and the
-      <option>--enable-relocatable</option> option passed to configure above.
-      If these conditions are present, the tests may be run with <command>make
-      check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring enchant</title>
-
-    <sect3 id="enchant-config">
-      <title>Config Files</title>
-      <para>
-        <filename>~/.enchant</filename> and
-        <filename>/usr/share/enchant/enchant.ordering</filename>
-      </para>
-
-      <indexterm zone="enchant enchant-config">
-        <primary sortas="e-AA.enchant">~/.enchant</primary>
-      </indexterm>
-
-      <indexterm zone="enchant enchant-config">
-        <primary
-        sortas="e-usr-share-enchant-enchant.ordering">/usr/share/enchant/enchant.ordering</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3><title>Configuration Information</title>
-<!--
-   Looks like this is not required when installing enchant in the flavor
-   we do above. Leaving it in source (for a while) in case I'm wrong and
-   it needs to be restored.
-      <para>
-        If you wish to use the <xref linkend="aspell"/> backend, create a
-        symlink, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>ln -svfn ../../lib/aspell /usr/share/enchant/aspell</userinput></screen>
--->
-      <para>
-        You can test your installation and configuration by creating a test
-        file and running the following commands (you can replace the
-        en_GB dictionary by any other downloaded when installing <xref
-        linkend="aspell"/>):
-      </para>
-
-<screen remap="test"><userinput>cat &gt; /tmp/test-enchant.txt &lt;&lt; "EOF"
-<literal>Tel me more abot linux
-Ther ar so many commads</literal>
-EOF
-
-enchant-2 -d en_GB -l /tmp/test-enchant.txt &amp;&amp;
-enchant-2 -d en_GB -a /tmp/test-enchant.txt</userinput></screen>
-
-      <para>
-        You will see a list of the misspelled words followed by a list of
-        alternatives for them.
-      </para>
-
-      <para>
-        See more details in the enchant manual page.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>enchant-2 and enchant-lsmod-2</seg>
-        <seg>libenchant-2.so</seg>
-        <seg>/usr/include/enchant-2, /usr/lib/enchant-2,
-          /usr/share/enchant, and /usr/share/doc/enchant-&enchant-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="enchant-2">
-        <term><command>enchant-2</command></term>
-        <listitem>
-          <para>
-            is a spellchecker
-          </para>
-          <indexterm zone="enchant enchant-2">
-            <primary sortas="b-enchant-2">enchant-2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="enchant-lsmod-2">
-        <term><command>enchant-lsmod-2</command></term>
-        <listitem>
-          <para>
-            lists available backends, languages, and dictionaries
-          </para>
-          <indexterm zone="enchant enchant-lsmod-2">
-            <primary sortas="b-enchant-lsmod-2">enchant-lsmod-2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libenchant-2">
-        <term><filename class="libraryfile">libenchant-2.so</filename></term>
-        <listitem>
-          <para>
-            contains spell checking interface API functions
-          </para>
-          <indexterm zone="enchant libenchant-2">
-            <primary sortas="c-libenchant-2">libenchant-2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/exempi.xml
===================================================================
--- general/genlib/exempi.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,173 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 exempi-download-http "https://libopenraw.freedesktop.org/download/exempi-&exempi-version;.tar.xz">
-  <!ENTITY exempi-download-ftp  " ">
-  <!ENTITY exempi-md5sum        "51fe14c2a5fa44816ba8187c6ad87d78">
-  <!ENTITY exempi-size          "2.7 MB">
-  <!ENTITY exempi-buildsize     "289 MB (add 236 MB for tests)">
-  <!ENTITY exempi-time          "0.4 SBU (add 0.6 SBU for tests; both using parallelism=4)">
-]>
-
-<sect1 id="exempi" xreflabel="Exempi-&exempi-version;">
-  <?dbhtml filename="exempi.html"?>
-
-
-  <title>Exempi-&exempi-version;</title>
-
-  <indexterm zone="exempi">
-    <primary sortas="a-Exempi">Exempi</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Exempi</title>
-
-    <para>
-      <application>Exempi</application> is an implementation of XMP (Adobe's
-      Extensible Metadata Platform).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&exempi-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&exempi-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &exempi-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &exempi-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &exempi-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &exempi-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Exempi Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="boost"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="required">
-      <xref linkend="valgrind"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Exempi</title>
-
-    <para>
-      If you intend to run the regression tests, first remove a test
-      that depends on an apparently proprietary Adobe SDK:
-    </para>
-
-<screen><userinput>sed -i -r '/^\s?testadobesdk/d' exempi/Makefile.am &amp;&amp;
-autoreconf -fiv</userinput></screen>
-
-
-    <para>
-      Install <application>Exempi</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.<!--
-      If valgrind is installed, mosts tests will indicate a failure, but
-      that is a test problem and not a package problem.-->
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>exempi</seg>
-        <seg>libexempi.so</seg>
-        <seg>/usr/include/exempi-2.0</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-     <varlistentry id="exempi-prog">
-        <term><command>exempi</command></term>
-        <listitem>
-          <para>
-            is a command line tool to manipulate XMP metadata
-          </para>
-          <indexterm zone="exempi exempi-prog">
-            <primary sortas="b-exempi">exempi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libexempi">
-        <term><filename class="libraryfile">libexempi.so</filename></term>
-        <listitem>
-          <para>
-            is a library used to parse XMP metadata
-          </para>
-          <indexterm zone="exempi libexempi">
-            <primary sortas="c-libexempi">libexempi.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/fftw.xml
===================================================================
--- general/genlib/fftw.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,339 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 fftw-download-http "https://www.fftw.org/fftw-&fftw-version;.tar.gz">
-  <!ENTITY fftw-download-ftp  " ">
-  <!ENTITY fftw-md5sum        "8ccbf6a5ea78a16dbc3e1306e234cc5c">
-  <!ENTITY fftw-size          "4.0 MB">
-  <!ENTITY fftw-buildsize     "59 MB">
-  <!ENTITY fftw-time          "1.6 SBU (add 3.4 SBU for tests, both using parallelism=4)">
-]>
-
-<sect1 id="fftw" xreflabel="fftw-&fftw-version;">
-  <?dbhtml filename="fftw.html"?>
-
-
-  <title>fftw-&fftw-version;</title>
-
-  <indexterm zone="fftw">
-    <primary sortas="a-fftw">fftw</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to fftw</title>
-
-    <para>
-      FFTW is a C subroutine library for computing the discrete Fourier
-      transform (DFT) in one or more dimensions, of arbitrary input size, and
-      of both real and complex data (as well as of even/odd data, i.e. the
-      discrete cosine/sine transforms or DCT/DST).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&fftw-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&fftw-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &fftw-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &fftw-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &fftw-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &fftw-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of fftw</title>
-
-    <note>
-      <para>
-        We build fftw three times for different libraries in different
-        numerical precisions: the default double precision floating point, the
-        older 32-bit (single precision) version named float which sacrifices
-        precision for speed, and the long double which offers increased
-        precision at the cost of slower execution.
-      </para>
-    </note>
-
-    <para>
-      The first build is for double precision arithmetic.  Install
-      <application>fftw</application> by running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --enable-shared  \
-            --disable-static \
-            --enable-threads \
-            --enable-sse2    \
-            --enable-avx     \
-            --enable-avx2    &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-      On 32-bit systems, the tests can take substantially longer than
-      they would on 64-bit machines.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      Now build single precision:
-    </para>
-
-<screen><userinput>make clean &amp;&amp;
-
-./configure --prefix=/usr    \
-            --enable-shared  \
-            --disable-static \
-            --enable-threads \
-            --enable-sse2    \
-            --enable-avx     \
-            --enable-avx2    \
-            --enable-float   &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      As the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      Finally, build long double precision:
-    </para>
-
-<screen><userinput>make clean &amp;&amp;
-
-./configure --prefix=/usr    \
-            --enable-shared  \
-            --disable-static \
-            --enable-threads \
-            --enable-long-double &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      As the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-      <para>
-        <parameter>--enable-shared</parameter>
-        <parameter>--disable-static</parameter>: Use shared
-        libs instead of static libs.
-      </para>
-
-      <para>
-        <parameter>--enable-threads</parameter>: This enables <filename
-        class="libraryfile"> libfftw3_threads.so</filename> to be compiled.
-        It is used by e.g. the <application>gimp</application> plugin from
-        <ulink url="https://gmic.eu/">G'MIC</ulink>.
-      </para>
-
-      <para>
-        <parameter>--enable-{sse2,avx,avx2}</parameter>: These enables building
-        the optimized routines using SSE2, AVX, and AVX2 instructions.  FFTW
-        will check if these routines can be really used on the current CPU when
-        the FFTW library is loaded, so a FFTW build with these routines enabled
-        can still run on a CPU without SSE2, AVX, or AVX512.  These options
-        are not compatible with <parameter>--enable-long-double</parameter>.
-      </para>
-
-      <para>
-        <parameter>--enable-float</parameter>: This enables building the library that
-        uses single precision floating point arithmetic.  It is faster but less
-        precise than the default double precision library.  The library will be
-        called <filename class="libraryfile">libfftw3f.so</filename> needed by
-        <xref linkend="pulseaudio"/>.
-      </para>
-
-      <para>
-        <parameter>--enable-long-double</parameter>: This enables building the
-        library that uses higher precision long-double floating point arithmetic.
-        The library will be called <filename
-        class="libraryfile">libfftw3l.so</filename>.
-      </para>
-
-      <para>
-        <option>--enable-avx512</option>: This enables building the optimized
-        routines using AVX512F instructions.  FFTW will check if these routines
-        can be really used on the current CPU when the FFTW library is loaded,
-        so a FFTW build with these routines enabled can still run on a CPU
-        without AVX512F.  Use this option if the FFTW build will be used on
-        a CPU with AVX512F.  This option is not compatible with
-        <parameter>--enable-long-double</parameter>.
-      </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          fftw-wisdom and fftw-wisdom-to-conf
-        </seg>
-        <seg>
-          libfftw3.so, libfftw3_threads.so, libfftw3f.so,
-          libfftw3f_threads.so, libfftw3l.so and libfftw3l_threads.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="fftw-wisdom">
-        <term><command>fftw-wisdom</command></term>
-        <listitem>
-          <para>
-            is a utility to generate FFTW wisdom files, which contain saved
-            information about how to optimally compute (Fourier) transforms  of
-            various sizes
-          </para>
-          <indexterm zone="fftw fftw-wisdom">
-            <primary sortas="b-fftw-wisdom">fftw-wisdom</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fftw-wisdom-to-conf">
-        <term><command>fftw-wisdom-to-conf</command></term>
-        <listitem>
-          <para>
-            is a utility to generate C configuration routines from FFTW wisdom
-            files, where the latter contain saved information about  how  to
-            optimally  compute  (Fourier)  transforms of various sizes
-          </para>
-          <indexterm zone="fftw fftw-wisdom-to-conf">
-            <primary sortas="b-fftw-wisdom-to-conf">fftw-wisdom-to-conf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfftw3">
-        <term><filename class="libraryfile">libfftw3.so</filename></term>
-        <listitem>
-          <para>
-            is the Fast Fourier Transform library
-          </para>
-          <indexterm zone="fftw libfftw3">
-            <primary sortas="c-libfftw3">libfftw3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfftw3_threads">
-        <term><filename class="libraryfile">libfftw3_threads.so</filename></term>
-        <listitem>
-          <para>
-            is the threaded Fast Fourier Transform library
-          </para>
-          <indexterm zone="fftw libfftw3_threads">
-            <primary sortas="c-libfftw3_threads">libfftw3_threads.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfftw3f">
-        <term><filename class="libraryfile">libfftw3f.so</filename></term>
-        <listitem>
-          <para>
-            is the single-precision Fast Fourier Transform library, described
-            as <quote>float</quote> for historic reasons
-          </para>
-          <indexterm zone="fftw libfftw3f">
-            <primary sortas="c-libfftw3f">libfftw3f.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfftw3f_threads">
-        <term><filename class="libraryfile">libfftw3f_threads.so</filename></term>
-        <listitem>
-          <para>
-            is the threaded single-precision Fast Fourier Transform library
-          </para>
-          <indexterm zone="fftw libfftw3f_threads">
-            <primary sortas="c-libfftw3f_threads">libfftw3f_threads.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfftw3l">
-        <term><filename class="libraryfile">libfftw3l.so</filename></term>
-        <listitem>
-          <para>
-            is the long double Fast Fourier Transform library
-          </para>
-          <indexterm zone="fftw libfftw3l">
-            <primary sortas="c-libfftw3l">libfftw3l.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfftw3l_threads">
-        <term><filename class="libraryfile">libfftw3l_threads.so</filename></term>
-        <listitem>
-          <para>
-            is the threaded long double Fast Fourier Transform library
-          </para>
-          <indexterm zone="fftw libfftw3l_threads">
-            <primary sortas="c-libfftw3l_threads">libfftw3l_threads.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/fmt.xml
===================================================================
--- general/genlib/fmt.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,151 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 fmt-download-http "https://github.com/fmtlib/fmt/archive/&fmt-version;/fmt-&fmt-version;.tar.gz">
-  <!ENTITY fmt-download-ftp  " ">
-  <!ENTITY fmt-md5sum        "dc09168c94f90ea890257995f2c497a5">
-  <!ENTITY fmt-size          "836 KB">
-  <!ENTITY fmt-buildsize     "4.5 MB (add 40 MB for tests)">
-  <!ENTITY fmt-time          "less than 0.1 SBU (add 0.2 SBU for tests)">
-]>
-
-<sect1 id="fmt" xreflabel="fmt-&fmt-version;">
-  <?dbhtml filename="fmt.html"?>
-
-
-  <title>fmt-&fmt-version;</title>
-
-  <indexterm zone="fmt">
-    <primary sortas="a-fmt">fmt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to fmt</title>
-
-    <para>
-      The <application>fmt</application> package is an open-source formatting
-      library providing a fast and safe alternative to C stdio and C++
-      iostreams.</para>
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&fmt-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&fmt-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &fmt-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &fmt-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &fmt-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &fmt-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Fmt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> and
-      <xref linkend="libsigc"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>,
-      <xref linkend="glib-networking"/> (for tests),
-      <xref linkend="gnutls"/> (for tests),
-      <xref linkend="libxslt"/>, and
-      <ulink url="&gnome-download-http;/mm-common">mm-common</ulink>
-    </para>
--->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of fmt</title>
-
-    <para>
-      Install <application>fmt</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr     \
-      -DCMAKE_INSTALL_LIBDIR=/usr/lib \
-      -DBUILD_SHARED_LIBS=ON          \
-      -DFMT_TEST=OFF                  \
-      -G Ninja ..                     &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      If you have enabled tests, issue: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DFMT_TEST=OFF</parameter>: This switch initializes 
-      the package tests.  Set to ON if you wish to run tests.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libfmt.so
-        </seg>
-        <seg>
-          /usr/include/fmt and
-          /usr/lib/cmake/fmt
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ general/genlib/genlib.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,179 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
+<chapter id="general-genlib">
+<?dbhtml filename="genlib.html" dir="general"?>
+<title>General Libraries</title>
 
-<chapter id="general-genlib">
-  <?dbhtml filename="genlib.html"?>
+<para>Libraries contain code which is often required by more than
+one program.  This has the advantage that each program doesn't need to
+duplicate code (and risk introducing bugs), it just has to call
+functions from the libraries installed on the system.  The most obvious
+example of a set of libraries is glibc which is installed during the LFS
+book.  This contains all of the C library functions which programs
+use.</para>
 
-  <title>General Libraries</title>
+<para>There are two types of library, static and shared.  Shared
+libraries (usually libXXX.so) are loaded into memory from the shared
+copy at runtime (hence the name).  Static libraries (libXXX.a) are
+actually linked into the program executable file itself, thus making the
+program file larger.  Quite often, you will find both static and shared
+copies of the same library on your system.</para>
 
-  <para>
-    Libraries contain code which is often required by more than
-    one program.  This has the advantage that each program doesn't need to
-    duplicate code (and risk introducing bugs), it just has to call
-    functions from the libraries installed on the system.  The most obvious
-    example of a set of libraries is <application>Glibc</application> which is
-    installed during the LFS book.  This contains all of the
-    <application>C</application> library functions which programs use.
-  </para>
+<para>Generally, you only need to install libraries when you are
+installing software which requires functionality which they supply.  In
+the BLFS book, each package is listed with a list of (known)
+dependencies.  Thus, you can figure out which libraries you need to have
+before installing that program.  If you are installing something without
+using BLFS instructions, usually the <filename>README</filename>  or
+<filename>INSTALL</filename> file will contain details of the programs
+requirements.</para>
 
-  <para>
-    There are two types of libraries: static and shared.  Shared libraries
-    (usually <filename>libXXX.so</filename>) are loaded into memory from the
-    shared copy at runtime (hence the name).  Static libraries (<filename>
-    libXXX.a</filename>) are actually linked into the program executable file
-    itself, thus making the program file larger.  Quite often, you will find
-    both static and shared copies of the same library on your system.
-  </para>
+<para>There are certain libraries which nearly
+<emphasis>everyone</emphasis> will need at some point.  In this chapter
+we list these and some others and explain why you may want to install
+them.</para>
 
-  <para>
-    Generally, you only need to install libraries when you are
-    installing software that needs the functionality they supply.  In
-    the BLFS book, each package is presented with a list of (known)
-    dependencies.  Thus, you can figure out which libraries you need to have
-    before installing that program.  If you are installing something without
-    using BLFS instructions, usually the <filename>README</filename> or
-    <filename>INSTALL</filename> file will contain
-    details of the program's requirements.
-  </para>
-
-  <para>
-    There are certain libraries which nearly <emphasis>everyone</emphasis> will
-    need at some point.  In this chapter these and some others are listed and
-    it is explained why you may want to install them.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="abseil-cpp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appstream.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apr-util.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aspell.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="boost.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="brotli.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clucene.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus-glib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="double-conversion.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="duktape.xml"/>
-  <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="fftw.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fmt.xml"/>
-
-<!-- systemd only -->
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcab.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"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glibmm2.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gmime.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gmime3.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grantlee.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gsl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gspell.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="highway.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="icu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inih.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intel-gmmlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="jansson.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="json-c.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="json-glib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="keyutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kirigami-addons.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libaio.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libarchive.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libassuan.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libatasmart.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libatomic_ops.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libblockdev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libbytesize.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcloudproviders.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcroco.xml"/>-->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdbusmenuqt.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdaemon.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdisplay-info.xml"/>
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdbusmenuqt.xml"/> -->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libesmtp.xml"/> -->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libffi.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgcrypt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgpg-error.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgrss.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgsf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgudev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgusb.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libical.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libidn.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libidn2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libiodbc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libksba.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="liblinear.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmbim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libnvme.xml"/>
-
-   <!-- systemd only -->
-  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libnfsidmap.xml"/>-->
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpaper.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libportal.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libptytty.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libqalculate.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libqmi.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libseccomp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsigc++.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsigc++3.xml"/>
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsigc3.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsigsegv.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libssh2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libstatgrab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libtasn1.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libuninameslist.xml"/> -->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libunique.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libunistring.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libunwind.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="liburcu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libusb.xml"/>
-<!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libusb-compat.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libuv.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxkbcommon.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxml2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxmlb.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxslt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libwacom.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libyaml.xml"/>
-
-<!-- systemd only -->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libzeitgeist.xml"/> -->
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="log4cplus.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lzo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mtdev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nodejs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="npth.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nspr.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openobex.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pcre2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="popt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="protobuf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="protobuf-c.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pth.xml"/> -->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ptlib.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qca.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qcoro.xml"/>
-<!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qjson.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="spidermonkey.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="spirv-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="spirv-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="talloc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-glib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="uchardet.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="umockdev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="utfcpp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wayland.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wayland-protocols.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wv.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xapian.xml"/>
+&zlib;
+&openssl;
+&pcre;
+&popt;
+&slang;
+&libfam;
+&libxml;
+&libxml2;
+&libxslt;
 
 </chapter>
Index: general/genlib/glib2.xml
===================================================================
--- general/genlib/glib2.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,794 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 glib2-download-http "&gnome-download-http;/glib/&glib2-minor;/glib-&glib2-version;.tar.xz">
-  <!ENTITY glib2-download-ftp  " ">
-  <!ENTITY glib2-md5sum        "3a51e2803ecd22c2dadcd07d9475ebe3">
-  <!ENTITY glib2-size          "5.3 MB">
-  <!ENTITY glib2-buildsize     "130 MB (add 20 MB for tests)">
-  <!ENTITY glib2-time          "0.8 SBU (add 0.5 SBU for tests; both using parallelism=4)">
-
-  <!ENTITY gobject-introspection-download-http
-    "&gnome-download-http;/gobject-introspection/1.80/gobject-introspection-&gobject-introspection-version;.tar.xz">
-  <!ENTITY gobject-introspection-md5sum        "ef1496a7a7abfcd31d25b3459ea86ebb">
-  <!ENTITY gobject-introspection-size          "1.0 MB">
-]>
-
-<sect1 id="glib2" xreflabel="GLib-&glib2-version;">
-  <?dbhtml filename="glib2.html"?>
-
-
-  <title>GLib-&glib2-version;</title>
-
-  <indexterm zone="glib2">
-    <primary sortas="a-GLib2">GLib2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GLib</title>
-
-    <para>
-      The <application>GLib</application> package contains low-level
-      libraries useful for providing data structure handling for C, portability
-      wrappers and interfaces for runtime functionality such as an
-      event loop, threads, dynamic loading and an object system.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&glib2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&glib2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &glib2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &glib2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &glib2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &glib2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-
-    <para>
-      <emphasis role="strong">GObject Introspection (Recommended)</emphasis>
-    </para>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download: <ulink url="&gobject-introspection-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gobject-introspection-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gobject-introspection-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para>
-      <emphasis role="strong">Patch for Log Level Selection (Optional)</emphasis>
-    </para>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional patch:
-          <ulink url="&patch-root;/glib-skip_warnings-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GLib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend='packaging'/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend='docutils'/>,
-      <xref linkend="libxslt"/>, and
-      <xref linkend="pcre2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend='cairo'/> (for some GObject Introspection tests),
-      <xref linkend="dbus"/> (for some tests),
-      <xref linkend="fuse3"/> and
-      <ulink url="https://bindfs.org/">bindfs</ulink>
-        (both needed for one test),
-      <xref linkend="gdb"/> (for bindings),
-      <xref linkend='gjs'/> (for some GObject Introspection tests),
-      <xref linkend='gtk-doc'/> (for GObject Introspection documentation),
-      <xref linkend="DocBook"/>,
-      <xref linkend="docbook-xsl"/>,
-      <xref linkend="gi-docgen"/> (to build API documentation),
-      <xref linkend="glib-networking"/> (for some tests, but this is a circular
-      dependency),
-      <xref linkend="Mako"/> and <xref linkend="markdown"/>
-      (both for <command>g-ir-doc-tool</command>), and
-      <!--<xref linkend="sysprof"/>-->
-      <ulink url="&sysprof-url;">sysprof</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Additional Runtime Dependencies</bridgehead>
-    <para role="recommended">
-      Quoted directly from the <filename>INSTALL</filename> file:
-      <quote>Some of the mimetype-related functionality in GIO requires the
-      <command>update-mime-database</command> and
-      <command>update-desktop-database</command> utilities</quote>,
-      which are part of
-      <xref role="runtime" linkend="shared-mime-info"/> and
-      <xref role="runtime" linkend="desktop-file-utils"/>, respectively.
-      These two utilities are also needed for some tests.
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GLib</title>
-
-    <para>
-      If desired, apply the optional patch. In many cases, applications that
-      use this library, either  directly or indirectly via other libraries such
-      as <xref linkend="gtk3"/>, output numerous warnings when run from the
-      command line.  This patch enables the use of an environment variable,
-      <envar>GLIB_LOG_LEVEL</envar>, that suppresses unwanted messages. The
-      value of the variable is a digit that corresponds to:
-    </para>
-
-    <simplelist>
-      <member>1  Alert</member>
-      <member>2  Critical</member>
-      <member>3  Error</member>
-      <member>4  Warning</member>
-      <member>5  Notice</member>
-    </simplelist>
-
-    <para>
-      For instance <userinput>export GLIB_LOG_LEVEL=4</userinput> will skip
-      output of Warning and Notice messages (and Info/Debug messages if they
-      are turned on).  If <envar>GLIB_LOG_LEVEL</envar> is not defined, normal
-      message output will not be affected.
-    </para>
-
-<screen><userinput>patch -Np1 -i ../glib-skip_warnings-1.patch</userinput></screen>
-
-    <warning>
-      <para>
-        If a previous version of glib is installed, move the headers out of the
-        way so that later packages do not encounter conflicts:
-      </para>
-
-<screen role="root"><userinput remap="pre">if [ -e /usr/include/glib-2.0 ]; then
-    rm -rf /usr/include/glib-2.0.old &amp;&amp;
-    mv -vf /usr/include/glib-2.0{,.old}
-fi</userinput></screen>
-
-    </warning>
-
-    <para>
-      Install <application>GLib</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..                 \
-      --prefix=/usr            \
-      --buildtype=release      \
-      -Dintrospection=disabled \
-      -Dman-pages=enabled      &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      The <application>GLib</application> test suite requires
-      <application>desktop-file-utils</application> for some tests. However,
-      <application>desktop-file-utils</application> requires
-      <application>GLib</application> in order to compile; therefore, you must
-      first install <application>GLib</application> and then run the test
-      suite.
-    </para>
-
-    <para>
-      As the <systemitem class="username">root</systemitem> user,
-      install this package for the first time to allow building
-      GObject Introspection:
-    </para>
-
-    <screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para>
-      Build GObject Introspection:
-    </para>
-
-    <screen><userinput>tar xf ../../gobject-introspection-&gobject-introspection-version;.tar.xz &amp;&amp;
-
-meson setup gobject-introspection-&gobject-introspection-version; gi-build \
-            --prefix=/usr --buildtype=release     &amp;&amp;
-ninja -C gi-build</userinput></screen>
-
-    <para>
-      To test the results of GObject Introspection, issue:
-      <command>ninja -C gi-build test</command>.
-    </para>
-
-    <para>
-      As the &root; user, install GObject Introspection for generating
-      the introspection data of GLib libraries (required by various packages
-      using Glib, especially some GNOME packages):
-    </para>
-
-    <screen role='root'><userinput>ninja -C gi-build install</userinput></screen>
-
-    <para>
-      Now generate the introspection data:
-    </para>
-
-    <screen><userinput>meson configure -Dintrospection=enabled &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      If you have <xref linkend='gi-docgen'/> installed and wish to build
-      the API documentation for this package, issue:
-    </para>
-
-    <screen remap='doc'><userinput>sed 's/glib-2.0/glib-&glib2-version;/'        \
-    -i ../docs/reference/meson.build &amp;&amp;
-meson configure -Ddocumentation=true &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      As the &root; user, install this package again for the introspection
-      data (and optionally, the documentation):
-    </para>
-
-    <screen role='root'><userinput>ninja install</userinput></screen>
-
-    <para>
-      You should now install <xref linkend="desktop-file-utils"/> and
-      <xref linkend="shared-mime-info"/> and proceed to
-      run the test suite.
-    </para>
-
-    <warning>
-      <para>
-        Do not run the test suite as &root; or some tests will fail
-        unexpectedly and leave some non-FHS-compliant directories in the
-        <filename class='directory'>/usr</filename> hierarchy.
-      </para>
-    </warning>
-
-    <para>
-      To test the results, after having installed the packages, issue:
-      <command>LC_ALL=C ninja test</command> as a non-&root; user.
-    </para>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <parameter>-Dman-pages=enabled</parameter>: This switch causes the
-      build to create and install the package man pages.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <bridgehead renderas="sect3">GLib Contents</bridgehead>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gapplication,           gdbus, gdbus-codegen,
-          gi-compile-repository,  gi-decompile-typelib, gi-inspect-typelib
-          gio,                    gio-querymodules,
-          glib-compile-resources, glib-compile-schemas,
-          glib-genmarshal,        glib-gettextize,
-          glib-mkenums,           gobject-query,
-          gresource,              gsettings,
-          gtester, and            gtester-report
-        </seg>
-        <seg>
-          libgio-2.0.so,
-          libgirepository-2.0.so,
-          libglib-2.0.so,
-          libgmodule-2.0.so,
-          libgobject-2.0.so, and
-          libgthread-2.0.so
-        </seg>
-        <seg>
-          /usr/include/gio-unix-2.0,
-          /usr/include/glib-2.0,
-          /usr/lib/gio,
-          /usr/lib/glib-2.0,
-          /usr/share/glib-2.0, and
-          /usr/share/doc/glib-&glib2-version; (optional)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <bridgehead renderas="sect3">GObject Introspection Contents</bridgehead>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <!-- g-ir-doc-tool is installed if Mako and Markdown are present -->
-      <seglistitem>
-        <seg>
-          g-ir-annotation-tool, g-ir-compiler, g-ir-doc-tool (optional),
-          g-ir-generate, g-ir-inspect, and g-ir-scanner
-        </seg>
-        <seg>
-          libgirepository-1.0.so and
-          _giscanner.&python3-lib-suffix;.so
-        </seg>
-        <seg>
-          /usr/include/gobject-introspection-1.0,
-          /usr/lib/girepository-1.0,
-          /usr/lib/gobject-introspection,
-          /usr/share/gir-1.0, and
-          /usr/share/gobject-introspection-1.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gapplication">
-        <term><command>gapplication</command></term>
-        <listitem>
-          <para>
-            can be used to start applications and to send
-            messages to already-running instances of other applications
-          </para>
-          <indexterm zone="glib2 gapplication">
-            <primary sortas="b-gapplication">application</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gdbus">
-        <term><command>gdbus</command></term>
-        <listitem>
-          <para>
-            is a simple tool used for working with
-            <application>D-Bus</application> objects
-          </para>
-          <indexterm zone="glib2 gdbus">
-            <primary sortas="b-gdbus">gdbus</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gdbus-codegen">
-        <term><command>gdbus-codegen</command></term>
-        <listitem>
-          <para>
-            is used to generate code and/or documentation for one or
-            more <application>D-Bus</application> interfaces
-          </para>
-          <indexterm zone="glib2 gdbus-codegen">
-            <primary sortas="b-gdbus-codegen">gdbus-codegen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gi-compile-repository">
-        <term><command>gi-compile-repository</command></term>
-        <listitem>
-          <para>
-            converts one or more GIR files into one or more typelib files
-          </para>
-          <indexterm zone="glib2 gi-compile-repository">
-            <primary sortas="b-gi-compile-repository">gi-compile-repository</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gi-decompile-typelib">
-        <term><command>gi-decompile-typelib</command></term>
-        <listitem>
-          <para>
-            is a GIR decompiler that uses the repository API
-          </para>
-          <indexterm zone="glib2 gi-decompile-typelib">
-            <primary sortas="b-gi-decompile-typelib">gi-decompile-typelib</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gi-inspect-typelib">
-        <term><command>gi-inspect-typelib</command></term>
-        <listitem>
-          <para>
-            is a utility that gives information about a GI typelib
-          </para>
-          <indexterm zone="glib2 gi-inspect-typelib">
-            <primary sortas="b-gi-inspect-typelib">gi-inspect-typelib</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gio">
-        <term><command>gio</command></term>
-        <listitem>
-          <para>
-            is a utility that makes many <application>GIO</application>
-            features available from the command line
-          </para>
-          <indexterm zone="glib2 gio">
-            <primary sortas="b-gio">gio</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gio-querymodules">
-        <term><command>gio-querymodules</command></term>
-        <listitem>
-          <para>
-            is used to create a <filename>giomodule.cache</filename> file in
-            the listed directories. This file lists the implemented extension
-            points for each module that has been found
-          </para>
-          <indexterm zone="glib2 gio-querymodules">
-            <primary sortas="b-gio-querymodules">gio-querymodules</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="glib-compile-resources">
-        <term><command>glib-compile-resources</command></term>
-        <listitem>
-          <para>
-            is used to read the resource description from a file and
-            the files that it references to create a binary resource
-            bundle that is suitable for use with the GResource API
-          </para>
-          <indexterm zone="glib2 glib-compile-resources">
-            <primary sortas="b-glib-compile-resources">glib-compile-resources</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="glib-compile-schemas">
-        <term><command>glib-compile-schemas</command></term>
-        <listitem>
-          <para>
-            is used to compile all the GSettings XML schema files
-            in a directory into a binary file with the name
-            <filename>gschemas.compiled</filename> that can be used by GSettings
-          </para>
-          <indexterm zone="glib2 glib-compile-schemas">
-            <primary sortas="b-glib-compile-resources">glib-compile-schemas</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="glib-genmarshal">
-        <term><command>glib-genmarshal</command></term>
-        <listitem>
-          <para>
-            is a C code marshaller generation utility for GLib closures
-          </para>
-          <indexterm zone="glib2 glib-genmarshal">
-            <primary sortas="b-glib-genmarshal">glib-genmarshal</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="glib-gettextize">
-        <term><command>glib-gettextize</command></term>
-        <listitem>
-          <para>
-            is a variant of the <application>gettext</application>
-            internationalization utility
-          </para>
-          <indexterm zone="glib2 glib-gettextize">
-            <primary sortas="b-glib-gettextize">glib-gettextize</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="glib-mkenums">
-        <term><command>glib-mkenums</command></term>
-        <listitem>
-          <para>
-            is a C language enum description generation utility
-          </para>
-          <indexterm zone="glib2 glib-mkenums">
-            <primary sortas="b-glib-mkenums">glib-mkenums</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gobject-query">
-        <term><command>gobject-query</command></term>
-        <listitem>
-          <para>
-            is a small utility that draws a tree of types
-          </para>
-          <indexterm zone="glib2 gobject-query">
-            <primary sortas="b-gobject-query">gobject-query</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gresource">
-        <term><command>gresource</command></term>
-        <listitem>
-          <para>
-            offers a simple command line interface to GResource
-          </para>
-          <indexterm zone="glib2 gresource">
-            <primary sortas="b-gresource">gresource</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gsettings">
-        <term><command>gsettings</command></term>
-        <listitem>
-          <para>
-            offers a simple command line interface to GSettings
-          </para>
-          <indexterm zone="glib2 gsettings">
-            <primary sortas="b-gsettings">gsettings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtester">
-        <term><command>gtester</command></term>
-        <listitem>
-          <para>
-            is a test running utility
-          </para>
-          <indexterm zone="glib2 gtester">
-            <primary sortas="b-gtester">gtester</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtester-report">
-        <term><command>gtester-report</command></term>
-        <listitem>
-          <para>
-            is a test report formatting utility
-          </para>
-          <indexterm zone="glib2 gtester-report">
-            <primary sortas="b-gtester-report">gtester-report</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgio">
-        <term><filename class='libraryfile'>libgio-2.0.so</filename></term>
-        <listitem>
-          <para>
-            is a library providing useful classes for general purpose I/O,
-            networking, IPC, settings, and other high level application
-            functionality
-          </para>
-          <indexterm zone="glib2 libgio">
-            <primary sortas="c-libgio">libgio-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgirepository">
-        <term><filename class='libraryfile'>libgirepository-2.0.so</filename></term>
-        <listitem>
-          <para>
-            is a library providing access to typelibs and introspection data
-            which describes C APIs
-          </para>
-          <indexterm zone="glib2 libgirepository">
-            <primary sortas="c-libgirepository2">libgirepository-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libglib">
-        <term><filename class='libraryfile'>libglib-2.0.so</filename></term>
-        <listitem>
-          <para>
-            is a general-purpose, portable utility library, which provides
-            many useful data types, macros, type conversions, string
-            utilities, file utilities, a mainloop abstraction, and so on
-          </para>
-          <indexterm zone="glib2 libglib">
-            <primary sortas="c-libglib">libglib-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgmodule">
-        <term><filename class='libraryfile'>libgmodule-2.0.so</filename></term>
-        <listitem>
-          <para>
-            provides portable API for dynamically loading modules
-          </para>
-          <indexterm zone="glib2 libgmodule">
-            <primary sortas="c-libgmodule">libgmodule-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgobject">
-        <term><filename class='libraryfile'>libgobject-2.0.so</filename></term>
-        <listitem>
-          <para>
-            provides the GLib base type system and object class
-          </para>
-          <indexterm zone="glib2 libgobject">
-            <primary sortas="c-libgobject">libgobject-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgthread">
-        <term><filename class='libraryfile'>libgthread-2.0.so</filename></term>
-        <listitem>
-          <para>
-            is a skeleton library for backwards compatibility; it used to
-            be the GLib thread library but the functionalities has been
-            merged info <systemitem class='library'>libglib-2.0</systemitem>
-          </para>
-          <indexterm zone="glib2 libgthread">
-            <primary sortas="c-libgthread">libgthread-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="g-ir-annotation-tool">
-        <term><command>g-ir-annotation-tool</command></term>
-        <listitem>
-          <para>
-            creates or extracts annotation data from GI typelibs
-          </para>
-          <indexterm zone="glib2 g-ir-annotation-tool">
-            <primary sortas="b-g-ir-annotation-tool">g-ir-annotation-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="g-ir-compiler">
-        <term><command>g-ir-compiler</command></term>
-        <listitem>
-          <para>
-            is a counterpart of <command>gi-compile-repository</command>
-            for the old
-            <systemitem class='library'>libgirepository-1.0</systemitem>
-            API
-          </para>
-          <indexterm zone="glib2 g-ir-compiler">
-            <primary sortas="b-g-ir-compiler">g-ir-compiler</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="g-ir-doc-tool">
-        <term><command>g-ir-doc-tool</command></term>
-        <listitem>
-          <para>
-            generates Mallard files that can be viewed with
-            <command>yelp</command> or rendered to HTML with
-            <command>yelp-build</command> from
-            <ulink url="&gnome-download-http;/yelp-tools">yelp-tools</ulink>
-          </para>
-          <indexterm zone="glib2 g-ir-doc-tool">
-            <primary sortas="b-g-ir-doc-tool">g-ir-doc-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="g-ir-inspect">
-        <term><command>g-ir-inspect</command></term>
-        <listitem>
-          <para>
-            is a counterpart of <command>gi-inspect-typelib</command>
-            for the old
-            <systemitem class='library'>libgirepository-1.0</systemitem>
-            API
-          </para>
-          <indexterm zone="glib2 g-ir-inspect">
-            <primary sortas="b-g-ir-inspect">g-ir-inspect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="g-ir-generate">
-        <term><command>g-ir-generate</command></term>
-        <listitem>
-          <para>
-            is a counterpart of <command>gi-decompile-typelib</command>
-            for the old
-            <systemitem class='library'>libgirepository-1.0</systemitem>
-            API
-          </para>
-          <indexterm zone="glib2 g-ir-generate">
-            <primary sortas="b-g-ir-generate">g-ir-generate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="g-ir-scanner">
-        <term><command>g-ir-scanner</command></term>
-        <listitem>
-          <para>
-            is a tool which generates GIR XML files by parsing headers and
-            introspecting GObject based libraries
-          </para>
-          <indexterm zone="glib2 g-ir-scanner">
-            <primary sortas="b-g-ir-scanner">g-ir-scanner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgirepository-1.0">
-        <term><filename class='libraryfile'>libgirepository-1.0.so</filename></term>
-        <listitem>
-          <para>
-            is a counterpart of
-            <systemitem class='library'>libgirepository-2.0</systemitem>
-            with the old 1.0 API
-          </para>
-          <indexterm zone="glib2 libgirepository-1.0">
-            <primary sortas="c-libgirepository1">libgirepository-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/glibmm.xml
===================================================================
--- general/genlib/glibmm.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,170 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 glibmm-download-http "&gnome-download-http;/glibmm/2.66/glibmm-&glibmm-version;.tar.xz">
-  <!ENTITY glibmm-download-ftp  " ">
-  <!ENTITY glibmm-md5sum        "c6edf4cc986adec2a6d21e7423bad7d1">
-  <!ENTITY glibmm-size          "8.4 MB">
-  <!ENTITY glibmm-buildsize     "83 MB (with tests)">
-  <!ENTITY glibmm-time          "0.5 SBU (Using parallelism=4; with tests)">
-]>
-
-<sect1 id="glibmm" xreflabel="GLibmm-&glibmm-version;">
-  <?dbhtml filename="glibmm.html"?>
-
-
-  <title>GLibmm-&glibmm-version;</title>
-
-  <indexterm zone="glibmm">
-    <primary sortas="a-GLibmm">GLibmm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GLibmm</title>
-
-    <para>
-      The <application>GLibmm</application> package is a set of C++ bindings
-      for <application>GLib</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&glibmm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&glibmm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &glibmm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &glibmm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &glibmm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &glibmm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GLibmm Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> and
-      <xref linkend="libsigc"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>,
-      <xref linkend="glib-networking"/> (for tests),
-      <xref linkend="gnutls"/> (for tests),
-      <xref linkend="libxslt"/>, and
-      <ulink url="&gnome-download-http;/mm-common">mm-common</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GLibmm</title>
-
-    <para>
-      Install <application>GLibmm</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir bld &amp;&amp;
-cd    bld &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libgiomm-2.4.so, libglibmm-2.4.so and
-          libglibmm_generate_extra_defs-2.4.so
-        </seg>
-        <seg>
-          /usr/lib/g{io,lib}mm-2.4 and
-          /usr/include/g{io,lib}mm-2.4
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgiomm-2">
-        <term><filename class="libraryfile">libgiomm-2.4.so</filename></term>
-        <listitem>
-          <para>
-            contains the GIO API classes
-          </para>
-          <indexterm zone="glibmm libgiomm-2">
-            <primary sortas="c-libgiomm-2">libgiomm-2.4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libglibmm-2">
-        <term><filename class="libraryfile">libglibmm-2.4.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>GLib</application> API classes
-          </para>
-          <indexterm zone="glibmm libglibmm-2">
-            <primary sortas="c-libglibmm-2">libglibmm-2.4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/glibmm2.xml
===================================================================
--- general/genlib/glibmm2.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,171 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 glibmm-download-http "&gnome-download-http;/glibmm/2.80/glibmm-&glibmm2-version;.tar.xz">
-  <!ENTITY glibmm-download-ftp  " ">
-  <!ENTITY glibmm-md5sum        "7e58344303cec7cd5f1e812f4c70cb43">
-  <!ENTITY glibmm-size          "9.1 MB">
-  <!ENTITY glibmm-buildsize     "97 MB (with tests)">
-  <!ENTITY glibmm-time          "0.6 SBU (Using parallelism=4; with tests)">
-]>
-
-<sect1 id="glibmm2" xreflabel="GLibmm-&glibmm2-version;">
-  <?dbhtml filename="glibmm2.html"?>
-
-
-  <title>GLibmm-&glibmm2-version;</title>
-
-  <indexterm zone="glibmm2">
-    <primary sortas="a-GLibmm2">GLibmm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GLibmm</title>
-
-    <para>
-      The <application>GLibmm</application> package is a set of C++ bindings
-      for <application>GLib</application>. This version is part of a new API
-      for supporting gtkmm-4.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&glibmm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&glibmm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &glibmm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &glibmm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &glibmm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &glibmm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GLibmm Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> and
-      <xref linkend="libsigc3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>,
-      <xref linkend="glib-networking"/> (for tests),
-      <xref linkend="gnutls"/> (for tests),
-      <xref linkend="libxslt"/>, and
-      <ulink url="&gnome-download-http;/mm-common">mm-common</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GLibmm</title>
-
-    <para>
-      Install <application>GLibmm</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir bld &amp;&amp;
-cd    bld &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libgiomm-2.68.so,
-          libglibmm-2.68.so, and
-          libglibmm_generate_extra_defs-2.68.so
-        </seg>
-        <seg>
-          /usr/lib/g{io,lib}mm-2.68 and
-          /usr/include/g{io,lib}mm-2.68
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgiomm-2.68">
-        <term><filename class="libraryfile">libgiomm-2.68.so</filename></term>
-        <listitem>
-          <para>
-            contains the GIO API classes
-          </para>
-          <indexterm zone="glibmm2 libgiomm-2.68">
-            <primary sortas="c-libgiomm-2.68">libgiomm-2.68.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libglibmm-2.68">
-        <term><filename class="libraryfile">libglibmm-2.68.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>GLib</application> API classes
-          </para>
-          <indexterm zone="glibmm2 libglibmm-2.68">
-            <primary sortas="c-libglibmm-2.68">libglibmm-2.68.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/gmime3.xml
===================================================================
--- general/genlib/gmime3.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,173 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gmime3-download-http "&gnome-download-http;/gmime/3.2/gmime-&gmime3-version;.tar.xz">
-  <!ENTITY gmime3-download-ftp  " ">
-  <!ENTITY gmime3-md5sum        "7ecd9aa75e0cd2e8668206b1d53df874">
-  <!ENTITY gmime3-size          "2.1 MB">
-  <!ENTITY gmime3-buildsize     "25 MB (with tests)">
-  <!ENTITY gmime3-time          "0.3 SBU (with tests)">
-]>
-
-<sect1 id="gmime3" xreflabel="GMime-&gmime3-version;">
-  <?dbhtml filename="gmime3.html"?>
-
-
-  <title>GMime-&gmime3-version;</title>
-
-  <indexterm zone="gmime3">
-    <primary sortas="a-GMime-3">GMime 3</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GMime</title>
-
-    <para>
-      The <application>GMime</application> package contains a set of
-      utilities for parsing and creating messages using the Multipurpose
-      Internet Mail Extension (MIME) as defined by the applicable RFCs. See the
-      <ulink url="https://spruce.sourceforge.net/gmime/">GMime web site</ulink>
-      for the RFCs resourced. This is useful as it provides an API which adheres
-      to the MIME specification as closely as possible while also providing
-      programmers with an extremely easy to use interface to the API functions.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gmime3-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gmime3-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gmime3-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gmime3-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gmime3-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gmime3-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GMime Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> (GObject Introspection recommended) and
-      <xref linkend="libgpg-error"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="docbook-utils"/>,
-      <xref linkend="gpgme"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="libnsl"/>,
-      <xref linkend="vala"/>, and
-      <ulink url="https://download.mono-project.com/sources/gtk-sharp/">Gtk#</ulink> (requires
-      <ulink url="https://www.mono-project.com/Main_Page">Mono</ulink>)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GMime</title>
-
-    <para>
-      Install <application>GMime</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libgmime-3.0.so
-        </seg>
-        <seg>
-          /usr/include/gmime-3.0 and
-          /usr/share/gtk-doc/html/gmime-3.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgmime-3">
-        <term><filename class="libraryfile">libgmime-3.0.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions used by programs that need to comply to
-            the MIME standards
-          </para>
-          <indexterm zone="gmime3 libgmime-3">
-            <primary sortas="c-libgmime-3">libgmime-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/gsl.xml
===================================================================
--- general/genlib/gsl.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,218 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gsl-download-http "&gnu-http;/gsl/gsl-&gsl-version;.tar.gz">
-  <!ENTITY gsl-download-ftp  " ">
-  <!ENTITY gsl-md5sum        "36aee97e67f64dbdab7afae197e3483b">
-  <!ENTITY gsl-size          "7.2 MB">
-  <!ENTITY gsl-buildsize     "213 MB (with tests, without docs)">
-  <!ENTITY gsl-time          "1.2 SBU (Using parallelism=4; with tests, without docs)">
-]>
-
-<sect1 id="gsl" xreflabel="Gsl-&gsl-version;">
-  <?dbhtml filename="gsl.html"?>
-
-
-  <title>Gsl-&gsl-version;</title>
-
-  <indexterm zone="gsl">
-    <primary sortas="a-gsl">Gsl</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gsl</title>
-
-    <para>
-      The GNU Scientific Library (GSL) is a numerical library for C and C++
-      programmers. It provides a wide range of mathematical routines such as
-      random number generators, special functions and least-squares fitting.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gsl-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gsl-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gsl-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gsl-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gsl-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gsl-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gsl Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="sphinx_rtd_theme"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gsl</title>
-
-    <para>
-      Install <application>Gsl</application> by running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have <xref linkend="sphinx_rtd_theme"/>
-      installed, build the documentation with:
-    </para>
-
-<screen remap="doc"><userinput>make html</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you built the documentation, install it (as <systemitem
-      class="username">root</systemitem>) with:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>mkdir                   /usr/share/doc/gsl-&gsl-version; &amp;&amp;
-cp -R doc/_build/html/* /usr/share/doc/gsl-&gsl-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/static-libraries.xml"/>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          gsl-config, gsl-histogram, and gsl-randist
-        </seg>
-        <seg>
-          libgslcblas.so and libgsl.so
-        </seg>
-        <seg>
-          /usr/include/gsl and /usr/share/doc/gsl-&gsl-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gsl-config">
-        <term><command>gsl-config</command></term>
-        <listitem>
-          <para>
-            is a shell script to get the version number and compiler flags of
-            the installed <application>Gsl</application> library
-          </para>
-          <indexterm zone="gsl gsl-config">
-            <primary sortas="b-gsl-config">gsl-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gsl-histogram">
-        <term><command>gsl-histogram</command></term>
-        <listitem>
-          <para>
-            is a demonstration program for the GNU Scientific Library that
-            computes a histogram from data taken from stdin
-          </para>
-          <indexterm zone="gsl gsl-histogram">
-            <primary sortas="b-gsl-histogram">gsl-histogram</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gsl-randist">
-        <term><command>gsl-randist</command></term>
-        <listitem>
-          <para>
-            is a demonstration program for the GNU Scientific Library that
-            generates random samples from various distributions
-          </para>
-          <indexterm zone="gsl gsl-randist">
-            <primary sortas="b-gsl-randist">gsl-randist</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgslcblas">
-        <term><filename class="libraryfile">libgslcblas.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that implement a C interface to Basic Linear
-            Algebra Subprograms
-          </para>
-          <indexterm zone="gsl libgslcblas">
-            <primary sortas="c-libgslcblas">libgslcblas.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgsl.so">
-        <term><filename class="libraryfile">libgsl.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide a collection of numerical routines
-            for scientific computing
-          </para>
-          <indexterm zone="gsl libgsl.so">
-            <primary sortas="c-libgsl.so">libgsl.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/genlib/gspell.xml
===================================================================
--- general/genlib/gspell.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,168 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gspell-download-http "&gnome-download-http;/gspell/&gspell-minor;/gspell-&gspell-version;.tar.xz">
-  <!ENTITY gspell-download-ftp  " ">
-  <!ENTITY gspell-md5sum        "f1e5f02695aee20ba543352889c28ff5">
-  <!ENTITY gspell-size          "436 KB">
-  <!ENTITY gspell-buildsize     "11 MB (with tests)">
-  <!ENTITY gspell-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="gspell" xreflabel="gspell-&gspell-version;">
-  <?dbhtml filename="gspell.html"?>
-
-
-  <title>gspell-&gspell-version;</title>
-
-  <indexterm zone="gspell">
-    <primary sortas="a-gspell">gspell</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to gspell</title>
-
-    <para>
-      The <application>gspell</application> package provides a flexible API to
-      add spell checking to a GTK+ application.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gspell-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gspell-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gspell-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gspell-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gspell-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gspell-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">gspell Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="enchant"/>,
-      <xref linkend="icu"/>, and
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      &gobject-introspection;,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="vala"/>, and
-      <xref linkend="valgrind"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of gspell</title>
-
-    <para>
-      Install <application>gspell</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.  The tests
-      must be run in an X session. One test, test-checker, is known to fail if
-      the external package
-      <ulink url="https://hunspell.github.io/">Hunspell</ulink> is not
-      installed.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/rm-la-file-referring-icu.xml"/>
-
-<screen role="root"><userinput>rm -v /usr/lib/libgspell-1.la</userinput></screen>
- </sect2>
-
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>gspell-app1</seg>
-        <seg>libgspell-1.so</seg>
-        <seg>/usr/include/gspell-1 and
-             /usr/share/gtk-doc/html/gspell-1.0</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gspell-app1">
-        <term><command>gspell-app1</command></term>
-        <listitem>
-          <para>
-            checks the spelling of a text entered in a window
-          </para>
-          <indexterm zone="gspell gspell-app1">
-            <primary sortas="b-gspell-app1">gspell-app1</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgspell">
-        <term><filename class="libraryfile">libgspell-1.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>gspell</application> API library
-          </para>
-          <indexterm zone="gspell libgspell">
-            <primary sortas="c-libgspell">libgspell-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/highway.xml
===================================================================
--- general/genlib/highway.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,190 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 highway-download-http "https://github.com/google/highway/archive/&highway-version;/highway-&highway-version;.tar.gz">
-  <!ENTITY highway-md5sum        "6a5d433b66626afbd3fcc5884d2f270a">
-  <!ENTITY highway-size          "2.1 MB">
-  <!ENTITY highway-buildsize     "25 MB">
-  <!ENTITY highway-time          "0.6 SBU (with parallelism=4)">
-]>
-
-<sect1 id="highway" xreflabel="highway-&highway-version;">
-  <?dbhtml filename="highway.html"?>
-
-   <title>highway-&highway-version;</title>
-
-  <indexterm zone="highway">
-    <primary sortas="a-highway">highway</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to highway</title>
-
-    <para>
-      The <application>highway</application> package contains a C++ library
-      that provides portable SIMD/vector intrinsics.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&highway-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &highway-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &highway-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &highway-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &highway-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">highway Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of highway</title>
-
-    <para>
-      Install <application>highway</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
-      -D CMAKE_BUILD_TYPE=Release  \
-      -D BUILD_TESTING=OFF         \
-      -D BUILD_SHARED_LIBS=ON      \
-      -G Ninja ..                  &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package does come with a test suite, but it requires
-      <ulink url="https://github.com/google/googletest">gtest</ulink>, which
-      is not in BLFS.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DBUILD_TESTING=OFF</parameter>: This parameter disables the
-      test suite from being built because
-      <ulink url="https://github.com/google/googletest">gtest</ulink> is not
-      part of BLFS. Without this parameter, CMake will download this package
-      during the configuration process. If you wish to run the tests, install
-      <ulink url="https://github.com/google/googletest">gtest</ulink> and then
-      remove this parameter.
-    </para>
-
-    <para>
-      <parameter>-DBUILD_SHARED_LIBS=ON</parameter>: This parameter enables
-      building shared versions of the libraries instead of static versions.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libhwy.so,
-          libhwy_contrib.so, and
-          libhwy_test.so
-        </seg>
-        <seg>
-          /usr/include/hwy and
-          /usr/lib/cmake/hwy
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libhwy">
-        <term><filename class="libraryfile">libhwy.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide portable SIMD/vector intrinsics
-          </para>
-          <indexterm zone="highway libhwy">
-            <primary sortas="c-libhwy">libhwy.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libhwy_contrib">
-        <term><filename class="libraryfile">libhwy_contrib.so</filename></term>
-        <listitem>
-          <para>
-            contains several additions to Highway, including a series of dot
-            product, image, math, and sort routines
-          </para>
-          <indexterm zone="highway libhwy_contrib">
-            <primary sortas="c-libhwy_contrib">libhwy_contrib.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      
-      <varlistentry id="libhwy_test">
-        <term><filename class="libraryfile">libhwy_test.so</filename></term>
-        <listitem>
-          <para>
-            contains test helpers for Highway
-          </para>
-          <indexterm zone="highway libhwy_test">
-            <primary sortas="c-libhwy_test">libhwy_test.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: general/genlib/icu.xml
===================================================================
--- general/genlib/icu.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,520 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 icu-download-http
-           "https://github.com/unicode-org/icu/releases/download/release-&icu-major;-&icu-minor;/icu4c-&icu-major;_&icu-minor;-src.tgz">
-  <!ENTITY icu-download-ftp  " ">
-  <!ENTITY icu-md5sum        "a83c1499e508f73ddbc60002f84ea42a">
-  <!ENTITY icu-size          "25 MB">
-  <!ENTITY icu-buildsize     "341 MB (add 45 MB for tests)">
-  <!ENTITY icu-time          "0.7 SBU (Using parallelism=4; add 2.0 SBU for tests)">
-]>
-
-<sect1 id="icu" xreflabel="ICU-&icu-version;">
-  <?dbhtml filename="icu.html"?>
-
-
-  <title>icu-&icu-version;</title>
-
-  <indexterm zone="icu">
-    <primary sortas="a-icu">icu</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ICU</title>
-
-    <para>
-      The <application>International Components for Unicode</application> (ICU)
-      package is a mature, widely used set of C/C++ libraries providing Unicode
-      and Globalization support for software applications.
-      <application>ICU</application> is widely portable and gives applications
-      the same results on all platforms.
-    </para>
-
-    <warning>
-      <para>
-        Upgrading this package to a new major version (for example, from
-        72.1 to &icu-version;) will require rebuilding of many other
-        packages. If some packages that use the libraries built by
-        icu4c-&icu-major; are rebuilt, they will use the new libraries while
-        current packages will use the previous libraries.  If the Linux
-        application loader
-        (<filename class='libraryfile'>/usr/lib/ld-linux-x86-64.so.2</filename>)
-        determines that both the old and new libraries are needed, and a
-        symbol (name of data or function) exists in both versions of the
-        library, all references to the symbol will be resolved to the
-        version appearing earlier in the breadth-first sequence of the
-        dependency graph.  This may result in the application failing if
-        the definition of the data or the behavior of the function referred
-        by the symbol differs in two versions.  To avoid the issue, users
-        will need to rebuild every package linked to an ICU library as soon
-        as possible once ICU is updated to a new major version.
-      </para>
-
-      <para>
-        To determine what external libraries are needed (directly or indirectly)
-        by an application or a library, run:
-      </para>
-
-<screen><userinput>ldd &lt;application or library&gt; </userinput></screen>
-
-      <para>
-        or to see only the directly needed libraries:
-      </para>
-
-<screen><userinput>readelf -d  &lt;application or library&gt; | grep NEEDED</userinput></screen>
-
-    </warning>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&icu-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&icu-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &icu-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &icu-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &icu-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &icu-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/icu4c-&icu-version;-fix_enumeration-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">ICU Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="llvm"/> (with Clang), and
-      <xref linkend="doxygen"/> (for documentation)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ICU</title>
-
-    <note>
-      <para>
-        This package expands to the directory
-        <filename class='directory'>icu</filename>.
-      </para>
-    </note>
-
-    <note>
-      <para>
-        If <command>clang++</command> is available, it will be used in the
-        mistaken belief that <command>g++</command> might not support C++11,
-        even though <command>configure</command> has tested for that.  If
-        using <command>g++</command> there will be an unnecessary warning at
-        the end of <command>configure</command>.  Building with
-        <command>g++</command> also takes longer than the estimated SBU shown.
-      </para>
-    </note>
-<!--
-    <para>
-      First, fix a regression in version 58.1:
-    </para>
-
-<screen><userinput>patch -p1 -i ../icu4c-&icu-version;-fix_enumeration-1.patch</userinput></screen>
--->
-    <para>
-      Install <application>ICU</application> by running the following commands:
-    </para>
-
-<!-- Review comments at:
-https://chromium.googlesource.com/chromium/src/+/e58fa0ba66272c5f28828b15d06c7e42a9882b3b
-To see if the following prebuild command is appropriate for BLFS:
-sed '/fdef U_CHARSET_I/i#define U_CHARSET_IS_UTF8 1' -i common/unicode/platform.h
--->
-<screen><userinput>cd source                                    &amp;&amp;
-
-./configure --prefix=/usr                    &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          derb, escapesrc, genbrk, genccode, gencfu, gencmn, gencnval,
-          gendict, gennorm2,
-          genrb, gensprep, icu-config, icuexportdata, icuinfo, icupkg,
-          makeconv, pkgdata, and uconv
-        </seg>
-        <seg>
-          libicudata.so, libicui18n.so, libicuio.so,
-          libicutest.so, libicutu.so, and libicuuc.so
-        </seg>
-        <seg>
-          /usr/include/unicode,
-          /usr/lib/icu, and
-          /usr/share/icu
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="derb">
-        <term><command>derb</command></term>
-        <listitem>
-          <para>
-            disassembles a resource bundle
-          </para>
-          <indexterm zone="icu derb">
-            <primary sortas="b-derb">derb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="escapesrc">
-        <term><command>escapesrc</command></term>
-        <listitem>
-          <para>
-            converts <quote>\u</quote> escaped characters into unicode
-            characters
-          </para>
-          <indexterm zone="icu escapesrc">
-            <primary sortas="b-escapesrc">escapesrc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="genbrk">
-        <term><command>genbrk</command></term>
-        <listitem>
-          <para>
-            compiles ICU break iteration rules source files into binary data
-            files
-          </para>
-          <indexterm zone="icu genbrk">
-            <primary sortas="b-genbrk">genbrk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="genccode">
-        <term><command>genccode</command></term>
-        <listitem>
-          <para>
-            generates C or platform specific assembly code from an ICU data
-            file
-          </para>
-          <indexterm zone="icu genccode">
-            <primary sortas="b-genccode">genccode</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gencfu">
-        <term><command>gencfu</command></term>
-        <listitem>
-          <para>
-            reads in Unicode confusable character definitions and writes out the
-            binary data
-          </para>
-          <indexterm zone="icu gencfu">
-            <primary sortas="b-gencfu">gencfu</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gencmn">
-        <term><command>gencmn</command></term>
-        <listitem>
-          <para>
-            generates an ICU memory-mappable data file
-          </para>
-          <indexterm zone="icu gencmn">
-            <primary sortas="b-gencmn">gencmn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gencnval">
-        <term><command>gencnval</command></term>
-        <listitem>
-          <para>
-            compiles the converter's aliases file
-          </para>
-          <indexterm zone="icu gencnval">
-            <primary sortas="b-gencnval">gencnval</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gendict">
-        <term><command>gendict</command></term>
-        <listitem>
-          <para>
-            compiles word lists into ICU string trie dictionaries
-          </para>
-          <indexterm zone="icu gendict">
-            <primary sortas="b-gendict">gendict</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gennorm2">
-        <term><command>gennorm2</command></term>
-        <listitem>
-          <para>
-            builds binary data files with Unicode normalization data
-          </para>
-          <indexterm zone="icu gennorm2">
-            <primary sortas="b-gennorm2">gennorm2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="genrb">
-        <term><command>genrb</command></term>
-        <listitem>
-          <para>
-            compiles a resource bundle
-          </para>
-          <indexterm zone="icu genrb">
-            <primary sortas="b-genrb">genrb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gensprep">
-        <term><command>gensprep</command></term>
-        <listitem>
-          <para>
-            compiles StringPrep data from filtered RFC 3454 files
-          </para>
-          <indexterm zone="icu gensprep">
-            <primary sortas="b-gensprep">gensprep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="icu-config">
-        <term><command>icu-config</command></term>
-        <listitem>
-          <para>
-            outputs ICU build options
-          </para>
-          <indexterm zone="icu icu-config">
-            <primary sortas="b-icu-config">icu-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="icuinfo">
-        <term><command>icuinfo</command></term>
-        <listitem>
-          <para>
-            outputs configuration information about the current ICU
-          </para>
-          <indexterm zone="icu icuinfo">
-            <primary sortas="b-icuinfo">icuinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="icupkg">
-        <term><command>icupkg</command></term>
-        <listitem>
-          <para>
-            extracts or modifies an ICU .dat archive
-          </para>
-          <indexterm zone="icu icupkg">
-            <primary sortas="b-icupkg">icupkg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="makeconv">
-        <term><command>makeconv</command></term>
-        <listitem>
-          <para>
-            compiles a converter table
-          </para>
-          <indexterm zone="icu makeconv">
-            <primary sortas="b-makeconv">makeconv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pkgdata">
-        <term><command>pkgdata</command></term>
-        <listitem>
-          <para>
-            packages data for use by ICU
-          </para>
-          <indexterm zone="icu pkgdata">
-            <primary sortas="b-pkgdata">pkgdata</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uconv">
-        <term><command>uconv</command></term>
-        <listitem>
-          <para>
-            converts data from one encoding to another
-          </para>
-          <indexterm zone="icu uconv">
-            <primary sortas="b-uconv">uconv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libicudata">
-        <term><filename class="libraryfile">libicudata.so</filename></term>
-        <listitem>
-          <para>
-            is the data library
-          </para>
-          <indexterm zone="icu libicudata">
-            <primary sortas="c-libicudata">libicudata.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libicui18n">
-        <term><filename class="libraryfile">libicui18n.so</filename></term>
-        <listitem>
-          <para>
-            is the internationalization (i18n) library
-          </para>
-          <indexterm zone="icu libicui18n">
-            <primary sortas="c-libicui18n">libicui18n.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libicuio">
-        <term><filename class="libraryfile">libicuio.so</filename></term>
-        <listitem>
-          <para>
-            is the ICU I/O (unicode stdio) library
-          </para>
-          <indexterm zone="icu libicuio">
-            <primary sortas="c-libicuio">libicuio.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!--  <varlistentry id="libicule">
-        <term><filename class="libraryfile">libicule.so</filename></term>
-        <listitem>
-          <para>
-            is the layout engine.
-          </para>
-          <indexterm zone="icu libicule">
-            <primary sortas="c-libicule">libicule.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libiculx">
-        <term><filename class="libraryfile">libiculx.so</filename></term>
-        <listitem>
-          <para>
-            is the layout extensions engine.
-          </para>
-          <indexterm zone="icu libiculx">
-            <primary sortas="c-libiculx">libiculx.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
-
-      <varlistentry id="libicutest">
-        <term><filename class="libraryfile">libicutest.so</filename></term>
-        <listitem>
-          <para>
-            is the test library
-          </para>
-          <indexterm zone="icu libicutest">
-            <primary sortas="c-libicutest">libicutest.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libicutu">
-        <term><filename class="libraryfile">libicutu.so</filename></term>
-        <listitem>
-          <para>
-            is the tool utility library
-          </para>
-          <indexterm zone="icu libicutu">
-            <primary sortas="c-libicutu">libicutu.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libicuuc">
-        <term><filename class="libraryfile">libicuuc.so</filename></term>
-        <listitem>
-          <para>
-            is the common library
-          </para>
-          <indexterm zone="icu libicuuc">
-            <primary sortas="c-libicuuc">libicuuc.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/inih.xml
===================================================================
--- general/genlib/inih.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,154 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 inih-download-http
-    "https://github.com/benhoyt/inih/archive/r&inih-version;/inih-r&inih-version;.tar.gz">
-  <!ENTITY inih-download-ftp  " ">
-  <!ENTITY inih-md5sum        "5c9725320ad2c79e0b1f76568bd0ff24">
-  <!ENTITY inih-size          "20 KB">
-  <!ENTITY inih-buildsize     "724 KB">
-  <!ENTITY inih-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="inih" xreflabel="inih-&inih-version;">
-  <?dbhtml filename="inih.html"?>
-
-
-  <title>inih-&inih-version;</title>
-
-  <indexterm zone="inih">
-    <primary sortas="a-inih">inih</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to inih</title>
-
-    <para>
-      This package is a simple .INI file parser written in C.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&inih-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&inih-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &inih-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &inih-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &inih-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &inih-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of inih</title>
-
-    <para>
-      Install <application>inih</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-<!-- Note.  There is a tests directoy.  If we do:
-  cd ../tests
-  sh unittest.sh
-The tests seem to be run, but there is no output or log.
--->
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libinih.so, libINIReader.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libinih">
-        <term><filename class="libraryfile">libinih.so</filename></term>
-        <listitem>
-          <para>
-            is the inih main library
-          </para>
-          <indexterm zone="inih libinih">
-            <primary sortas="c-libinih">libinih.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libINIReader">
-        <term><filename class="libraryfile">libINIReader.so</filename></term>
-        <listitem>
-          <para>
-            is the inih parser library
-          </para>
-          <indexterm zone="inih libINIReader">
-            <primary sortas="c-libINIReader">libINIReader.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/genlib/intel-gmmlib.xml
===================================================================
--- general/genlib/intel-gmmlib.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,158 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 intel-gmmlib-download-http "https://github.com/intel/gmmlib/archive/intel-gmmlib-&intel-gmmlib-version;.tar.gz">
-  <!ENTITY intel-gmmlib-download-ftp  " ">
-  <!ENTITY intel-gmmlib-md5sum        "7d947d9fa06c101731ac4881857e056a">
-  <!ENTITY intel-gmmlib-size          "828 KB">
-  <!ENTITY intel-gmmlib-buildsize     "53 MB">
-  <!ENTITY intel-gmmlib-time          "0.5 SBU">
-]>
-
-<sect1 id="intel-gmmlib" xreflabel="Intel-gmmlib-&intel-gmmlib-version;">
-  <?dbhtml filename="intel-gmmlib.html"?>
-
-  <title>Intel-gmmlib-&intel-gmmlib-version;</title>
-
-  <indexterm zone="intel-gmmlib">
-    <primary sortas="a-intel-gmmlib">Intel-gmmlib</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Intel-gmmlib</title>
-
-    <para>
-      The <application>Intel-gmmlib</application> package contains the Intel
-      Graphics Memory Management Library, which provides device specific memory
-      and buffer management functions for the Intel Media Driver for VAAPI and
-      the Intel Graphics Computer Runtime for OpenCL (TM).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&intel-gmmlib-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&intel-gmmlib-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &intel-gmmlib-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &intel-gmmlib-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &intel-gmmlib-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &intel-gmmlib-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <note>
-      <para>
-        The tarball
-        <filename>intel-gmmlib-&intel-gmmlib-version;.tar.gz</filename> will
-        extract to the directory
-        <filename class="directory">gmmlib-intel-gmmlib-&intel-gmmlib-version;</filename>.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">Intel-gmmlib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Intel-gmmlib</title>
-
-    <para>
-      Install <application>Intel-gmmlib</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr   \
-      -DBUILD_TYPE=Release          \
-      -G Ninja                      \
-      -Wno-dev ..                   &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      The test suite is normally run by <command>ninja</command> unless
-      -DRUN_TEST_SUITE=NO is passed to cmake.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libigdgmm.so
-        </seg>
-        <seg>
-          /usr/include/igdgmm
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libigdgmm">
-        <term><filename class="libraryfile">libigdgmm.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide Memory Management functions for
-            Intel Graphics Drivers
-          </para>
-          <indexterm zone="intel-gmmlib libigdgmm">
-            <primary sortas="c-libigdgmm">libigdgmm.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: general/genlib/jansson.xml
===================================================================
--- general/genlib/jansson.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,141 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 jansson-download-http "https://github.com/akheron/jansson/releases/download/v&jansson-version;/jansson-&jansson-version;.tar.bz2">
-  <!ENTITY jansson-download-ftp  " ">
-  <!ENTITY jansson-md5sum        "3f90473d7d54ebd1cb6a2757396641df">
-  <!ENTITY jansson-size          "424 KB">
-  <!ENTITY jansson-buildsize     "5.6 MB (add 1.9 MB for tests)">
-  <!ENTITY jansson-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="jansson" xreflabel="jansson-&jansson-version;">
-  <?dbhtml filename="jansson.html"?>
-
-
-  <title>Jansson-&jansson-version;</title>
-
-  <indexterm zone="jansson">
-    <primary sortas="a-jansson">jansson</primary>
-  </indexterm>
-  <sect2 role="package">
-    <title>Introduction to Jansson</title>
-
-    <para>
-      The <application>Jansson</application> package contains a library used to
-      encode, decode, and manipulate JSON data.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&jansson-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&jansson-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &jansson-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &jansson-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &jansson-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &jansson-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <!-- No dependencies -->
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Jansson</title>
-
-    <para>
-      First fix one of the tests:
-    </para>
-
-<screen><userinput>sed -e "/DT/s;| sort;| sed 's/@@libjansson.*//' &amp;;" \
-    -i test/suites/api/check-exports</userinput></screen>
-
-    <para>
-      Install <application>jansson</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libjansson.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libjansson">
-        <term><filename class="libraryfile">libjansson.so</filename></term>
-        <listitem>
-          <para>
-            contains an API for encoding, decoding, and manipulating JSON data
-          </para>
-          <indexterm zone="jansson libjansson">
-            <primary sortas="c-libjansson">libjansson.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/genlib/json-c.xml
===================================================================
--- general/genlib/json-c.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,189 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 json-c-download-http "https://s3.amazonaws.com/json-c_releases/releases/json-c-&json-c-version;.tar.gz">
-  <!ENTITY json-c-download-ftp  " ">
-  <!ENTITY json-c-md5sum        "bad8f5e91b7b2563ee2d507054c70eb2">
-  <!ENTITY json-c-size          "384 KB">
-  <!ENTITY json-c-buildsize     "7.9 MB">
-  <!ENTITY json-c-time          "0.4 SBU (with tests)">
-]>
-
-<sect1 id="json-c" xreflabel="JSON-C-&json-c-version;">
-  <?dbhtml filename="json-c.html"?>
-
-
-  <title>JSON-C-&json-c-version;</title>
-
-  <indexterm zone="json-c">
-    <primary sortas="a-JSON-C">JSON-C</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to JSON-C</title>
-
-    <para>
-      The <application>JSON-C</application> implements a reference counting
-      object model that allows you to easily construct JSON objects in C,
-      output them as JSON formatted strings and parse JSON formatted strings
-      back into the C representation of JSON objects.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&json-c-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&json-c-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &json-c-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &json-c-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &json-c-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &json-c-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">JSON-C Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (for documentation)</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> and
-      <xref linkend="graphviz"/> (for dot tool)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of JSON-C</title>
-<!--
-    <note>
-      <para>
-        This package does not support parallel build.
-      </para>
-    </note>
--->
-    <para>
-      Install <application>JSON-C</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      -DBUILD_STATIC_LIBS=OFF     \
-      .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have installed <xref linkend="doxygen" role="nodep"/> and
-      <xref linkend="graphviz" role="nodep"/>, you can build the documentation
-      by running the following command:
-    </para>
-
-<screen remap="doc"><userinput>doxygen doc/Doxyfile</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you built the documentation, install it by running the following
-      commands as the &root; user:
-    </para>
-
-<screen role="root" remap="doc"><userinput>install -d -vm755 /usr/share/doc/json-c-&json-c-version; &amp;&amp;
-install -v -m644 doc/html/* /usr/share/doc/json-c-&json-c-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is
-      used to apply a higher level of compiler optimizations.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libjson-c.so
-        </seg>
-        <seg>
-          /usr/include/json-c
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libjson-c">
-        <term><filename class="libraryfile">libjson-c.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>JSON-C</application> API functions
-          </para>
-          <indexterm zone="json-c libjson-c">
-            <primary sortas="c-libjson-c">libjson-c.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/json-glib.xml
===================================================================
--- general/genlib/json-glib.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,192 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 json-glib-download-http "&gnome-download-http;/json-glib/1.8/json-glib-&json-glib-version;.tar.xz">
-  <!ENTITY json-glib-download-ftp  " ">
-  <!ENTITY json-glib-md5sum        "f1aac2b8a17fd68646653cc4d8426486">
-  <!ENTITY json-glib-size          "156 KB">
-  <!ENTITY json-glib-buildsize     "7.8 MB (with tests)">
-  <!ENTITY json-glib-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="json-glib" xreflabel="JSON-GLib-&json-glib-version;">
-  <?dbhtml filename="json-glib.html"?>
-
-
-  <title>JSON-GLib-&json-glib-version;</title>
-
-  <indexterm zone="json-glib">
-    <primary sortas="a-JSON-GLib">JSON-GLib</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to JSON GLib</title>
-
-    <para>
-      The <application>JSON GLib</application> package is a library
-      providing serialization and deserialization support for the JavaScript
-      Object Notation (JSON) format described by RFC 4627.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&json-glib-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&json-glib-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &json-glib-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &json-glib-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &json-glib-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &json-glib-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">JSON-GLib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> (GObject Introspection required if building
-      GNOME)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of JSON GLib</title>
-
-    <para>
-      Install <application>JSON GLib</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <option>-Dgtk_doc=disabled</option>: Add this option if you have
-      <xref role="nodep" linkend="gtk-doc"/> installed and do not wish to
-      generate the API documentation.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          json-glib-format and json-glib-validate
-        </seg>
-        <seg>
-          libjson-glib-1.0.so
-        </seg>
-        <seg>
-          /usr/{include,{libexec,share{/installed-tests}/json-glib-1.0 and
-          /usr/share/gtk-doc/html/json-glib
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-     <varlistentry id="json-glib-format">
-        <term><command>json-glib-format</command></term>
-        <listitem>
-          <para>
-            is a simple command line interface to format JSON data
-          </para>
-          <indexterm zone="json-glib json-glib-format">
-            <primary sortas="b-json-glib-format">json-glib-format</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="json-glib-validate">
-        <term><command>json-glib-validate</command></term>
-        <listitem>
-          <para>
-            is a simple command line interface to validate JSON data
-          </para>
-          <indexterm zone="json-glib json-glib-validate">
-            <primary sortas="b-json-glib-validate">json-glib-validate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libjson-glib-1">
-        <term><filename class="libraryfile">libjson-glib-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>JSON GLib</application> API functions
-          </para>
-          <indexterm zone="json-glib libjson-glib-1">
-            <primary sortas="c-libjson-glib-1">libjson-glib-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/keyutils-test-kernel.xml
===================================================================
--- general/genlib/keyutils-test-kernel.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,33 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>S</emphasis>ecurity options ---&gt;
-  [*] <emphasis role='blue'>E</emphasis>nable access key retention support                                 [KEYS]
-  [*]   <emphasis role='blue'>L</emphasis>arge payload keys                                            [BIG_KEYS]
-  [*]   <emphasis role='blue'>D</emphasis>iffie-Hellman operations on retained keys           [KEY_DH_OPERATIONS]
-
--*- <emphasis role='blue'>C</emphasis>ryptographic API ---&gt;                                              [CRYPTO]
-  <emphasis role='blue'>P</emphasis>ublic-key cryptography ---&gt;
-    &lt;*/M&gt; <emphasis role='blue'>R</emphasis>SA (Rivest-Shamir-Adleman)                               [CRYPTO_RSA]
-  H<emphasis role='blue'>a</emphasis>shes, digests, and MACs ---&gt;
-    &lt;*/M&gt; <emphasis role='blue'>S</emphasis>HA-1                                                    [CRYPTO_SHA1]
-  [*] <emphasis role='blue'>A</emphasis>symmetric (public-key cryptographic) key type ---&gt;  [ASYMMETRIC_KEY_TYPE]
-    &lt;*&gt; <emphasis role='blue'>A</emphasis>symmetric public-key crypto algorithm subtype
-                                            ...  [ASYMMETRIC_PUBLIC_KEY_SUBTYPE]
-    # If not built into the kernel, [SYSTEM_TRUSTED_KEYRING] won't show up;
-    # building as a module won't work:
-    &lt;*&gt;   <emphasis role='blue'>X</emphasis>.509 certificate parser                     [X509_CERTIFICATE_PARSER]
-  <emphasis role='blue'>C</emphasis>ertificates for signature checking ---&gt;
-    [*] <emphasis role='blue'>P</emphasis>rovide system-wide ring of trusted keys        [SYSTEM_TRUSTED_KEYRING]
-    [*]   <emphasis role='blue'>P</emphasis>rovide a keyring to which extra trustable keys may be added
-                                                ...  [SECONDARY_TRUSTED_KEYRING]
-    [*] <emphasis role='blue'>P</emphasis>rovide system-wide ring of blacklisted keys  [SYSTEM_BLACKLIST_KEYRING]
-
-<emphasis role='blue'>L</emphasis>ibrary routines ---&gt;
-  <emphasis role='blue'>C</emphasis>rypto library routines ---&gt;
-    # If not built into the kernel, [BIG_KEYS] won't show up;
-    # building as a module won't work:
-    &lt;*&gt; <emphasis role='blue'>C</emphasis>haCha20-Poly1305 AEAD support (8-byte nonce library version)
-                                              ...  [CRYPTO_LIB_CHACHA20POLY1305]</screen>
Index: general/genlib/keyutils.xml
===================================================================
--- general/genlib/keyutils.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,255 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 keyutils-download-http "https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/keyutils-&keyutils-version;.tar.gz">
-  <!ENTITY keyutils-download-ftp  " ">
-  <!ENTITY keyutils-md5sum        "6b70b2b381c1b6d9adfaf66d5d3e7c00">
-  <!ENTITY keyutils-size          "136 KB">
-  <!ENTITY keyutils-buildsize     "2.6 MB (with tests)">
-  <!ENTITY keyutils-time          "less than 0.1 SBU (add 0.4 SBU for tests)">
-]>
-
-<sect1 id="keyutils" xreflabel="keyutils-&keyutils-version;">
-  <?dbhtml filename="keyutils.html"?>
-
-
-  <title>keyutils-&keyutils-version;</title>
-
-  <indexterm zone="keyutils">
-    <primary sortas="a-keyutils">keyutils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to keyutils</title>
-
-    <para>
-      <application>Keyutils</application> is a set of utilities for managing
-      the key retention facility in the kernel, which can be used by
-      filesystems, block devices and more to gain and retain the authorization
-      and encryption keys required to perform secure operations.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&keyutils-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&keyutils-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &keyutils-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &keyutils-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &keyutils-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &keyutils-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Keyutils Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="lsb-tools"/> (referred by the test suite)
-    </para>
-  </sect2>
-
-  <sect2 role="kernel" id="keyutils-test-kernel"
-         xreflabel="Keyutils Kernel Configuration">
-    <title>Kernel Configuration</title>
-
-    <para>
-      If running the test suite, some tests needs the following kernel
-      features enabled:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="keyutils-test-kernel.xml"/>
-
-    <indexterm zone="keyutils keyutils-test-kernel">
-      <primary sortas="d-keyutils">keyutils (testing)</primary>
-    </indexterm>
-  </sect2>
-  <sect2 role="installation">
-    <title>Installation of keyutils</title>
-
-    <para>
-      Install <application>keyutils</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make NO_ARLIB=1 LIBDIR=/usr/lib BINDIR=/usr/bin SBINDIR=/usr/sbin install</userinput></screen>
-
-    <para>
-      The test suite can only run after installing this package.
-      To test the results, issue, as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root" remap="test"><userinput>make -k test</userinput></screen>
-
-    <para>
-      If <xref linkend='lsb-tools'/> is not installed, the test suite will
-      output some lines complaining the <command>lsb_release</command>
-      command not available but it won't affect the test result.
-    </para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-<!--
-    <para>
-      <command>sed ... Makefile</command>: This command ensures the pkgconfig
-      file is placed in the correct directory.
-    </para>
-
-    <para>
-      <command>sed ... tests/toolbox.inc.sh</command>: In LFS, GCC has been
-      configured with <option>- -enable-default-pie</option> so
-      <command>/usr/bin/bash</command> is a PIE, but the test script does
-      not anticipate it.  Fix this oversight so the test can run on a LFS
-      system.
-    </para>
--->
-
-    <para>
-      <parameter>NO_ARLIB=1</parameter>: This make flag disables installing the
-      static library.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring keyutils</title>
-
-    <sect3 id="keyutils-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/request-key.conf</filename> and
-        <filename>/etc/request-key.d/*</filename>
-      </para>
-
-      <indexterm zone="keyutils keyutils-config">
-        <primary sortas="e-etc-request-key.conf">/etc/request-key.conf</primary>
-      </indexterm>
-
-      <indexterm zone="keyutils keyutils-config">
-        <primary sortas="e-etc-request-key.d">/etc/request-key.d/*</primary>
-      </indexterm>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>keyctl, key.dns_resolver, and request-key</seg>
-        <seg>libkeyutils.so</seg>
-        <seg>/etc/keyutils,
-        /etc/request-key.d,
-        and /usr/share/keyutils</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="keyctl">
-        <term><command>keyctl</command></term>
-        <listitem>
-          <para>
-            controls the key management facility with a variety of subcommands
-          </para>
-          <indexterm zone="keyutils keyctl">
-            <primary sortas="b-keyctl">keyctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="key.dns_resolver">
-        <term><command>key.dns_resolver</command></term>
-        <listitem>
-          <para>
-            is invoked by <command>request-key</command> on behalf of the
-            kernel when kernel services (such as NFS, CIFS and AFS) need to
-            perform a hostname lookup and the kernel does not have the key
-            cached.  It is not ordinarily intended to be called directly
-          </para>
-          <indexterm zone="keyutils key.dns_resolver">
-            <primary sortas="b-key.dns_resolver">key.dns_resolver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="request-key">
-        <term><command>request-key</command></term>
-        <listitem>
-          <para>
-            is invoked by the kernel when the kernel is asked for a key that it
-            doesn't have immediately available. The kernel creates a temporary
-            key and then calls out to this program to instantiate it.  It is
-            not intended to be called directly
-          </para>
-          <indexterm zone="keyutils request-key">
-            <primary sortas="b-request-keyt-key">request-key</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libkeyutils">
-        <term><filename class="libraryfile">libkeyutils.so</filename></term>
-        <listitem>
-          <para>
-            contains the keyutils library API instantiation
-          </para>
-          <indexterm zone="keyutils libkeyutils">
-            <primary sortas="c-libkeyutils">libkeyutils.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/kirigami-addons.xml
===================================================================
--- general/genlib/kirigami-addons.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,140 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 kirigami-addons-download-http "https://download.kde.org/stable/kirigami-addons/kirigami-addons-&kirigami-addons-version;.tar.xz">
-  <!ENTITY kirigami-addons-download-ftp  " ">
-  <!ENTITY kirigami-addons-md5sum        "14dc120c21d6fe165cac577f26f4d6e3">
-  <!ENTITY kirigami-addons-size          "1.0 MB">
-  <!ENTITY kirigami-addons-buildsize     "35 MB">
-  <!ENTITY kirigami-addons-time          "0.4 SBU (Using parallelism=4">
-]>
-
-<sect1 id="kirigami-addons" xreflabel="kirigami-addons-&kirigami-addons-version;">
-  <?dbhtml filename="kirigami-addons.html"?>
-
-  <title>kirigami-addons-&kirigami-addons-version;</title>
-
-  <indexterm zone="kirigami-addons">
-    <primary sortas="g-kirigami-addons">kirigami-addons</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to kirigami-addons</title>
-
-    <para>
-      This package provides add-on qml files for the Kirigami framework.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&kirigami-addons-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&kirigami-addons-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &kirigami-addons-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &kirigami-addons-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &kirigami-addons-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &kirigami-addons-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">kirigami-addons Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kf6-frameworks"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="vulkan-loader"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of kirigami-addons</title>
-
-    <para>
-      Install <application>kirigami-addons</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE__INSTALL_PREFIX=$KF6_PREFIX \
-      -D CMAKE_BUILD_TYPE=Release          \
-      -D BUILD_TESTING=OFF                 \
-       ..                                  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This packages does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-<!-- We don't need to repeat this for every package
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is
-      used to apply a higher level of compiler optimizations.
-    </para>
-
-  </sect2>
--->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>None</seg>
-        <seg>
-          $KF6_PREFIX/lib/qml/org/kde/kirigamiaddons and
-          $KF6_PREFIX/lib/cmake/KF6KirigamiAddons
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libaio.xml
===================================================================
--- general/genlib/libaio.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,155 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libaio-download-http "https://pagure.io/libaio/archive/libaio-&libaio-version;/libaio-&libaio-version;.tar.gz">
-  <!ENTITY libaio-download-ftp  " ">
-  <!ENTITY libaio-md5sum        "605237f35de238dfacc83bcae406d95d">
-  <!ENTITY libaio-size          "48 KB">
-  <!ENTITY libaio-buildsize     "1.0 MB">
-  <!ENTITY libaio-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libaio" xreflabel="libaio-&libaio-version;">
-  <?dbhtml filename="libaio.html"?>
-
-
-  <title>libaio-&libaio-version;</title>
-
-  <indexterm zone="libaio">
-    <primary sortas="a-libaio">libaio</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libaio</title>
-
-    <para>
-      The <application>libaio</application> package is an asynchronous I/O
-      facility ("async I/O", or "aio") that has a richer API and capability set
-      than the simple POSIX async I/O facility.  This library, libaio, provides
-      the Linux-native API for async I/O.  The POSIX async I/O facility
-      requires this library in order to provide kernel-accelerated async I/O
-      capabilities, as do applications which require the Linux-native async I/O
-      API.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libaio-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libaio-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libaio-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libaio-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libaio-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libaio-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libaio</title>
-
-    <para>
-      First, disable the installation of the static library:
-    </para>
-
-<screen><userinput>sed -i '/install.*libaio.a/s/^/#/' src/Makefile</userinput></screen>
-
-    <para>
-      Build <application>libaio</application> by running the following
-      command:
-    </para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make partcheck</command>.
-    </para>
-
-    <para>
-      Now, install the package as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
--->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libaio.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libaio-lib">
-        <term><filename class="libraryfile">libaio.so</filename></term>
-        <listitem>
-          <para>
-            is the libaio library
-          </para>
-          <indexterm zone="libaio libaio-lib">
-            <primary sortas="c-libaio">libaio.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libarchive.xml
===================================================================
--- general/genlib/libarchive.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,223 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libarchive-download-http "https://github.com/libarchive/libarchive/releases/download/v&libarchive-version;/libarchive-&libarchive-version;.tar.xz">
-  <!ENTITY libarchive-download-ftp  " ">
-  <!ENTITY libarchive-md5sum        "b60683739a16ff6f00f32aa3516402ed">
-  <!ENTITY libarchive-size          "5.2 MB">
-  <!ENTITY libarchive-buildsize     "42 MB (add 32 MB for tests)">
-  <!ENTITY libarchive-time          "0.4 SBU (add 0.6 SBU for tests)">
-]>
-
-<sect1 id="libarchive" xreflabel="libarchive-&libarchive-version;">
-  <?dbhtml filename="libarchive.html"?>
-
-
-  <title>libarchive-&libarchive-version;</title>
-
-  <indexterm zone="libarchive">
-    <primary sortas="a-libarchive">libarchive</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libarchive</title>
-
-    <para>
-      The <application>libarchive</application> library provides a single
-      interface for reading/writing various compression formats.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libarchive-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libarchive-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libarchive-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libarchive-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libarchive-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libarchive-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/libarchive-&libarchive-version;-testsuite_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">libarchive Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libxml2"/>,
-      <xref linkend="lzo"/>, 
-      <xref linkend="nettle"/>, and
-      <xref linkend="pcre2"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libarchive</title>
-
-    <para>
-      Install <application>libarchive</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>LC_ALL=C make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <option>--without-xml2</option>: This switch sets expat for xar archive
-      format support instead of preferred libxml2 if both packages are installed.
-    </para>
-
-    <para>
-      <option>--without-nettle</option>: This switch sets OpenSSL for crypto
-      support instead of preferred Nettle if both packages are installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          bsdcat, bsdcpio, bsdtar, and bsdunzip
-        </seg>
-        <seg>
-          libarchive.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bsdcat">
-        <term><command>bsdcat</command></term>
-        <listitem>
-          <para>
-            expands files to standard output
-          </para>
-          <indexterm zone="libarchive bsdcat">
-            <primary sortas="b-bsdcat">bsdcat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bsdcpio">
-        <term><command>bsdcpio</command></term>
-        <listitem>
-          <para>
-            is a tool similar to <command>cpio</command>
-          </para>
-          <indexterm zone="libarchive bsdcpio">
-            <primary sortas="b-bsdcpio">bsdcpio</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bsdtar">
-        <term><command>bsdtar</command></term>
-        <listitem>
-          <para>
-            is a tool similar to GNU <command>tar</command>
-          </para>
-          <indexterm zone="libarchive bsdtar">
-            <primary sortas="b-bsdtar">bsdtar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bsdunzip">
-        <term><command>bsdunzip</command></term>
-        <listitem>
-          <para>
-            is a tool similar to Info-ZIP <command>unzip</command>
-          </para>
-          <indexterm zone="libarchive bsdunzip">
-            <primary sortas="b-bsdunzip">bsdunzip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libarchive-lib">
-        <term><filename class="libraryfile">libarchive.so</filename></term>
-        <listitem>
-          <para>
-            is a library that can create and read several streaming
-            archive formats
-          </para>
-          <indexterm zone="libarchive libarchive-lib">
-            <primary sortas="c-libarchive">libarchive.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libassuan.xml
===================================================================
--- general/genlib/libassuan.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,198 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libassuan-download-http "&gnupg-http;/libassuan/libassuan-&libassuan-version;.tar.bz2">
-  <!ENTITY libassuan-download-ftp  " ">
-  <!ENTITY libassuan-md5sum        "fe8310b1a5bcaa32d70af476fa2b942a">
-  <!ENTITY libassuan-size          "592 KB">
-  <!ENTITY libassuan-buildsize     "7.9 MB (with tests, add 3.4 MB for documentation)">
-  <!ENTITY libassuan-time          "0.1 SBU (with tests and documentation)">
-]>
-
-<sect1 id="libassuan" xreflabel="libassuan-&libassuan-version;">
-  <?dbhtml filename="libassuan.html"?>
-
-
-  <title>libassuan-&libassuan-version;</title>
-
-  <indexterm zone="libassuan">
-    <primary sortas="a-libassuan">libassuan</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libassuan</title>
-
-    <para>
-      The <application>libassuan</application> package contains an inter
-      process communication library used by some of the other
-      <application>GnuPG</application> related packages.
-      <application>libassuan</application>'s primary use is to allow a
-      client to interact with a non-persistent server.
-      <application>libassuan</application> is not, however, limited to
-      use with <application>GnuPG</application> servers and clients. It
-      was designed to be flexible enough to meet the demands of many
-      transaction based environments with non-persistent servers.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libassuan-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libassuan-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libassuan-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libassuan-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libassuan-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libassuan-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libassuan Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libgpg-error"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libassuan</title>
-
-    <para>
-      Install <application>libassuan</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make                      &amp;&amp;
-
-make -C doc html                                                       &amp;&amp;
-makeinfo --html --no-split -o doc/assuan_nochunks.html doc/assuan.texi &amp;&amp;
-makeinfo --plaintext       -o doc/assuan.txt           doc/assuan.texi
-</userinput></screen>
-
-    <para>
-      The above commands build the documentation in html and plaintext formats.
-      If you wish to build alternate formats of the documentation, you must
-      have <xref linkend="texlive"/> installed and issue the following commands:
-    </para>
-
-<screen remap="doc"><userinput>make -C doc pdf ps</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 -dm755   /usr/share/doc/libassuan-&libassuan-version;/html &amp;&amp;
-install -v -m644 doc/assuan.html/* \
-                    /usr/share/doc/libassuan-&libassuan-version;/html &amp;&amp;
-install -v -m644 doc/assuan_nochunks.html \
-                    /usr/share/doc/libassuan-&libassuan-version;      &amp;&amp;
-install -v -m644 doc/assuan.{txt,texi} \
-                    /usr/share/doc/libassuan-&libassuan-version;</userinput></screen>
-
-    <para>
-      If you built alternate formats of the documentation, install them by
-      running the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -v -m644  doc/assuan.{pdf,ps,dvi} \
-                  /usr/share/doc/libassuan-&libassuan-version;</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          libassuan-config
-        </seg>
-        <seg>
-          libassuan.so
-        </seg>
-        <seg>
-          /usr/share/doc/libassuan-&libassuan-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libassuan-config">
-        <term><command>libassuan-config</command></term>
-        <listitem>
-          <para>
-            is a <filename class="libraryfile">libassuan</filename> build information script
-          </para>
-          <indexterm zone="libassuan libassuan-config">
-            <primary sortas="b-libassuan-config">libassuan-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libassuan-lib">
-        <term><filename class="libraryfile">libassuan.so</filename></term>
-        <listitem>
-          <para>
-            is an inter process communication library which
-            implements the Assuan protocol
-          </para>
-          <indexterm zone="libassuan libassuan-lib">
-            <primary sortas="c-libassuan">libassuan.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libatasmart.xml
===================================================================
--- general/genlib/libatasmart.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,171 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libatasmart-download-http "https://0pointer.de/public/libatasmart-&libatasmart-version;.tar.xz">
-  <!ENTITY libatasmart-download-ftp  " ">
-  <!ENTITY libatasmart-md5sum        "53afe2b155c36f658e121fe6def33e77">
-  <!ENTITY libatasmart-size          "248 KB">
-  <!ENTITY libatasmart-buildsize     "3 MB">
-  <!ENTITY libatasmart-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libatasmart" xreflabel="libatasmart-&libatasmart-version;">
-  <?dbhtml filename="libatasmart.html"?>
-
-
-  <title>libatasmart-&libatasmart-version;</title>
-
-  <indexterm zone="libatasmart">
-    <primary sortas="a-libatasmart">libatasmart</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libatasmart</title>
-
-    <para>
-      The <application>libatasmart</application> package is a disk reporting
-      library. It only supports a subset of the ATA S.M.A.R.T. functionality.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libatasmart-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libatasmart-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libatasmart-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libatasmart-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libatasmart-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libatasmart-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">Editor Notes:
-      <ulink url="&blfs-wiki;/libatasmart"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libatasmart</title>
-
-    <para>
-      Install <application>libatasmart</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make docdir=/usr/share/doc/libatasmart-&libatasmart-version; install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          skdump and sktest
-        </seg>
-        <seg>
-          libatasmart.so
-        </seg>
-        <seg>
-          /usr/share/doc/libatasmart-&libatasmart-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="skdump">
-        <term><command>skdump</command></term>
-        <listitem>
-          <para>
-            is a utility that reports on the status of the disk
-          </para>
-          <indexterm zone="libatasmart skdump">
-            <primary sortas="b-skdump">skdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sktest">
-        <term><command>sktest</command></term>
-        <listitem>
-          <para>
-            is a utility to issue disks tests
-          </para>
-          <indexterm zone="libatasmart sktest">
-            <primary sortas="b-sktest">sktest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libatasmart-lib">
-        <term><filename class="libraryfile">libatasmart.so</filename></term>
-        <listitem>
-          <para>
-            contains the ATA S.M.A.R.T API functions
-          </para>
-          <indexterm zone="libatasmart libatasmart-lib">
-            <primary sortas="c-libatasmart">libatasmart.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libatomic_ops.xml
===================================================================
--- general/genlib/libatomic_ops.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,157 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libatomic_ops-download-http "https://github.com/ivmai/libatomic_ops/releases/download/v&libatomic_ops-version;/libatomic_ops-&libatomic_ops-version;.tar.gz">
-  <!ENTITY libatomic_ops-download-ftp  " ">
-  <!ENTITY libatomic_ops-md5sum        "d07b3d8369d7f9efdca59f7501dd1117">
-  <!ENTITY libatomic_ops-size          "516 KB">
-  <!ENTITY libatomic_ops-buildsize     "6.8 MB (with tests)">
-  <!ENTITY libatomic_ops-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="libatomic_ops" xreflabel="libatomic_ops-&libatomic_ops-version;">
-  <?dbhtml filename="libatomic_ops.html"?>
-
-
-  <title>libatomic_ops-&libatomic_ops-version;</title>
-
-  <indexterm zone="libatomic_ops">
-    <primary sortas="a-libatomic_ops">libatomic_ops</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libatomic_ops</title>
-
-    <para>
-      <application>libatomic_ops</application> provides implementations for
-      atomic memory update operations on a number of architectures. This allows
-      direct use of these in reasonably portable code. Unlike earlier similar
-      packages, this one explicitly considers memory barrier semantics, and
-      allows the construction of code that involves minimum overhead across a
-      variety of architectures.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libatomic_ops-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libatomic_ops-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libatomic_ops-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libatomic_ops-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libatomic_ops-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libatomic_ops-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libatomic_ops</title>
-
-    <para>
-      Install <application>libatomic_ops</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --enable-shared  \
-            --disable-static \
-            --docdir=/usr/share/doc/libatomic_ops-&libatomic_ops-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To check the results, issue <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-shared</parameter>: This switch enables building of the
-      <filename class="libraryfile">libatomic_ops</filename> shared libraries.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libatomic_ops.so and libatomic_ops_gpl.so
-        </seg>
-        <seg>
-          /usr/include/libatomic_ops and
-          /usr/share/doc/libatomic_ops-&libatomic_ops-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libatomic_ops-lib">
-        <term><filename class="libraryfile">libatomic_ops.so</filename></term>
-        <listitem>
-          <para>
-            contains functions for atomic memory operations
-          </para>
-          <indexterm zone="libatomic_ops libatomic_ops-lib">
-            <primary sortas="c-libatomic_ops">libatomic_ops.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libblockdev.xml
===================================================================
--- general/genlib/libblockdev.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,275 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libblockdev-download-http
-    "https://github.com/storaged-project/libblockdev/releases/download/&libblockdev-version;-1/libblockdev-&libblockdev-version;.tar.gz">
-  <!ENTITY libblockdev-download-ftp " ">
-  <!ENTITY libblockdev-md5sum        "28d43f2d6bff85245502a8c4c478c5a3">
-  <!ENTITY libblockdev-size          "1.0 MB">
-  <!ENTITY libblockdev-buildsize     "13 MB">
-  <!ENTITY libblockdev-time          "0.1 SBU">
-]>
-
-<sect1 id="libblockdev" xreflabel="libblockdev-&libblockdev-version;">
-  <?dbhtml filename="libblockdev.html"?>
-
-
-  <title>libblockdev-&libblockdev-version;</title>
-
-  <indexterm zone="libblockdev">
-    <primary sortas="a-libblockdev">libblockdev</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libblockdev</title>
-
-    <para>
-      libblockdev is a C library supporting GObject Introspection for
-      manipulation of block devices. It has a plugin-based architecture where
-      each technology (like LVM, Btrfs, MD RAID, Swap,...) is implemented in a
-      separate plugin, possibly with multiple implementations (e.g. using LVM
-      CLI or the new LVM DBus API).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libblockdev-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libblockdev-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libblockdev-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libblockdev-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libblockdev-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libblockdev-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libblockdev Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> (GObject Introspection required for GNOME)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="cryptsetup"/>,
-      <xref linkend="keyutils"/>,
-      <xref linkend="libbytesize"/>,
-      <xref linkend="libnvme"/>, and
-      <xref linkend="lvm2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="btrfs-progs"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="mdadm"/>,
-      <xref linkend="parted"/>,
-      <ulink url="https://github.com/felixonmars/volume_key">volume_key</ulink>,
-<!--      <xref linkend="volume_key"/>,-->
-<!--      <ulink url="https://people.redhat.com/~heinzm/sw/dmraid/">dmraid</ulink>, -->
-<!--      <ulink url="https://bcachefs.org/">bcachefs</ulink>, -->
-      <ulink url="https://github.com/pmem/ndctl">ndctl</ulink>, and
-      <ulink url="https://github.com/Datera/targetcli">targetcli</ulink>
-      (for tests)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libblockdev</title>
-<!--
-    <para>
-      Fix the usage of a glib function deprecated for security:
-    </para>
-
-<screen><userinput>sed 's/g_memdup/&amp;2/' -i             \
-    src/lib/plugin_apis/vdo.{c,api} \
-    src/plugins/vdo.c</userinput></screen>
--->
-    <para>
-      Install <application>libblockdev</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr      \
-            --sysconfdir=/etc  \
-            --with-python3     \
-            --without-escrow   \
-            --without-gtk-doc  \
-            --without-lvm      \
-            --without-lvm_dbus \
-            --without-nvdimm   \
-            --without-tools    &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      The test suite requires <application>targetcli</application>, which
-      is not a part of BLFS.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--without-escrow</parameter>: This switch allows building
-      <application>libblockdev</application> without volume_key installed.  
-    </para>
-
-    <para>
-      <parameter>--without-lvm</parameter>
-      <parameter>--without-lvm_dbus</parameter>
-      <parameter>--without-tools</parameter>: The combination of these
-      switches allows
-      building <application>libblockdev</application> without
-      <xref linkend="parted"/> installed.  Remove it if you've installed
-      <xref linkend="parted"/> and wish to build the
-      <command>lvm-cache-stats</command> or <command>vfat-resize</command>
-      utilities, or wish <application>libblockdev</application> to support
-      logical volumes.
-    </para>
-
-    <para>
-      <option>--without-btrfs --without-mdraid --without-tools</option>:
-      The combination of these switches allows building
-      <application>libblockdev</application> without
-      <xref linkend="libbytesize"/> installed.  The
-      <option>--without-mdraid</option> option will break
-      <xref linkend="udisks2"/>, so don't use it unless you really know what
-      you are doing.
-    </para>
-
-    <para>
-      <option>--without-crypto</option>: This switch allows building
-      <application>libblockdev</application> without
-      <xref linkend="cryptsetup"/> or <xref linkend="keyutils"/> installed.
-      This switch will break <xref linkend="udisks2"/>, so don't use it
-      unless you really know what you are doing.
-    </para>
-
-    <para>
-      <option>--without-dm --without-lvm --without-lvm_dbus
-      --without-mpath</option>: The combination of these switches allows
-      building <application>libblockdev</application> without
-      <xref linkend="lvm2"/> installed.  The <option>--without-dm</option>
-      and <option>--without-mpath</option> options are not in the instructions
-      provided by the book because <xref linkend="lvm2"/> is required for
-      <xref linkend="cryptsetup"/> and <xref linkend="cryptsetup"/> is a
-      recommended dependency of <application>libblockdev</application> anyway.
-    </para>
-
-    <para>
-      <option>--without-nvme</option>: This switch allows building
-      <application>libblockdev</application> without
-      <xref linkend="libnvme"/> installed.  This switch will break
-      <xref linkend="udisks2"/>, so don't use it unless you really know what
-      you are doing.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lvm-cache-stats and vfat-resize (both optional)
-        </seg>
-        <seg>
-          libbd_btrfs.so,
-          libbd_crypto.so,
-          libbd_dm.so,
-          libbd_fs.so,
-          libbd_loop.so,
-          libbd_lvm.so (optional),
-          libbd_lvm-dbus.so (optional),
-          libbd_mdraid.so,
-          libbd_mpath.so,
-          libbd_nvme.so,
-          libbd_part.so,
-          libbd_swap.so,
-          libbd_utils.so, and
-          libblockdev.so
-        </seg>
-        <seg>
-          /etc/libblockdev,
-          /usr/include/blockdev, and
-          /usr/share/gtk-doc/html/libblockdev (optional)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lvm-cache-stats">
-        <term><command>lvm-cache-stats</command></term>
-        <listitem>
-          <para>
-            prints statistics on caches on LVM Logical Volumes
-          </para>
-          <indexterm zone="libblockdev lvm-cache-stats">
-            <primary sortas="b-lvm-cache-stats">lvm-cache-stats</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vfat-resize">
-        <term><command>vfat-resize</command></term>
-        <listitem>
-          <para>
-            resizes <systemitem class="filesystem">vfat</systemitem>
-            file systems
-          </para>
-          <indexterm zone="libblockdev vfat-resize">
-            <primary sortas="b-vfat-resize">vfat-resize</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libbytesize.xml
===================================================================
--- general/genlib/libbytesize.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,185 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libbytesize-download-http "https://github.com/storaged-project/libbytesize/releases/download/&libbytesize-version;/libbytesize-&libbytesize-version;.tar.gz">
-  <!ENTITY libbytesize-download-ftp  " ">
-  <!ENTITY libbytesize-md5sum        "2ed2ad2e44c4017f016e1ca55be83e62">
-  <!ENTITY libbytesize-size          "452 KB">
-  <!ENTITY libbytesize-buildsize     "3.5 MB">
-  <!ENTITY libbytesize-time          "less than 0.1 SBU (including tests)">
-]>
-
-<sect1 id="libbytesize" xreflabel="libbytesize-&libbytesize-version;">
-  <?dbhtml filename="libbytesize.html"?>
-
-
-  <title>libbytesize-&libbytesize-version;</title>
-
-  <indexterm zone="libbytesize">
-    <primary sortas="a-libbytesize">libbytesize</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libbytesize</title>
-
-    <para>
-      The <application>libbytesize</application> package is a library which
-      facilitates the common operations with sizes in bytes.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libbytesize-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libbytesize-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libbytesize-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libbytesize-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libbytesize-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libbytesize-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-   <bridgehead renderas="sect3">libbytesize Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="pcre2"/> and
-      <xref linkend="pygments"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-
-    <para role="recommended">
-      <xref linkend="six"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      <ulink url="https://github.com/rhinstaller/pocketlint/releases">pocketlint</ulink> (python module for one test), and
-      <ulink url="https://pypi.python.org/pypi/polib">polib</ulink> (python module for one test)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libbytesize</title>
-
-    <para>
-      Install <application>libbytesize</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have the optional python modules installed, the regression
-      tests can be run with: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>-i -without-python2</option>: If
-      <application>Python 2</application> is installed, use this switch to
-      prevent the use of <application>Python 2</application>. This may be
-      required to run the tests, if some of the needed python modules have been
-      installed for <application>Python 3</application> only.
-    </para>
-  </sect2>
--->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          bscalc
-        </seg>
-        <seg>
-          libbytesize.so
-        </seg>
-        <seg>
-          /usr/include/bytesize and
-          /usr/lib/python&python3-majorver;/site-packages/bytesize
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bscalc">
-        <term><command>bscalc</command></term>
-        <listitem>
-          <para>
-            converts from a larger unit, such as MB or TB,
-            back to a value in bytes
-          </para>
-          <indexterm zone="libbytesize bscalc">
-            <primary sortas="b-bscalc">bscalc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libbytesize-lib">
-        <term><filename class="libraryfile">libbytesize.so</filename></term>
-        <listitem>
-          <para>
-            contains functions used to handle common read/write operations
-            with sizes in bytes
-          </para>
-          <indexterm zone="libbytesize libbytesize-lib">
-            <primary sortas="c-libbytesize">libbytesize.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libcloudproviders.xml
===================================================================
--- general/genlib/libcloudproviders.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,163 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libcloudproviders-download-http "&gnome-download-http;/libcloudproviders/0.3/libcloudproviders-&libcloudproviders-version;.tar.xz">
-  <!ENTITY libcloudproviders-download-ftp  " ">
-  <!ENTITY libcloudproviders-md5sum        "f0f994bdc36fdfe9b31e3655b8071599">
-  <!ENTITY libcloudproviders-size          "24 KB">
-  <!ENTITY libcloudproviders-buildsize     "1.4 MB">
-  <!ENTITY libcloudproviders-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libcloudproviders" xreflabel="libcloudproviders-&libcloudproviders-version;">
-  <?dbhtml filename="libcloudproviders.html"?>
-
-  <title>libcloudproviders-&libcloudproviders-version;</title>
-
-  <indexterm zone="libcloudproviders">
-    <primary sortas="a-libcloudproviders">libcloudproviders</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libcloudproviders</title>
-
-    <para>
-      The <application>libcloudproviders</application> package contains a
-      library which provides a DBus API that allows cloud storage sync clients
-      to expose their services.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libcloudproviders-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libcloudproviders-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libcloudproviders-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libcloudproviders-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libcloudproviders-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libcloudproviders-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libcloudproviders Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      &gobject-introspection; and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libcloudproviders</title>
-
-    <para>
-      Install <application>libcloudproviders</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <option>-Denable-gtk-doc</option>: Use this switch if you have
-      <xref linkend="gtk-doc" role="nodep"/> installed and wish to generate the
-      API documentation.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libcloudproviders.so
-        </seg>
-        <seg>
-          /usr/include/cloudproviders
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libcloudproviders-lib">
-        <term><filename class="libraryfile">libcloudproviders.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide a DBus API to allow cloud storage
-            sync clients to expose their services
-          </para>
-          <indexterm zone="libcloudproviders libcloudproviders-lib">
-            <primary sortas="c-libcloudproviders">libcloudproviders.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: general/genlib/libdaemon.xml
===================================================================
--- general/genlib/libdaemon.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,172 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libdaemon-download-http "https://0pointer.de/lennart/projects/libdaemon/libdaemon-&libdaemon-version;.tar.gz">
-  <!ENTITY libdaemon-download-ftp  " ">
-  <!ENTITY libdaemon-md5sum        "509dc27107c21bcd9fbf2f95f5669563">
-  <!ENTITY libdaemon-size          "332 KB">
-  <!ENTITY libdaemon-buildsize     "3 MB">
-  <!ENTITY libdaemon-time          "0.1 SBU">
-]>
-
-<sect1 id="libdaemon" xreflabel="libdaemon-&libdaemon-version;">
-  <?dbhtml filename="libdaemon.html"?>
-
-
-  <title>libdaemon-&libdaemon-version;</title>
-
-  <indexterm zone="libdaemon">
-    <primary sortas="a-libdaemon">libdaemon</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libdaemon</title>
-
-    <para>
-      The <application>libdaemon</application> package is a lightweight C
-      library that eases the writing of UNIX daemons.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libdaemon-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libdaemon-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libdaemon-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libdaemon-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libdaemon-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libdaemon-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libdaemon Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> and
-      <xref linkend="lynx"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libdaemon</title>
-
-    <para>
-      Install <application>libdaemon</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have <application>Doxygen</application> installed and wish to
-      build the API documentation, issue the following command:
-    </para>
-
-<screen remap="doc"><userinput>make -C doc doxygen</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make docdir=/usr/share/doc/libdaemon-&libdaemon-version; install</userinput></screen>
-
-    <para>
-      If you built the API documentation, install it using the following commands
-      as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<!-- there is a link from README.html to reference/html, so install there -->
-<screen role="root"
-        remap="doc"><userinput>install -v -m755 -d /usr/share/doc/libdaemon-&libdaemon-version;/reference/html &amp;&amp;
-install -v -m644 doc/reference/html/* /usr/share/doc/libdaemon-&libdaemon-version;/reference/html &amp;&amp;
-install -v -m644 doc/reference/man/man3/* /usr/share/man/man3</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libdaemon.so
-        </seg>
-        <seg>
-          /usr/include/libdaemon and
-          /usr/share/doc/libdaemon-&libdaemon-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libdaemon-lib">
-        <term><filename class="libraryfile">libdaemon.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libdaemon</application> API functions
-          </para>
-          <indexterm zone="libdaemon libdaemon-lib">
-            <primary sortas="c-libdaemon">libdaemon.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libdisplay-info.xml
===================================================================
--- general/genlib/libdisplay-info.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,154 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libdisplay-info-download-http "https://gitlab.freedesktop.org/emersion/libdisplay-info/-/releases/&libdisplay-info-version;/downloads//libdisplay-info-&libdisplay-info-version;.tar.xz">
-  <!ENTITY libdisplay-info-download-ftp  " ">
-  <!ENTITY libdisplay-info-md5sum        "56e8d2213d2aefd7defaaddfd9cb80e1">
-  <!ENTITY libdisplay-info-size          "t6 KB">
-  <!ENTITY libdisplay-info-buildsize     "2.4 MB">
-  <!ENTITY libdisplay-info-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libdisplay-info" xreflabel="libdisplay-info-&libdisplay-info-version;">
-  <?dbhtml filename="libdisplay-info.html"?>
-
-  <title>libdisplay-info-&libdisplay-info-version;</title>
-
-  <indexterm zone="libdisplay-info">
-    <primary sortas="a-libdisplay-info">libdisplay-info</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libdisplay-info</title>
-
-    <para>
-      The <application>libdisplay-info</application> package provides 
-       a set of high-level and low-level functions to 
-       access detailed Extended Display Identification Data (EDID) information.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libdisplay-info-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libdisplay-info-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libdisplay-info-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libdisplay-info-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libdisplay-info-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libdisplay-info-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-   <bridgehead renderas="sect3">libdisplay-info Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="hwdata"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libdisplay-info</title>
-
-    <para>
-      Install <application>libdisplay-info</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package requires special software to run tests.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libdisplay-info.so 
-        </seg>
-        <seg>
-          /usr/include/libdisplay-info
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libdisplay-info-lib">
-        <term><filename class="libraryfile">libdisplay-info.so</filename></term>
-        <listitem>
-          <para>
-            contains functions used to handle operations
-            relating to NVMe devices.
-          </para>
-          <indexterm zone="libdisplay-info libdisplay-info-lib">
-            <primary sortas="c-libdisplay-info">libdisplay-info.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
-  </sect2>
-
-</sect1>
Index: general/genlib/libfam.xml
===================================================================
--- general/genlib/libfam.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/libfam.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,7 @@
+<sect1 id="libfam" xreflabel="libfam">
+<?dbhtml filename="libfam.html" dir="general"?>
+<title>libfam</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
Index: general/genlib/libfam/libfam.ent
===================================================================
--- general/genlib/libfam/libfam.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/libfam/libfam.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY libfam SYSTEM "../libfam.xml">
Index: general/genlib/libgcrypt.xml
===================================================================
--- general/genlib/libgcrypt.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,247 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libgcrypt-download-http "&gnupg-http;/libgcrypt/libgcrypt-&libgcrypt-version;.tar.bz2">
-  <!ENTITY libgcrypt-download-ftp  " ">
-  <!ENTITY libgcrypt-md5sum        "a8cada0b343e10dbee51c9e92d856a94">
-  <!ENTITY libgcrypt-size          "3.6 MB">
-  <!ENTITY libgcrypt-buildsize     "131 MB (with tests)">
-  <!ENTITY libgcrypt-time          "0.3 SBU (with documentation; add 0.4 SBU for tests)">
-]>
-
-<sect1 id="libgcrypt" xreflabel="libgcrypt-&libgcrypt-version;">
-  <?dbhtml filename="libgcrypt.html"?>
-
-
-  <title>libgcrypt-&libgcrypt-version;</title>
-
-  <indexterm zone="libgcrypt">
-    <primary sortas="a-libgcrypt">libgcrypt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgcrypt</title>
-
-    <para>
-      The <application>libgcrypt</application> package contains a general
-      purpose crypto library based on the code used in
-      <application>GnuPG</application>. The library provides a high level
-      interface to cryptographic building blocks using an extendable and flexible
-      API.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libgcrypt-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libgcrypt-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libgcrypt-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libgcrypt-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libgcrypt-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libgcrypt-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libgcrypt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libgpg-error"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <!-- <xref linkend="libcap-pam"/> -->
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgcrypt</title>
-
-    <para>
-      Install <application>libgcrypt</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make                      &amp;&amp;
-
-make -C doc html                                                       &amp;&amp;
-makeinfo --html --no-split -o doc/gcrypt_nochunks.html doc/gcrypt.texi &amp;&amp;
-makeinfo --plaintext       -o doc/gcrypt.txt           doc/gcrypt.texi</userinput></screen>
-
-<!--  The commands for building the pdf and ps formats are broken.
-    <para>
-      The above commands build the documentation in html and plaintext
-      formats. If you wish to build alternate formats of the documentation, you
-      need <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>). Issue
-      the following command:
-    </para>
-
-<screen remap="doc"><userinput>make -C doc pdf</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 -dm755   /usr/share/doc/libgcrypt-&libgcrypt-version; &amp;&amp;
-install -v -m644    README doc/{README.apichanges,fips*,libgcrypt*} \
-                    /usr/share/doc/libgcrypt-&libgcrypt-version; &amp;&amp;
-
-install -v -dm755   /usr/share/doc/libgcrypt-&libgcrypt-version;/html &amp;&amp;
-install -v -m644 doc/gcrypt.html/* \
-                    /usr/share/doc/libgcrypt-&libgcrypt-version;/html &amp;&amp;
-install -v -m644 doc/gcrypt_nochunks.html \
-                    /usr/share/doc/libgcrypt-&libgcrypt-version;      &amp;&amp;
-install -v -m644 doc/gcrypt.{txt,texi} \
-                    /usr/share/doc/libgcrypt-&libgcrypt-version;</userinput></screen>
-<!--
-    <para>
-      If you built alternate formats of the documentation, install them by
-      issuing the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -v -m644 doc/gcrypt.{pdf,ps,dvi} \
-                    /usr/share/doc/libgcrypt-&libgcrypt-version;</userinput></screen>
--->
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--with-capabilities</option>: This option enables libcap2 support.
-      Note that this breaks <xref linkend="cryptsetup"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          dumpsexp, hmac256, libgcrypt-config, and mpicalc
-        </seg>
-        <seg>
-          libgcrypt.so
-        </seg>
-        <seg>
-          /usr/share/doc/libgcrypt-&libgcrypt-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="dumpsexp">
-        <term><command>dumpsexp</command></term>
-        <listitem>
-          <para>
-            is a debug tool for S-expressions
-          </para>
-          <indexterm zone="libgcrypt dumpsexp">
-            <primary sortas="b-dumpsexp">dumpsexp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hmac256">
-        <term><command>hmac256</command></term>
-        <listitem>
-          <para>
-            is a standalone HMAC-SHA-256 implementation used to compute
-            an HMAC-SHA-256 authentication code
-          </para>
-          <indexterm zone="libgcrypt hmac256">
-            <primary sortas="b-hmac256">hmac256</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgcrypt-config">
-        <term><command>libgcrypt-config</command></term>
-        <listitem>
-          <para>
-            determines the compile and linker flags that should be used to
-            compile and link programs that use <filename class="libraryfile">libgcrypt</filename>
-          </para>
-          <indexterm zone="libgcrypt libgcrypt-config">
-            <primary sortas="b-libgcrypt-config">libgcrypt-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mpicalc">
-        <term><command>mpicalc</command></term>
-        <listitem>
-          <para>
-            is a RPN (Reverse Polish Notation) calculator
-          </para>
-          <indexterm zone="libgcrypt mpicalc">
-            <primary sortas="b-mpicalc">mpicalc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgcrypt-lib">
-        <term><filename class="libraryfile">libgcrypt.so</filename></term>
-        <listitem>
-          <para>
-            contains the cryptographic API functions
-          </para>
-          <indexterm zone="libgcrypt libgcrypt-lib">
-            <primary sortas="c-libgcrypt">libgcrypt.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libgpg-error.xml
===================================================================
--- general/genlib/libgpg-error.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,179 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libgpg-error-download-http "&gnupg-http;/libgpg-error/libgpg-error-&libgpg-error-version;.tar.bz2">
-  <!ENTITY libgpg-error-download-ftp  " ">
-  <!ENTITY libgpg-error-md5sum        "eb171d62d761f49e110b77b747d8a157">
-  <!ENTITY libgpg-error-size          "1.0 MB">
-  <!ENTITY libgpg-error-buildsize     "11 MB (with tests)">
-  <!ENTITY libgpg-error-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="libgpg-error" xreflabel="libgpg-error-&libgpg-error-version;">
-  <?dbhtml filename="libgpg-error.html"?>
-
-
-  <title>libgpg-error-&libgpg-error-version;</title>
-
-  <indexterm zone="libgpg-error">
-    <primary sortas="a-libgpg-error">libgpg-error</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgpg-error</title>
-
-    <para>
-      The <application>libgpg-error</application> package contains a
-      library that defines common error values for all
-      <application>GnuPG</application> components.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libgpg-error-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libgpg-error-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libgpg-error-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libgpg-error-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libgpg-error-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libgpg-error-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgpg-error</title>
-
-    <para>
-      Install <application>libgpg-error</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 README /usr/share/doc/libgpg-error-&libgpg-error-version;/README</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gpg-error, gpgrt-config, and yat2m
-        </seg>
-        <seg>
-          libgpg-error.so
-        </seg>
-        <seg>
-          /usr/share/common-lisp/source/gpg-error,
-          /usr/share/libgpg-error, and
-          /usr/share/doc/libgpg-error-&libgpg-error-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gpg-error">
-        <term><command>gpg-error</command></term>
-        <listitem>
-          <para>
-            is used to determine <application>libgpg-error</application>
-            error codes
-          </para>
-          <indexterm zone="libgpg-error gpg-error">
-            <primary sortas="b-gpg-error">gpg-error</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpgrt-config">
-        <term><command>gpgrt-config</command></term>
-        <listitem>
-          <para>
-            is a <command>pkg-config</command> style tool for querying the
-            information about installed version of libgpg-error
-          </para>
-          <indexterm zone="libgpg-error gpgrt-config">
-            <primary sortas="b-gpgrt-config">gpgrt-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="yat2m">
-        <term><command>yat2m</command></term>
-        <listitem>
-          <para>
-            extracts man pages from a Texinfo source
-          </para>
-          <indexterm zone="libgpg-error yat2m">
-            <primary sortas="b-yat2m">yat2m</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgpg-error-lib">
-        <term><filename class="libraryfile">libgpg-error.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libgpg-error</application> API
-            functions
-          </para>
-          <indexterm zone="libgpg-error libgpg-error-lib">
-            <primary sortas="c-libgpg-error">libgpg-error.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libgrss.xml
===================================================================
--- general/genlib/libgrss.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,170 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libgrss-download-http "&gnome-download-http;/libgrss/0.7/libgrss-0.7.0.tar.xz">
-  <!ENTITY libgrss-download-ftp  " ">
-  <!ENTITY libgrss-md5sum        "7c0ee46a82dc0e9610183fe9ef8c7c1d">
-  <!ENTITY libgrss-size          "356 KB">
-  <!ENTITY libgrss-buildsize     "10 MB">
-  <!ENTITY libgrss-time          "0.1 SBU">
-]>
-
-<sect1 id="libgrss" xreflabel="libgrss-&libgrss-version;">
-  <?dbhtml filename="libgrss.html"?>
-
-
-  <title>libgrss-&libgrss-version;</title>
-
-  <indexterm zone="libgrss">
-    <primary sortas="a-libgrss">libgrss</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgrss</title>
-
-    <para>
-      The <application>libgrss</application> package contains a library
-      designed to manipulate RSS and Atom feeds.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libgrss-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libgrss-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libgrss-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libgrss-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libgrss-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libgrss-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/libgrss-&libgrss-version;-bugfixes-2.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libgrss Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libsoup"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgrss</title>
-
-    <para>
-      Install <application>libgrss</application> by running the following
-      commands:
-    </para>
-
-
-<screen><userinput>patch -Np1 -i ../libgrss-&libgrss-version;-bugfixes-2.patch &amp;&amp;
-autoreconf -fv &amp;&amp;
-./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libgrss.so
-        </seg>
-        <seg>
-          /usr/include/libgrss and
-          /usr/share/doc/libgrss-&libgrss-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgrss-lib">
-        <term><filename class="libraryfile">libgrss.so</filename></term>
-        <listitem>
-          <para>
-            provides API functions for handling RSS feeds
-          </para>
-          <indexterm zone="libgrss libgrss-lib">
-            <primary sortas="c-libgrss">libgrss.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/genlib/libgsf.xml
===================================================================
--- general/genlib/libgsf.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,209 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libgsf-download-http "&gnome-download-http;/libgsf/1.14/libgsf-&libgsf-version;.tar.xz">
-  <!ENTITY libgsf-download-ftp  " ">
-  <!ENTITY libgsf-md5sum        "c64b4a29dd2e67749313f3917a12a709">
-  <!ENTITY libgsf-size          "692 KB">
-  <!ENTITY libgsf-buildsize     "14 MB (with tests)">
-  <!ENTITY libgsf-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="libgsf" xreflabel="libgsf-&libgsf-version;">
-  <?dbhtml filename="libgsf.html"?>
-
-
-  <title>libgsf-&libgsf-version;</title>
-
-  <indexterm zone="libgsf">
-    <primary sortas="a-libgsf">libgsf</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgsf</title>
-
-    <para>
-      The <application>libgsf</application> package contains a library
-      used for providing an extensible input/output abstraction layer for
-      structured file formats.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libgsf-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libgsf-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libgsf-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libgsf-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libgsf-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libgsf-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libgsf Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> and
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gdk-pixbuf"/>
-      (To build <command>gsf-office-thumbnailer</command>)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="valgrind"/> (for tests)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgsf</title>
-
-    <para>
-      Install <application>libgsf</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>. 
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gsf, gsf-office-thumbnailer, and gsf-vba-dump
-        </seg>
-        <seg>
-          libgsf-1.so
-        </seg>
-        <seg>
-          /usr/include/libgsf-1,
-          /usr/share/gtk-doc/html/gsf and
-          /usr/share/thumbnailers
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gsf">
-        <term><command>gsf</command></term>
-        <listitem>
-          <para>
-            is a simple archive utility, somewhat similar to
-            <ulink role='man' url='&man;tar.1'>tar(1)</ulink>
-          </para>
-          <indexterm zone="libgsf gsf">
-            <primary sortas="b-gsf">gsf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gsf-office-thumbnailer">
-        <term><command>gsf-office-thumbnailer</command></term>
-        <listitem>
-          <para>
-            is used internally by <application>GNOME</application> applications
-            such as <application>Nautilus</application> to generate
-            thumbnails of several types of office application files
-          </para>
-          <indexterm zone="libgsf gsf-office-thumbnailer">
-            <primary sortas="b-gsf-office-thumbnailer">gsf-office-thumbnailer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gsf-vba-dump">
-        <term><command>gsf-vba-dump</command></term>
-        <listitem>
-          <para>
-            is used to extract Visual Basic for Applications macros from files
-          </para>
-          <indexterm zone="libgsf gsf-vba-dump">
-            <primary sortas="b-gsf-vba-dump">gsf-vba-dump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgsf-1">
-        <term><filename class="libraryfile">libgsf-1.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libgsf</application> API functions
-          </para>
-          <indexterm zone="libgsf libgsf-1">
-            <primary sortas="c-libgsf-1">libgsf-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libgudev.xml
===================================================================
--- general/genlib/libgudev.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,175 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libgudev-download-http
-           "&gnome-download-http;/libgudev/&libgudev-version;/libgudev-&libgudev-version;.tar.xz">
-  <!ENTITY libgudev-download-ftp  " ">
-  <!ENTITY libgudev-md5sum        "46da30a1c69101c3a13fa660d9ab7b73">
-  <!ENTITY libgudev-size          "32 KB">
-  <!ENTITY libgudev-buildsize     "2.0 MB">
-  <!ENTITY libgudev-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libgudev" xreflabel="libgudev-&libgudev-version;">
-  <?dbhtml filename="libgudev.html"?>
-
-
-  <title>libgudev-&libgudev-version;</title>
-
-  <indexterm zone="libgudev">
-    <primary sortas="a-libgudev">libgudev</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgudev</title>
-
-    <para>
-      The <application>libgudev</application> package contains
-      GObject bindings for libudev.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libgudev-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libgudev-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libgudev-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libgudev-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libgudev-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libgudev-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> (GObject Introspection required for GNOME)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="umockdev"/> (for testing)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgudev</title>
-
-    <para>
-      Install <application>libgudev</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <option>-Dgtk_doc=true</option>: Use this option if GTK-Doc is installed
-      and you wish to build and install the API documentation.
-    </para>
-
-    <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>-->
-
-<!-- With meson, the tests will be disabled automatically without umockdev present.
-    <para>
-      <parameter>- -disable-umockdev</parameter>: Disables the usage of
-      <xref role="nodep" linkend="umockdev"/>. Omit this switch if you
-      wish to run the test suite.
-    </para>
--->
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libgudev-1.0.so
-        </seg>
-        <seg>
-          /usr/include/gudev-1.0 and
-          /usr/share/gtk-doc/html/gudev
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgudev-1.0">
-        <term><filename class="libraryfile">libgudev-1.0.so</filename></term>
-        <listitem>
-          <para>
-            is a GObject-based wrapper library for libudev
-          </para>
-          <indexterm zone="libgudev libgudev-1.0">
-            <primary sortas="c-libgudev-1.0">libgudev-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libgusb.xml
===================================================================
--- general/genlib/libgusb.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,200 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libgusb-download-http "https://github.com/hughsie/libgusb/releases/download/&libgusb-version;/libgusb-&libgusb-version;.tar.xz">
-  <!ENTITY libgusb-download-ftp  " ">
-  <!ENTITY libgusb-md5sum        "354a3227334991ea4e924843c144bd82">
-  <!ENTITY libgusb-size          "52 KB">
-  <!ENTITY libgusb-buildsize     "5.0 MB (with tests and docs)">
-  <!ENTITY libgusb-time          "0.1 SBU (with tests and docs)">
-]>
-
-<sect1 id="libgusb" xreflabel="libgusb-&libgusb-version;">
-  <?dbhtml filename="libgusb.html"?>
-
-
-  <title>libgusb-&libgusb-version;</title>
-
-  <indexterm zone="libgusb">
-    <primary sortas="a-libgusb">libgusb</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgusb</title>
-
-    <para>
-      The <application>libgusb</application> package contains the GObject
-      wrappers for <application>libusb-1.0</application> that makes it
-      easy to do asynchronous control, bulk and interrupt transfers with
-      proper cancellation and integration into a mainloop.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libgusb-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libgusb-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libgusb-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libgusb-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libgusb-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libgusb-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libgusb Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="json-glib"/> and
-      <xref linkend="libusb"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection;,
-      <xref linkend="usbutils"/> (for <filename>usb.ids</filename> data file,
-      which is also required for the tests), and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gi-docgen"/> and
-      <xref linkend="umockdev"/> (for full test coverage)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgusb</title>
-
-    <para>
-      Install <application>libgusb</application> by running the following
-      commands:
-    </para>
-
-    <screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..            \
-      --prefix=/usr       \
-      --buildtype=release \
-      -Ddocs=false        &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      If you have <xref linkend='gi-docgen'/> installed and wish to build
-      the API documentation for this package, issue:
-    </para>
-
-<screen role='nodump'><userinput>sed -E "/output|install_dir/s/('libgusb)'/\1-&libgusb-version;'/" \
-    -i ../docs/meson.build                            &amp;&amp;
-meson configure -Ddocs=true                           &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <parameter>-Ddocs=false</parameter>: &gi-doc-disable;
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gusbcmd
-        </seg>
-        <seg>
-          libgusb.so
-        </seg>
-        <seg>
-          /usr/include/gusb-1 and
-          /usr/share/doc/libgusb-&libgusb-version; (if gi-docgen is used)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gusbcmd">
-        <term><command>gusbcmd</command></term>
-        <listitem>
-          <para>
-            is a debugging tool for the libgusb library
-          </para>
-          <indexterm zone="libgusb gusbcmd">
-            <primary sortas="b-gusbcmd">gusbcmd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgusb-lib">
-        <term><filename class="libraryfile">libgusb.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libgusb</application> API functions
-          </para>
-          <indexterm zone="libgusb libgusb-lib">
-            <primary sortas="c-libgusb">libgusb.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libical.xml
===================================================================
--- general/genlib/libical.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,325 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libical-download-http "https://github.com/libical/libical/releases/download/v&libical-version;/libical-&libical-version;.tar.gz">
-  <!ENTITY libical-download-ftp  " ">
-  <!ENTITY libical-md5sum        "cc790ea49701df0335d42b89d57c04bc">
-  <!ENTITY libical-size          "888 KB">
-  <!ENTITY libical-buildsize     "24 MB (with tests)">
-  <!ENTITY libical-time          "0.1 SBU (iusing parallelism=4; with tests)">
-<!-- run at -j1 because it fails at -j4 -->
-]>
-
-<sect1 id="libical" xreflabel="libical-&libical-version;">
-  <?dbhtml filename="libical.html"?>
-
-
-  <title>libical-&libical-version;</title>
-
-  <indexterm zone="libical">
-    <primary sortas="a-libical">libical</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libical</title>
-
-    <para>
-      The <application>libical</application> package contains an implementation
-      of the iCalendar protocols and data formats.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libical-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libical-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libical-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libical-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libical-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libical-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libical Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection; and
-      <xref linkend="vala"/> (both required for GNOME)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> (for the API documentation),
-      <xref linkend="graphviz"/> (for the API documentation),
-      <xref linkend="gtk-doc"/> (for the API documentation),
-      <xref linkend="icu"/>, 
-      <xref linkend="pygobject3"/> (for some tests), and
-      &berkeley-db;
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libical</title>
-
-    <para>
-      Install <application>libical</application> by running the
-      following commands:
-    </para>
-
-  <!-- Needs confirmation, but I got a race condition at -j8,
-  -j1 allowed the build to pass. Pierre 2019-12-06
-  I always have it actually. Hence the entity.
-
-  Works at -j8 and -j4 for version 3.0.18
-    &parallel_issues;-->
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr  \
-      -D CMAKE_BUILD_TYPE=Release   \
-      -D SHARED_ONLY=yes            \
-      -D ICAL_BUILD_DOCS=false      \
-      -D ICAL_BUILD_EXAMPLES=false  \
-      -D GOBJECT_INTROSPECTION=true \
-      -D ICAL_GLIB_VAPI=true        \
-      .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have <xref linkend="doxygen"/>, <xref linkend="graphviz"/>,
-      and <xref linkend="gtk-doc"/>
-      installed and wish to build the API documentation,  you should
-      remove the <parameter>-DICAL_BUILD_DOCS=false</parameter> switch
-      and issue:
-    </para>
-
-<screen remap="doc"><userinput>make docs</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-      <!-- One test, timezones, is known to fail on SysV systems. -->
-      <!-- On systemd, we symlink the current timezone to
-           /etc/localtime, which is what libical expects.
-           This is now done on SysV as well.-->
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you have built the API documentation, install by issuing, as
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -vdm755 /usr/share/doc/libical-&libical-version;/html &amp;&amp;
-cp -vr apidocs/html/* /usr/share/doc/libical-&libical-version;/html</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-D CMAKE_BUILD_TYPE=Release</parameter>: This switch is used
-      to apply higher level of the compiler optimizations.
-    </para>
-
-    <para>
-      <parameter>-D SHARED_ONLY=yes</parameter>: This switch is used
-      in order to only build the shared libraries.
-    </para>
-
-    <para>
-      <parameter>-D ICAL_BUILD_DOCS=false</parameter>: This switch prevents
-      building the <application>GTK</application> documentation. Remove
-      if you want to build the documentation.
-    </para>
-
-    <para>
-      <parameter>-D ICAL_BUILD_EXAMPLES=false</parameter>: This switch prevents
-      building examples. Remove if you want to build them.
-    </para>
-
-    <para>
-      <parameter>-D GOBJECT_INTROSPECTION=true</parameter>: This switch is used
-      to generate GObject metadata bindings.
-    </para>
-
-    <para>
-      <parameter>-D ICAL_GLIB_VAPI=true</parameter>: This switch is used
-      in order to build bindings for <xref linkend="vala"/>.
-    </para>
-
-    <para>
-      <option>-D USE_BUILTIN_TZDATA=yes</option>: This switch is used
-      in order to build using your own timezone data.
-    </para>
-
-    <!-- No CMake equivalents
-    <para>
-      <parameter>- -enable-cxx</parameter>: This switch enables
-      <application>libical</application> C++ library.
-    </para>
-
-    <para>
-      <option>- -enable-python</option>: This switch enables
-      <application>libical</application> Python bindings.
-    </para> -->
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libical_cxx.so,
-          libical.so,
-          libical-glib.so,
-          libicalss_cxx.so,
-          libicalss.so,
-          and libicalvcal.so
-        </seg>
-        <seg>
-          /usr/include/libical,
-          /usr/include/libical-glib,
-          /usr/lib/cmake/LibIcal,
-          /usr/libexec/libical,
-          /usr/share/gtk-doc/html/libical-glib (optional),
-          and /usr/share/doc/libical-&libical-version;/html
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libical-lib">
-        <term><filename class="libraryfile">libical.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libical</application> API
-            functions
-          </para>
-          <indexterm zone="libical libical-lib">
-            <primary sortas="c-libical">libical.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libical_cxx-lib">
-        <term><filename class="libraryfile">libical_cxx.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libical</application> C++ bindings
-          </para>
-          <indexterm zone="libical libical_cxx-lib">
-            <primary sortas="c-libical_cxx">libical_cxx.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libical-glib">
-        <term><filename class="libraryfile">libical-glib.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libical</application> glib bindings
-          </para>
-          <indexterm zone="libical libical-glib">
-            <primary sortas="c-libical-glib">libical-glib.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libicalss">
-        <term><filename class="libraryfile">libicalss.so</filename></term>
-        <listitem>
-          <para>
-            is a library that allows you to store iCal component data
-            to disk in a variety of ways
-          </para>
-          <indexterm zone="libical libicalss">
-            <primary sortas="c-libicalss">libicalss.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libicalss_cxx">
-        <term><filename class="libraryfile">libicalss_cxx.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libicalss</application> C++
-            bindings
-          </para>
-          <indexterm zone="libical libicalss_cxx">
-            <primary sortas="c-libicalss_cxx">libicalss_cxx.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libicalvcal">
-        <term><filename class="libraryfile">libicalvcal.so</filename></term>
-        <listitem>
-          <para>
-            is a vCard/vCalendar C interface
-          </para>
-          <indexterm zone="libical libicalvcal">
-            <primary sortas="c-libicalvcal">libicalvcal.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libidn.xml
===================================================================
--- general/genlib/libidn.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,205 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libidn-download-http "&gnu-http;/libidn/libidn-&libidn-version;.tar.gz">
-  <!ENTITY libidn-download-ftp  " ">
-  <!ENTITY libidn-md5sum        "fe061a95ae23979150a692d102dce4ad">
-  <!ENTITY libidn-size          "2.5 MB">
-  <!ENTITY libidn-buildsize     "19 MB (with tests)">
-  <!ENTITY libidn-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="libidn" xreflabel="libidn-&libidn-version;">
-  <?dbhtml filename="libidn.html"?>
-
-
-  <title>libidn-&libidn-version;</title>
-
-  <indexterm zone="libidn">
-    <primary sortas="a-libidn">libidn</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libidn</title>
-
-    <para>
-      <application>libidn</application> is a package designed for
-      internationalized string handling based on the
-      <ulink url="https://www.ietf.org/rfc/rfc3454.txt">Stringprep</ulink>,
-      <ulink url="https://www.ietf.org/rfc/rfc3492.txt">Punycode</ulink> and
-      <ulink url="https://www.ietf.org/rfc/rfc3490.txt">IDNA</ulink>
-      specifications defined by the Internet Engineering Task Force
-      (IETF) Internationalized Domain Names (IDN) working group, used for
-      internationalized domain names. This is useful for converting data from the
-      system's native representation into UTF-8, transforming Unicode strings
-      into ASCII strings, allowing applications to use certain ASCII name labels
-      (beginning with a special prefix) to represent non-ASCII name labels, and
-      converting entire domain names to and from the ASCII Compatible Encoding
-      (ACE) form.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libidn-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libidn-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libidn-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libidn-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libidn-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libidn-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libidn Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="emacs"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="openjdk"/>,
-      <xref linkend="valgrind"/>, and
-      <ulink url="https://www.mono-project.com/">Mono</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libidn</title>
-
-    <para>
-      Install <application>libidn</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, run:
-    </para>
-
-<screen remap="test"><userinput>pushd tests  &amp;&amp;
-  make check &amp;&amp;
-popd </userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-
-find doc -name "Makefile*" -delete            &amp;&amp;
-rm -rf -v doc/{gdoc,idn.1,stamp-vti,man,texi} &amp;&amp;
-mkdir -v       /usr/share/doc/libidn-&libidn-version;     &amp;&amp;
-cp -r -v doc/* /usr/share/doc/libidn-&libidn-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-    <para>
-      <option>--enable-java</option>: Use this switch to enable building
-      the Java implementation of <application>libidn</application>. Note that
-      <xref linkend="openjdk"/> must be installed to use this option.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          idn
-        </seg>
-        <seg>
-          libidn.so
-        </seg>
-        <seg>
-          /usr/share/doc/libidn-&libidn-version; and
-          /usr/share/gtk-doc/html/libidn
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="idn">
-        <term><command>idn</command></term>
-        <listitem>
-          <para>
-            is a command line interface to the internationalized domain
-            name library
-          </para>
-          <indexterm zone="libidn idn">
-            <primary sortas="b-idn">idn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libidn-lib">
-        <term><filename class="libraryfile">libidn.so</filename></term>
-        <listitem>
-          <para>
-            contains a generic Stringprep implementation that does Unicode
-            3.2 NFKC normalization, mapping and prohibition of characters, and
-            bidirectional character handling. Profiles for Nameprep, iSCSI, SASL
-            and XMPP are included as well as support for Punycode and ASCII
-            Compatible Encoding (ACE) via IDNA. A mechanism to define Top-Level
-            Domain (TLD) specific validation tables, and to compare strings
-            against those tables, as well as default tables for some TLDs are
-            included
-          </para>
-          <indexterm zone="libidn libidn-lib">
-            <primary sortas="c-libidn">libidn.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libidn2.xml
===================================================================
--- general/genlib/libidn2.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,179 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libidn2-download-http "&gnu-http;/libidn/libidn2-&libidn2-version;.tar.gz">
-  <!ENTITY libidn2-download-ftp  " ">
-  <!ENTITY libidn2-md5sum        "de2818c7dea718a4f264f463f595596b">
-  <!ENTITY libidn2-size          "2.1 MB">
-  <!ENTITY libidn2-buildsize     "21 MB (add 3 MB for tests)">
-  <!ENTITY libidn2-time          "0.1 SBU (add 0.6 SBU for tests)">
-]>
-
-<!-- Try to keep the indentation used in this file-->
-<sect1 id="libidn2" xreflabel="libidn2-&libidn2-version;">
-  <?dbhtml filename="libidn2.html"?>
-
-
-  <title>libidn2-&libidn2-version;</title>
-
-  <indexterm zone="libidn2">
-    <primary sortas="a-libidn2">libidn2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libidn2</title>
-
-    <para>
-      <application>libidn2</application> is a package designed for
-      internationalized string handling based on standards from the
-      Internet Engineering Task Force (IETF)'s IDN working group, designed for
-      internationalized domain names.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libidn2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libidn2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libidn2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libidn2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libidn2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libidn2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libidn2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libunistring"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="git"/> and
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <!--Required section-->
-  <sect2 role="installation">
-    <title>Installation of libidn2</title>
-
-    <para>
-      Install <application>libidn2</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          idn2
-        </seg>
-        <seg>
-          libidn2.so
-        </seg>
-        <seg>
-          /usr/share/gtk-doc/html/libidn2
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <!-- If the program or library name conflicts (is the same) as the
-      package name, add -prog or -lib to the varlistentry entity id
-      and the 2nd entry of the indexterm zone entity -->
-
-      <varlistentry id="idn2">
-        <term><command>idn2</command></term>
-        <listitem>
-          <para>
-            is a command line interface to the internationalized domain
-            library
-          </para>
-          <indexterm zone="libidn2 idn2">
-            <primary sortas="b-idn2">idn2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libidn2-lib">
-        <term><filename class="libraryfile">libidn2.so</filename></term>
-        <listitem>
-          <para>
-            contains a generic Stringprep implementation used for
-            internationalized string handling
-          </para>
-          <indexterm zone="libidn2 libidn2-lib">
-            <primary sortas="c-libidn2">libidn2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/genlib/libiodbc.xml
===================================================================
--- general/genlib/libiodbc.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,193 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libiodbc-download-http "&sourceforge-dl;/iodbc/libiodbc-&libiodbc-version;.tar.gz">
-  <!ENTITY libiodbc-download-ftp  " ">
-  <!ENTITY libiodbc-md5sum        "89949a41e542bb1b880d7fcc4987dad2">
-  <!ENTITY libiodbc-size          "1.0 MB">
-  <!ENTITY libiodbc-buildsize     "26 MB">
-  <!ENTITY libiodbc-time          "0.2 SBU">
-]>
-
-<sect1 id="libiodbc" xreflabel="libiodbc-&libiodbc-version;">
-  <?dbhtml filename="libiodbc.html"?>
-
-
-  <title>libiodbc-&libiodbc-version;</title>
-
-  <indexterm zone="libiodbc">
-    <primary sortas="a-libiodbc">libiodbc</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libiodbc</title>
-
-    <para>
-      <application>libiodbc</application> is an API to ODBC compatible
-      databases.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libiodbc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libiodbc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libiodbc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libiodbc-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libiodbc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libiodbc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libiodbc Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gtk2"/> (to create the GUI admin tool)
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libiodbc</title>
-
-    <para>
-      Install <application>libiodbc</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr                   \
-            --with-iodbc-inidir=/etc/iodbc  \
-            --includedir=/usr/include/iodbc \
-            --disable-libodbc               \
-            --disable-static                &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-iodbc-inidir=/etc/iodbc</parameter>:
-      <application>libiodbc</application> will install configuration files
-      in this directory.
-    </para>
-
-    <para>
-      <parameter>--includedir=/usr/include/iodbc</parameter>: This installs the
-      interface headers to a private directory to avoid a conflict with headers
-      installed by <application>unixODBC</application>.
-    </para>
-
-    <para>
-      <parameter>--disable-libodbc</parameter>: This prevents the installation
-      of the <filename class="symlink">libodbc.so</filename> symbolic link to
-      avoid a conflict with <application>unixODBC</application>.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>iodbc-config, iodbctest, iodbctestw, and iodbcadm-gtk</seg>
-        <seg>libdrvproxy.so, libiodbc.so, libiodbcinst.so, and
-        libiodbcadm.so</seg>
-        <seg>/usr/include/iodbc, /usr/share/libiodbc, and /etc/iodbc</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="iodbc-config">
-        <term><command>iodbc-config</command></term>
-        <listitem>
-          <para>
-            is a utility for retrieving the installation options of libiodbc
-          </para>
-          <indexterm zone="libiodbc iodbc-config">
-            <primary sortas="b-iodbc-config">iodbc-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="iodbctest">
-        <term><command>iodbctest{,w}</command></term>
-        <listitem>
-          <para>
-            are interactive SQL processors
-          </para>
-          <indexterm zone="libiodbc iodbctest">
-            <primary sortas="b-iodbctest">iodbctest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="iodbcadm">
-        <term><command>iodbcadm-gtk</command></term>
-        <listitem>
-          <para>
-            is a graphical administration utility
-          </para>
-          <indexterm zone="libiodbc iodbcadm">
-            <primary sortas="b-iodbcadm">iodbcadm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libksba.xml
===================================================================
--- general/genlib/libksba.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,189 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libksba-download-http "&gnupg-http;/libksba/libksba-&libksba-version;.tar.bz2">
-  <!ENTITY libksba-download-ftp  " ">
-  <!ENTITY libksba-md5sum        "b84be832461d4704c227c3719288bfc9">
-  <!ENTITY libksba-size          "692 KB">
-  <!ENTITY libksba-buildsize     "9.4 MB (with tests)">
-  <!ENTITY libksba-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="libksba" xreflabel="libksba-&libksba-version;">
-  <?dbhtml filename="libksba.html"?>
-
-
-  <title>libksba-&libksba-version;</title>
-
-  <indexterm zone="libksba">
-    <primary sortas="a-libksba">libksba</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Libksba</title>
-
-    <para>
-      The <application>Libksba</application> package contains a library
-      used to make X.509 certificates as well as making the CMS (Cryptographic
-      Message Syntax) easily accessible by other applications. Both
-      specifications are building blocks of S/MIME and TLS. The library does
-      not rely on another cryptographic library but provides hooks for easy
-      integration with <application>Libgcrypt</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libksba-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libksba-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libksba-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libksba-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libksba-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libksba-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Libksba Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libgpg-error"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="valgrind"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Libksba</title>
-
-    <para>
-      Install <application>Libksba</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen><!-- &amp;&amp;
-
-makeinfo - -html - -no-split -o doc/ksba_nochunks.html doc/ksba.texi &amp;&amp;
-makeinfo - -plaintext       -o doc/ksba.txt           doc/ksba.texi</userinput></screen>
-
-    <para>
-      If you wish to build alternate formats of the documentation, you
-      must have <xref linkend="texlive"/> installed,
-      then issue the following commands:
-    </para>
-
-<screen remap="doc"><userinput>make -C doc ps pdf html</userinput></screen> -->
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen><!-- &amp;&amp;
-
-install -v -m755 -d /usr/share/doc/libksba-&libksba-version; &amp;&amp;
-install -v -m644    README doc/ksba{_nochunks.html,.txt,.texi} \
-                    /usr/share/doc/libksba-&libksba-version;</userinput></screen>
-
-    <para>
-      If you built the additional documentation, install it by issuing the
-      following commands as the <systemitem class="username">root</systemitem>
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -v -m755 -d /usr/share/doc/libksba-&libksba-version;/html &amp;&amp;
-install -v -m644 doc/ksba.html/* \
-                    /usr/share/doc/libksba-&libksba-version;/html &amp;&amp;
-install -v -m644 doc/ksba.{pdf,ps,dvi} \
-                    /usr/share/doc/libksba-&libksba-version;</userinput></screen> -->
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg><!--ksba-config not in 1.6.3-->None</seg>
-        <seg>libksba.so</seg>
-        <seg>None<!--/usr/share/doc/libksba-&libksba-version;--></seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-      <!--
-      <varlistentry id="ksba-config">
-        <term><command>ksba-config</command></term>
-        <listitem>
-          <para>
-            is a utility used to configure and build applications based on
-            the libksba(3) library. It can be used to query the C compiler and
-            linker flags which are required to correctly compile and link the
-            application against the libksba(3) library
-          </para>
-          <indexterm zone="libksba ksba-config">
-            <primary sortas="b-ksba-config">ksba-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      -->
-      <varlistentry id="libksba-lib">
-        <term><filename class="libraryfile">libksba.{so,a}</filename></term>
-        <listitem>
-          <para>
-            contains the cryptographic API functions
-          </para>
-          <indexterm zone="libksba libksba-lib">
-            <primary sortas="c-libksba">libksba.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/liblinear.xml
===================================================================
--- general/genlib/liblinear.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 liblinear-download-http "https://github.com/cjlin1/liblinear/archive/v&liblinear-version;/liblinear-&liblinear-version;.tar.gz">
-  <!ENTITY liblinear-download-ftp  " ">
-  <!ENTITY liblinear-md5sum        "0c81dd2b2cabc4fba85f61b9dc51c4a3">
-  <!ENTITY liblinear-size          "560 KB">
-  <!ENTITY liblinear-buildsize     "1.6 MB">
-  <!ENTITY liblinear-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="liblinear" xreflabel="liblinear-&liblinear-version;">
-  <?dbhtml filename="liblinear.html"?>
-
-
-  <title>liblinear-&liblinear-version;</title>
-
-  <indexterm zone="liblinear">
-    <primary sortas="a-liblinear">liblinear</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to liblinear</title>
-
-    <para>
-      This package provides a library for learning linear classifiers for large
-      scale applications. It supports Support Vector Machines (SVM) with L2 and
-      L1 loss, logistic regression, multi class classification and also Linear
-      Programming Machines (L1-regularized SVMs). Its computational complexity
-      scales linearly with the number of training examples making it one of the
-      fastest SVM solvers around.
-    </para>
-
-    &lfs121_checked;
-
-    <note>
-      <para>
-        After updating this package from
-        <application>liblinear-1.96</application> or earlier, you need to
-        reinstall <xref linkend="nmap"/>, in order to link to the new library.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&liblinear-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&liblinear-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &liblinear-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &liblinear-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &liblinear-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &liblinear-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of liblinear</title>
-
-    <para>
-      Install <application>liblinear</application> by running the following commands:
-    </para>
-
-<screen><userinput>make lib</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -vm644 linear.h /usr/include &amp;&amp;
-install -vm755 liblinear.so.5 /usr/lib &amp;&amp;
-ln -sfv liblinear.so.5 /usr/lib/liblinear.so</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          liblinear.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="liblinear-lib">
-        <term><filename class="libraryfile">liblinear.so</filename></term>
-        <listitem>
-          <para>
-            is a large linear classification library
-          </para>
-          <indexterm zone="liblinear liblinear-lib">
-            <primary sortas="c-liblinear">liblinear.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libmbim.xml
===================================================================
--- general/genlib/libmbim.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,197 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libmbim-download-http "https://www.freedesktop.org/software/libmbim/libmbim-&libmbim-version;.tar.xz">
-  <!ENTITY libmbim-download-ftp  " ">
-  <!ENTITY libmbim-md5sum        "58dea20cad346f31d2873b68385a9973">
-  <!ENTITY libmbim-size          "553 KB">
-  <!ENTITY libmbim-buildsize     "33 MB (with tests)">
-  <!ENTITY libmbim-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="libmbim" xreflabel="libmbim-&libmbim-version;">
-  <?dbhtml filename="libmbim.html"?>
-
-
-  <title>libmbim-&libmbim-version;</title>
-
-  <indexterm zone="libmbim">
-    <primary sortas="a-libmbim">libmbim</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libmbim</title>
-
-    <para>
-      The <application>libmbim</application> package contains a GLib-based library
-      for talking to WWAN modems and devices which speak the Mobile Interface
-      Broadband Model (MBIM) protocol.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libmbim-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libmbim-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libmbim-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libmbim-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libmbim-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libmbim-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libmbim Dependencies</bridgehead>
-
-    <!-- not needed anymore with 1.26.0
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libgudev"/>
-    </para>
-    -->
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection;
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <ulink url="https://ftpmirror.gnu.org/gnu/help2man/">help2man</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libmbim</title>
-
-    <para>
-      Install <application>libmbim</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          mbimcli and mbim-network
-        </seg>
-        <seg>
-          libmbim-glib.so
-        </seg>
-        <seg>
-          /usr/include/libmbim-glib and
-          /usr/share/gtk-doc/html/libmbim-glib
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mbimcli">
-        <term><command>mbimcli</command></term>
-        <listitem>
-          <para>
-            is an utility used to control MBIM devices
-          </para>
-          <indexterm zone="libmbim mbimcli">
-            <primary sortas="b-mbimcli">mbimcli</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mbim-network">
-        <term><command>mbim-network</command></term>
-        <listitem>
-          <para>
-            is an utility used for simple network management
-            of MBIM devices
-          </para>
-          <indexterm zone="libmbim mbim-network">
-            <primary sortas="b-mbim-network">mbim-network</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmbim-glib">
-        <term><filename class="libraryfile">libmbim-glib.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for talking to WWAN modems and devices
-            which speak the Mobile Interface Broadband Model (MBIM)
-            protocol
-          </para>
-          <indexterm zone="libmbim libmbim-glib">
-            <primary sortas="c-libmbim-glib">libmbim-glib.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libnvme.xml
===================================================================
--- general/genlib/libnvme.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,155 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libnvme-download-http "https://github.com/linux-nvme/libnvme/archive/v&libnvme-version;/libnvme-&libnvme-version;.tar.gz">
-  <!ENTITY libnvme-download-ftp  " ">
-  <!ENTITY libnvme-md5sum        "ff72b83dc2ada1da0bd528570154eed3">
-  <!ENTITY libnvme-size          "616 KB">
-  <!ENTITY libnvme-buildsize     "13 MB">
-  <!ENTITY libnvme-time          "0.1 SBU (including tests)">
-]>
-
-<sect1 id="libnvme" xreflabel="libnvme-&libnvme-version;">
-  <?dbhtml filename="libnvme.html"?>
-
-  <title>libnvme-&libnvme-version;</title>
-
-  <indexterm zone="libnvme">
-    <primary sortas="a-libnvme">libnvme</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libnvme</title>
-
-    <para>
-      The <application>libnvme</application> package is a library which
-      provides type definitions for NVMe specification structures,
-      enumerations, and bit fields, helper functions to construct, dispatch,
-      and decode commands and payloads, and utilities to connect, scan, and
-      manage NVMe devices on a Linux system.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libnvme-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libnvme-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libnvme-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libnvme-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libnvme-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libnvme-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-   <bridgehead renderas="sect3">libnvme Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <phrase revision="sysv"><xref linkend="dbus"/>,</phrase>
-      <xref linkend="json-c"/>,
-      <xref linkend="keyutils"/>, and
-      <xref linkend="swig"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libnvme</title>
-
-    <para>
-      Install <application>libnvme</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release -Dlibdbus=auto .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To run the tests, issue: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libnvme.so and
-          libnvme-mi.so
-        </seg>
-        <seg>
-          /usr/include/nvme and
-          /usr/lib/python3.11/site-packages/libnvme
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libnvme-lib">
-        <term><filename class="libraryfile">libnvme.so</filename></term>
-        <listitem>
-          <para>
-            contains functions used to handle operations
-            relating to NVMe devices.
-          </para>
-          <indexterm zone="libnvme libnvme-lib">
-            <primary sortas="c-libnvme">libnvme.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libpaper.xml
===================================================================
--- general/genlib/libpaper.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,212 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libpaper-download-http "https://github.com/rrthomas/libpaper/releases/download/v&libpaper-version;/libpaper-&libpaper-version;.tar.gz">
-  <!ENTITY libpaper-download-ftp  " ">
-  <!ENTITY libpaper-md5sum        "4b914c3ca6d8277260fce418e12bae6b">
-  <!ENTITY libpaper-size          "1.1 MB">
-  <!ENTITY libpaper-buildsize     "11 MB (with tests)">
-  <!ENTITY libpaper-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="libpaper" xreflabel="libpaper-&libpaper-version;">
-  <?dbhtml filename="libpaper.html"?>
-
-
-  <title>libpaper-&libpaper-version;</title>
-
-  <indexterm zone="libpaper">
-    <primary sortas="a-libpaper">libpaper</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libpaper</title>
-
-    <para>
-      This package is intended to provide a simple way for applications to take
-      actions based on a system or user-specified paper size.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libpaper-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libpaper-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libpaper-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libpaper-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libpaper-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libpaper-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libpaper</title>
-
-    <para>
-      Install <application>libpaper</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr        \
-            --sysconfdir=/etc    \
-            --disable-static     \
-            --enable-relocatable \
-            --docdir=/usr/share/doc/libpaper-&libpaper-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <parameter>--enable-relocatable</parameter>:
-      This switch is needed to run the tests.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring libpaper</title>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        The paper size is automatically determined from the system locale;
-        see <literal>LC_PAPER</literal> in <ulink role='man'
-        url='&man;locale.7'>locale(7)</ulink>.
-        If you want to override it, create a <filename>papersize</filename>
-        file in the user configuration directory.  For example:
-      </para>
-
-<screen role="nodump"><userinput>mkdir -pv ~/.config &amp;&amp;
-echo "a4" &gt; ~/.config/papersize</userinput></screen>
-
-      <para>
-        If you want to override the paper size globally (for all users),
-        set up the <envar>PAPERSIZE</envar> environment variable.  For
-        example:
-      </para>
-
-<screen role="nodump"><userinput>echo "PAPERSIZE=a4" &gt; /etc/profile.d/libpaper.sh</userinput></screen>
-
-      <para>
-        You may use a different paper size, such as
-        <quote><literal>letter</literal></quote>.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          paper and
-          paperconf
-        </seg>
-        <seg>
-          libpaper.so
-        </seg>
-        <seg>
-          /usr/share/doc/libpaper-&libpaper-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="paper">
-        <term><command>paper</command></term>
-        <listitem>
-          <para>
-            prints paper configuration information
-          </para>
-          <indexterm zone="libpaper paper">
-            <primary sortas="b-paper">paper</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="paperconf">
-        <term><command>paperconf</command></term>
-        <listitem>
-          <para>
-            prints paper configuration information in a compatibility mode
-          </para>
-          <indexterm zone="libpaper paperconf">
-            <primary sortas="b-paperconf">paperconf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpaper-lib">
-        <term><filename class="libraryfile">libpaper.so</filename></term>
-        <listitem>
-          <para>
-            contains functions for interrogating the paper library
-          </para>
-          <indexterm zone="libpaper libpaper-lib">
-            <primary sortas="c-libpaper">libpaper.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libportal.xml
===================================================================
--- general/genlib/libportal.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,276 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libportal-download-http "https://github.com/flatpak/libportal/releases/download/&libportal-version;/libportal-&libportal-version;.tar.xz">
-  <!ENTITY libportal-download-ftp  " ">
-  <!ENTITY libportal-md5sum        "f94be41e8495ae7d6aaed046481daa61">
-  <!ENTITY libportal-size          "76 KB">
-  <!ENTITY libportal-buildsize     "3.0 MB (with tests)">
-  <!ENTITY libportal-time          "0.1 SBU (add 0.3 SBU for tests)">
-]>
-
-<sect1 id="libportal" xreflabel="libportal-&libportal-version;">
-  <?dbhtml filename="libportal.html"?>
-
-
-  <title>libportal-&libportal-version;</title>
-
-  <indexterm zone="libportal">
-    <primary sortas="a-libportal">libportal</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libportal</title>
-
-    <para>
-      The <application>libportal</application> package provides
-      a library that contains GIO-style async APIs for most Flatpak portals.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libportal-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libportal-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libportal-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libportal-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libportal-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libportal-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional patch (required for running the test suite):
-          <ulink url="&patch-root;/libportal-&libportal-version;-testsuite_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libportal Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      &gobject-introspection;
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gtk3"/> and
-      <xref linkend="gtk4"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (Runtime)</bridgehead>
-    <para role="runtime">
-      To make this package really useful, install
-      <xref linkend="xdg-desktop-portal"/>,
-      <xref linkend="xdg-desktop-portal-gtk"/>,
-      <xref role="nodep" linkend="xdg-desktop-portal-gnome"/> (if running
-      a GNOME desktop environment), and
-      <xref role="nodep" linkend="xdg-desktop-portal-lxqt"/> (if running
-      a LXQt desktop environment).  They are not needed if only using this
-      package to satisfy a build dependency.
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gi-docgen"/> (for documentation),
-      <xref linkend="python-dbusmock"/> and
-      <xref linkend="pytest"/> (for testing),
-      &qt5-deps; (for the Qt5 version of libportal), and
-      <xref linkend="vala"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libportal</title>
-
-    <warning>
-      <para>
-        If a previous version of libportal is installed, move the
-        headers out of the way so that later packages do not encounter
-        conflicts (as the <systemitem role="username">root</systemitem>
-        user):
-      </para>
-<screen role="root"><userinput>if [ -e /usr/include/libportal ]; then
-    rm -rf /usr/include/libportal.old &amp;&amp;
-    mv -vf /usr/include/libportal{,.old}
-fi</userinput></screen>
-    </warning>
-
-    <para>
-      If running the test suite, apply a patch to fix a dozen of test
-      failures with python-dbusmock 0.30.0 or later:
-    </para>
-
-    <screen><userinput>patch -Np1 -i ../libportal-&libportal-version;-testsuite_fix-1.patch</userinput></screen>
-
-    <para>
-      Install <application>libportal</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release -Ddocs=false .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      If you have <xref linkend='gi-docgen'/> installed and wish to build
-      the API documentation for this package, issue:
-    </para>
-
-<screen role='nodump'><userinput>sed "/output/s/-1/-&libportal-version;/" -i ../doc/meson.build &amp;&amp;
-meson configure -Ddocs=true                    &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>. Note that
-      additional <filename>dbus-daemon</filename> processes may need to be
-      killed after the tests are run.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <parameter>-Ddocs=false</parameter>: &gi-doc-disable;
-    </para>
-
-<!-- These options are now automatically detected, so it doesn't make sense to
-     explicitly set which ones are used (as of version 0.7)
-    <para>
-      <option>-Dbackends=gtk3,gtk4,qt5</option>: This switch allows you to set
-      the available backends. You can use it to disable the dependency on gtk-3,
-      gtk-4, or qt-5. Most applications that use libportal will use either
-      gtk-4 or gtk-3. The default is to build all three backends.
-    </para>
--->
-
-  </sect2>
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libportal.so,
-          libportal-gtk3.so,
-          libportal-gtk4.so, and
-          libportal-qt5.so
-        </seg>
-        <seg>
-          /usr/include/libportal and
-          /usr/share/gtk-doc/html/libportal
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libportal-lib">
-        <term><filename class="libraryfile">libportal.so</filename></term>
-        <listitem>
-          <para>
-            provides GIO-style async APIs for most Flatpak portals
-          </para>
-          <indexterm zone="libportal libportal-lib">
-            <primary sortas="c-libportal">libportal.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libportal-gtk3">
-        <term><filename class="libraryfile">libportal-gtk3.so</filename></term>
-        <listitem>
-          <para>
-            provides GTK+-3 specific functions for interacting with Flatpak
-            portals
-          </para>
-          <indexterm zone="libportal libportal-gtk3">
-            <primary sortas="c-libportal-gtk3">libportal-gtk3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libportal-gtk4">
-        <term><filename class="libraryfile">libportal-gtk4.so</filename></term>
-        <listitem>
-          <para>
-            provides GTK-4 specific functions for interacting with Flatpak
-            portals
-          </para>
-          <indexterm zone="libportal libportal-gtk4">
-            <primary sortas="c-libportal-gtk4">libportal-gtk4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libportal-qt5">
-        <term><filename class="libraryfile">libportal-qt5.so</filename></term>
-        <listitem>
-          <para>
-            provides Qt5 specific functions for interacting with Flatpak
-            portals
-          </para>
-          <indexterm zone="libportal libportal-qt5">
-            <primary sortas="c-libportal-qt5">libportal-qt5.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/genlib/libptytty.xml
===================================================================
--- general/genlib/libptytty.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libptytty-download-http "http://dist.schmorp.de/libptytty/libptytty-&libptytty-version;.tar.gz">
-  <!ENTITY libptytty-download-ftp  " ">
-  <!ENTITY libptytty-md5sum        "2a7f3f3c0d3ef71902da745dc7959529">
-  <!ENTITY libptytty-size          "48 KB">
-  <!ENTITY libptytty-buildsize     "1.4 MB">
-  <!ENTITY libptytty-time          "less than 0.1 SBU">
-
-]>
-
-<sect1 id="libptytty" xreflabel="libptytty-&libptytty-version;">
-  <?dbhtml filename="libptytty.html"?>
-
-
-  <title>libptytty-&libptytty-version;</title>
-
-  <indexterm zone="libptytty">
-    <primary sortas="a-libptytty">libptytty</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libptytty</title>
-
-    <para>
-      The <application>libptytty</application> package provides a library that
-      allows for OS independent and secure pty/tty and utmp/wtmp/lastlog
-      handling.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libptytty-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libptytty-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libptytty-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libptytty-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libptytty-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libptytty-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libptytty Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libptytty</title>
-
-    <para>
-      Install <application>libptytty</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr     \
-      -DCMAKE_BUILD_TYPE=Release      \
-      -DPT_UTMP_FILE:STRING=/run/utmp \
-      .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libptytty.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libptytty-lib">
-        <term><filename class="libraryfile">libptytty.so</filename></term>
-        <listitem>
-          <para>
-            provides for OS independent and secure pty/tty and utmp/wtmp/lastlog handling
-          </para>
-          <indexterm zone="libptytty libptytty-lib">
-            <primary sortas="c-libptytty">libptytty.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/genlib/libqalculate.xml
===================================================================
--- general/genlib/libqalculate.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,177 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libqalculate-download-http "https://github.com/Qalculate/libqalculate/releases/download/v&libqalculate-version;/libqalculate-&libqalculate-version;.tar.gz">
-  <!ENTITY libqalculate-download-ftp  " ">
-  <!ENTITY libqalculate-md5sum        "7283e883d79287a57d635bd9ff9a9932">
-  <!ENTITY libqalculate-size          "2.6 MB">
-  <!ENTITY libqalculate-buildsize     "150 MB (with tests)">
-  <!ENTITY libqalculate-time          "0.9 SBU (With tests; both using parallelism=8)">
-]>
-
-<sect1 id="libqalculate" xreflabel="libqalculate-&libqalculate-version;">
-  <?dbhtml filename="libqalculate.html"?>
-
-  <title>libqalculate-&libqalculate-version;</title>
-
-  <indexterm zone="libqalculate">
-    <primary sortas="a-libqalculate">libqalculate</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libqalculate</title>
-
-    <para>
-      The <application>libqalculate</application> package contains a library
-      that provides functions for a multi-purpose calculator.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libqalculate-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libqalculate-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libqalculate-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libqalculate-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libqalculate-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libqalculate-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libqalculate Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="curl"/>,
-      <xref linkend="icu"/>, and
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> and
-      <ulink url="http://www.gnuplot.info/download.html">gnuplot</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libqalculate</title>
-
-    <para>
-      Install <application>libqalculate</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static \
-            --docdir=/usr/share/doc/libqalculate-&libqalculate-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/rm-la-file-referring-icu.xml"/>
-
-<screen role="root"><userinput>rm -v /usr/lib/libqalculate.la</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          qalc
-        </seg>
-        <seg>
-          libqalculate.so
-        </seg>
-        <seg>
-          /usr/include/libqalculate,
-          /usr/share/doc/libqalculate-&libqalculate-version;, and
-          /usr/share/qalculate
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="qalc">
-        <term><command>qalc</command></term>
-        <listitem>
-          <para>
-            is a powerful and easy to use command line calculator
-          </para>
-          <indexterm zone="libqalculate qalc">
-            <primary sortas="b-qalc">qalc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libqalculate.so">
-        <term><filename class="libraryfile">libqalculate.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libqalculate</application> API functions
-          </para>
-          <indexterm zone="libqalculate libqalculate.so">
-            <primary sortas="c-libqalculate">libqalculate.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libqmi.xml
===================================================================
--- general/genlib/libqmi.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,216 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libqmi-download-http "https://www.freedesktop.org/software/libqmi/libqmi-&libqmi-version;.tar.xz">
-  <!ENTITY libqmi-download-ftp  " ">
-  <!ENTITY libqmi-md5sum        "5ec8838914f80e1dfa4d2fa8cc2f186d">
-  <!ENTITY libqmi-size          "1.2 MB">
-  <!ENTITY libqmi-buildsize     "151 MB (with tests)">
-  <!ENTITY libqmi-time          "0.3 SBU (Using parallelism=4; with tests)">
-]>
-
-<sect1 id="libqmi" xreflabel="libqmi-&libqmi-version;">
-  <?dbhtml filename="libqmi.html"?>
-
-
-  <title>libqmi-&libqmi-version;</title>
-
-  <indexterm zone="libqmi">
-    <primary sortas="a-libqmi">libqmi</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libqmi</title>
-
-    <para>
-      The <application>libqmi</application> package contains a GLib-based library
-      for talking to WWAN modems and devices which speak the Qualcomm MSM Interface
-      (QMI) protocol.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libqmi-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libqmi-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libqmi-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libqmi-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libqmi-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libqmi-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libqmi Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> (GObject Introspection recommended) and
-      <xref linkend="libgudev"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libmbim"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      <ulink url="https://ftpmirror.gnu.org/gnu/help2man/">help2man</ulink>, and
-      <ulink url="https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib">libqrtr-glib</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libqmi</title>
-
-    <para>
-      Install <application>libqmi</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>PYTHON=python3 ./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-    <para>
-      <option>--disable-mbim-qmux</option>: This switch disables support for
-      using a MBIM control device for QMI messages. Use this switch if you
-      did not install <application>libmbim</application>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          qmicli,
-          qmi-firmware-update,
-          and qmi-network
-        </seg>
-        <seg>
-          libqmi-glib.so
-        </seg>
-        <seg>
-          /usr/include/libqmi-glib and
-          /usr/share/gtk-doc/html/libqmi-glib
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="qmicli">
-        <term><command>qmicli</command></term>
-        <listitem>
-          <para>
-            is an utility used to control QMI devices
-          </para>
-          <indexterm zone="libqmi qmicli">
-            <primary sortas="b-qmicli">qmicli</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmi-firmware-update">
-        <term><command>qmi-firmware-update</command></term>
-        <listitem>
-          <para>
-            is an utility used to perform firmware updates on QMI devices
-          </para>
-          <indexterm zone="libqmi qmi-firmware-update">
-            <primary sortas="b-qmi-firmware-update">qmi-firmware-update</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmi-network">
-        <term><command>qmi-network</command></term>
-        <listitem>
-          <para>
-            is an utility used for simple network management
-            of QMI devices
-          </para>
-          <indexterm zone="libqmi qmi-network">
-            <primary sortas="b-qmi-network">qmi-network</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libqmi-glib">
-        <term><filename class="libraryfile">libqmi-glib.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for talking to WWAN modems and devices
-            which speak the Qualcomm MSM Interface (QMI) protocol
-          </para>
-          <indexterm zone="libqmi libqmi-glib">
-            <primary sortas="c-libqmi-glib">libqmi-glib.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libseccomp.xml
===================================================================
--- general/genlib/libseccomp.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,174 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libseccomp-download-http "https://github.com/seccomp/libseccomp/releases/download/v&libseccomp-version;/libseccomp-&libseccomp-version;.tar.gz">
-  <!ENTITY libseccomp-download-ftp  " ">
-  <!ENTITY libseccomp-md5sum        "c27a5e43cae1e89e6ebfedeea734c9b4">
-  <!ENTITY libseccomp-size          "628 KB">
-  <!ENTITY libseccomp-buildsize     "7.1 MB (additional 4.7 MB for tests)">
-  <!ENTITY libseccomp-time          "less than 0.1 SBU (additional 2.9 SBU for tests)">
-<!-- EDITORS NOTE:
-   This library is heavily dependent on system calls at the time of it's release.
-   This should be tested with every new minor (v4.13, v4.14, etc.) release
-   of the kernel, as it is very finicky and relies on hacks to accomplish
-   it's purpose. -->
-]>
-
-<sect1 id="libseccomp" xreflabel="libseccomp-&libseccomp-version;">
-  <?dbhtml filename="libseccomp.html"?>
-
-
-  <title>libseccomp-&libseccomp-version;</title>
-
-  <indexterm zone="libseccomp">
-    <primary sortas="a-libseccomp">libseccomp</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libseccomp</title>
-
-    <para>
-      The <application>libseccomp</application> package provides an easy to use
-      and platform independent interface to the <application>Linux</application>
-      kernel's syscall filtering mechanism.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libseccomp-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libseccomp-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libseccomp-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libseccomp-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libseccomp-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libseccomp-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libseccomp Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="which"/> (needed for tests),
-      <xref linkend="valgrind"/>,
-      <!--<xref linkend="cython"/> (for python bindings), -->and
-      <ulink url="https://github.com/linux-test-project/lcov">LCOV</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libseccomp</title>
-
-    <para>
-      Install <application>libseccomp</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-<!--
-    <para>
-      <option>- -enable-python</option>: this switch is needed to build
-      python bindings if <xref linkend="cython"/> is installed.
-    </para>
--->
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          scmp_sys_resolver
-        </seg>
-        <seg>
-          libseccomp.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="scmp_sys_resolver">
-        <term><command>scmp_sys_resolver</command></term>
-        <listitem>
-          <para>
-            is used to resolve system calls for applications
-          </para>
-          <indexterm zone="libseccomp scmp_sys_resolver">
-            <primary sortas="b-scmp_sys_resolver">scmp_sys_resolver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libseccomp-lib">
-        <term><filename class="libraryfile">libseccomp.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for translating syscalls
-          </para>
-          <indexterm zone="libseccomp libseccomp-lib">
-            <primary sortas="c-libseccomp-lib">libseccomp.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/genlib/libsigc++.xml
===================================================================
--- general/genlib/libsigc++.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,172 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libsigc-download-http "&gnome-download-http;/libsigc++/&libsigc-minor;/libsigc++-&libsigc-version;.tar.xz">
-  <!ENTITY libsigc-download-ftp  " ">
-  <!ENTITY libsigc-md5sum        "891f1b2dbaebd8007eda8c639bbe1149">
-  <!ENTITY libsigc-size          "4.8 MB">
-  <!ENTITY libsigc-buildsize     "27 MB (with tests)">
-  <!ENTITY libsigc-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="libsigc" xreflabel="libsigc++-&libsigc-version;">
-  <?dbhtml filename="libsigc.html"?>
-
-
-  <title>libsigc++-&libsigc-version;</title>
-
-  <indexterm zone="libsigc">
-    <primary sortas="a-libsigc++">libsigc++</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libsigc++</title>
-
-    <para>
-      The <application>libsigc++</application> package implements a typesafe
-      callback system for standard C++.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libsigc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libsigc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libsigc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libsigc-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libsigc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libsigc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libsigc++ Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="boost"/> and
-      <xref linkend="libxslt"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="docbook-utils"/>,
-      <xref linkend="docbook5"/>,
-      <xref linkend="doxygen"/>,
-      <xref linkend="fop"/>, and
-      <ulink url="&gnome-download-http;/mm-common">mm-common</ulink>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libsigc++</title>
-
-    <para>
-      Install <application>libsigc++</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir bld &amp;&amp;
-cd    bld &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <option>-Dbuild-documentation=true</option>: Use this switch if
-      <xref role="nodep" linkend="doxygen"/> is installed and you wish to
-      build and install the API documentation.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libsigc-2.0.so
-        </seg>
-        <seg>
-          /usr/{include,lib}/sigc++-2.0 and
-          /usr/share/{devhelp/books,doc}/libsigc++-2.0 (if the documentation is enabled)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libsigc-2">
-        <term><filename class="libraryfile">libsigc-2.0.so</filename></term>
-        <listitem>
-          <para>
-            provides a typesafe callback system for standard C++
-          </para>
-          <indexterm zone="libsigc libsigc-2">
-            <primary sortas="c-libsigc-2">libsigc-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libsigc++3.xml
===================================================================
--- general/genlib/libsigc++3.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,172 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libsigc-download-http "&gnome-download-http;/libsigc++/&libsigc3-minor;/libsigc++-&libsigc3-version;.tar.xz">
-  <!ENTITY libsigc-download-ftp  " ">
-  <!ENTITY libsigc-md5sum        "b7205d5465ac15fbc0c781d39b4011be">
-  <!ENTITY libsigc-size          "972 KB">
-  <!ENTITY libsigc-buildsize     "12 MB (with tests)">
-  <!ENTITY libsigc-time          "0.4 SBU (with tests)">
-]>
-
-<sect1 id="libsigc3" xreflabel="libsigc++-&libsigc3-version;">
-  <?dbhtml filename="libsigc3.html"?>
-
-
-  <title>libsigc++-&libsigc3-version;</title>
-
-  <indexterm zone="libsigc3">
-    <primary sortas="a-libsigc++-3">libsigc++-3</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libsigc++</title>
-
-    <para>
-      The <application>libsigc++</application> package implements a typesafe
-      callback system for standard C++. This version is part of a new API for
-      supporting gtkmm-4.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libsigc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libsigc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libsigc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libsigc-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libsigc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libsigc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libsigc++ Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="boost"/> and
-      <xref linkend="libxslt"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="docbook-utils"/>,
-      <xref linkend="docbook5"/>,
-      <xref linkend="doxygen"/>,
-      <xref linkend="fop"/>, and
-      <ulink url="&gnome-download-http;/mm-common">mm-common</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libsigc++</title>
-
-    <para>
-      Install <application>libsigc++</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir bld &amp;&amp;
-cd    bld &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <option>-Dbuild-documentation=true</option>: Use this switch if
-      <xref role="nodep" linkend="doxygen"/> is installed and you wish to
-      build and install the API documentation.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libsigc-3.0.so
-        </seg>
-        <seg>
-          /usr/{include,lib}/sigc++-3.0 and
-          /usr/share/{devhelp/books,doc}/libsigc++-3.0 (if the documentation is enabled)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libsigc-3">
-        <term><filename class="libraryfile">libsigc-3.0.so</filename></term>
-        <listitem>
-          <para>
-            provides a typesafe callback system for standard C++
-          </para>
-          <indexterm zone="libsigc3 libsigc-3">
-            <primary sortas="c-libsigc-3">libsigc-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libsigsegv.xml
===================================================================
--- general/genlib/libsigsegv.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,154 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libsigsegv-download-http "&gnu-http;/libsigsegv/libsigsegv-&libsigsegv-version;.tar.gz">
-  <!ENTITY libsigsegv-download-ftp  " ">
-  <!ENTITY libsigsegv-md5sum        "63a2b35f11b2fbccc3d82f9e6c6afd58">
-  <!ENTITY libsigsegv-size          "456 KB">
-  <!ENTITY libsigsegv-buildsize     "3.6 MB (with tests)">
-  <!ENTITY libsigsegv-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="libsigsegv" xreflabel="libsigsegv-&libsigsegv-version;">
-  <?dbhtml filename="libsigsegv.html"?>
-
-
-  <title>libsigsegv-&libsigsegv-version;</title>
-
-  <indexterm zone="libsigsegv">
-    <primary sortas="a-libsigsegv">libsigsegv</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libsigsegv</title>
-
-    <para>
-      libsigsegv is a library for handling page faults in user mode. A page fault
-      occurs when a program tries to access to a region of memory that is
-      currently not available. Catching and handling a page fault is a useful
-      technique for implementing pageable virtual memory, memory-mapped access
-      to persistent databases, generational garbage collectors, stack overflow
-      handlers, and distributed shared memory.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libsigsegv-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libsigsegv-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libsigsegv-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libsigsegv-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libsigsegv-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libsigsegv-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libsigsegv</title>
-
-    <para>
-      Install <application>libsigsegv</application> by running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr   \
-            --enable-shared \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-shared</parameter>: This switch ensures that shared
-      libraries are compiled.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libsigsegv.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libsigsegv-lib">
-        <term><filename class="libraryfile">libsigsegv.so</filename></term>
-        <listitem>
-          <para>
-            is a library for handling page faults in user mode
-          </para>
-          <indexterm zone="libsigsegv libsigsegv-lib">
-            <primary sortas="c-libsigsegv">libsigsegv.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libssh2.xml
===================================================================
--- general/genlib/libssh2.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,187 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libssh2-download-http "https://www.libssh2.org/download/libssh2-&libssh2-version;.tar.gz">
-  <!ENTITY libssh2-download-ftp  " ">
-  <!ENTITY libssh2-md5sum        "a01d543fd891ca48fe47726540d50b17">
-  <!ENTITY libssh2-size          "1.1 MB">
-  <!ENTITY libssh2-buildsize     "13 MB (with tests)">
-  <!ENTITY libssh2-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="libssh2" xreflabel="libssh2-&libssh2-version;">
-  <?dbhtml filename="libssh2.html"?>
-
-
-  <title>libssh2-&libssh2-version;</title>
-
-  <indexterm zone="libssh2">
-    <primary sortas="a-libssh2">libssh2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libssh2</title>
-
-    <para>
-      <application>Libssh2</application> package is a client-side C library
-      implementing the SSH2 protocol.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libssh2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libssh2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libssh2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libssh2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libssh2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libssh2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/libssh2-&libssh2-version;-security_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libssh2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cmake"/> (can be used instead of the
-      <command>configure</command> script),
-      <xref linkend="libgcrypt"/> (can be used instead of OpenSSL),
-      <xref linkend="openssh"/> (for some tests), and
-      <ulink url='https://www.docker.com'>Docker</ulink> (for some tests)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libssh2</title>
-
-    <para>
-      <!-- the Terrapin attack -->
-      First, fix a critical security vulnerability in libssh2:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../libssh2-&libssh2-version;-security_fixes-1.patch</userinput></screen>
-
-    <para>
-      If you want to test the package, exclude the tests requiring a static
-      library:
-    </para>
-
-<screen><userinput>sed -E '/^DOCKER_TEST/,/^SSHD_TEST/s/test_(auth_keyboard_info.* |hostkey |simple)/$(NOTHING)/' \
-    -i tests/Makefile.inc &amp;&amp;
-autoreconf -fi</userinput></screen>
-
-    <para>
-      Install <application>libssh2</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr          \
-            --disable-docker-tests \
-            --disable-static       &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-docker-tests</parameter>: Disable the tests
-      requiring Docker, which is beyond the scope of BLFS.  Remove this
-      switch if you've installed Docker and you wish to run the test suite.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libssh2.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libssh2-lib">
-        <term><filename class="libraryfile">libssh2.so</filename></term>
-        <listitem>
-          <para>
-            contains functions to use the SSH2 protocol
-          </para>
-          <indexterm zone="libssh2 libssh2-lib">
-            <primary sortas="c-libssh2">libssh2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/genlib/libstatgrab.xml
===================================================================
--- general/genlib/libstatgrab.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,206 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libstatgrab-download-http "https://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/libstatgrab/libstatgrab-&libstatgrab-version;.tar.gz">
-  <!ENTITY libstatgrab-download-ftp  " ">
-  <!ENTITY libstatgrab-md5sum        "af685494e985229e0ac46365bc0cd50e">
-  <!ENTITY libstatgrab-size          "800 KB">
-  <!ENTITY libstatgrab-buildsize     "7.6 MB (with tests)">
-  <!ENTITY libstatgrab-time          "0.1 SBU (add 1.5 SBU for tests)">
-]>
-
-<sect1 id="libstatgrab" xreflabel="libstatgrab-&libstatgrab-version;">
-  <?dbhtml filename="libstatgrab.html"?>
-
-
-  <title>libstatgrab-&libstatgrab-version;</title>
-
-  <indexterm zone="libstatgrab">
-    <primary sortas="a-libstatgrab">libstatgrab</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libstatgrab</title>
-
-    <para>
-      This is a library that provides cross platform access to statistics about
-      the system on which it's run. It's written in C and presents a selection
-      of useful interfaces which can be used to access key system statistics.
-      The current list of statistics includes CPU usage, memory utilisation,
-      disk usage, process counts, network traffic, disk I/O, and more.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libstatgrab-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libstatgrab-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libstatgrab-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libstatgrab-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libstatgrab-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libstatgrab-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libstatgrab Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="log4cplus"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libstatgrab</title>
-
-    <para>
-      Install <application>libstatgrab</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr   \
-            --disable-static \
-            --docdir=/usr/share/doc/libstatgrab-&libstatgrab-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          saidar, statgrab, statgrab-make-mrtg-config, and
-          statgrab-make-mrtg-index
-        </seg>
-        <seg>
-          libstatgrab.so
-        </seg>
-        <seg>
-          /usr/share/doc/libstatgrab-&libstatgrab-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="saidar">
-        <term><command>saidar</command></term>
-        <listitem>
-          <para>
-            is a curses-based tool for viewing system statistics
-          </para>
-          <indexterm zone="libstatgrab saidar">
-            <primary sortas="b-saidar">saidar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="statgrab">
-        <term><command>statgrab</command></term>
-        <listitem>
-          <para>
-            is a sysctl-style interface to system statistics
-          </para>
-          <indexterm zone="libstatgrab statgrab">
-            <primary sortas="b-statgrab">statgrab</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="statgrab-make-mrtg-config">
-        <term><command>statgrab-make-mrtg-config</command></term>
-        <listitem>
-          <para>
-            generates MRTG configuration
-          </para>
-          <indexterm zone="libstatgrab statgrab-make-mrtg-config">
-            <primary sortas="b-statgrab-make-mrtg-config">statgrab-make-mrtg-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="statgrab-make-mrtg-index">
-        <term><command>statgrab-make-mrtg-index</command></term>
-        <listitem>
-          <para>
-            generates an XHTML index page from MRTG configuration files or
-            stdin
-          </para>
-          <indexterm zone="libstatgrab statgrab-make-mrtg-index">
-            <primary sortas="b-statgrab-make-mrtg-index">statgrab-make-mrtg-index</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libstatgrab-lib">
-        <term><filename class="libraryfile">libstatgrab.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libstatgrab</application> API functions
-          </para>
-          <indexterm zone="libstatgrab libstatgrab-lib">
-            <primary sortas="c-libstatgrab">libstatgrab.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libtasn1.xml
===================================================================
--- general/genlib/libtasn1.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,209 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libtasn1-download-http "&gnu-http;/libtasn1/libtasn1-&libtasn1-version;.tar.gz">
-  <!ENTITY libtasn1-download-ftp  " ">
-  <!ENTITY libtasn1-md5sum        "f701ab57eb8e7d9c105b2cd5d809b29a">
-  <!ENTITY libtasn1-size          "1.7 MB">
-  <!ENTITY libtasn1-buildsize     "17 MB (with tests)">
-  <!ENTITY libtasn1-time          "0.8 SBU (with tests)">
-]>
-
-<sect1 id="libtasn1" xreflabel="libtasn1-&libtasn1-version;">
-  <?dbhtml filename="libtasn1.html"?>
-
-
-  <title>libtasn1-&libtasn1-version;</title>
-
-  <indexterm zone="libtasn1">
-    <primary sortas="a-libtasn1">libtasn1</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libtasn1</title>
-
-    <para>
-      <application>libtasn1</application> is a highly portable C library
-      that encodes and decodes DER/BER data following an ASN.1 schema.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libtasn1-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libtasn1-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libtasn1-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libtasn1-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libtasn1-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libtasn1-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libtasn1 Dependencies</bridgehead>
-
-<!-- does not seem to be needed anymore:
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="six"/>
-    </para>
--->
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="valgrind"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libtasn1</title>
-
-    <para>
-      Install <application>libtasn1</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you did not pass the <option>--enable-gtk-doc</option> parameter
-      to the <command>configure</command> script, you can install the API
-      documentation using the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make -C doc/reference install-data-local</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild-problem.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          asn1Coding, asn1Decoding and asn1Parser
-        </seg>
-        <seg>
-          libtasn1.so
-        </seg>
-        <seg>
-          /usr/share/gtk-doc/html/libtasn1
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="asn1Coding">
-        <term><command>asn1Coding</command></term>
-        <listitem>
-          <para>
-            is an ASN.1 DER encoder
-          </para>
-          <indexterm zone="libtasn1 asn1Coding">
-            <primary sortas="b-asn1Coding">asn1Coding</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="asn1Decoding">
-        <term><command>asn1Decoding</command></term>
-        <listitem>
-          <para>
-            is an ASN.1 DER decoder
-          </para>
-          <indexterm zone="libtasn1 asn1Decoding">
-            <primary sortas="b-asn1Decoding">asn1Decoding</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="asn1Parser">
-        <term><command>asn1Parser</command></term>
-        <listitem>
-          <para>
-            is an ASN.1 syntax tree generator for
-            <application>libtasn1</application>
-          </para>
-          <indexterm zone="libtasn1 asn1Parser">
-            <primary sortas="b-asn1Parser">asn1Parser</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtasn1-lib">
-        <term><filename class="libraryfile">libtasn1.so</filename></term>
-        <listitem>
-          <para>
-            is a library for Abstract Syntax Notation One (ASN.1) and
-            Distinguish Encoding Rules (DER) manipulation
-          </para>
-          <indexterm zone="libtasn1 libtasn1-lib">
-            <primary sortas="c-libtasn1">libtasn1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libunistring.xml
===================================================================
--- general/genlib/libunistring.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,152 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libunistring-download-http "&gnu-http;/libunistring/libunistring-&libunistring-version;.tar.xz">
-  <!ENTITY libunistring-download-ftp  " ">
-  <!ENTITY libunistring-md5sum        "6b4ea63617bf09d76e5234379e75e7f9">
-  <!ENTITY libunistring-size          "2.4 MB">
-  <!ENTITY libunistring-buildsize     "54 MB (add 56 MB for tests)">
-  <!ENTITY libunistring-time          "0.5 SBU; add 0.3 SBU for tests; both using parallelism=4">
-]>
-
-<sect1 id="libunistring" xreflabel="libunistring-&libunistring-version;">
-  <?dbhtml filename="libunistring.html"?>
-
-
-  <title>libunistring-&libunistring-version;</title>
-
-  <indexterm zone="libunistring">
-    <primary sortas="a-libunistring">libunistring</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libunistring</title>
-
-    <para>
-      <application>libunistring</application> is a library that provides
-      functions for manipulating Unicode strings and for manipulating C
-      strings according to the Unicode standard.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libunistring-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libunistring-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libunistring-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libunistring-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libunistring-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libunistring-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libunistring Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
-      (to rebuild the documentation)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libunistring</title>
-
-    <para>
-      Install <application>libunistring</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static \
-            --docdir=/usr/share/doc/libunistring-&libunistring-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libunistring.so</seg>
-        <seg>
-          /usr/include/unistring and
-          /usr/share/doc/libunistring-&libunistring-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libunistring-lib">
-        <term><command>libunistring.so</command></term>
-        <listitem>
-          <para>
-            provides the unicode string library API
-          </para>
-          <indexterm zone="libunistring libunistring-lib">
-            <primary sortas="c-libunistring-lib">libunistring.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libunwind.xml
===================================================================
--- general/genlib/libunwind.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,143 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libunwind-download-http "https://download.savannah.nongnu.org/releases/libunwind/libunwind-&libunwind-version;.tar.gz">
-  <!ENTITY libunwind-download-ftp  " ">
-  <!ENTITY libunwind-md5sum        "f625b6a98ac1976116c71708a73dc44a">
-  <!ENTITY libunwind-size          "884 KB">
-  <!ENTITY libunwind-buildsize     "20 MB (with tests)">
-  <!ENTITY libunwind-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="libunwind" xreflabel="libunwind-&libunwind-version;">
-  <?dbhtml filename="libunwind.html"?>
-
-  <title>libunwind-&libunwind-version;</title>
-
-  <indexterm zone="libunwind">
-    <primary sortas="a-libunwind">libunwind</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libunwind</title>
-
-    <para>
-      The <application>libunwind</application> package contains a portable and
-      efficient C programming interface (API) to determine the call-chain of a
-      program. The API additionally provides the means to manipulate the
-      preserved (callee-saved) state of each call-frame and to resume execution
-      at any point in the call-chain (non-local goto). The API supports both
-      local (same-process) and remote (across-process) operation.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libunwind-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libunwind-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libunwind-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libunwind-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libunwind-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libunwind-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libunwind Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="texlive"/> (for latex2man)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libunwind</title>
-
-    <para>
-      Install <application>libunwind</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.  Two
-      tests, run-coredump-unwind and run-coredump-unwind-mdi are known
-      to fail.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libunwind.so,
-          libunwind-coredump.so,
-          libunwind-generic.so,
-          libunwind-ptrace.so,
-          libunwind-setjmp.so, and
-          libunwind-x86_64.so (libunwind-x86.so on i686)
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/liburcu.xml
===================================================================
--- general/genlib/liburcu.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,149 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 liburcu-download-http "https://lttng.org/files/urcu/userspace-rcu-&liburcu-version;.tar.bz2">
-  <!ENTITY liburcu-download-ftp  " ">
-  <!ENTITY liburcu-md5sum        "0cd5647788b048a5d6bbdb3b08d46299">
-  <!ENTITY liburcu-size          "648 KB">
-  <!ENTITY liburcu-buildsize     "25 MB (with tests)">
-  <!ENTITY liburcu-time          "0.2 SBU (with tests)">
-
-]>
-
-<sect1 id="liburcu" xreflabel="liburcu-&liburcu-version;">
-  <?dbhtml filename="liburcu.html"?>
-
-
-  <title>liburcu-&liburcu-version;</title>
-
-  <indexterm zone="liburcu">
-    <primary sortas="a-liburcu">liburcu</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to liburcu</title>
-
-    <para>
-      The <application>userspace-rcu</application> package provides
-      a set of userspace RCU (read-copy-update) libraries. These data synchronization
-      libraries provide read-side access which scales linearly with the number of cores.
-      It does so by allowing multiples copies of a given data structure to live at
-      the same time, and by monitoring the data structure accesses to detect grace
-      periods after which memory reclamation is possible.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&liburcu-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&liburcu-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &liburcu-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &liburcu-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &liburcu-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &liburcu-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of liburcu</title>
-
-    <para>
-      Install <application>liburcu</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static \
-            --docdir=/usr/share/doc/liburcu-&liburcu-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          liburcu.so,
-          liburcu-bp.so,
-          liburcu-cds.so,
-          liburcu-common.so,
-          liburcu-mb.so,
-          liburcu-memb.so,
-          liburcu-qsbr.so, and
-          liburcu-signal.so
-        </seg>
-        <seg>
-          /usr/include/urcu and
-          /usr/share/doc/liburcu-&liburcu-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="liburcu-lib">
-        <term><filename class="libraryfile">liburcu.so</filename></term>
-        <listitem>
-          <para>
-            provides for
-          </para>
-          <indexterm zone="liburcu liburcu-lib">
-            <primary sortas="c-liburcu">liburcu.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
--->
-  </sect2>
-
-</sect1>
Index: general/genlib/libusb-kernel.xml
===================================================================
--- general/genlib/libusb-kernel.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,15 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>D</emphasis>evice Drivers ---&gt;
-  [*] <emphasis role='blue'>U</emphasis>SB support ---&gt;                                             [USB_SUPPORT]
-    &lt;*/M&gt;   <emphasis role='blue'>S</emphasis>upport for Host-side USB                                      [USB]
-    [*]     <emphasis role='blue'>P</emphasis>CI based USB host interface                               [USB_PCI]
-    # These are most common USB controller drivers for PC-like systems.
-    # For modern systems often [USB_XHCI_HCD] is the only one needed
-    # even if the system has USB 2.0 ports:
-    &lt; /*/M&gt; <emphasis role='blue'>x</emphasis>HCI HCD (USB 3.0) support                            [USB_XHCI_HCD]
-    &lt; /*/M&gt; <emphasis role='blue'>E</emphasis>HCI HCD (USB 2.0) support                            [USB_EHCI_HCD]
-    &lt; /*/M&gt; <emphasis role='blue'>O</emphasis>HCI HCD (USB 1.1) support                            [USB_OHCI_HCD]</screen>
Index: general/genlib/libusb.xml
===================================================================
--- general/genlib/libusb.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,195 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libusb-download-http "https://github.com/libusb/libusb/releases/download/v&libusb-version;/libusb-&libusb-version;.tar.bz2">
-  <!ENTITY libusb-download-ftp  " ">
-  <!ENTITY libusb-md5sum        "1fb61afe370e94f902a67e03eb39c51f">
-  <!ENTITY libusb-size          "632 KB">
-  <!ENTITY libusb-buildsize     "5.7 MB">
-  <!ENTITY libusb-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libusb" xreflabel="libusb-&libusb-version;">
-  <?dbhtml filename="libusb.html"?>
-
-
-  <title>libusb-&libusb-version;</title>
-
-  <indexterm zone="libusb">
-    <primary sortas="a-libusb">libusb</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libusb</title>
-
-    <para>
-      The <application>libusb</application> package contains a library
-      used by some applications for USB device access.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libusb-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libusb-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libusb-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libusb-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libusb-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libusb-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libusb Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="kernel">
-    <title>Configuring Libusb</title>
-
-    <para id="libusb-kernel">
-      To access raw USB devices (those not treated as a disk by the mass-storage
-      driver), appropriate support must be available in the kernel.  Check your
-      kernel configuration:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="libusb-kernel.xml"/>
-
-    <indexterm zone="libusb libusb-kernel">
-      <primary sortas="d-USB-device-filesystem">Support for Host-side USB</primary>
-    </indexterm>
-
-    <para>
-      For more details on setting up USB devices, see <xref
-      linkend="usb-device-issues"/>.
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libusb</title>
-
-    <para>
-      Install <application>libusb</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If <application>Doxygen</application> is installed and you wish to
-      build the API documentation, issue the following commands:
-    </para>
-
-<screen remap="doc"><userinput>pushd doc                &amp;&amp;
-  doxygen -u doxygen.cfg &amp;&amp;
-  make docs              &amp;&amp;
-popd</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you built the API documentation, install it using the following
-      commands as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -v -d -m755 /usr/share/doc/libusb-&libusb-version;/apidocs &amp;&amp;
-install -v -m644    doc/api-1.0/* \
-                    /usr/share/doc/libusb-&libusb-version;/apidocs</userinput></screen>
-
-  </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i ...</command>: This sed prevents some warnings when
-      building the documentation.
-    </para>
-  </sect2>
--->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libusb-1.0.so
-        </seg>
-        <seg>
-          /usr/include/libusb-1.0 and
-          /usr/share/doc/libusb-&libusb-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libusb-lib">
-        <term><filename class="libraryfile">libusb-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions used for accessing USB hardware
-          </para>
-          <indexterm zone="libusb libusb-lib">
-            <primary sortas="c-libusb">libusb-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libuv.xml
===================================================================
--- general/genlib/libuv.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,195 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libuv-download-http "https://dist.libuv.org/dist/v&libuv-version;/libuv-v&libuv-version;.tar.gz">
-  <!ENTITY libuv-download-ftp  " ">
-  <!ENTITY libuv-md5sum        "a808517c32ebd07c561bf21a4e30aeab">
-  <!ENTITY libuv-size          "1.3 MB">
-  <!ENTITY libuv-buildsize     "14 MB (add 16 MB for tests)">
-  <!ENTITY libuv-time          "less than 0.1 SBU (add 0.5 SBU for tests)">
-]>
-
-<sect1 id="libuv" xreflabel="libuv-&libuv-version;">
-  <?dbhtml filename="libuv.html"?>
-
-
-  <title>libuv-&libuv-version;</title>
-
-  <indexterm zone="libuv">
-    <primary sortas="a-libuv">libuv</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libuv</title>
-
-    <para>
-      The <application>libuv</application> package is a
-      multi-platform support library with a focus on asynchronous I/O.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libuv-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libuv-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libuv-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libuv-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libuv-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libuv-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libuv Dependencies</bridgehead>
-<!--
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="???"/>
-    </para>
--->
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="sphinx"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libuv</title>
-
-    <para>
-      Install <application>libuv</application> by running the following
-      commands:
-    </para>
-
-    <caution>
-      <para>
-        The <command>sh autogen.sh</command> command below fails if the ACLOCAL
-        environment variable is set as specified in <xref linkend="xorg7"/>.
-        If it is used, ACLOCAL needs to be unset for this package and then
-        reset for other packages.
-      </para>
-    </caution>
-
-<!--
-Don't use cmake here to avoid circular dependency
-
-<screen><userinput>sed -i "/TARGETS uv_a ARCHIVE/d" CMakeLists.txt &amp;&amp;
-
-mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr .. &amp;&amp;
-make </userinput></screen>
--->
-
-<screen><userinput>sh autogen.sh                              &amp;&amp;
-./configure --prefix=/usr --disable-static &amp;&amp;
-make </userinput></screen>
-
-    <para>
-      If you installed the optional <xref linkend="sphinx"/> python module,
-      create the man page:
-    </para>
-
-<screen remap="doc"><userinput>make man -C docs</userinput></screen>
-
-    <para>
-      If you want to run the tests, run: <command>make check</command> as
-      a non-root user. <!-- the test suite refuses to run as root -->
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
- 
-    <para>
-      If you built the man page, install it  as the &root; user:
-    </para>
-    
-<screen role="root" remap="doc"><userinput>install -Dm644 docs/build/man/libuv.1 /usr/share/man/man1</userinput></screen>
-
-  </sect2>
-
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed ...</command>: This command disables installation
-      of the static library.
-    </para>
-
-  </sect2>
--->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libuv.so
-        </seg>
-        <seg>
-          /usr/include/uv
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libuv.so">
-        <term><filename class="libraryfile">libuv.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for asynchronous I/O operations
-          </para>
-          <indexterm zone="libuv libuv.so">
-            <primary sortas="c-libuv.so">libuv.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libwacom.xml
===================================================================
--- general/genlib/libwacom.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,242 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libwacom-download-http "https://github.com/linuxwacom/libwacom/releases/download/libwacom-&libwacom-version;/libwacom-&libwacom-version;.tar.xz">
-  <!ENTITY libwacom-download-ftp  " ">
-  <!ENTITY libwacom-md5sum        "fa489522c2b5f014360f44a3e38a30f8">
-  <!ENTITY libwacom-size          "116 KB">
-  <!ENTITY libwacom-buildsize     "3.6 MB (with tests)">
-  <!ENTITY libwacom-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="libwacom" xreflabel="libwacom-&libwacom-version;">
-  <?dbhtml filename="libwacom.html"?>
-
-
-  <title>libwacom-&libwacom-version;</title>
-
-  <indexterm zone="libwacom">
-    <primary sortas="a-libwacom">libwacom</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libwacom</title>
-
-    <para>
-      The <application>libwacom</application> package contains a library used
-      to identify wacom tablets and their model-specific features.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libwacom-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libwacom-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libwacom-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libwacom-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libwacom-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libwacom-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libwacom Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libgudev"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>,
-      <xref linkend="git"/>,
-      <xref linkend="librsvg"/>,
-      <xref linkend="valgrind"/> (optional for some tests), and
-      <xref linkend="pytest"/> with
-      <ulink url="https://pypi.org/project/libevdev/">python-libevdev</ulink> and
-      <ulink url="https://pypi.org/project/pyudev/">pyudev</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libwacom</title>
-
-<!--  Fixed in libwacom-1.7
-    <para>
-      First, adapt the udev rules to upstream udev/kernel changes:
-    </para>
-
-<screen><userinput remap="pre">sed -i 's/ACTION!="add|change"/ACTION=="remove"/' tools/65-libwacom.rules.in</userinput></screen>
--->
-
-    <para>
-      Install <application>libwacom</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..            \
-      --prefix=/usr       \
-      --buildtype=release \
-      -Dtests=disabled    &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-      To run additional tests, install
-      <xref linkend="pytest"/>, python-libevdev, and pyudev, then remove
-      the "-Dtests=disabled" option from the meson line above.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <parameter>-Dtests=disabled</parameter>: This parameter disables some of
-      the more advanced tests because they require <xref linkend="pytest"/> and
-      other two Python modules beyond the scope of BLFS to work properly.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          libwacom-list-devices,
-          libwacom-list-local-devices,
-          libwacom-show-stylus, and
-          libwacom-update-db
-        </seg>
-        <seg>
-          libwacom.so
-        </seg>
-        <seg>
-          /usr/include/libwacom-1.0 and
-          /usr/share/libwacom
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libwacom-list-devices">
-        <term><command>libwacom-list-devices</command></term>
-        <listitem>
-          <para>
-            lists all tablet devices that are supported by libwacom
-          </para>
-          <indexterm zone="libwacom libwacom-list-devices">
-            <primary sortas="b-libwacom-list-devices">libwacom-list-devices</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwacom-list-local-devices">
-        <term><command>libwacom-list-local-devices</command></term>
-        <listitem>
-          <para>
-            lists tablet devices that are connected to the system
-          </para>
-          <indexterm zone="libwacom libwacom-list-local-devices">
-            <primary sortas="b-libwacom-list-local-devices">libwacom-list-local-devices</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwacom-show-stylus">
-        <term><command>libwacom-show-stylus</command></term>
-        <listitem>
-          <para>
-            lists tablet stylus IDs
-          </para>
-          <indexterm zone="libwacom libwacom-show-stylus">
-            <primary sortas="b-libwacom-show-stylus">libwacom-show-stylus</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwacom-update-db">
-        <term><command>libwacom-update-db</command></term>
-        <listitem>
-          <para>
-            updates the system according to the current set of tablet data files
-          </para>
-          <indexterm zone="libwacom libwacom-update-db">
-            <primary sortas="b-libwacom-update-db">libwacom-update-db</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwacom-lib">
-        <term><filename class="libraryfile">libwacom.so</filename></term>
-        <listitem>
-          <para>
-            contains functions used for accessing Wacom information
-          </para>
-          <indexterm zone="libwacom libwacom-lib">
-            <primary sortas="c-libwacom">libwacom.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libxkbcommon.xml
===================================================================
--- general/genlib/libxkbcommon.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,236 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libxkbcommon-download-http "https://xkbcommon.org/download/libxkbcommon-&libxkbcommon-version;.tar.xz">
-  <!ENTITY libxkbcommon-download-ftp  " ">
-  <!ENTITY libxkbcommon-md5sum        "b05b1a0d473189efb2dd995dd944f152">
-  <!ENTITY libxkbcommon-size          "524 KB">
-  <!ENTITY libxkbcommon-buildsize     "26 MB (with tests)">
-  <!ENTITY libxkbcommon-time          "0.5 SBU (with tests)">
-]>
-
-<sect1 id="libxkbcommon" xreflabel="libxkbcommon-&libxkbcommon-version;">
-  <?dbhtml filename="libxkbcommon.html"?>
-
-
-  <title>libxkbcommon-&libxkbcommon-version;</title>
-
-  <indexterm zone="libxkbcommon">
-    <primary sortas="a-libxkbcommon">libxkbcommon</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libxkbcommon</title>
-
-    <para>
-      <application>libxkbcommon</application> is a keymap compiler and
-      support library which processes a reduced subset of keymaps as
-      defined by the XKB specification.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libxkbcommon-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libxkbcommon-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libxkbcommon-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libxkbcommon-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libxkbcommon-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libxkbcommon-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libxkbcommon Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref role="runtime" linkend="xkeyboard-config"/> (runtime)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-       <xref linkend="libxcb"/>,
-       <xref linkend="wayland"/>, and
-       <xref linkend="wayland-protocols"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-       <xref linkend="doxygen"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libxkbcommon</title>
-
-    <para>
-      Install <application>libxkbcommon</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..            \
-      --prefix=/usr       \
-      --buildtype=release \
-      -Denable-docs=false &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <!--
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <option>- -disable-x11</option>: Use this switch if you
-      have not installed <xref linkend="libxcb"/> and
-      don't need the <filename>libxkbcommon-x11.so</filename>
-      library.
-    </para>
-    -->
-
-    <para>
-      <parameter>-Denable-docs=true</parameter>: This switch enables
-      documentation generation. The <xref linkend="doxygen"/> is
-      required.
-    </para>
-
-    <para>
-      <command>mv -v /usr/share/doc/libxkbcommon{,-&libxkbcommon-version;}</command>:
-      If you built the documentation, use this command to install the
-      it in a versioned directory.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          xkbcli
-        </seg>
-        <seg>
-          libxkbcommon.so,
-          libxkbcommon-x11.so, and
-          libxkbregistry.so
-        </seg>
-        <seg>
-          /usr/include/xkbcommon,
-          /usr/libexec/xkbcommon, and
-          /usr/share/doc/libxkbcommon-&libxkbcommon-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xkbcli">
-        <term><command>xkbcli</command></term>
-        <listitem>
-          <para>
-            provides a debugger and compiler for XKB keymaps
-          </para>
-          <indexterm zone="libxkbcommon xkbcli">
-            <primary sortas="b-xkbcli">xkbcli</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libxkbcommon-lib">
-        <term><filename class="libraryfile">libxkbcommon.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libxkbcommon</application> API functions
-          </para>
-          <indexterm zone="libxkbcommon libxkbcommon-lib">
-            <primary sortas="c-libxkbcommon">libxkbcommon.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libxkbcommon-x11">
-        <term><filename class="libraryfile">libxkbcommon-x11.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libxkbcommon</application> X11 specific API
-            functions
-          </para>
-          <indexterm zone="libxkbcommon libxkbcommon-x11">
-            <primary sortas="c-libxkbcommon-x11">libxkbcommon-x11.so</primary>
-          </indexterm>
-        </listitem>
-     </varlistentry>
-
-     <varlistentry id="libxkbregistry">
-       <term><filename class="libraryfile">libxkbregistry.so</filename></term>
-       <listitem>
-         <para>
-           contains a list of available XKB models, layouts, and variants for a
-           given ruleset
-         </para>
-         <indexterm zone="libxkbcommon libxkbregistry">
-           <primary sortas="c-libxkbregistry">libxkbregistry.so</primary>
-         </indexterm>
-       </listitem>
-     </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libxml.xml
===================================================================
--- general/genlib/libxml.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/libxml.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<sect1 id="libxml" xreflabel="libxml-&libxml-version;">
+<?dbhtml filename="libxml.html" dir="general"?>
+<title>libxml-&libxml-version;</title>
+
+&libxml-intro;
+&libxml-inst;
+&libxml-config;
+&libxml-desc;
+
+</sect1>
Index: general/genlib/libxml2.xml
===================================================================
--- general/genlib/libxml2.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ general/genlib/libxml2.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,295 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
+<sect1 id="libxml2" xreflabel="libxml2-&libxml2-version;">
+<?dbhtml filename="libxml2.html" dir="general"?>
+<title>libxml2-&libxml2-version;</title>
 
-  <!-- Also update the download, md5, size entities in libxml2py2.xml -->
-  <!ENTITY libxml2-download-http "https://download.gnome.org/sources/libxml2/2.12/libxml2-&libxml2-version;.tar.xz">
-<!--  <!ENTITY libxml2-download-http "http://xmlsoft.org/sources/libxml2-&libxml2-version;.tar.xz">-->
-  <!ENTITY libxml2-download-ftp  " ">
-  <!ENTITY libxml2-md5sum        "37fab9ace78d8a085af81dc9a19f36d9">
-  <!ENTITY libxml2-size          "2.5 MB">
-  <!ENTITY libxml2-buildsize     "103 MB (with tests)">
-  <!ENTITY libxml2-time          "0.4 SBU (Using parallelism=4; with tests)">
-  <!ENTITY testsuite-version     "20130923">
-]>
-
-<sect1 id="libxml2" xreflabel="libxml2-&libxml2-version;">
-  <?dbhtml filename="libxml2.html"?>
-
-
-  <title>libxml2-&libxml2-version;</title>
-
-  <indexterm zone="libxml2">
-    <primary sortas="a-libxml2">libxml2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libxml2</title>
-
-    <para>
-      The <application>libxml2</application> package contains libraries
-      and utilities used for parsing XML files.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libxml2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libxml2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libxml2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libxml2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libxml2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libxml2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional Test Suite:
-          <ulink url="https://www.w3.org/XML/Test/xmlts&testsuite-version;.tar.gz"/> - This
-          enables <command>make check</command> to do complete testing.
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libxml2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="icu"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="valgrind"/> (may be used in the tests)
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libxml2</title>
-
-    <para>
-      Install <application>libxml2</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr           \
-            --sysconfdir=/etc       \
-            --disable-static        \
-            --with-history          \
-            --with-icu              \
-            PYTHON=/usr/bin/python3 \
-            --docdir=/usr/share/doc/libxml2-&libxml2-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you downloaded the test suite, issue the following command:
-    </para>
-
-<screen><userinput>tar xf ../xmlts&testsuite-version;.tar.gz</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check &gt; check.log</command>.
-      This command will print several lines of error messages like
-      <quote><computeroutput>Failed to parse
-      xstc/...</computeroutput></quote> because some test files are missing
-      and these messages can be safely ignored.
-      A summary of the results can be obtained with <command>grep -E
-      '^Total|expected|Ran' check.log</command>. If <xref linkend="valgrind"/> is
-      installed and you want to check for memory leaks, replace
-      <command>check</command> with <command>check-valgrind</command>.
-    </para>
-
-    <note>
-      <para>
-        The tests use <ulink url="http://localhost/">http://localhost/</ulink>
-        to test parsing of external entities. If the machine where you run the
-        tests serves as a web site, the tests may hang, depending on the
-        content of the file served. It is therefore recommended to shut down
-        the server during the tests, as the <systemitem
-        class="username">root</systemitem> user:
-      </para>
-
-<screen role="nodump" revision="sysv"><userinput>/etc/init.d/httpd stop</userinput></screen>
-<screen role="nodump" revision="systemd"><userinput>systemctl stop httpd.service</userinput></screen>
-
-    </note>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      Finally, prevent some packages from unnecessarily linking to ICU using
-      the following commands as the &root; user:
-    </para>
-
-<screen role="root"><userinput>rm -vf /usr/lib/libxml2.la &amp;&amp;
-sed '/libs=/s/xml2.*/xml2"/' -i /usr/bin/xml2-config</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <parameter>--with-history</parameter>: This switch enables
-      <application>Readline</application> support when running
-      <command>xmlcatalog</command> or <command>xmllint</command> in shell mode.
-    </para>
-
-    <para>
-      <parameter>--with-icu</parameter>: This switch enables support for
-      <application>ICU</application>, which provides additional Unicode support.
-      This is needed for some packages in BLFS, such as for QtWebEngine.
-    </para>
-
-    <para>
-      <parameter>PYTHON=/usr/bin/python3</parameter>: Allows building
-      the libxml2 module with Python3 instead of Python2.
-    </para>
-
-<!--
-    <para>
-      <option>- -with-icu</option>: Add this switch if you have built
-      <xref linkend="icu"/>, for better unicode support.
-    </para>
-
-    <note>
-      <para>
-        If the <option>- -with-icu</option> switch is used, the BLFS editors
-        recommend removing unneeded references to the ICU libraries. This
-        will prevent many packages that use libxml2 from unnecessarily linking
-        to the ICU libraries.  This, in turn, will prevent the need for
-        rebuilding many packages when upgrading ICU to a new major version.
-        After installing libxml2, as the &root; user, issue:
-      </para>
-
-<screen role="nodump"><userinput>rm -vf /usr/lib/libxml2.la &amp;&amp;
-sed '/libs=/s/xml2.*/xml2"/' -i /usr/bin/xml2-config</userinput></screen>
-    </note>
--->
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          xml2-config,
-          xmlcatalog, and
-          xmllint
-        </seg>
-        <seg>
-          libxml2.so
-        </seg>
-        <seg>
-          /usr/include/libxml2,
-          /usr/lib/cmake/libxml2,
-          /usr/share/doc/libxml2-&libxml2-version;, and
-          /usr/share/gtk-doc/html/libxml2
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xml2-config">
-        <term><command>xml2-config</command></term>
-        <listitem>
-          <para>
-            determines the compile and linker flags that should be used to
-            compile and link programs that use
-            <filename class="libraryfile">libxml2</filename>
-          </para>
-          <indexterm zone="libxml2 xml2-config">
-            <primary sortas="b-xml2-config">xml2-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xmlcatalog">
-        <term><command>xmlcatalog</command></term>
-        <listitem>
-          <para>
-            is used to monitor and manipulate XML and SGML catalogs
-          </para>
-          <indexterm zone="libxml2 xmlcatalog">
-            <primary sortas="b-xmlcatalog">xmlcatalog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xmllint">
-        <term><command>xmllint</command></term>
-        <listitem>
-          <para>
-            parses XML files and outputs reports (based upon options) to detect
-            errors in XML coding
-          </para>
-          <indexterm zone="libxml2 xmllint">
-            <primary sortas="b-xmllint">xmllint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libxml2-lib">
-        <term><filename class="libraryfile">libxml2.so</filename></term>
-        <listitem>
-          <para>
-            provides functions for programs to parse files that use the XML
-            format
-          </para>
-          <indexterm zone="libxml2 libxml2-lib">
-            <primary sortas="c-libxml2">libxml2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+&libxml2-intro;
+&libxml2-inst;
+&libxml2-config;
+&libxml2-desc;
 
 </sect1>
+
Index: general/genlib/libxmlb.xml
===================================================================
--- general/genlib/libxmlb.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,197 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libxmlb-download-http "https://github.com/hughsie/libxmlb/releases/download/&libxmlb-version;/libxmlb-&libxmlb-version;.tar.xz">
-  <!ENTITY libxmlb-download-ftp  " ">
-  <!ENTITY libxmlb-md5sum        "0749fbcd7179b800c68ed8a6aa31cb74">
-  <!ENTITY libxmlb-size          "104 KB">
-  <!ENTITY libxmlb-buildsize     "3.8 MB">
-  <!ENTITY libxmlb-time          "0.1 SBU">
-]>
-
-<sect1 id="libxmlb" xreflabel="libxmlb-&libxmlb-version;">
-  <?dbhtml filename="libxmlb.html"?>
-
-  <title>libxmlb-&libxmlb-version;</title>
-
-  <indexterm zone="libxmlb">
-    <primary sortas="a-libxmlb">libxmlb</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libxmlb</title>
-
-    <para>
-      The <application>libxmlb</application> package contains a library and
-      a tool which help create and query binary XML blobs.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libxmlb-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libxmlb-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libxmlb-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libxmlb-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libxmlb-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libxmlb-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libxmlb Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> (GObject Introspection recommended)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <ulink url="https://github.com/zvelo/libstemmer">libstemmer</ulink>
-    </para>
-
-    <!--  Only use this if you want to note something in the wiki
-    <para condition="html" role="usernotes">
-      Editor Notes: <ulink url="&blfs-wiki;/libxmlb"/>
-    </para>
-    -->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libxmlb</title>
-
-    <para>
-      Install <application>libxmlb</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release -Dgtkdoc=false .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-    
-<!-- Over in meson_options.txt, gtkdoc is set to 'true' by default. This would
-     introduce a dependency on gtk-doc, so let's set it as 'false' and let the
-     user enable it if they want the documentation. -renodr -->
-    <para>
-      <parameter>-Dgtkdoc=false</parameter>: This switch disables building the
-      API documentation. Remove it if you have
-      <xref linkend="gtk-doc" role="nodep"/> installed and wish to build the
-      API documentation.
-    </para>
-
-    <para>
-      <option>-Dintrospection=false</option>: Use this switch if you do not
-      have built <xref linkend='glib2'/> with GObject Introspection.
-    </para>
-
-    <para>
-      <option>-Dstemmer=true</option>: Use this switch if you have
-      <ulink url="https://github.com/zvelo/libstemmer">libstemmer</ulink>
-      installed and wish to build stemmer support.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          xb-tool
-        </seg>
-        <seg>
-          libxmlb.so
-        </seg>
-        <seg>
-          /usr/include/libxmlb-2,
-          /usr/libexec/installed-tests/libxmlb, and
-          /usr/share/gtk-doc/html/libxmlb (if gtk-doc was enabled)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xb-tool">
-        <term><command>xb-tool</command></term>
-        <listitem>
-          <para>
-            is a tool used to create, dump, or query a binary XML blob
-          </para>
-          <indexterm zone="libxmlb xb-tool">
-            <primary sortas="b-xb-tool">xb-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libxmlb-lib">
-        <term><filename class="libraryfile">libxmlb.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that allow for creating and querying binary XML
-            blobs
-          </para>
-          <indexterm zone="libxmlb libxmlb-lib">
-            <primary sortas="c-libxmlb">libxmlb.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: general/genlib/libxslt.xml
===================================================================
--- general/genlib/libxslt.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ general/genlib/libxslt.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,232 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
+<sect1 id="libxslt" xreflabel="libxslt-&libxslt-version;">
+<?dbhtml filename="libxslt.html" dir="general"?>
+<title>libxslt-&libxslt-version;</title>
 
-  <!ENTITY libxslt-download-http "https://download.gnome.org/sources/libxslt/1.1/libxslt-&libxslt-version;.tar.xz">
-  <!ENTITY libxslt-download-ftp  " ">
-  <!ENTITY libxslt-md5sum        "22e9eb7c23825124e786611b3760a3c7">
-  <!ENTITY libxslt-size          "1.5 MB">
-  <!ENTITY libxslt-buildsize     "34 MB (with tests)">
-  <!ENTITY libxslt-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="libxslt" xreflabel="libxslt-&libxslt-version;">
-  <?dbhtml filename="libxslt.html"?>
-
-
-  <title>libxslt-&libxslt-version;</title>
-
-  <indexterm zone="libxslt">
-    <primary sortas="a-libxslt">libxslt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libxslt</title>
-
-    <para>
-      The <application>libxslt</application> package contains
-      XSLT libraries used for extending <filename
-      class="libraryfile">libxml2</filename> libraries to
-      support XSLT files.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libxslt-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libxslt-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libxslt-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libxslt-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libxslt-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libxslt-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/libxslt-&libxslt-version;-security_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">libxslt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (at runtime)</bridgehead>
-    <para role="recommended">
-      <xref role="runtime" linkend="DocBook"/> and
-      <xref role="runtime" linkend="docbook-xsl"/>
-    </para>
-
-    <note>
-      <para>
-        Although it is not a direct dependency, many applications
-        using <application>libxslt</application> will expect
-        <xref linkend="DocBook"/> and <xref linkend="docbook-xsl"/>
-        to be present.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libgcrypt"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libxslt</title>
-
-    <para>
-      Install <application>libxslt</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr                          \
-            --disable-static                       \
-            --docdir=/usr/share/doc/libxslt-&libxslt-version; \
-            PYTHON=/usr/bin/python3 &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          xslt-config and xsltproc
-        </seg>
-        <seg>
-          libexslt.so, libxslt.so and optionally, libxsltmod.so
-          <application>Python</application> module
-        </seg>
-        <seg>
-          /usr/include/libexslt,
-          /usr/include/libxslt,
-          /usr/lib/cmake/libxslt,
-          /usr/lib/libxslt-plugins,
-          /usr/share/gtk-doc/lib{xslt,exslt},
-          /usr/share/doc/libxslt-&libxslt-version;, and
-          /usr/share/doc/libxslt-python-&libxslt-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xslt-config">
-        <term><command>xslt-config</command></term>
-        <listitem>
-          <para>
-            is used to find out the pre-processor, linking and
-            compiling flags necessary to use the <application>libxslt</application>
-            libraries in 3rd-party programs
-          </para>
-          <indexterm zone="libxslt xslt-config">
-            <primary sortas="b-xslt-config">xslt-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xsltproc">
-        <term><command>xsltproc</command></term>
-        <listitem>
-          <para>
-            is used to apply XSLT stylesheets to XML documents
-          </para>
-          <indexterm zone="libxslt xsltproc">
-            <primary sortas="b-xsltproc">xsltproc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libexslt">
-        <term><filename class="libraryfile">libexslt.so</filename></term>
-        <listitem>
-          <para>
-            is used to provide extensions to XSLT functions
-          </para>
-          <indexterm zone="libxslt libexslt">
-            <primary sortas="c-libexslt">libexslt.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libxslt-lib">
-        <term><filename class="libraryfile">libxslt.so</filename></term>
-        <listitem>
-          <para>
-            provides extensions to the
-            <filename class="libraryfile">libxml2</filename>
-            libraries to parse files that use the XSLT format
-          </para>
-          <indexterm zone="libxslt libxslt-lib">
-            <primary sortas="c-libxslt">libxslt.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+&libxslt-intro;
+&libxslt-inst;
+&libxslt-config;
+&libxslt-desc;
 
 </sect1>
+
Index: general/genlib/libyaml.xml
===================================================================
--- general/genlib/libyaml.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,161 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 yaml-download-http "https://github.com/yaml/libyaml/releases/download/&yaml-version;/yaml-&yaml-version;.tar.gz">
-  <!ENTITY yaml-download-ftp  " ">
-  <!ENTITY yaml-md5sum        "bb15429d8fb787e7d3f1c83ae129a999">
-  <!ENTITY yaml-size          "596 KB">
-  <!ENTITY yaml-buildsize     "6.4 MB (with tests)">
-  <!ENTITY yaml-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="libyaml" xreflabel="libyaml-&yaml-version;">
-  <?dbhtml filename="libyaml.html"?>
-
-
-  <title>libyaml-&yaml-version;</title>
-
-  <indexterm zone="libyaml">
-    <primary sortas="a-libyaml">libyaml</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libyaml</title>
-
-    <para>
-      The <application>yaml</application> package contains a C
-      library for parsing and emitting YAML (YAML Ain't Markup
-      Language) code.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&yaml-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&yaml-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &yaml-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &yaml-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &yaml-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &yaml-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libyaml Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libyaml</title>
-
-    <para>
-      Install <application>libyaml</application> by running the following
-      commands:
-    </para>
-
-    <screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-<!--
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DBUILD_SHARED_LIBS=true    \
-      -DCMAKE_BUILD_TYPE=RELEASE ..  &amp;&amp;
-make</userinput></screen> -->
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libyaml.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libyaml-lib">
-        <term><filename class="libraryfile">libyaml.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for parsing and emitting YAML code
-          </para>
-          <indexterm zone="libyaml libyaml-lib">
-            <primary sortas="c-libyaml">libyaml.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/log4cplus.xml
===================================================================
--- general/genlib/log4cplus.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,157 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 log4cplus-download-http "https://github.com/log4cplus/log4cplus/releases/download/REL_&log4cplus-release;/log4cplus-&log4cplus-version;.tar.xz">
-  <!ENTITY log4cplus-download-ftp  " ">
-  <!ENTITY log4cplus-md5sum        "6ee2555be39cd269086cc871c834e43f">
-  <!ENTITY log4cplus-size          "919 KB">
-  <!ENTITY log4cplus-buildsize     "73 MB">
-  <!ENTITY log4cplus-time          "0.3 SBU (Using parallelism=4; add 0.5 SBU for tests)">
-]>
-
-<sect1 id="log4cplus" xreflabel="log4cplus-&log4cplus-version;">
-  <?dbhtml filename="log4cplus.html"?>
-
-
-  <title>log4cplus-&log4cplus-version;</title>
-
-  <indexterm zone="log4cplus">
-    <primary sortas="a-log4cplus">log4cplus</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to log4cplus</title>
-
-    <para>
-      <application>log4cplus</application> is an easy to use C++20
-      logging API providing thread-safe, flexible, and arbitrarily
-      granular control over log management and configuration. It is
-      modeled after the Java log4j API.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&log4cplus-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&log4cplus-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &log4cplus-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &log4cplus-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &log4cplus-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &log4cplus-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">log4cplus Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      &qt5-deps;
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of log4cplus</title>
-
-    <para>
-      Build <application>log4cplus</application> by running the following
-      command:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, install the package as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--with-qt5</option>: This option enables
-      compilation of a separate shared library (liblog4cplusqt5debugappender)
-      that implements Qt5DebugAppender. It requires Qt5 and pkg-config
-      to be available.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          log4cplus.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="log4cplus-lib">
-        <term><filename class="libraryfile">log4cplus.so</filename></term>
-        <listitem>
-          <para>
-            is the log4cplus library
-          </para>
-          <indexterm zone="log4cplus log4cplus-lib">
-            <primary sortas="c-log4cplus">log4cplus.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/lzo.xml
===================================================================
--- general/genlib/lzo.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,151 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 lzo-download-http "https://www.oberhumer.com/opensource/lzo/download/lzo-&lzo-version;.tar.gz">
-  <!ENTITY lzo-download-ftp  " ">
-  <!ENTITY lzo-md5sum        "39d3f3f9c55c87b1e5d6888e1420f4b5">
-  <!ENTITY lzo-size          "588 KB">
-  <!ENTITY lzo-buildsize     "12 MB">
-  <!ENTITY lzo-time          "0.3 SBU (with tests)">
-]>
-
-<sect1 id="lzo" xreflabel="LZO-&lzo-version;">
-  <?dbhtml filename="lzo.html"?>
-
-
-  <title>LZO-&lzo-version;</title>
-
-  <indexterm zone="lzo">
-    <primary sortas="a-LZO">LZO</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to LZO</title>
-
-    <para>
-      <application>LZO</application> is a data compression
-      library which is suitable for data decompression and compression in
-      real-time. This means it favors speed over compression ratio.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lzo-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lzo-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lzo-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lzo-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lzo-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lzo-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of LZO</title>
-
-    <para>
-      Install <application>LZO</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr                    \
-            --enable-shared                  \
-            --disable-static                 \
-            --docdir=/usr/share/doc/lzo-&lzo-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>. All the
-      checks should pass. Now issue <command>make test</command> to run the full
-      suite of tests.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          liblzo2.so
-        </seg>
-        <seg>
-          /usr/include/lzo and
-          /usr/share/doc/lzo
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-    <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="liblzo2">
-        <term><filename class="libraryfile">liblzo2.so</filename></term>
-        <listitem>
-          <para>
-            is a data compression and decompression library
-          </para>
-          <indexterm zone="lzo liblzo2">
-            <primary sortas="c-liblzo2">liblzo2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/mtdev.xml
===================================================================
--- general/genlib/mtdev.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,157 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 mtdev-download-http "https://bitmath.org/code/mtdev/mtdev-&mtdev-version;.tar.bz2">
-  <!ENTITY mtdev-download-ftp  " ">
-  <!ENTITY mtdev-md5sum        "483ed7fdf7c1e7b7375c05a62848cce7">
-  <!ENTITY mtdev-size          "296 KB">
-  <!ENTITY mtdev-buildsize     "2.5 MB">
-  <!ENTITY mtdev-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="mtdev" xreflabel="mtdev-&mtdev-version;">
-  <?dbhtml filename="mtdev.html"?>
-
-
-  <title>mtdev-&mtdev-version;</title>
-
-  <indexterm zone="mtdev">
-    <primary sortas="a-mtdev">mtdev</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to mtdev</title>
-
-    <para>
-      The <application>mtdev</application> package contains Multitouch
-      Protocol Translation Library which is used to transform all
-      variants of kernel MT (Multitouch) events to the slotted type B
-      protocol.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&mtdev-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&mtdev-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &mtdev-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &mtdev-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &mtdev-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &mtdev-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of mtdev</title>
-
-    <para>
-      Install <application>mtdev</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          mtdev-test
-        </seg>
-        <seg>
-          libmtdev.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mtdev-test">
-        <term><command>mtdev-test</command></term>
-        <listitem>
-          <para>
-            is a tool to test <filename class="libraryfile">libmtdev</filename>
-          </para>
-          <indexterm zone="mtdev mtdev-test">
-            <primary sortas="b-mtdev-test">mtdev-test</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmtdev">
-        <term><filename class="libraryfile">libmtdev.so</filename></term>
-        <listitem>
-          <para>
-            contains Multitouch Protocol Translation API functions
-          </para>
-          <indexterm zone="mtdev libmtdev">
-            <primary sortas="c-libmtdev">libmtdev.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/nodejs.xml
===================================================================
--- general/genlib/nodejs.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,273 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 nodejs-download-http "https://nodejs.org/dist/v&nodejs-version;/node-v&nodejs-version;.tar.xz">
-  <!ENTITY nodejs-download-ftp  " ">
-  <!ENTITY nodejs-md5sum        "85986134f75f98e9a1c006e7a72d1172">
-  <!ENTITY nodejs-size          "40 MB">
-  <!ENTITY nodejs-buildsize     "974 MB (add 62 MB for tests)">
-  <!ENTITY nodejs-time          "10.9 SBU (add 3.2 SBU for tests: both using parallelism=8 and 8 CPUs online, parts of the tests will use all online CPUs)">
-]>
-
-<sect1 id="nodejs" xreflabel="nodejs-&nodejs-version;">
-  <?dbhtml filename="nodejs.html"?>
-
-
-  <title>Node.js-&nodejs-version;</title>
-
-  <indexterm zone="nodejs">
-    <primary sortas="a-nodejs">nodejs</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Node.js</title>
-
-    <para>
-      <application>Node.js</application> is a
-      <application>JavaScript</application> runtime built on
-      <application>Chrome's</application> V8 JavaScript engine.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&nodejs-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&nodejs-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &nodejs-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &nodejs-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &nodejs-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &nodejs-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/node-v&nodejs-version;-icu_69-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">Node.js Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="which"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="brotli"/>,
-      <xref linkend="c-ares"/>,
-      <xref linkend="icu"/>,
-      <xref linkend="libuv"/>, and
-      <xref linkend="nghttp2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://github.com/nodejs/http-parser">http-parser</ulink> and
-      <ulink url="https://www.npmjs.com/">npm</ulink> (an internal copy of
-      <command>npm</command> will be installed if not present)
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Node.js</title>
-
-<!--
-    <para>
-      If Python-3.12 is installed, fix the <command>configure</command> script:
-    </para>
-
-<screen><userinput>sed -e '/python3.11/i command -v python3.12 >/dev/null &amp;&amp; exec python3.12 "$0" "$@"' \
-    -e '/3, 11/s/\(.3, 11.\)/(3, 12), \1/' \
-    -i configure</userinput></screen>
--->
-
-    <para>
-      Build <application>Node.js</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr          \
-            --shared-brotli        \
-            --shared-cares         \
-            --shared-libuv         \
-            --shared-openssl       \
-            --shared-nghttp2       \
-            --shared-zlib          \
-            --with-intl=system-icu &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test-only</command>.
-<!--
-Failed tests:
-out/Release/node - -tls-min-v1.0 /build/node/node-v18.18.2/test/parallel/test-https-agent-session-eviction.js
-out/Release/node /build/node/node-v18.18.2/test/parallel/test-tls-alert.js
-out/Release/node - -tls-max-v1.2 /build/node/node-v18.18.2/test/parallel/test-tls-cli-max-version-1.2.js
-out/Release/node - -tls-max-v1.3 /build/node/node-v18.18.2/test/parallel/test-tls-cli-max-version-1.3.js
-out/Release/node - -tls-min-v1.1 /build/node/node-v18.18.2/test/parallel/test-tls-cli-min-version-1.1.js
-out/Release/node - -tls-min-v1.2 /build/node/node-v18.18.2/test/parallel/test-tls-cli-min-version-1.2.js
-out/Release/node - -tls-min-v1.3 /build/node/node-v18.18.2/test/parallel/test-tls-cli-min-version-1.3.js
-out/Release/node /build/node/node-v18.18.2/test/parallel/test-tls-getprotocol.js
-out/Release/node /build/node/node-v18.18.2/test/parallel/test-tls-min-max-version.js
-out/Release/node /build/node/node-v18.18.2/test/parallel/test-tls-session-cache.js
-
-For node-v20.9.0 all 3969 tests passed.  bdubbs 3 Nov 23
--->
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-ln -sf node /usr/share/doc/node-&nodejs-version;</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-intl=system-icu</parameter>: use the system version
-      of <application>icu</application>. Other values are
-      <option>full-icu</option> (to build a local, full
-      <application>icu</application> library) and <option>small-icu</option>
-      (to build a local, minimal <application>icu</application> library).
-    </para>
-
-    <para>
-      <parameter>--shared-{brotli,cares,libuv,nghttp2,openssl,zlib}</parameter>:
-      use the system installed libraries instead of local copies.
-    </para>
-
-    <para>
-      <option>--without-npm</option>: do not build
-      <application>npm</application> (use if you'd like to build a separate
-      <application>npm</application> later).
-    </para>
-
-    <para>
-      <option>--shared-http-parser</option>: use the system
-      installed library instead of a local copy.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          corepack, node, npm, and npx
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/include/node,
-          /usr/lib/node_modules/{corepack,npm},
-          /usr/share/doc/{node,node-&nodejs-version;}, and
-          /usr/share/systemtap/tapset
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="corepack">
-        <term><command>corepack</command></term>
-        <listitem>
-          <para>
-            is an experimental tool to help with managing versions of package
-            managers.
-          </para>
-          <indexterm zone="nodejs corepack">
-            <primary sortas="b-corepack">corepack</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="node">
-        <term><command>node</command></term>
-        <listitem>
-          <para>
-            is the server-side JavaScript runtime
-          </para>
-          <indexterm zone="nodejs node">
-            <primary sortas="b-node">node</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="npm">
-        <term><command>npm</command></term>
-        <listitem>
-          <para>
-            is the <application>Node.js</application> package manager
-          </para>
-          <indexterm zone="nodejs npm">
-            <primary sortas="b-npm">npm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>
-          <filename class="directory">/usr/lib/node_modules/npm/</filename>
-        </term>
-        <listitem>
-          <para>
-            is the installation root for Node.js executables and libraries
-          </para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/npth.xml
===================================================================
--- general/genlib/npth.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,170 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 npth-download-http "&gnupg-http;/npth/npth-&npth-version;.tar.bz2">
-  <!ENTITY npth-download-ftp  " ">
-  <!ENTITY npth-md5sum        "286274d0106ec408efebe4a399975b11">
-  <!ENTITY npth-size          "308 KB">
-  <!ENTITY npth-buildsize     "2.6 MB (with checks)">
-  <!ENTITY npth-time          "less than 0.1 SBU (with checks)">
-]>
-
-<sect1 id="npth" xreflabel="npth-&npth-version;">
-  <?dbhtml filename="npth.html"?>
-
-
-  <title>npth-&npth-version;</title>
-
-  <indexterm zone="npth">
-    <primary sortas="a-NPth">NPth</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to NPth</title>
-
-    <para>
-      The <application>NPth</application> package contains a very portable
-      POSIX/ANSI-C based library for Unix platforms which provides
-      non-preemptive priority-based scheduling for multiple threads of
-      execution (multithreading) inside event-driven applications. All threads
-      run in the same address space of the server application, but each thread
-      has its own individual program-counter, run-time stack, signal mask and
-      errno variable.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&npth-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&npth-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &npth-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &npth-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &npth-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &npth-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of NPth</title>
-
-    <para>
-      Install <application>NPth</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i 's#$(LOBJS) ...</command>: This <command>sed</command>
-      fixes a race condition in the <filename>Makefile</filename>. It allows
-      running <command>make</command> with multiple jobs (e.g., <command>make
-      -j4</command>).
-    </para>
-
-    <para>
-      <option>-\-disable-static</option>: This option stops it compiling a
-      static version of the library.
-    </para>
-
-    <para>
-      <option>-\-mandir=/usr/share/man</option>: This option puts the man
-      pages in <filename class="directory">/usr/share/man</filename> and not
-      <filename class="directory">/usr/man</filename>.
-    </para>
-  </sect2>-->
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>npth-config</seg>
-        <seg>libnpth.so</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="npth-config">
-        <term><command>npth-config</command></term>
-        <listitem>
-          <para>
-            is a utility used to configure and build applications based on
-            the npth library. It can be used to query the C compiler and
-            linker flags which are required to correctly compile and link the
-            application against the npth library
-          </para>
-          <indexterm zone="npth npth-config">
-            <primary sortas="b-npth-config">npth-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnpth">
-        <term><filename class="libraryfile">libnpth.so</filename></term>
-        <listitem>
-          <para>
-            contains the API functions used by the New Portable Threads
-            Library
-          </para>
-          <indexterm zone="npth libnpth">
-            <primary sortas="c-libnpth">libnpth.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/genlib/nspr.xml
===================================================================
--- general/genlib/nspr.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,221 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 nspr-download-http "&mozilla-http;/nspr/releases/v&nspr-version;/src/nspr-&nspr-version;.tar.gz">
-  <!ENTITY nspr-download-ftp  " ">
-  <!ENTITY nspr-md5sum        "5e0acf9fbdde85181bddd510f4624841">
-  <!ENTITY nspr-size          "1.0 MB">
-  <!ENTITY nspr-buildsize     "9.6 MB">
-  <!ENTITY nspr-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="nspr" xreflabel="NSPR-&nspr-version;">
-  <?dbhtml filename="nspr.html"?>
-
-
-  <title>NSPR-&nspr-version;</title>
-
-  <indexterm zone="nspr">
-    <primary sortas="a-NSPR">NSPR</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to NSPR</title>
-
-    <para>
-      <application>Netscape Portable Runtime</application> (NSPR) provides a
-      platform-neutral API for system level and libc like functions.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&nspr-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&nspr-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &nspr-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-         Download size: &nspr-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &nspr-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &nspr-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of NSPR</title>
-
-    <para>
-      Install <application>NSPR</application> by running the following commands:
-    </para>
-
-<screen><userinput>cd nspr &amp;&amp;
-
-sed -i '/^RELEASE/s|^|#|' pr/src/misc/Makefile.in &amp;&amp;
-sed -i 's|$(LIBRARY) ||'  config/rules.mk         &amp;&amp;
-
-./configure --prefix=/usr   \
-            --with-mozilla  \
-            --with-pthreads \
-            $([ $(uname -m) = x86_64 ] &amp;&amp; echo --enable-64bit) &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      The test suite is designed for testing changes to nss or nspr and is
-      not particularly useful for checking a released version (e.g. it needs
-      to be run on a non-optimized build with both nss and nspr directories
-      existing alongside each other). For further details, see the Editor Notes
-      for nss at <ulink url="&blfs-wiki;/nss"/>
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -ri '/^RELEASE/s/^/#/' pr/src/misc/Makefile.in</command>:
-      This sed disables installing two unneeded scripts.
-    </para>
-
-    <para>
-      <command>sed -i 's#$(LIBRARY) ##' config/rules.mk</command>: This sed disables
-      installing the static libraries.
-    </para>
-
-    <para>
-      <parameter>--with-mozilla</parameter>: This parameter adds Mozilla support
-      to the libraries (required if you want to build any other Mozilla
-      products and link them to these libraries).
-    </para>
-
-    <para>
-      <parameter>--with-pthreads</parameter>: This parameter forces use of the
-      system pthread library.
-    </para>
-
-    <para>
-      <parameter>--enable-64bit</parameter>: The --enable-64bit parameter is
-      <emphasis>required</emphasis> on an x86_64 system to prevent
-      <command>configure</command> failing with a claim that this is a system
-      without pthread support. The [ $(uname -m) = x86_64 ] test ensures it has
-      no effect on a 32 bit system.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          nspr-config
-        </seg>
-        <seg>
-          libnspr4.so, libplc4.so, and libplds4.so
-        </seg>
-        <seg>
-          /usr/include/nspr
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="nspr-config">
-        <term><command>nspr-config</command></term>
-        <listitem>
-          <para>
-            provides compiler and linker options to other packages that use
-            <application>NSPR</application>
-          </para>
-          <indexterm zone="nspr nspr-config">
-            <primary sortas="b-nspr-config">nspr-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnspr4">
-        <term><filename class="libraryfile">libnspr4.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide platform independence for non-GUI
-            operating system facilities such as threads, thread synchronization,
-            normal file and network I/O, interval timing and calendar time,
-            basic memory management and shared library linking
-          </para>
-          <indexterm zone="nspr libnspr4">
-            <primary sortas="c-libnspr4">libnspr4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libplc4">
-        <term><filename class="libraryfile">libplc4.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that implement many of the features offered by
-            libnspr4
-          </para>
-          <indexterm zone="nspr libplc4">
-            <primary sortas="c-libplc4">libplc4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libplds4">
-        <term><filename class="libraryfile">libplds4.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide data structures
-          </para>
-          <indexterm zone="nspr libplds4">
-            <primary sortas="c-libplds4">libplds4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/openssl.xml
===================================================================
--- general/genlib/openssl.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/openssl.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect1 id="openssl" xreflabel="openssl-&openssl-version;">
+<?dbhtml filename="openssl.html" dir="general"?>
+<title>openssl-&openssl-version;</title>
+
+&openssl-intro;
+&openssl-inst;
+&openssl-exp;
+&openssl-config;
+&openssl-desc;
+
+</sect1>
Index: general/genlib/openssl/openssl-config.xml
===================================================================
--- general/genlib/openssl/openssl-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/openssl/openssl-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,18 @@
+<sect2>
+<title>Configuring Openssl</title>
+
+<sect3><title>Config files</title>
+<para><userinput>/etc/ssl/openssl.cnf</userinput></para>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para>Most people who just want to use openssl for providing functions
+to other programs such as OpenSSH and web browsers won't need to worry
+about configuring openssl.  Configuring openssl is an advanced topic and
+so those who do would normally be expected to either know how to do it
+or to be able to find out how to do it.</para>
+</sect3>
+
+</sect2>
+
Index: general/genlib/openssl/openssl-desc.xml
===================================================================
--- general/genlib/openssl/openssl-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/openssl/openssl-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,47 @@
+<sect2>
+<title>Contents</title>
+
+<para>The openssl package contains <userinput>c_rehash</userinput>,
+<userinput>openssl</userinput>, <userinput>libcrypto</userinput> and
+<userinput>libssl</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>c_rehash</title>
+
+<para>No description is available for c_rehash.</para>
+
+</sect3>
+
+<sect3><title>openssl</title>
+
+<para>The openssl program is a command line tool for using the various
+cryptography functions of OpenSSL's crypto library from the shell.  
+It can be used for various functions which are documented in
+<userinput>man 1 openssl</userinput>.</para>
+
+</sect3>
+
+<sect3><title>libcrypto</title>
+
+<para>The OpenSSL crypto library implements a wide range of cryptographic 
+algorithms used in various Internet standards. The services provided by 
+this library are used by the OpenSSL implementations of SSL, TLS and S/MIME, 
+and they have also been used to implement SSH, OpenPGP, and other 
+cryptographic standards.</para>
+
+</sect3>
+
+<sect3><title>libssl</title>
+ 
+<para>The OpenSSL ssl library implements the Secure Sockets Layer (SSL 
+v2/v3) and Transport Layer Security (TLS v1) protocols. It provides a rich 
+API, documentation on which can be found by running 
+<userinput>man 3 ssl</userinput>.</para>
+ 
+</sect3>
+
+</sect2>
+
Index: general/genlib/openssl/openssl-exp.xml
===================================================================
--- general/genlib/openssl/openssl-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/openssl/openssl-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,20 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>mv doc/apps/passwd.pod
+doc/apps/openssl-passwd.pod :</userinput> We do this because otherwise
+openssl installs it's passwd man page over the existing system one which
+isn't what we want.</para>
+
+<para><screen><userinput>make MANDIR=/usr/share/man</userinput>
+<userinput>make MANDIR=/usr/share/man install :</userinput></screen> These
+commands install openssl with the man pages in /usr/share/man instead of
+the default which is /etc/ssl/man.</para>
+ 
+<para><userinput>rmdir /etc/ssl/lib :</userinput> This is simply a
+tidy-up command.  For some reason, the openssl install routine creates
+the /etc/ssl/lib directory even though the libraries have been installed
+in /usr/lib.  We remove it to keep things nice and tidy!</para>
+
+</sect2>
+
Index: general/genlib/openssl/openssl-inst.xml
===================================================================
--- general/genlib/openssl/openssl-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/openssl/openssl-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,21 @@
+<sect2>
+<title>Installation of openssl</title>
+
+<para>Install openssl by running the following commands:</para>
+
+<note><para>GCC issues a warning on every compilation because the Configure 
+command uses -m486 instead of -march=i486.  To fix this behavior, 
+change the definition on line 337 of Configure.  The line begins with "linux-elf". 
+</para></note>
+
+<para><screen><userinput>mv doc/apps/passwd.pod doc/apps/openssl-passwd.pod &amp;&amp;
+./Configure linux-elf  --openssldir=/etc/ssl --prefix=/usr shared &amp;&amp;</userinput>
+<userinput>make MANDIR=/usr/share/man &amp;&amp;</userinput>
+<userinput>make MANDIR=/usr/share/man install &amp;&amp;</userinput>
+<userinput>rmdir /etc/ssl/lib</userinput>
+</screen>
+</para>
+
+
+</sect2>
+
Index: general/genlib/openssl/openssl-intro.xml
===================================================================
--- general/genlib/openssl/openssl-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/openssl/openssl-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,15 @@
+<sect2>
+<title>Introduction to openssl</title>
+
+<screen>Download location:              <ulink url="&openssl-download;"/>
+Version used:                   &openssl-version;
+Package size:                   &openssl-size;
+Estimated Disk space required:  &openssl-buildsize;</screen>
+
+<para>The openssl package contains <userinput>c_rehash</userinput>,
+<userinput>openssl</userinput>, <userinput>libcrypto</userinput> and
+<userinput>libssl</userinput>.  These are useful for providing
+cryptography functions to other packages, notably OpenSSH and web
+browsers (for accessing secure https sites).</para>
+
+</sect2>
Index: general/genlib/openssl/openssl.ent
===================================================================
--- general/genlib/openssl/openssl.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/openssl/openssl.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<!ENTITY openssl SYSTEM "../openssl.xml">
+<!ENTITY openssl-intro SYSTEM "openssl-intro.xml">
+<!ENTITY openssl-inst SYSTEM "openssl-inst.xml">
+<!ENTITY openssl-exp SYSTEM "openssl-exp.xml">
+<!ENTITY openssl-desc SYSTEM "openssl-desc.xml">
+<!ENTITY openssl-config SYSTEM "openssl-config.xml">
+<!ENTITY openssl-buildsize "23 MB">
+<!ENTITY openssl-version "0.9.6d">
+<!ENTITY openssl-download "ftp://ftp.openssl.org/source/openssl-0.9.6d.tar.gz">
+<!ENTITY openssl-size "2.0 MB">
Index: general/genlib/pcre.xml
===================================================================
--- general/genlib/pcre.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/pcre.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<sect1 id="pcre" xreflabel="pcre-&pcre-version;">
+<?dbhtml filename="pcre.html" dir="general"?>
+<title>pcre-&pcre-version;</title>
+
+&pcre-intro;
+&pcre-inst;
+&pcre-config;
+&pcre-desc;
+
+</sect1>
Index: general/genlib/pcre/pcre-config.xml
===================================================================
--- general/genlib/pcre/pcre-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/pcre/pcre-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Configuring pcre</title>
+
+<sect3><title>Configuration Information</title>
+
+&library-config;
+
+</sect3>
+
+</sect2>
+
Index: general/genlib/pcre/pcre-desc.xml
===================================================================
--- general/genlib/pcre/pcre-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/pcre/pcre-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,25 @@
+<sect2>
+<title>Contents</title>
+
+<para>The pcre package contains the <userinput>pcre
+libraries</userinput>, <userinput>pcregrep</userinput>,
+<userinput>pcretest</userinput> and 
+<userinput>pcre-config</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>pcregrep</title>
+<para>pcregrep is a grep that understands perl compatible regular
+expressions.</para></sect3>
+
+<sect3><title>pcretest</title>
+<para>pcretest can test your perl compatible regular expression.</para></sect3>
+
+<sect3><title>pcre-config</title>
+<para>pcre-config is used during the compile process of programs
+linking to this library.</para></sect3>
+
+</sect2>
+
Index: general/genlib/pcre/pcre-inst.xml
===================================================================
--- general/genlib/pcre/pcre-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/pcre/pcre-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of pcre</title>
+
+<para>Install pcre by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
Index: general/genlib/pcre/pcre-intro.xml
===================================================================
--- general/genlib/pcre/pcre-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/pcre/pcre-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,14 @@
+<sect2>
+<title>Introduction to pcre</title>
+
+<screen>Download location:              &pcre-download;
+Version used:                   &pcre-version;
+Package size:                   &pcre-size;
+Estimated Disk space required:  &pcre-buildsize;</screen>
+
+<para>The pcre package contains perl compatible regular expression
+libraries. These are useful for implementing regular expression pattern
+matching using the same syntax and semantics as Perl 5.</para>
+
+
+</sect2>
Index: general/genlib/pcre/pcre.ent
===================================================================
--- general/genlib/pcre/pcre.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/pcre/pcre.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<!ENTITY pcre SYSTEM "../pcre.xml">
+<!ENTITY pcre-intro SYSTEM "pcre-intro.xml">
+<!ENTITY pcre-inst SYSTEM "pcre-inst.xml">
+<!ENTITY pcre-desc SYSTEM "pcre-desc.xml">
+<!ENTITY pcre-config SYSTEM "pcre-config.xml">
+<!ENTITY pcre-buildsize "2.1 MB">
+<!ENTITY pcre-version "3.9">
+<!ENTITY pcre-download "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-3.9.tar.bz2">
+<!ENTITY pcre-size "255 KB">
Index: general/genlib/pcre2.xml
===================================================================
--- general/genlib/pcre2.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,233 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 pcre2-download-http "https://github.com/PCRE2Project/pcre2/releases/download/pcre2-&pcre2-version;/pcre2-&pcre2-version;.tar.bz2">
-  <!ENTITY pcre2-download-ftp  " ">
-  <!ENTITY pcre2-md5sum        "c8e2043cbc4abb80e76dba323f7c409f">
-  <!ENTITY pcre2-size          "1.8 MB">
-  <!ENTITY pcre2-buildsize     "20 MB (with tests)">
-  <!ENTITY pcre2-time          "0.4 SBU (with tests)">
-]>
-
-<sect1 id="pcre2" xreflabel="pcre2-&pcre2-version;">
-  <?dbhtml filename="pcre2.html"?>
-
-
-  <title>PCRE2-&pcre2-version;</title>
-
-  <indexterm zone="pcre2">
-    <primary sortas="a-pcre2">PCRE2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to PCRE2</title>
-
-    <para>
-      The <application>PCRE2</application> package contains a new generation of
-      the <application>Perl Compatible Regular Expression</application>
-      libraries. These are useful for implementing regular expression pattern
-      matching using the same syntax and semantics as <application>Perl</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&pcre2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&pcre2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &pcre2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &pcre2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &pcre2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &pcre2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">PCRE2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="valgrind"/> and
-      <ulink url="https://thrysoee.dk/editline/">libedit</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of PCRE2</title>
-
-    <para>
-      Install <application>PCRE2</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr                       \
-            --docdir=/usr/share/doc/pcre2-&pcre2-version; \
-            --enable-unicode                    \
-            --enable-jit                        \
-            --enable-pcre2-16                   \
-            --enable-pcre2-32                   \
-            --enable-pcre2grep-libz             \
-            --enable-pcre2grep-libbz2           \
-            --enable-pcre2test-libreadline      \
-            --disable-static                    &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-unicode</parameter>: This switch enables Unicode
-      support and includes the functions for handling UTF-8/16/32 character
-      strings in the library.
-    </para>
-
-    <para>
-      <parameter>--enable-pcre2-16</parameter>: This switch enables 16 bit
-      character support.
-    </para>
-
-    <para>
-      <parameter>--enable-pcre2-32</parameter>: This switch enables 32 bit
-      character support.
-    </para>
-
-    <para>
-      <parameter>--enable-pcre2grep-libz</parameter>: This switch adds support
-      for reading .gz compressed files to <application>pcre2grep</application>.
-    </para>
-
-    <para>
-      <parameter>--enable-pcre2grep-libbz2</parameter>: This switch adds
-      support for reading .bz2 compressed files to
-      <application>pcre2grep</application>.
-    </para>
-
-    <para>
-      <parameter>--enable-pcre2test-libreadline</parameter>: This switch adds
-      line editing and history features to the
-      <application>pcre2test</application> program.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <parameter>--enable-jit</parameter>: this option enables Just-in-time
-      compiling, which can greatly speed up pattern matching.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          pcre2-config,
-          pcre2grep,
-          and pcre2test.
-        </seg>
-        <seg>
-          libpcre2-8.so,
-          libpcre2-16.so,
-          libpcre2-32.so,
-          and libpcre2-posix.so
-        </seg>
-        <seg>
-          /usr/share/doc/pcre2-&pcre2-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pcre2grep">
-        <term><command>pcre2grep</command></term>
-        <listitem>
-          <para>
-            is a version of <application>grep</application>
-            that understands
-            <application>Perl compatible regular expressions.</application>
-          </para>
-          <indexterm zone="pcre2 pcre2grep">
-            <primary sortas="b-pcre2grep">pcre2grep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pcre2test">
-        <term><command>pcre2test</command></term>
-        <listitem>
-          <para>
-            can test a
-            <application>Perl compatible regular expression.</application>
-          </para>
-          <indexterm zone="pcre2 pcre2test">
-            <primary sortas="b-pcre2test">pcre2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pcre2-config">
-        <term><command>pcre2-config</command></term>
-        <listitem>
-          <para>
-            outputs compilation information to programs linking against the
-            <application>PCRE2</application> libraries
-          </para>
-          <indexterm zone="pcre2 pcre2-config">
-            <primary sortas="b-pcre2-config">pcre2-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/popt.xml
===================================================================
--- general/genlib/popt.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ general/genlib/popt.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,173 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
+<sect1 id="popt" xreflabel="popt">
+<?dbhtml filename="popt.html" dir="general"?>
+<title>popt</title>
 
-  <!ENTITY popt-download-http "http://ftp.rpm.org/popt/releases/popt-1.x/popt-&popt-version;.tar.gz">
-  <!ENTITY popt-download-ftp  " ">
-  <!ENTITY popt-md5sum        "eaa2135fddb6eb03f2c87ee1823e5a78">
-  <!ENTITY popt-size          "584 KB">
-  <!ENTITY popt-buildsize     "6.9 MB (includes installing documentation and tests)">
-  <!ENTITY popt-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="popt" xreflabel="popt-&popt-version;">
-  <?dbhtml filename="popt.html"?>
-
-
-  <title>Popt-&popt-version;</title>
-
-  <indexterm zone="popt">
-    <primary sortas="a-Popt">Popt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Popt</title>
-
-    <para>
-      The <application>popt</application> package contains the
-      <application>popt</application> libraries which are used by
-      some programs to parse command-line options.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&popt-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&popt-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &popt-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &popt-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &popt-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &popt-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">popt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> (for generating documentation)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Popt</title>
-
-    <para>
-      Install <application>popt</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have <xref linkend="doxygen"/> installed and wish to build
-      the API documentation, issue:
-    </para>
-
-<screen remap="doc"><userinput>sed -i 's@\./@src/@' Doxyfile &amp;&amp;
-doxygen</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you built the API documentation, install it using the following
-      commands issued by the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -v -m755 -d /usr/share/doc/popt-&popt-version; &amp;&amp;
-install -v -m644 doxygen/html/* /usr/share/doc/popt-&popt-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <!-- FIXME Removed due to merged-/usr changes
-    <para>
-      <command>mv /usr/lib/libpopt.so.* /lib</command> and
-      <command>ln -sfv ...</command>: Moves the popt library on the root
-      filesystem, so it is available in case
-      <systemitem class="filesystem">/usr</systemitem> is offline and
-      <xref linkend="efibootmgr"/> is installed and linked to popt.
-    </para>
-    -->
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libpopt.so</seg>
-        <seg>/usr/share/doc/popt-&popt-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libpopt">
-      <term><filename class="libraryfile">libpopt.so</filename></term>
-      <listitem>
-        <para>
-          is used to parse command-line options
-        </para>
-        <indexterm zone="popt libpopt">
-          <primary sortas="c-libpopt">libpopt.so</primary>
-        </indexterm>
-      </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
+<para>TO BE DONE</para>
 
 </sect1>
Index: general/genlib/popt/popt.ent
===================================================================
--- general/genlib/popt/popt.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/popt/popt.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY popt SYSTEM "../popt.xml">
Index: general/genlib/protobuf-c.xml
===================================================================
--- general/genlib/protobuf-c.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,178 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 protobuf-c-download-http "https://github.com/protobuf-c/protobuf-c/releases/download/v&protobuf-c-version;/protobuf-c-&protobuf-c-version;.tar.gz">
-  <!ENTITY protobuf-c-md5sum        "03030a3994b9f89ef166336048992484">
-  <!ENTITY protobuf-c-size          "496 KB">
-  <!ENTITY protobuf-c-buildsize     "60 MB">
-  <!ENTITY protobuf-c-time          "0.6 SBU">
-]>
-
-<sect1 id="protobuf-c" xreflabel="Protobuf-c-&protobuf-c-version;">
-  <?dbhtml filename="protobuf-c.html"?>
-
-  <title>Protobuf-c-&protobuf-c-version;</title>
-
-  <indexterm zone="protobuf-c">
-    <primary sortas="a-protobuf-c">Protobuf-c</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Protobuf-c</title>
-
-    <para>
-      The <application>Protobuf-c</application> package contains an
-      implementation of the Google Protocol Buffers data serialization format
-      in C.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&protobuf-c-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &protobuf-c-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &protobuf-c-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &protobuf-c-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &protobuf-c-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/protobuf-c-&protobuf-c-version;-consolidated_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Protobuf-c Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="protobuf"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Protobuf-c</title>
-
-    <para>
-      First, apply some upstream fixes to make this package compatible 
-      with protobuf-26.1:
-    </para>
-
-    <screen role="pre"><userinput>patch -Np1 -i ../protobuf-c-&protobuf-c-version;-consolidated_fixes-1.patch</userinput></screen>
-
-    <para>
-      Install <application>Protobuf-c</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          protoc-gen-c and protoc-c (symlinked to protoc-gen-c)
-        </seg>
-        <seg>
-          libprotobuf-c.so
-        </seg>
-        <seg>
-          /usr/include/google and
-          /usr/include/protobuf-c
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="protoc-c">
-        <term><command>protoc-c</command></term>
-        <listitem>
-          <para>
-            generates C descriptor code from a .proto file
-          </para>
-          <indexterm zone="protobuf-c protoc-c">
-            <primary sortas="b-protoc-c">protoc-c</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libprotobuf-c">
-        <term><filename class="libraryfile">libprotobuf-c.so</filename></term>
-        <listitem>
-          <para>
-            contains a C implementation of the Google Protocol Buffers data
-            serialization format
-          </para>
-          <indexterm zone="protobuf-c libprotobuf-c">
-            <primary sortas="c-libprotobuf-c">libprotobuf-c.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: general/genlib/protobuf.xml
===================================================================
--- general/genlib/protobuf.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,234 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 protobuf-download-http "https://github.com/protocolbuffers/protobuf/releases/download/v&protobuf-version;/protobuf-&protobuf-version;.tar.gz">
-  <!ENTITY protobuf-md5sum        "6ad6edec05fd08477a442db77dbebf98">
-  <!ENTITY protobuf-size          "5.7 MB">
-  <!ENTITY protobuf-buildsize     "89 MB">
-  <!ENTITY protobuf-time          "1.3 SBU (with parallelism=4)">
-]>
-
-<sect1 id="protobuf" xreflabel="Protobuf-&protobuf-version;">
-  <?dbhtml filename="protobuf.html"?>
-
-  <title>Protobuf-&protobuf-version;</title>
-
-  <indexterm zone="protobuf">
-    <primary sortas="a-protobuf">Protobuf</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Protobuf</title>
-
-    <para>
-      The <application>Protobuf</application> package contains utilities and
-      libraries for using data in Google's data interchange format.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&protobuf-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &protobuf-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &protobuf-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &protobuf-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &protobuf-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Protobuf Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="abseil-cpp"/> and
-      <xref linkend="cmake"/>
-    </para>
-    
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://github.com/google/googletest">gtest (for tests)</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Protobuf</title>
-
-    <para>
-      Install <application>Protobuf</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr      \
-      -DCMAKE_BUILD_TYPE=Release       \
-      -Dprotobuf_BUILD_TESTS=OFF       \
-      -Dprotobuf_ABSL_PROVIDER=package \
-      -Dprotobuf_BUILD_SHARED_LIBS=ON  \
-      -Dutf8_range_ENABLE_INSTALL=OFF  \
-      -G Ninja ..                      &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package does come with a test suite, but it requires
-      <ulink url="https://github.com/google/googletest">gtest</ulink>, which
-      is not part of BLFS.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>sed 's/utf8_range//' -i *.pc &amp;&amp;
-ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed 's/utf8_range//' -i *.pc</command>: This command removes a
-      leftover reference to libutf8_range from the pkg-config files installed
-      by this package.
-    </para>
-
-    <para>
-      <parameter>-Dprotobuf_BUILD_TESTS=OFF</parameter>: This parameter prevents
-      the tests from being built because
-      <ulink url="https://github.com/google/googletest">gtest</ulink> is not
-      part of BLFS.
-    </para>
-
-    <para>
-      <parameter>-Dprotobuf_ABSL_PROVIDER=package</parameter>: This parameter
-      allows the build system to use the system-installed copy of
-      <xref linkend="abseil-cpp" role="nodep"/>.
-    </para>
-
-    <para>
-      <parameter>-Dprotobuf_BUILD_SHARED_LIBS=ON</parameter>: This parameter
-      enables building shared versions of the libraries provided by this package
-      instead of static versions.
-    </para>
-
-    <para>
-      <parameter>-Dutf8_range_ENABLE_INSTALL=OFF</parameter>: This parameter
-      disables installing the utf8_range static library.  The functions
-      provided by this library and used by protobuf is already embedded into
-      <filename class='libraryfile'>libprotobuf.so</filename>, so installing
-      a full copy of the static library is just wasting the disk space.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          protoc-26.1.0 and protoc (a symlink to protoc-26.1.0)
-        </seg>
-        <seg>
-          libprotobuf.so,
-          libprotobuf-lite.so, and
-          libprotoc.so
-        </seg>
-        <seg>
-          /usr/include/google,
-          /usr/include/java,
-          /usr/include/upb_generator, and
-          /usr/lib/cmake/protobuf
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="protoc">
-        <term><command>protoc</command></term>
-        <listitem>
-          <para>
-            parses protocol buffer files and generates output for several
-            programming languages and formats
-          </para>
-          <indexterm zone="protobuf protoc">
-            <primary sortas="b-protoc">protoc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libprotobuf">
-        <term><filename class="libraryfile">libprotobuf.so</filename></term>
-        <listitem>
-          <para>
-            contains functions for utilizing data in Google's data interchange
-            format
-          </para>
-          <indexterm zone="protobuf libprotobuf">
-            <primary sortas="c-libprotobuf">libprotobuf.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libprotobuf-lite">
-        <term><filename class="libraryfile">libprotobuf-lite.so</filename></term>
-        <listitem>
-          <para>
-            contains a simpler version of the functions for utilizing data in
-            Google's data interchange format
-          </para>
-          <indexterm zone="protobuf libprotobuf-lite">
-            <primary sortas="c-libprotobuf-lite">libprotobuf-lite.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libprotoc">
-        <term><filename class="libraryfile">libprotoc.so</filename></term>
-        <listitem>
-          <para>
-            contains functions used by protoc at runtime for outputting data
-            for several programming languages and formats
-          </para>
-          <indexterm zone="protobuf libprotoc">
-            <primary sortas="c-libprotoc">libprotoc.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: general/genlib/qca.xml
===================================================================
--- general/genlib/qca.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,240 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 qca-download-http "https://download.kde.org/stable/qca/&qca-version;/qca-&qca-version;.tar.xz">
-  <!ENTITY qca-download-ftp  " ">
-  <!ENTITY qca-md5sum        "4c6348286c170b3da24820c977565d75">
-  <!ENTITY qca-size          "744 KB">
-  <!ENTITY qca-buildsize     "42 MB">
-  <!ENTITY qca-time          "0.5 SBU (using parallelism=4; add 0.1 SBU for tests)">
-]>
-
-<sect1 id="qca" xreflabel="qca-&qca-version;">
-  <?dbhtml filename="qca.html"?>
-
-
-  <title>Qca-&qca-version;</title>
-
-  <indexterm zone="qca">
-    <primary sortas="a-qca">qca</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Qca</title>
-
-    <para>
-      <application>Qca</application> aims to provide a straightforward and
-      cross-platform crypto API, using <application>Qt</application> datatypes
-      and conventions. <application>Qca</application> separates the API from
-      the implementation, using plugins known as Providers.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qca-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qca-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qca-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qca-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &qca-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qca-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/qca-&qca-version;-openssl-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Qca Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="make-ca"/>,
-    <xref linkend="cmake"/>,
-    <xref linkend="qt6"/>, and
-    <xref linkend="which"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="Optional">
-    <xref linkend="cyrus-sasl"/>,
-    <xref linkend="gnupg2"/>,
-    <xref linkend="libgcrypt"/>,
-    <xref linkend="libgpg-error"/>,
-    <xref linkend="nss"/>,
-    <xref linkend="nspr"/>,
-    <xref linkend="p11-kit"/>,
-    <xref linkend="doxygen"/>,
-    <xref linkend="which"/>, and
-    <ulink url="https://botan.randombit.net/">Botan</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Qca</title>
-
-    <para>
-      Fix the location of the CA certificates:
-    </para>
-
-<screen><userinput>sed -i 's@cert.pem@certs/ca-bundle.crt@' CMakeLists.txt</userinput></screen>
-
-    <para>
-      Install <application>Qca</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=$QT6DIR            \
-      -DCMAKE_BUILD_TYPE=Release                \
-      -DQT6=ON                                  \
-      -DQCA_MAN_INSTALL_DIR:PATH=/usr/share/man \
-      .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue <command>make test</command>. <!--One test
-      using <xref linkend="gnupg2"/> fails without a correct passphrase.  The
-      required passphrase does not seem to be published.-->
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is
-      used to apply a higher level of compiler optimizations.
-    </para>
-
-    <para>
-      <parameter>-DQT6=ON</parameter>:
-      Ensure the packages is built with <xref linkend="qt6"/>.
-    </para>
-
-    <para>
-      <parameter>-DQCA_MAN_INSTALL_DIR:PATH=/usr/share/man</parameter>:
-      Install the qca man page in the normal location.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>mozcerts-qt6 and qcatool-qt6</seg>
-        <seg>
-          libqca-qt6.so,
-          libqca-cyrus-sasl.so,
-          libqca-gcrypt.so,
-          libqca-gnupg.so,
-          libqca-logger.so,
-          libqca-nss.so,
-          libqca-ossl.so, and
-          libqca-softstore.so
-        </seg>
-        <seg>
-          &qt6-dir;/include/Qca-qt6,
-          &qt6-dir;/lib/cmake/Qca-qt6, and
-          &qt6-dir;/lib/qca-qt6
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mozcerts">
-        <term><command>mozcerts-qt6</command></term>
-        <listitem>
-          <para>
-            is a command line tool for converting certdata.txt into
-            outfile.pem files
-          </para>
-          <indexterm zone="qca mozcerts">
-            <primary sortas="b-mozcerts">mozcerts-qt6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qcatool">
-        <term><command>qcatool-qt6</command></term>
-        <listitem>
-          <para>
-            is a command line tool for performing various cryptographic
-            operations with Qca
-          </para>
-          <indexterm zone="qca qcatool">
-            <primary sortas="b-qcatool">qcatool-qt6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libqca">
-        <term><filename class="libraryfile">libqca-qt6.so</filename></term>
-        <listitem>
-          <para>
-            is the Qt Cryptography Architecture (Qca) library
-          </para>
-          <indexterm zone="qca libqca">
-            <primary sortas="c-libqca">libqca-qt6.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/qcoro.xml
===================================================================
--- general/genlib/qcoro.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,192 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 qcoro-download-http "https://github.com/danvratil/qcoro/archive/v&qcoro-version;/qcoro-&qcoro-version;.tar.gz">
-  <!ENTITY qcoro-download-ftp  " ">
-  <!ENTITY qcoro-md5sum        "2af4e86cd77493cd41ba5ffcac33d5f4">
-  <!ENTITY qcoro-size          "148 KB">
-  <!ENTITY qcoro-buildsize     "8.4 MB (Add 19 MB for tests)">
-  <!ENTITY qcoro-time          "0.4 SBU (Add 0.5 SBU for tests)">
-]>
-
-<sect1 id="qcoro" xreflabel="qcoro-&qcoro-version;">
-  <?dbhtml filename="qcoro.html"?>
-
-  <title>qcoro-&qcoro-version;</title>
-
-  <indexterm zone="qcoro">
-    <primary sortas="b-qcoro">qcoro</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to qcoro</title>
-
-    <para>
-      This package provides a set of tools to make use of C++20 coroutines with Qt.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qcoro-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qcoro-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qcoro-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qcoro-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &qcoro-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qcoro-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">qcoro Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="qt6"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of qcoro</title>
-
-    <para>
-      Install <application>qcoro</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=$QT6DIR \
-      -D CMAKE_BUILD_TYPE=Release     \
-      -D BUILD_TESTING=OFF            \
-      -D QCORO_BUILD_EXAMPLES=OFF     \
-      -D BUILD_SHARED_LIBS=ON         \
-       ..                             &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test this package, remove the 'BUILD_TESTING=OFF' parameter
-      above and run:
-    </para>
-
-<screen><userinput>make test</userinput></screen>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is
-      used to apply a higher level of compiler optimizations.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>
-          libQCoro6Core.so,
-          libQCoro6DBus.so,
-          libQCoro6Network.so,
-          libQCoro6Qml.so,
-          libQCoro6Quick.so, and
-          libQCoro6WebSockets.so
-        </seg>
-        <seg>
-          Nine directories in $QT6DIR/lib/cmake/ and 
-          $QT6DIR/include/qcoro6
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mozcerts">
-        <term><command>mozcerts-qt6</command></term>
-        <listitem>
-          <para>
-            is a command line tool for converting certdata.txt into
-            outfile.pem files
-          </para>
-          <indexterm zone="qcoro mozcerts">
-            <primary sortas="b-mozcerts">mozcerts-qt6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qcorotool">
-        <term><command>qcorotool-qt6</command></term>
-        <listitem>
-          <para>
-            is a command line tool for performing various cryptographic
-            operations with qcoro
-          </para>
-          <indexterm zone="qcoro qcorotool">
-            <primary sortas="b-qcorotool">qcorotool-qt6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libqcoro">
-        <term><filename class="libraryfile">libqcoro-qt6.so</filename></term>
-        <listitem>
-          <para>
-            is the Qt Cryptography Architecture (qcoro) library
-          </para>
-          <indexterm zone="qcoro libqcoro">
-            <primary sortas="c-libqcoro">libqcoro-qt6.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
-  </sect2>
-
-</sect1>
Index: general/genlib/slang.xml
===================================================================
--- general/genlib/slang.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/slang.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,7 @@
+<sect1 id="slang" xreflabel="slang">
+<?dbhtml filename="slang.html" dir="general"?>
+<title>slang</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
Index: general/genlib/slang/slang.ent
===================================================================
--- general/genlib/slang/slang.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/slang/slang.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY slang SYSTEM "../slang.xml">
Index: general/genlib/spidermonkey.xml
===================================================================
--- general/genlib/spidermonkey.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,425 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 spidermonkey-download-http "&mozilla-http;/firefox/releases/&spidermonkey-version;esr/source/firefox-&spidermonkey-version;esr.source.tar.xz">
-  <!ENTITY spidermonkey-download-ftp  " ">
-  <!ENTITY spidermonkey-md5sum        "150ac3fe6200f01879148ef32c5dd16f">
-  <!ENTITY spidermonkey-size          "484 MB">
-  <!ENTITY spidermonkey-buildsize     "3.6 GB (40 MB installed after removing 36MB static lib; add 34 MB for the main tests and 37 MB for the jit tests)">
-  <!ENTITY spidermonkey-time          "1.9 SBU (with parallelism=4; add 1.1 SBU for the main tests and 3.7 SBU for the jit tests)">
-]>
-
-<sect1 id="spidermonkey" xreflabel="SpiderMonkey from Firefox-&spidermonkey-version;">
-  <?dbhtml filename="spidermonkey.html"?>
-
-
-  <title>SpiderMonkey from firefox-&spidermonkey-version;</title>
-
-  <indexterm zone="spidermonkey">
-    <primary sortas="a-spidermonkey">SpiderMonkey</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to SpiderMonkey</title>
-
-    <para>
-      <application>SpiderMonkey</application> is Mozilla's JavaScript and
-      WebAssembly Engine, written in C++ and Rust.
-      In BLFS, the source code of SpiderMonkey is taken from Firefox.
-    </para>
-
-    <!-- To editors: make sure polkit works with mozjs when
-         tagging SpiderMonkey or upgrading it to a new major version.  -->
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&spidermonkey-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&spidermonkey-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &spidermonkey-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &spidermonkey-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &spidermonkey-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &spidermonkey-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/js-&JS91-version;-python_3_10-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">SpiderMonkey Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="icu"/>,
-      <xref linkend="rust"/>,
-      <xref linkend="six"/>, and
-      <xref linkend="which"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <!-- If clang is installed, it will be used instead of gcc.
-           gcc does not work for 32-bit system w/o -msse2 -mfpmath=sse:
-           https://bugzilla.mozilla.org/show_bug.cgi?id=1729459 -->
-      <xref linkend="llvm"/> (with <application>Clang</application>,
-      required for 32-bit systems without SSE2 capabilities)
-    </para>
-
-    <important>
-      <para>
-        If you are building this package on a 32-bit system, and Clang
-        is not installed or you're overriding the default compiler choice
-        with the environment variable <envar>CXX</envar>, please read the
-        Command Explanations section first.
-      </para>
-    </important>
-
-    <!-- It seems nasm is only used for aarch64-win64. -->
-    <!--bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="nasm"/>
-    </para-->
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of SpiderMonkey</title>
-
-    <note>
-      <para>
-        Unlike most other packages in BLFS, the instructions below require
-        you to untar
-        <filename>firefox-&spidermonkey-version;esr.tar.xz</filename> and
-        change into the <filename>firefox-&spidermonkey-version;</filename>
-        folder.
-      </para>
-
-      <para>
-        Extracting the tarball
-        will reset the permissions of the current directory to 0755 if you
-        have permission to do that. If you do this in a directory where
-        the sticky bit is set, such
-        as <filename class="directory">/tmp</filename> it will end with error
-        messages:
-      </para>
-
-<literallayout>tar: .: Cannot utime: Operation not permitted
-tar: .: Cannot change mode to rwxr-xr-t: Operation not permitted
-tar: Exiting with failure status due to previous errors
-</literallayout>
-
-      <para>
-        This does finish with non-zero status, but it does
-        <emphasis>NOT</emphasis> mean there is a real problem.
-        Do not untar as the <systemitem class="username">root</systemitem> user
-        in a directory where the sticky bit is set - that will unset it.
-      </para>
-
-    </note>
-
-    <para>
-      The building system ships several internal copies of the Python 3
-      module <filename>six.py</filename>.  The shipped copies are too old
-      to work well with Python 3.12 or later.  Replace them with the
-      symlinks to <xref linkend='six'/> already installed on the system:
-    </para>
-
-<screen><userinput>for i in $(find -name six.py); do
-  ln -sfv /usr/lib/python&python3-majorver;/site-packages/six.py $i;
-done</userinput></screen>
-
-    <para>
-      Install <application>SpiderMonkey</application> by running the following
-      commands:
-    </para>
-
-    <note>
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-         href="../../xincludes/mozshm.xml"/>
-      <para>
-        Compiling the C++ code respects $MAKEFLAGS and defaults to 'j1',
-        the rust code will use all processors.
-      </para>
-    </note>
-
-<screen><userinput>mkdir obj &amp;&amp;
-cd    obj &amp;&amp;
-
-../js/src/configure --prefix=/usr            \
-                    --disable-debug-symbols  \
-                    --disable-jemalloc       \
-                    --enable-readline        \
-                    --enable-rust-simd       \
-                    --with-intl-api          \
-                    --with-system-icu        \
-                    --with-system-zlib       &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To run the SpiderMonkey test suite, issue:
-      <command>make -C js/src check-jstests
-      JSTESTS_EXTRA_ARGS="--timeout 300 --wpt=disabled"</command>.
-      It's recommended to redirect the output into a log.
-      <!-- recheck when ICU gets upgraded -->
-      Because we are building with system ICU, 39 tests
-      (out of a total of more than 50,000) are known to fail.
-      The test suite is executed with all CPU cores available: even in a
-      cgroup with less cores assigned, it still attempts to spawn as many
-      testing jobs as the number of <emphasis>all</emphasis> cores in the
-      system; fortunately the kernel still won't run these jobs on cores
-      not assigned to the cgroup so the CPU usage is still controlled.
-    </para>
-    <para>
-      To run the JIT test suite, issue: <command>make -C js/src
-      check-jit-test JITTEST_EXTRA_ARGS="--timeout 300"</command>.
-      Like the SpiderMonkey test suite, the number of test jobs is same as
-      the number of all CPU cores in the system even if a cgroup is used. To
-      make things worse, there are six tests each of them will use 3 GB
-      of system memory, so the peak memory usage may be up to 18 GB if the
-      number of cores is six or more.  Running the JIT test suite without
-      enough memory may invoke the kernel OOM killer and cause stability
-      issues.  If you don't have enough system memory available, append
-      <option>-jN</option> after <option>--timeout 300</option> with N
-      replaced by the number of parallel test jobs you want to start.  For
-      example, if you have 16 GB system memory available and 8 CPU cores,
-      issue <command>make -C js/src check-jit-test
-      JITTEST_EXTRA_ARGS="--timeout=300 -j5"</command> to run the test with
-      5 parallel jobs so the memory usage won't exceed 15 GB.
-      <!-- TL;DR: DO NOT REMOVE MEMORY USAGE NOTE W/O MY CONFIRMATION!
-
-           "six tests": bug1782468-ptrdiff-veclen.js, it's ran with 6
-           different configurations.
-
-           "may": this is stochasitic (like all parallelization issue),
-           don't remove the note about memory usage simply because "I cannot
-           reproduce it".
-
-           "peak": the time period using so much memory is very short, so
-           don't just watch the output of "top" or "free" with eyesight.
-           Run the test in a cgroup and read the "memory.peak" psuedo file
-           for a proper measurement.
-
-           Q: Why not just document some test failures?
-           A: This *really* can cause stability issue because the kernel
-              may OOM kill another process if the test is not ran in a
-              cgroup with memory.max set.  Even if running it in a cgroup,
-              the kernel may still OOM kill the "main" process controlling
-              the test process instead of a single test job, causing a
-              incomplete test.
-
-                                                                 - xry111
-      -->
-    </para>
-
-    <caution>
-      <para>
-        An issue in the installation process causes any running program which
-        links to SpiderMonkey shared library (for example, GNOME Shell) to
-        crash if SpiderMonkey is reinstalled, or upgraded or downgraded
-        without a change of the major version number
-        (&spidermonkey-major; in &spidermonkey-version;).  To work around
-        this issue, remove the old version of the SpiderMonkey shared
-        library before installation:
-      </para>
-
-<screen role="root"><userinput>rm -fv /usr/lib/libmozjs-&spidermonkey-major;.so</userinput></screen>
-    </caution>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-rm -v /usr/lib/libjs_static.ajs &amp;&amp;
-sed -i '/@NSPR_CFLAGS@/d' /usr/bin/js&spidermonkey-major;-config</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-debug-symbols</parameter>: Don't generate debug
-      symbols since they are very large and most users won't need it. Remove
-      it if you want to debug SpiderMonkey.
-    </para>
-
-    <para>
-      <parameter>--disable-jemalloc</parameter>: This switch disables the
-      internal memory allocator used in SpiderMonkey. jemalloc is only
-      intended for the Firefox browser environment. For other applications
-      using SpiderMonkey, the application may crash as items allocated in
-      the jemalloc allocator are freed on the system (glibc) allocator.
-    </para>
-
-    <para>
-      <parameter>--enable-readline</parameter>: This switch enables Readline
-      support in the SpiderMonkey command line interface.
-    </para>
-
-    <para>
-      <parameter>--enable-rust-simd</parameter>: This switch enables SIMD
-      optimization in the shipped encoding_rs crate.
-    </para>
-
-    <para>
-      <parameter>--with-intl-api</parameter>: This enables the
-      internationalization functions required by
-      <application>Gjs</application>.
-    </para>
-
-    <para>
-      <parameter>--with-system-*</parameter>: These parameters allow the build system
-      to use system versions of the above libraries. These are required for
-      stability.
-    </para>
-
-    <para>
-      <command>rm -v /usr/lib/libjs_static.ajs</command>: Remove a large
-      static library which is not used by any BLFS package.
-    </para>
-
-    <para>
-      <command>sed -i '/@NSPR_CFLAGS@/d'
-      /usr/bin/js&spidermonkey-major;-config</command>:
-      Prevent <command>js&spidermonkey-major;-config</command> from using
-      buggy CFLAGS.
-    </para>
-
-    <para>
-      <option><envar>CC=gcc CXX=g++</envar></option>: BLFS used to
-      prefer to use gcc and g++ instead of upstream's defaults of the
-      <application>clang</application> programs. With the release of
-      gcc-12 the build takes longer with gcc and g++, primarily because
-      of extra warnings, and is bigger. Pass these environment variables
-      to the configure script if you wish to continue to use gcc, g++
-      (by exporting them and unset them after the installation, or simply
-      prepending them before the
-      <command>../js/src/configure</command> command).  If you are
-      building on a 32-bit system, also see below.
-    </para>
-
-    <para>
-      <option><envar>CXXFLAGS="-msse2 -mfpmath=sse"</envar></option>:
-      Use SSE2 instead of 387 for double-precision floating-point
-      operations.  It's needed by GCC to satisfy the expectations of
-      upstream (Mozilla) developers with floating-point arithmetic.
-      Use it if you are building this package on a 32-bit system with
-      GCC (if Clang is not installed or GCC is explicitly specified).
-      Note that this will cause SpiderMonkey to crash on a processor without
-      SSE2 capability.  If you are running the system on such an old
-      processor, Clang is strictly needed.  This setting is not needed on
-      64-bit systems because all 64-bit x86 processors support SSE2 and the
-      64-bit compilers (both Clang and GCC) use SSE2 by default.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          js&spidermonkey-major; and js&spidermonkey-major;-config
-        </seg>
-        <seg>
-          libmozjs-&spidermonkey-major;.so
-        </seg>
-        <seg>
-          /usr/include/mozjs-&spidermonkey-major;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="js&spidermonkey-major;">
-        <term><command>js&spidermonkey-major;</command></term>
-        <listitem>
-          <para>
-            provides a command line interface to the
-            <application>JavaScript</application> engine
-          </para>
-          <indexterm zone="spidermonkey js&spidermonkey-major;">
-            <primary sortas="b-js&spidermonkey-major;">
-              js&spidermonkey-major;
-            </primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="js&spidermonkey-major;-config">
-        <term><command>js&spidermonkey-major;-config</command></term>
-        <listitem>
-          <para>
-            is used to find the SpiderMonkey compiler and linker flags
-          </para>
-          <indexterm zone="spidermonkey js&spidermonkey-major;-config">
-            <primary sortas="b-js&spidermonkey-major;-config">i
-              js&spidermonkey-major;-config
-            </primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmozjs-&spidermonkey-major;">
-        <term>
-          <filename class="libraryfile">
-            libmozjs-&spidermonkey-major;.so
-          </filename>
-        </term>
-        <listitem>
-          <para>
-            contains the Mozilla JavaScript API functions
-          </para>
-          <indexterm zone="spidermonkey libmozjs-&spidermonkey-major;">
-            <primary sortas="c-libmozjs&spidermonkey-major;">
-              libmozjs-&spidermonkey-major;.so
-            </primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/genlib/spirv-headers.xml
===================================================================
--- general/genlib/spirv-headers.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,138 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 spirv-headers-download-http "https://github.com/KhronosGroup/SPIRV-Headers/archive/vulkan-sdk-&spirv-headers-version;/SPIRV-Headers-&spirv-headers-version;.tar.gz">
-  <!ENTITY spirv-headers-download-ftp  " ">
-  <!ENTITY spirv-headers-md5sum        "438892138fe25c123cdacd05eb4a4b17">
-  <!ENTITY spirv-headers-size          "464 KB">
-  <!ENTITY spirv-headers-buildsize     "3.7 MB">
-  <!ENTITY spirv-headers-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="spirv-headers" xreflabel="SPIRV-Headers-&spirv-headers-version;">
-  <?dbhtml filename="spirv-headers.html"?>
-
-  <title>SPIRV-Headers-&spirv-headers-version;</title>
-
-  <indexterm zone="spirv-headers">
-    <primary sortas="a-spirv-headers">SPIRV-Headers</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to SPIRV-Headers</title>
-
-    <para>
-      The <application>SPIRV-Headers</application> package contains headers
-      that allow for applications to the SPIR-V language and instruction set
-      with Vulkan. SPIR-V is a binary intermediate language for representing
-      graphical shader stages and compute kernels for multiple Khronos APIs,
-      including OpenGL and Vulkan.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&spirv-headers-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&spirv-headers-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &spirv-headers-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &spirv-headers-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &spirv-headers-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &spirv-headers-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">SPIRV-Headers Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of SPIRV-Headers</title>
-
-    <note>
-      <para>
-        This tarball
-        <filename>SPIRV-Headers-&spirv-headers-version;.tar.gz</filename> will
-        extract to the directory
-        <filename class="directory">SPIRV-Headers-vulkan-sdk-&spirv-headers-version;</filename>.
-      </para>
-    </note>
-
-    <para>
-      Install <application>SPIRV-Headers</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr -G Ninja .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/include/spirv and
-          /usr/share/cmake/SPIRV-Headers
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-</sect1>
Index: general/genlib/spirv-tools.xml
===================================================================
--- general/genlib/spirv-tools.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,321 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 spirv-tools-download-http "https://github.com/KhronosGroup/SPIRV-Tools/archive/vulkan-sdk-&spirv-tools-version;/SPIRV-Tools-&spirv-tools-version;.tar.gz">
-  <!ENTITY spirv-tools-download-ftp  " ">
-  <!ENTITY spirv-tools-md5sum        "d55af678b61667313d478db9399c09d4">
-  <!ENTITY spirv-tools-size          "3.0 MB">
-  <!ENTITY spirv-tools-buildsize     "59 MB">
-  <!ENTITY spirv-tools-time          "0.9 SBU (with tests; both using parallelism=8)">
-]>
-
-<sect1 id="spirv-tools" xreflabel="SPIRV-Tools-&spirv-tools-version;">
-  <?dbhtml filename="spirv-tools.html"?>
-
-  <title>SPIRV-Tools-&spirv-tools-version;</title>
-
-  <indexterm zone="spirv-tools">
-    <primary sortas="a-spirv-tools">SPIRV-Tools</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to SPIRV-Tools</title>
-
-    <para>
-      The <application>SPIRV-Tools</application> package contains libraries
-      and utilities for processing SPIR-V modules.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&spirv-tools-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&spirv-tools-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &spirv-tools-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &spirv-tools-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &spirv-tools-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &spirv-tools-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">SPIRV-Tools Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/> and
-      <xref linkend="spirv-headers"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of SPIRV-Tools</title>
-
-    <note>
-      <para>
-        This tarball
-        <filename>SPIRV-Tools-&spirv-tools-version;.tar.gz</filename> will
-        extract to the directory
-        <filename class="directory">SPIRV-Tools-vulkan-sdk-&spirv-tools-version;</filename>.
-      </para>
-    </note>
-
-    <para>
-      Install <application>SPIRV-Tools</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr     \
-      -DCMAKE_BUILD_TYPE=Release      \
-      -DSPIRV_WERROR=OFF              \
-      -DBUILD_SHARED_LIBS=ON          \
-      -DSPIRV_TOOLS_BUILD_STATIC=OFF  \
-      -DSPIRV-Headers_SOURCE_DIR=/usr \
-      -G Ninja .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DSPIRV_WERROR=OFF</parameter>: This switch stops the build
-      system from treating warnings as errors.
-    </para>
-
-    <para>
-      <parameter>-DBUILD_SHARED_LIBS=ON</parameter>: This switch forces the
-      build system to install shared libraries instead of static libraries.
-    </para>
-    
-    <para>
-      <parameter>-DSPIRV_TOOLS_BUILD_STATIC=OFF</parameter>: This switch
-      disables building static versions of the libraries.
-    </para>
-
-    <para>
-      <parameter>-DSPIRV-Headers_SOURCE_DIR</parameter>: This switch tells the
-      build system that <xref linkend="spirv-headers" role="nodep"/> is
-      installed in /usr. This is needed since the build system tries to use an
-      internal copy by default.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          spirv-as,
-          spirv-cfg,
-          spirv-dis,
-          spirv-lesspipe.sh,
-          spirv-link,
-          spirv-lint,
-          spirv-objdump,
-          spirv-opt,
-          spirv-reduce, and
-          spirv-val
-        </seg>
-        <seg>
-          libSPIRV-Tools-diff.so,
-          libSPIRV-Tools-link.so,
-          libSPIRV-Tools-lint.so,
-          libSPIRV-Tools-opt.so,
-          libSPIRV-Tools-reduce.so,
-          libSPIRV-Tools-shared.so, and
-          libSPIRV-Tools.so
-        </seg>
-        <seg>
-          /usr/include/spirv-tools and
-          /usr/lib/cmake/SPIRV-Tools
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="spirv-as">
-        <term><command>spirv-as</command></term>
-        <listitem>
-          <para>
-            creates a SPIR-V binary module from SPIR-V assembly text
-          </para>
-          <indexterm zone="spirv-tools spirv-as">
-            <primary sortas="b-spirv-as">spirv-as</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spirv-cfg">
-        <term><command>spirv-cfg</command></term>
-        <listitem>
-          <para>
-            shows the control flow graph in "dot" format
-          </para>
-          <indexterm zone="spirv-tools spirv-cfg">
-            <primary sortas="b-spirv-cfg">spirv-cfg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spirv-dis">
-        <term><command>spirv-dis</command></term>
-        <listitem>
-          <para>
-            disassembles a SPIR-V binary module
-          </para>
-          <indexterm zone="spirv-tools spirv-dis">
-            <primary sortas="b-spirv-dis">spirv-dis</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spirv-lesspipe.sh">
-        <term><command>spirv-lesspipe.sh</command></term>
-        <listitem>
-          <para>
-            automatically disassembles a .SPV file for 'less'
-          </para>
-          <indexterm zone="spirv-tools spirv-lesspipe.sh">
-            <primary sortas="b-spirv-lesspipe.sh">spirv-lesspipe.sh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spirv-link">
-        <term><command>spirv-link</command></term>
-        <listitem>
-          <para>
-            links SPIR-V binary files together
-          </para>
-          <indexterm zone="spirv-tools spirv-link">
-            <primary sortas="b-spirv-link">spirv-link</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spirv-lint">
-        <term><command>spirv-lint</command></term>
-        <listitem>
-          <para>
-            checks a SPIR-V binary module for errors
-          </para>
-          <indexterm zone="spirv-tools spirv-lint">
-            <primary sortas="b-spirv-lint">spirv-lint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spirv-objdump">
-        <term><command>spirv-objdump</command></term>
-        <listitem>
-          <para>
-            dumps information from a SPIR-V binary
-          </para>
-          <indexterm zone="spirv-tools spirv-objdump">
-            <primary sortas="b-spirv-objdump">spirv-objdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spirv-opt">
-        <term><command>spirv-opt</command></term>
-        <listitem>
-          <para>
-            performs optimizations on SPIR-V binary files
-          </para>
-          <indexterm zone="spirv-tools spirv-opt">
-            <primary sortas="b-spirv-opt">spirv-opt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spirv-reduce">
-        <term><command>spirv-reduce</command></term>
-        <listitem>
-          <para>
-            reduces a SPIR-V binary file
-          </para>
-          <indexterm zone="spirv-tools spirv-reduce">
-            <primary sortas="b-spirv-reduce">spirv-reduce</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spirv-val">
-        <term><command>spirv-val</command></term>
-        <listitem>
-          <para>
-            validates a SPIR-V binary file
-          </para>
-          <indexterm zone="spirv-tools spirv-val">
-            <primary sortas="b-spirv-val">spirv-val</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libSPIRV-Tools">
-        <term><filename class="libraryfile">libSPIRV-Tools.so</filename></term>
-        <listitem>
-          <para>
-            contains functions for processing SPIR-V modules
-          </para>
-          <indexterm zone="spirv-tools libSPIRV-Tools">
-            <primary sortas="c-libSPIRV-Tools">libSPIRV-Tools.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: general/genlib/talloc.xml
===================================================================
--- general/genlib/talloc.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,162 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 talloc-download-http "https://www.samba.org/ftp/talloc/talloc-&talloc-version;.tar.gz">
-  <!ENTITY talloc-download-ftp  " ">
-  <!ENTITY talloc-md5sum        "d29bdf75ce181e148c46b16a83de6d76">
-  <!ENTITY talloc-size          "664 KB">
-  <!ENTITY talloc-buildsize     "10 MB (with tests)">
-  <!ENTITY talloc-time          "0.4 SBU (with tests)">
-]>
-
-<sect1 id="talloc" xreflabel="Talloc-&talloc-version;">
-  <?dbhtml filename="talloc.html"?>
-
-
-  <title>Talloc-&talloc-version;</title>
-
-  <indexterm zone="talloc">
-    <primary sortas="a-Talloc">Talloc</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Talloc</title>
-
-    <para>
-      <application>Talloc</application> provides a hierarchical, reference
-      counted memory pool system with destructors. It is the core memory
-      allocator used in <application>Samba</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&talloc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&talloc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &talloc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &talloc-size;</para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &talloc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &talloc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Talloc Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="DocBook"/>,
-      <xref linkend="docbook-xsl"/> and
-      <xref linkend="libxslt"/> (To generate man pages),
-      <xref linkend="gdb"/>,
-      <xref linkend="git"/>,
-      <xref linkend="libnsl"/>,
-      <xref linkend="libtirpc"/>,
-      <xref linkend="valgrind"/>, and
-      <xref linkend="xfsprogs"/>
-      <!-- These are all looked for at build time, but might not actually be used.-->
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Talloc</title>
-
-    <para>
-      Install <application>Talloc</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To check the results, issue <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-
-  </sect2>
--->
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libpytalloc-util.&python3-lib-suffix;.so,
-          libtalloc.so, and
-          talloc.&python3-lib-suffix;.so (Python 3 Module)
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libtalloc">
-        <term><filename class="libraryfile">libtalloc.so</filename></term>
-        <listitem>
-          <para>
-            contains a replacement for the <application>Glibc</application>
-            malloc function
-          </para>
-          <indexterm zone="talloc libtalloc">
-            <primary sortas="c-libtalloc">libtalloc.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/telepathy-glib.xml
===================================================================
--- general/genlib/telepathy-glib.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,215 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 telepathy-glib-download-http
-           "https://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-&telepathy-glib-version;.tar.gz">
-  <!ENTITY telepathy-glib-download-ftp  " ">
-  <!ENTITY telepathy-glib-md5sum        "a3a75657e9389381b44fee1680f770a7">
-  <!ENTITY telepathy-glib-size          "3.7 MB">
-  <!ENTITY telepathy-glib-buildsize     "256 MB">
-  <!ENTITY telepathy-glib-time          "1.2 SBU">
-]>
-
-<sect1 id="telepathy-glib" xreflabel="telepathy-glib-&telepathy-glib-version;">
-  <?dbhtml filename="telepathy-glib.html"?>
-
-
-  <title>telepathy-glib-&telepathy-glib-version;</title>
-
-  <indexterm zone="telepathy-glib">
-    <primary sortas="a-telepathy-glib">telepathy-glib</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Telepathy GLib</title>
-
-    <para>
-      The <application>Telepathy GLib</application> contains a library used by
-      <application>GLib</application> based <application>Telepathy</application>
-      components. Telepathy is a <application>D-Bus</application> framework for
-      unifying real time communication, including instant messaging, voice calls
-      and video calls. It abstracts differences between protocols to provide a
-      unified interface for applications.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&telepathy-glib-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&telepathy-glib-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &telepathy-glib-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &telepathy-glib-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &telepathy-glib-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &telepathy-glib-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/telepathy-glib-&telepathy-glib-version;-consolidated_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">Telepathy GLib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dbus-glib"/> and
-      <xref linkend="libxslt"/>
-    </para>
-
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection;, and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Telepathy Glib</title>
-
-<!--
-    <para>
-      First, apply a patch to fix several bugs discovered after
-      release:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../telepathy-glib-&telepathy-glib-version;-consolidated_fixes-1.patch</userinput></screen>
--->
-
-    <para>
-      If you intend to run the tests, one of them defaults to invoking
-      <filename>/usr/bin/python</filename> and fails if it is absent, causing
-      the second batch of tests to not run - unlike the other tests which can be
-      overridden from the environment. Fix it with the following command:
-    </para>
-    <!-- Still needed with 0.24.2 -->
-
-<screen><userinput>sed -i 's%/usr/bin/python%&amp;3%' tests/all-errors-documented.py</userinput></screen>
-
-    <para>
-      Install <application>Telepathy GLib</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>PYTHON=/usr/bin/python3 ./configure --prefix=/usr          \
-                                    --enable-vala-bindings \
-                                    --disable-static       &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-      <!--Four tests are known to fail: <emphasis>test-account</emphasis>,
-      <emphasis>test-cm</emphasis>, <emphasis>test-contact-lists</emphasis>, and
-      <emphasis>test-contact-list-client</emphasis>.-->
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-vala-bindings</parameter>: This switch
-      enables building of the Vala bindings. Remove if you don't
-      have <xref linkend="vala"/> installed.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libtelepathy-glib.so
-        </seg>
-        <seg>
-          /usr/include/telepathy-1.0 and
-          /usr/share/gtk-doc/html/telepathy-glib
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libtelepathy-glib">
-        <term><filename class="libraryfile">libtelepathy-glib.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Telepathy GLib</application> API functions
-          </para>
-          <indexterm zone="telepathy-glib libtelepathy-glib">
-            <primary sortas="c-libtelepathy-glib">libtelepathy-glib.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/uchardet.xml
===================================================================
--- general/genlib/uchardet.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,169 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 uchardet-download-http "https://www.freedesktop.org/software/uchardet/releases/uchardet-&uchardet-version;.tar.xz">
-  <!ENTITY uchardet-download-ftp  " ">
-  <!ENTITY uchardet-md5sum        "9e267be7aee81417e5875086dd9d44fd">
-  <!ENTITY uchardet-size          "217 KB">
-  <!ENTITY uchardet-buildsize     "4.6 MB (with test)">
-  <!ENTITY uchardet-time          "less than 0.1 SBU (with test)">
-
-]>
-
-<sect1 id="uchardet" xreflabel="uchardet-&uchardet-version;">
-  <?dbhtml filename="uchardet.html"?>
-
-
-  <title>Uchardet-&uchardet-version;</title>
-
-  <indexterm zone="uchardet">
-    <primary sortas="a-uchardet">uchardet</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Uchardet</title>
-
-    <para>
-      The <application>Uchardet</application> package contains an encoding
-      detectory library which takes a sequence of bytes in an unknown character
-      encoding and attempts to determine the encoding of the text.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&uchardet-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&uchardet-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &uchardet-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &uchardet-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &uchardet-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &uchardet-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Uchardet Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Uchardet</title>
-
-    <para>
-      Install <application>Uchardet</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DBUILD_STATIC=OFF          \
-      -Wno-dev ..                 &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DBUILD_STATIC=OFF</parameter>: This switch disables building
-      the static version of the library.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          uchardet
-        </seg>
-        <seg>
-          libuchardet.so
-        </seg>
-        <seg>
-          /usr/include/uchardet
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="uchardet-prog">
-        <term><command>uchardet</command></term>
-        <listitem>
-          <para>
-            detects what character set is used inside of a file
-          </para>
-          <indexterm zone="uchardet uchardet-prog">
-            <primary sortas="b-uchardet">uchardet</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libuchardet">
-        <term><filename class="libraryfile">libuchardet.so</filename></term>
-        <listitem>
-          <para>
-            provides an API for detecting the encoding of text in a file
-          </para>
-          <indexterm zone="uchardet libuchardet">
-            <primary sortas="c-libuchardet">libuchardet.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/genlib/umockdev.xml
===================================================================
--- general/genlib/umockdev.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,208 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 umockdev-download-http "https://github.com/martinpitt/umockdev/releases/download/&umockdev-version;/umockdev-&umockdev-version;.tar.xz">
-  <!ENTITY umockdev-download-ftp  " ">
-  <!ENTITY umockdev-md5sum        "74342306a6d25e266dfa2a7b7695c2e1">
-  <!ENTITY umockdev-size          "484 KB">
-  <!ENTITY umockdev-buildsize     "6.8 MB (with tests)">
-  <!ENTITY umockdev-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="umockdev" xreflabel="umockdev-&umockdev-version;">
-  <?dbhtml filename="umockdev.html"?>
-
-
-  <title>Umockdev-&umockdev-version;</title>
-
-  <indexterm zone="umockdev">
-    <primary sortas="a-umockdev">umockdev</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Umockdev</title>
-
-    <para>
-      The <application>Umockdev</application> package contains a framework
-      that allows a developer to mock devices for use in unit testing.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&umockdev-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&umockdev-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &umockdev-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &umockdev-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &umockdev-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &umockdev-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Umockdev Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libgudev"/>,
-      <xref linkend="libpcap"/>, and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <ulink url="http://www.gphoto.org/">libgphoto2</ulink> (optional for tests)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Umockdev</title>
-
-    <para>
-      Install <application>Umockdev</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue as the &root; user: <command>ninja test</command>.
-      One test needs to be run in an X session.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>-Dgtk_doc=true</option>: Use this switch if you have
-      <xref linkend="gtk-doc" role="nodep"/> installed and wish to rebuild and
-      install the API documentation.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-           umockdev-record,
-           umockdev-run, and
-           umockdev-wrapper
-        </seg>
-        <seg>
-          libumockdev-preload.so <!-- Only intended for use by
-          umockdev-wrapper. Don't put in a short description for this--> and
-          libumockdev.so
-        </seg>
-        <seg>
-          /usr/include/umockdev-1.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="umockdev-record">
-        <term><command>umockdev-record</command></term>
-        <listitem>
-          <para>
-            records Linux devices and their ancestors from sysfs/udev or
-            records ioctls for a device
-          </para>
-          <indexterm zone="umockdev umockdev-record">
-            <primary sortas="b-umockdev-record">umockdev-record</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="umockdev-run">
-        <term><command>umockdev-run</command></term>
-        <listitem>
-          <para>
-            runs a program under an <application>umockdev</application>
-            testbed
-          </para>
-          <indexterm zone="umockdev umockdev-run">
-            <primary sortas="b-umockdev-run">umockdev-run</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="umockdev-wrapper">
-        <term><command>umockdev-wrapper</command></term>
-        <listitem>
-          <para>
-            wraps a program around
-            <filename class="libraryfile">libumockdev-preload.so.0</filename>
-            through LD_PRELOAD
-          </para>
-          <indexterm zone="umockdev umockdev-wrapper">
-            <primary sortas="b-umockdev-wrapper">umockdev-wrapper</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libumockdev">
-        <term><filename class="libraryfile">libumockdev.so</filename></term>
-        <listitem>
-          <para>
-            provides API functions that allow mocking hardware devices for unit
-            testing
-          </para>
-          <indexterm zone="umockdev libumockdev">
-            <primary sortas="c-libumockdev">libumockdev.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/genlib/utfcpp.xml
===================================================================
--- general/genlib/utfcpp.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,125 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 utfcpp-download-http "https://github.com/nemtrif/utfcpp/archive/v&utfcpp-version;/utfcpp-&utfcpp-version;.tar.gz">
-  <!ENTITY utfcpp-download-ftp  " ">
-  <!ENTITY utfcpp-md5sum        "8e0fe13266a7fa02f61340bf399986c3">
-  <!ENTITY utfcpp-size          "36 KB">
-  <!ENTITY utfcpp-buildsize     "496 KB">
-  <!ENTITY utfcpp-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="utfcpp" xreflabel="utfcpp-&utfcpp-version;">
-  <?dbhtml filename="utfcpp.html"?>
-
-  <title>utfcpp-&utfcpp-version;</title>
-
-  <indexterm zone="utfcpp">
-    <primary sortas="a-utfcpp">utfcpp</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to utfcpp</title>
-
-    <para>
-      The <application>utfcpp</application> package contains a set of
-      include files to provide UTF-8 with C++ in a Portable Way.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&utfcpp-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&utfcpp-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &utfcpp-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &utfcpp-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &utfcpp-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &utfcpp-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">utfcpp Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of utfcpp</title>
-
-    <para>
-      Install <application>utfcpp</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr ..</userinput></screen>
-<!-- Running make does nothing -->
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/include/utfcpp and
-          /usr/share/utfcpp
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-  </sect2>
-</sect1>
Index: general/genlib/wayland-protocols.xml
===================================================================
--- general/genlib/wayland-protocols.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,126 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 wayland-protocols-download-http "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/&wayland-protocols-version;/downloads/wayland-protocols-&wayland-protocols-version;.tar.xz">
-  <!ENTITY wayland-protocols-download-ftp  " ">
-  <!ENTITY wayland-protocols-md5sum        "cd0f2a1ab6e54568e4f856f140dedca9">
-  <!ENTITY wayland-protocols-size          "96 KB">
-  <!ENTITY wayland-protocols-buildsize     "8.9 MB (with tests)">
-  <!ENTITY wayland-protocols-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="wayland-protocols" xreflabel="wayland-protocols-&wayland-protocols-version;">
-  <?dbhtml filename="wayland-protocols.html"?>
-
-
-  <title>Wayland-Protocols-&wayland-protocols-version;</title>
-
-  <indexterm zone="wayland-protocols">
-    <primary sortas="a-wayland-protocols">wayland-protocols</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Wayland-Protocols</title>
-
-    <para>
-      The <application>Wayland-Protocols</application> package contains
-      additional Wayland protocols that add functionality outside of
-      protocols already in the Wayland core.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&wayland-protocols-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&wayland-protocols-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &wayland-protocols-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &wayland-protocols-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &wayland-protocols-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &wayland-protocols-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Wayland-protocols Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="wayland"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Wayland-protocols</title>
-
-    <para>
-      Install <application>Wayland-protocols</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/wayland-protocols
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-  </sect2>
-
-</sect1>
Index: general/genlib/wayland.xml
===================================================================
--- general/genlib/wayland.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,232 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 wayland-download-http "https://gitlab.freedesktop.org/wayland/wayland/-/releases/&wayland-version;/downloads/wayland-&wayland-version;.tar.xz">
-  <!ENTITY wayland-download-ftp  " ">
-  <!ENTITY wayland-md5sum        "7410ab549e3928fce9381455b17b0803">
-  <!ENTITY wayland-size          "228 KB">
-  <!ENTITY wayland-buildsize     "7.4 MB (with tests)">
-  <!ENTITY wayland-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="wayland" xreflabel="Wayland-&wayland-version;">
-  <?dbhtml filename="wayland.html"?>
-
-
-  <title>Wayland-&wayland-version;</title>
-
-  <indexterm zone="wayland">
-    <primary sortas="a-Wayland">Wayland</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Wayland</title>
-
-    <para>
-      <application>Wayland</application> is a project to define a protocol
-      for a compositor to talk to its clients as well as a library
-      implementation of the protocol.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&wayland-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&wayland-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &wayland-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &wayland-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &wayland-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &wayland-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Wayland Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>,
-      <xref linkend="graphviz"/> and
-      <xref linkend="xmlto"/> (to build the API documentation) and
-      <xref linkend="DocBook"/>,
-      <xref linkend="docbook-xsl"/> and
-      <xref linkend="libxslt"/> (to build the manual pages)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Wayland</title>
-
-    <para>
-      Install <application>Wayland</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..            \
-      --prefix=/usr       \
-      --buildtype=release \
-      -Ddocumentation=false &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      <!-- If XDG_RUNTIME_DIR is set but the value is a non-exist path,
-           19 tests will fail.  Unfortunately BLFS /etc/profile sets
-           XDG_RUNTIME_DIR but does not create it.  For now simply unset
-           the variable.  -->
-      To test the results, issue:
-      <command>env -u XDG_RUNTIME_DIR ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-Ddocumentation=false</parameter>: This switch is used to
-      disable building of the API documentation. Remove it if you have
-      installed optional dependencies.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          wayland-scanner
-        </seg>
-        <seg>
-          libwayland-client.so,
-          libwayland-cursor.so,
-          libwayland-egl.so,
-          and libwayland-server.so
-        </seg>
-        <seg>
-          /usr/share/wayland
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="wayland-scanner">
-        <term><command>wayland-scanner</command></term>
-        <listitem>
-          <para>
-            is a tool to generate proxy methods in wayland-client-protocol.h
-            and wayland-server-protocol.h
-          </para>
-          <indexterm zone="wayland wayland-scanner">
-            <primary sortas="b-wayland-scanner">wayland-scanner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwayland-client">
-        <term><filename class="libraryfile">libwayland-client.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for writing <application>Wayland</application>
-            applications
-          </para>
-          <indexterm zone="wayland libwayland-client">
-            <primary sortas="c-libwayland-client">libwayland-client.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwayland-cursor">
-        <term><filename class="libraryfile">libwayland-cursor.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for managing cursors in <application>Wayland</application>
-            applications
-          </para>
-          <indexterm zone="wayland libwayland-cursor">
-            <primary sortas="c-libwayland-cursor">libwayland-cursor.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwayland-egl">
-        <term><filename class="libraryfile">libwayland-egl.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for handling OpenGL calls in
-            <application>Wayland</application> applications
-          </para>
-          <indexterm zone="wayland libwayland-egl">
-            <primary sortas="c-libwayland-egl">libwayland-egl.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwayland-server">
-        <term><filename class="libraryfile">libwayland-server.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for writing <application>Wayland</application>
-            compositors
-          </para>
-          <indexterm zone="wayland libwayland-server">
-            <primary sortas="c-libwayland-server">libwayland-server.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/wv.xml
===================================================================
--- general/genlib/wv.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,164 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 wv-download-http   "&sources-anduin-http;/wv/wv-&wv-version;.tar.gz">
-  <!ENTITY wv-download-ftp    " ">
-  <!ENTITY wv-md5sum          "dbccf2e9f747e50c913b7e3d126b73f7">
-  <!ENTITY wv-size            "608 KB">
-  <!ENTITY wv-buildsize       "25 MB">
-  <!ENTITY wv-time            "0.4 SBU">
-]>
-
-<sect1 id="wv" xreflabel="wv-&wv-version;">
-  <?dbhtml filename="wv.html"?>
-
-
-  <title>wv-&wv-version;</title>
-
-  <indexterm zone="wv">
-    <primary sortas="a-Wv">Wv</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to wv</title>
-
-    <para>
-      The <application>wv</application> package contains tools for reading
-      information from an MS Word document.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&wv-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&wv-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &wv-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &wv-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &wv-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &wv-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">wv Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libgsf"/> and
-      <xref linkend="libpng"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://wvware.sourceforge.net/libwmf.html">libwmf</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of wv</title>
-
-    <para>
-      Install <application>wv</application> by running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not have a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>wvSummary and several other wv* programs which are deprecated in
-        favour of abiword: see
-        <ulink url="https://wvware.sourceforge.net/"/></seg>
-        <seg>libwv-1.2.so</seg>
-        <seg>/usr/share/wv</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="wv-prog">
-        <term><command>wvSummary</command></term>
-        <listitem>
-          <para>
-            displays the summary information from an MS Word document
-          </para>
-          <indexterm zone="wv wv-prog">
-            <primary sortas="b-wv">wv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwv-1.2">
-        <term><filename class="libraryfile">libwv-1.2.so</filename></term>
-        <listitem>
-          <para>
-            provides functions to access MS Word documents
-          </para>
-          <indexterm zone="wv libwv-1.2">
-            <primary sortas="c-libwv-1.2">libwv-1.2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/xapian.xml
===================================================================
--- general/genlib/xapian.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,355 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xapian-download-http
-           "https://oligarchy.co.uk/xapian/&xapian-version;/xapian-core-&xapian-version;.tar.xz">
-  <!ENTITY xapian-download-ftp  " ">
-  <!ENTITY xapian-md5sum        "b570c2e47f157bee29584994657aafbb">
-  <!ENTITY xapian-size          "3.1 MB">
-  <!ENTITY xapian-buildsize     "144 MB (add 162 MB for tests)">
-  <!ENTITY xapian-time          "0.5 SBU (add 3.5 SBU for tests; both using parallelism=4)">
-]>
-
-<sect1 id="xapian" xreflabel="xapian-&xapian-version;">
-  <?dbhtml filename="xapian.html"?>
-
-
-  <title>Xapian-&xapian-version;</title>
-
-  <indexterm zone="xapian">
-    <primary sortas="a-xapian">xapian</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xapian</title>
-
-    <para>
-      Xapian is an open source search engine library.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xapian-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xapian-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xapian-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xapian-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xapian-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xapian-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xapian Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="valgrind"/> (for tests)
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Xapian</title>
-    <!-- Interesting footnote - SSE support is only enabled on i686.
-    There seems to be some trickery involved in that. It's not essential
-    to operation on x86_64 though, so look into it at the next version of
-    xapian. -->
-
-    <para>
-      Install <application>Xapian</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static \
-            --docdir=/usr/share/doc/xapian-core-&xapian-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      <!--
-      The regression tests are not recommended.  On a fast (3.2 GHz i7)
-      system they took over five hours and two of four tests (the valgrind
-      tests) failed.  To run the test suite anyway,
-      issue: <command>make check</command>.
-      The tests with 1.4.15 took under an hour, at 34 SBU total. Marking
-      the test suite as usable again. I had four passes and 0 failures:
-      PASS: apitest
-      PASS: internaltest
-      PASS: stemtest
-      PASS: unittest
-      I did have Valgrind installed too. -renodr -->
-      To run the test suite, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          copydatabase, quest, simpleexpand, simpleindex, simplesearch,
-          xapian-check, xapian-compact, xapian-config,
-          xapian-delve, xapian-metadata, xapian-pos, xapian-progsrv,
-          xapian-replicate, xapian-replicate-server and xapian-tcpsrv
-        </seg>
-        <seg>
-          libxapian.so
-        </seg>
-        <seg>
-          /usr/include/xapian,
-          /usr/lib/cmake/xapian,
-          /usr/share/doc/xapian-core-&xapian-version;, and
-          /usr/share/xapian-core
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="copydatabase">
-        <term><command>copydatabase</command></term>
-        <listitem>
-          <para>
-            performs a document-by-document copy of one or more
-            <application>Xapian</application> databases
-          </para>
-          <indexterm zone="xapian copydatabase">
-            <primary sortas="b-copydatabase">copydatabase</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="quest">
-        <term><command>quest</command></term>
-        <listitem>
-          <para>
-            is a command line tool to search through a database
-          </para>
-          <indexterm zone="xapian quest">
-            <primary sortas="b-quest">quest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="simpleexpand">
-        <term><command>simpleexpand</command></term>
-        <listitem>
-          <para>
-            is a simple example program demonstrating query expansion
-          </para>
-          <indexterm zone="xapian simpleexpand">
-            <primary sortas="b-simpleexpand">simpleexpand</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="simpleindex">
-        <term><command>simpleindex</command></term>
-        <listitem>
-          <para>
-            indexes each paragraph of a text file as a
-            <application>Xapian</application> document
-          </para>
-          <indexterm zone="xapian simpleindex">
-            <primary sortas="b-simpleindex">simpleindex</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="simplesearch">
-        <term><command>simplesearch</command></term>
-        <listitem>
-          <para>
-            is a simple command line search utility
-          </para>
-          <indexterm zone="xapian simplesearch">
-            <primary sortas="b-simplesearch">simplesearch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xapian-check">
-        <term><command>xapian-check</command></term>
-        <listitem>
-          <para>
-            checks the consistency of a database or table
-          </para>
-          <indexterm zone="xapian xapian-check">
-            <primary sortas="b-xapian-check">xapian-check</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <!--
-      <varlistentry id="xapian-chert-update">
-        <term><command>xapian-chert-update</command></term>
-        <listitem>
-          <para>
-            update a chert database to the new format keys.
-          </para>
-          <indexterm zone="xapian xapian-chert-update">
-            <primary sortas="b-xapian-chert-update">xapian-chert-update</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      No longer installed in 1.4.15. - renodr
-      -->
-
-      <varlistentry id="xapian-compact">
-        <term><command>xapian-compact</command></term>
-        <listitem>
-          <para>
-            compacts a database, or merges and compacts several databases
-          </para>
-          <indexterm zone="xapian xapian-compact">
-            <primary sortas="b-xapian-compact">xapian-compact</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xapian-config">
-        <term><command>xapian-config</command></term>
-        <listitem>
-          <para>
-            reports information about the installed version of xapian
-          </para>
-          <indexterm zone="xapian xapian-config">
-            <primary sortas="b-xapian-config">xapian-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xapian-delve">
-        <term><command>xapian-delve</command></term>
-        <listitem>
-          <para>
-            inspects the contents of a <application>Xapian</application>
-            database
-          </para>
-          <indexterm zone="xapian xapian-delve">
-            <primary sortas="b-xapian-delve">xapian-delve</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xapian-metadata">
-        <term><command>xapian-metadata</command></term>
-        <listitem>
-          <para>
-            reads and writes user metadata
-          </para>
-          <indexterm zone="xapian xapian-metadata">
-            <primary sortas="b-xapian-metadata">xapian-metadata</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xapian-pos">
-        <term><command>xapian-pos</command></term>
-        <listitem>
-          <para>
-            inspects the contents of a flint table for development or debugging
-          </para>
-          <indexterm zone="xapian xapian-pos">
-            <primary sortas="b-xapian-pos">xapian-pos</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xapian-progsrv">
-        <term><command>xapian-progsrv</command></term>
-        <listitem>
-          <para>
-            is a remote server for use with <application>ProgClient</application>
-          </para>
-          <indexterm zone="xapian xapian-progsrv">
-            <primary sortas="b-xapian-progsrv">xapian-progsrv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xapian-replicate">
-        <term><command>xapian-replicate</command></term>
-        <listitem>
-          <para>
-            replicates a database from a master server to a local copy
-          </para>
-          <indexterm zone="xapian xapian-replicate">
-            <primary sortas="b-xapian-replicate">xapian-replicate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xapian-replicate-server">
-        <term><command>xapian-replicate-server</command></term>
-        <listitem>
-          <para>
-            services database replication requests from clients
-          </para>
-          <indexterm zone="xapian xapian-replicate-server">
-            <primary sortas="b-xapian-replicate-server">xapian-replicate-server</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xapian-tcpsrv">
-        <term><command>xapian-tcpsrv</command></term>
-        <listitem>
-          <para>
-            is the TCP daemon for use with <application>Xapian</application>'s
-            remote backend
-          </para>
-          <indexterm zone="xapian xapian-tcpsrv">
-            <primary sortas="b-xapian-tcpsrv">xapian-tcpsrv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/zlib.xml
===================================================================
--- general/genlib/zlib.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/zlib.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,19 @@
+<sect1 id="zlib" xreflabel="zlib-&zlib-version;">
+<?dbhtml filename="zlib.html" dir="general"?>
+<title>zlib-&zlib-version;</title>
+
+<para>Zlib provides compression and decompression functions to programs.
+Most people will want zlib because both servers and clients are 
+likely to need the openssl libraries which in turn require zlib.
+Servers will want openssl because it is needed for running OpenSSH services and
+clients because most web browsers need it to deal with https (secure)
+websites.</para>
+
+&zlib-intro;
+&zlib-inst;
+&zlib-exp;
+&zlib-config;
+&zlib-desc;
+
+</sect1>
+
Index: general/genutils/asciidoctor.xml
===================================================================
--- general/genutils/asciidoctor.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,151 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 asciidoctor-download-http "https://github.com/asciidoctor/asciidoctor/archive/v&asciidoctor-version;/asciidoctor-&asciidoctor-version;.tar.gz">
-  <!ENTITY asciidoctor-download-ftp  " ">
-  <!ENTITY asciidoctor-md5sum        "6a733671b337c518d7ecc39240885ed0">
-  <!ENTITY asciidoctor-size          "1.6 MB">
-  <!ENTITY asciidoctor-buildsize     "5.5 MB">
-  <!ENTITY asciidoctor-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="asciidoctor" xreflabel="asciidoctor-&asciidoctor-version;">
-  <?dbhtml filename="asciidoctor.html"?>
-
-
-  <title>Asciidoctor-&asciidoctor-version;</title>
-
-  <indexterm zone="asciidoctor">
-    <primary sortas="a-asciidoctor">asciidoctor</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Asciidoctor</title>
-
-    <para>
-      Asciidoctor is a fast, open source text processor and publishing
-      toolchain for converting AsciiDoc content to HTML5, DocBook, PDF, and
-      other formats.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&asciidoctor-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&asciidoctor-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &asciidoctor-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &asciidoctor-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &asciidoctor-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &asciidoctor-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Asciidoctor Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="ruby"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Asciidoctor</title>
-
-    <note>
-      <para>
-        When building this package, the following message may appear:
-        <screen>fatal: not a git repository (or any of the parent directories): .git</screen>.
-        This is normal, and the package will continue building past this point.
-      </para>
-    </note>
-
-    <para>
-      Build the Ruby gem:
-    </para>
-
-<screen><userinput>gem build asciidoctor.gemspec</userinput></screen>
-
-    <para>
-      The test suite needs many Ruby gems beyond the scope of BLFS.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>gem install asciidoctor-&asciidoctor-version;.gem &amp;&amp;
-install -vm644 man/asciidoctor.1 /usr/share/man/man1</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          asciidoctor
-        </seg>
-        <seg>None</seg>
-        <seg>
-          &ruby-gemdir;/gems/asciidoctor-&asciidoctor-version; and
-          &ruby-gemdir;/doc/asciidoctor-&asciidoctor-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="asciidoctor-prog">
-        <term><command>asciidoctor</command></term>
-        <listitem>
-          <para>
-            converts AsciiDoc source files to HTML, DocBook, and other formats
-          </para>
-          <indexterm zone="asciidoctor asciidoctor-prog">
-            <primary sortas="b-asciidoctor-prog">asciidoctor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genutils/bc.xml
===================================================================
--- general/genutils/bc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genutils/bc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect1 id="bc" xreflabel="bc">
+<?dbhtml filename="bc.html" dir="general"?>
+<title>bc</title>
+
+<para>NEW ITEM - TO BE DONE</para>
+
+</sect1>
+
Index: general/genutils/bc/bc.ent
===================================================================
--- general/genutils/bc/bc.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genutils/bc/bc.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY bc SYSTEM "../bc.xml">
Index: general/genutils/bogofilter.xml
===================================================================
--- general/genutils/bogofilter.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,277 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 bogofilter-download-http "&sourceforge-dl;/bogofilter/bogofilter-&bogofilter-version;.tar.xz">
-  <!ENTITY bogofilter-download-ftp  " ">
-  <!ENTITY bogofilter-md5sum        "8763f87adfff7b802ced177d8c654539">
-  <!ENTITY bogofilter-size          "784 KB">
-  <!ENTITY bogofilter-buildsize     "19 MB">
-  <!ENTITY bogofilter-time          "0.1 SBU">
-]>
-
-<sect1 id="bogofilter" xreflabel="Bogofilter-&bogofilter-version;">
-  <?dbhtml filename="bogofilter.html"?>
-
-
-  <title>Bogofilter-&bogofilter-version;</title>
-
-  <indexterm zone="bogofilter">
-    <primary sortas="a-Bogofilter">Bogofilter</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Bogofilter</title>
-
-    <para>
-      The <application>Bogofilter</application> application is a mail filter that classifies
-      mail as spam or ham (non-spam) by a statistical analysis of the message's header and
-      content (body).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&bogofilter-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&bogofilter-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &bogofilter-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &bogofilter-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &bogofilter-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &bogofilter-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Bogofilter Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gsl"/>,
-      <xref linkend="libxml2"/>, and
-      <!-- 'required' to make this strong to jhalfs -->
-      <xref role='required' linkend="sqlite"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="lmdb"/>,
-      <xref linkend="xmlto"/>,
-      &berkeley-db;,
-      <ulink url="https://dbmx.net/qdbm/">QDBM</ulink> and
-      <ulink url="https://dbmx.net/tokyocabinet/">TokyoCabinet</ulink>
-    </para>
-
-    <note>
-      <para>
-        If you do not install the recommended <xref linkend="gsl"/> package
-        then a statically linked shipped version will be used instead.
-      </para>
-    </note>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Bogofilter</title>
-
-    <note>
-      <para>
-        If you plan to change the version of your database library on an
-        existing installation, or to change to a different database, read the
-        warning at the top of the RELEASE.NOTES file.
-      </para>
-    </note>
-
-    <para>
-      Install <application>Bogofilter</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr                \
-            --sysconfdir=/etc/bogofilter \
-            --with-database=sqlite3      &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-database=sqlite3</parameter>: This switch makes
-      Bogofilter use <xref linkend='sqlite'/> as the database, instead of
-      Berkeley DB<!-- which is beyond the scope of BLFS (slated for removal)-->.
-    </para>
-
-    <para>
-      <option>--with-database={lmdb,qdbm,tokyocabinet}</option>: This switch
-      also allows to use lmdb, qdbm, or tokyocabinet as the database.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          bf_compact, bf_copy, bf_tar, bogofilter, bogolexer, bogotune,
-          bogoupgrade and bogoutil
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /etc/bogofilter
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bf_compact">
-        <term><command>bf_compact</command></term>
-        <listitem>
-          <para>
-            creates a more compact bogofilter working directory with a
-            dump/load cycle
-          </para>
-          <indexterm zone="bogofilter bf_compact">
-            <primary sortas="b-bf_compact">bf_compact</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bf_copy">
-        <term><command>bf_copy</command></term>
-        <listitem>
-          <para>
-            copies a bogofilter working directory to another directory
-          </para>
-          <indexterm zone="bogofilter bf_copy">
-            <primary sortas="b-bf_copy">bf_copy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bf_tar">
-        <term><command>bf_tar</command></term>
-        <listitem>
-          <para>
-            bundles a bogofilter working directory in tar format and
-            copies it to standard output
-          </para>
-          <indexterm zone="bogofilter bf_tar">
-            <primary sortas="b-bf_tar">bf_tar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bogofilter-prog">
-        <term><command>bogofilter</command></term>
-        <listitem>
-          <para>
-            is a fast Bayesian spam filter
-          </para>
-          <indexterm zone="bogofilter bogofilter-prog">
-            <primary sortas="b-bogofilter">bogofilter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bogolexer">
-        <term><command>bogolexer</command></term>
-        <listitem>
-          <para>
-            is used to separate messages into tokens and to test new
-            versions of the lexer.l code
-          </para>
-          <indexterm zone="bogofilter bogolexer">
-            <primary sortas="b-bogolexer">bogolexer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bogotune">
-        <term><command>bogotune</command></term>
-        <listitem>
-          <para>
-            attempts to find optimum parameter settings for bogofilter
-          </para>
-          <indexterm zone="bogofilter bogotune">
-            <primary sortas="b-bogotune">bogotune</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bogoupgrade">
-        <term><command>bogoupgrade</command></term>
-        <listitem>
-          <para>
-            upgrades the bogofilter database to the current version
-          </para>
-          <indexterm zone="bogofilter bogoupgrade">
-            <primary sortas="b-bogoupgrade">bogoupgrade</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bogoutil">
-        <term><command>bogoutil</command></term>
-        <listitem>
-          <para>
-            dumps, loads, and maintains bogofilter database files
-          </para>
-          <indexterm zone="bogofilter bogoutil">
-            <primary sortas="b-bogoutil">bogoutil</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genutils/compface.xml
===================================================================
--- general/genutils/compface.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,171 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 compface-download-http "&sources-anduin-http;/compface/compface-&compface-version;.tar.gz">
-  <!ENTITY compface-download-ftp  " ">
-  <!ENTITY compface-md5sum        "62f4f79c0861ad292ba3cf77b4c48319">
-  <!ENTITY compface-size          "47 KB">
-  <!ENTITY compface-buildsize     "520 KB">
-  <!ENTITY compface-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="compface" xreflabel="Compface-&compface-version;">
-  <?dbhtml filename="compface.html"?>
-
-
-  <title>Compface-&compface-version;</title>
-
-  <indexterm zone="compface">
-    <primary sortas="a-Compface">Compface</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Compface</title>
-
-    <para>
-      <application>Compface</application> provides utilities and a library to
-      convert from/to X-Face format, a 48x48 bitmap format used to carry
-      thumbnails of email authors in a mail header.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&compface-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&compface-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &compface-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &compface-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &compface-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &compface-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Compface</title>
-
-    <para>
-      Install <application>Compface</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --mandir=/usr/share/man &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -m755 -v xbm2xface.pl /usr/bin</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>compface, uncompface and xbm2xface.pl</seg>
-        <seg>libcompface.{so,a}</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="compface-prog">
-        <term><command>compface</command></term>
-        <listitem>
-          <para>
-            is a filter for generating highly compressed representations
-            of 48x48x1 face image files
-          </para>
-          <indexterm zone="compface compface-prog">
-            <primary sortas="b-compface">compface</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uncompface">
-        <term><command>uncompface</command></term>
-        <listitem>
-          <para>
-            is an inverse filter which performs an inverse
-            transformation with no loss of data
-          </para>
-          <indexterm zone="compface uncompface">
-            <primary sortas="b-uncompface">uncompface</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xbm2xface">
-        <term><command>xbm2xface.pl</command></term>
-        <listitem>
-          <para>
-            is a script to generate xfaces
-          </para>
-          <indexterm zone="compface xbm2xface">
-            <primary sortas="b-xbm2xface.pl">xbm2xface.pl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcompface">
-        <term><filename class="libraryfile">libcompface.{so,a}</filename></term>
-        <listitem>
-          <para>
-            allows the compression and decompression algorithms to be
-            used in other programs such as MTAs
-          </para>
-          <indexterm zone="compface libcompface">
-            <primary sortas="c-libcompface">libcompface.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genutils/desktop-file-utils.xml
===================================================================
--- general/genutils/desktop-file-utils.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,260 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 desktop-file-utils-download-http
-           "https://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-&desktop-file-utils-version;.tar.xz">
-  <!ENTITY desktop-file-utils-download-ftp  " ">
-  <!ENTITY desktop-file-utils-md5sum        "fdf9215aea91acb6aebc43f770537f2c">
-  <!ENTITY desktop-file-utils-size          "80 KB">
-  <!ENTITY desktop-file-utils-buildsize     "1.2 MB">
-  <!ENTITY desktop-file-utils-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="desktop-file-utils" xreflabel="desktop-file-utils-&desktop-file-utils-version;">
-  <?dbhtml filename="desktop-file-utils.html"?>
-
-
-  <title>desktop-file-utils-&desktop-file-utils-version;</title>
-
-  <indexterm zone="desktop-file-utils">
-    <primary sortas="a-desktop-file-utils">desktop-file-utils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Desktop File Utils</title>
-
-    <para>
-      The <application>Desktop File Utils</application> package contains
-      command line utilities for working with <ulink
-      url="https://standards.freedesktop.org/desktop-entry-spec/latest/">
-      Desktop entries</ulink>. These utilities are used by Desktop
-      Environments and other applications to manipulate the MIME-types
-      application databases and help adhere to the Desktop Entry
-      Specification.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&desktop-file-utils-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&desktop-file-utils-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &desktop-file-utils-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &desktop-file-utils-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &desktop-file-utils-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &desktop-file-utils-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Desktop File Utils Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="emacs"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Desktop File Utils</title>
-
-    <warning>
-      <para>
-        If you are upgrading from a previous version of desktop-file-utils that
-        used the Autotools method of installing and configuring the package,
-        you must remove the desktop-file-edit symlink by using the following
-        commands.
-      </para>
-    </warning>
-    <!-- Works around a bug in meson's symlink creation exposed by this package -->
-
-<screen role="root"><userinput>rm -fv /usr/bin/desktop-file-edit</userinput></screen>
-
-    <para>
-      Install <application>Desktop File Utils</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Desktop File Utils</title>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        The <ulink
-        url="https://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html">XDG
-        Base Directory</ulink> specification defines the standard locations for
-        applications to place data and configuration files. These files can be
-        used, for instance, to define the menu structure and menu items in a
-        desktop environment.
-      </para>
-
-      <para>
-        The default location for configuration files to be installed
-        is <filename class="directory">/etc/xdg</filename>, and the default
-        locations for data files are <filename
-        class="directory">/usr/local/share</filename> and <filename
-        class="directory">/usr/share</filename>. These locations can be
-        extended with the environment variables <envar>XDG_CONFIG_DIRS</envar>
-        and <envar>XDG_DATA_DIRS</envar>, respectively. The
-        <application>GNOME</application>, <application>KDE</application> and
-        <application>XFCE</application> environments respect these
-        settings.
-      </para>
-
-      <para>
-        When a package installs a <filename>.desktop</filename> file
-        to a location in one of the base data directories, the database
-        that maps MIME-types to available applications can be updated. For
-        instance, the cache file at
-        <filename>/usr/share/applications/mimeinfo.cache</filename> can
-        be rebuilt by executing the following command as the <systemitem
-        class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>install -vdm755 /usr/share/applications &amp;&amp;
-update-desktop-database /usr/share/applications</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          desktop-file-edit, desktop-file-install,
-          desktop-file-validate and
-          update-desktop-database
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="desktop-file-edit">
-        <term><command>desktop-file-edit</command></term>
-        <listitem>
-          <para>
-            is used to modify an existing desktop file entry
-          </para>
-          <indexterm zone="desktop-file-utils desktop-file-edit">
-            <primary sortas="b-desktop-file-edit">desktop-file-edit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="desktop-file-install">
-        <term><command>desktop-file-install</command></term>
-        <listitem>
-          <para>
-            is used to install a new desktop file entry. It is
-            also used to rebuild or modify the MIME-types application
-            database
-          </para>
-          <indexterm zone="desktop-file-utils desktop-file-install">
-            <primary sortas="b-desktop-file-install">desktop-file-install</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="desktop-file-validate">
-        <term><command>desktop-file-validate</command></term>
-        <listitem>
-          <para>
-            is used to verify the integrity of a desktop file
-          </para>
-          <indexterm zone="desktop-file-utils desktop-file-validate">
-            <primary sortas="b-desktop-file-validate">desktop-file-validate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="update-desktop-database">
-        <term><command>update-desktop-database</command></term>
-        <listitem>
-          <para>
-            is used to update the MIME-types application database
-          </para>
-          <indexterm zone="desktop-file-utils update-desktop-database">
-            <primary sortas="b-update-desktop-database">update-desktop-database</primary>
-          </indexterm>
-          </listitem>
-        </varlistentry>
-      </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genutils/dos2unix.xml
===================================================================
--- general/genutils/dos2unix.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,166 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 dos2unix-download-http "&sourceforge-dl;/dos2unix/dos2unix-&dos2unix-version;.tar.gz">
-<!ENTITY dos2unix-download-ftp  " ">
-<!ENTITY dos2unix-md5sum        "646272020848c9b673de24c4e8e3422e">
-<!ENTITY dos2unix-size          "972 KB">
-<!ENTITY dos2unix-buildsize     "7.2 MB (with tests)">
-<!ENTITY dos2unix-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="dos2unix" xreflabel="dos2unix-&dos2unix-version;">
-  <?dbhtml filename="dos2unix.html"?>
-
-
-  <title>dos2unix-&dos2unix-version;</title>
-
-  <indexterm zone="dos2unix">
-    <primary sortas="a-dos2unix">dos2unix</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to dos2unix</title>
-
-    <para>
-      The <application>dos2unix</application> package contains
-      an any-to-any text format converter.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&dos2unix-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&dos2unix-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &dos2unix-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &dos2unix-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &dos2unix-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &dos2unix-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of dos2unix</title>
-
-    <para>
-      Build <application>dos2unix</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>dos2unix, mac2unix, unix2dos, and unix2mac</seg>
-        <seg>None</seg>
-        <seg>/usr/share/doc/dos2unix-&dos2unix-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="dos2unix-prog">
-        <term><command>dos2unix</command></term>
-        <listitem>
-          <para>
-            converts plain text files in DOS format to Unix format
-          </para>
-          <indexterm zone="dos2unix dos2unix">
-            <primary sortas="b-dos2unix">dos2unix</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mac2unix">
-        <term><command>mac2unix</command></term>
-        <listitem>
-          <para>
-            converts plain text files in Mac format to Unix format
-          </para>
-          <indexterm zone="dos2unix mac2unix">
-            <primary sortas="b-mac2unix">mac2unix</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unix2dos">
-        <term><command>unix2dos</command></term>
-        <listitem>
-          <para>
-            converts plain text files in Unix format to DOS format
-          </para>
-          <indexterm zone="dos2unix unix2dos">
-            <primary sortas="b-unix2dos">unix2dos</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unix2mac">
-        <term><command>unix2mac</command></term>
-        <listitem>
-          <para>
-            converts plain text files in Unix format to Mac format
-          </para>
-          <indexterm zone="dos2unix unix2mac">
-            <primary sortas="b-unix2mac">unix2mac</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genutils/genutils.xml
===================================================================
--- general/genutils/genutils.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ general/genutils/genutils.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,56 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
+<chapter id="general-genutils">
+<?dbhtml filename="genutils.html" dir="general"?>
+<title>General Utilities</title>
 
-<chapter id="general-genutils">
-  <?dbhtml filename="genutils.html"?>
-
-  <title>General Utilities</title>
-
-  <para>
-    This chapter contains various utilities that do not fit conveniently into
-    other chapters.  Programs include some documentation generators, several
-    utilities for manipulating text and graphics, programs for listing files,
-    a program for entering PIN numbers and pass-phrases, and a connection
-    manager.
-  </para>
-
-<!--
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="asciidoc.xml"/>
--->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="asciidoctor.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bogofilter.xml"/>
-
-  <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="dos2unix.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"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="highlight.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ibus.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="iso-codes.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lsof.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mandoc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pinentry.xml"/>
-  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rarian.xml"/>-->
-  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rep-gtk.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="screen.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shared-mime-info.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sharutils.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-logger.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-mission-control.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tidy-html5.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="time.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tree.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="unixodbc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xdg-dbus-proxy.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xdg-user-dirs.xml"/>
+&bc;
 
 </chapter>
Index: general/genutils/graphviz.xml
===================================================================
--- general/genutils/graphviz.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,952 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 graphviz-download-http "https://gitlab.com/graphviz/graphviz/-/archive/&graphviz-version;/graphviz-&graphviz-version;.tar.bz2">
-  <!ENTITY graphviz-download-ftp  " ">
-  <!ENTITY graphviz-md5sum        "5d343d0ba08dc11624d3961af2b4755c">
-  <!ENTITY graphviz-size          "26 MB">
-  <!ENTITY graphviz-buildsize     "220 MB">
-  <!ENTITY graphviz-time          "0.8 SBU (using parallelism=4)">
-]>
-
-<sect1 id="graphviz" xreflabel="Graphviz-&graphviz-version;">
-  <?dbhtml filename="graphviz.html"?>
-
-
-  <title>Graphviz-&graphviz-version;</title>
-
-  <indexterm zone="graphviz">
-    <primary sortas="a-Graphviz">Graphviz</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Graphviz</title>
-
-    <para>
-      The <application>Graphviz</application> package contains graph
-      visualization software. Graph visualization is a way of representing
-      structural information as diagrams of abstract graphs and networks.
-      <application>Graphviz</application> has several main graph layout
-      programs. It also has web and interactive graphical interfaces, auxiliary
-      tools, libraries, and language bindings.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&graphviz-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&graphviz-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &graphviz-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &graphviz-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &graphviz-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &graphviz-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Graphviz Dependencies</bridgehead>
-
-    <note>
-      <para>
-        <application>Graphviz</application> basic usage does not need any
-        libraries out of what is found in the LFS book. Its <quote>core</quote>
-        rendering engine allows to generate several graphic formats, such as
-        Postscript, SVG, VML, .fig, and Tk. Those formats can be converted
-        to almost any other format using for example tools from
-        <xref role="nodep" linkend="imagemagick"/>. The dependencies below add
-        the ability to generate graph images in bitmap format, to display the
-        graph image on screen, to edit a graph by viewing the resulting image
-        directly, or to view large graphs. Since
-        <application>Graphviz</application> is a dependency
-        of several other packages in this book, it is suggested to first build
-        it without any dependencies, then to rebuild it when you have built
-        enough packages to suit your needs.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect4">Optional, for various bitmap outputs</bridgehead>
-    <para role="optional">
-      <xref linkend="pango"/>, with
-      <xref linkend="cairo"/>,
-      <xref linkend="xorg7-lib"/>,
-      <xref linkend="fontconfig"/>, and
-      <xref linkend="libpng"/>, to generate images in bitmap SVG, postscript,
-      PNG, and PDF formats, or displaying the image on screen. The PNG
-      output is required for building <xref role="nodep" linkend="gegl"/>
-    </para>
-
-    <para role="optional">
-      Adding
-      <xref linkend="gtk2"/> with
-      <xref linkend="libjpeg"/> adds support for JPEG, BMP, TIF, and ICO
-      formats, and allows displaying the image in a GTK+ window
-    </para>
-
-    <para role="optional">
-      <ulink url="https://www.libgd.org/">GD Library</ulink> may be used
-      instead of <application>Pango</application>. It adds the ability to
-      generate images in GIF, VRML, and GD formats, but
-      <application>Pango</application> provides better outputs for the other
-      formats, and is needed for displaying images
-    </para>
-
-    <para role="optional">
-      Other formats may be added with
-      <xref linkend="libwebp"/> (WebP support is considered experimental),
-      <ulink url="https://openil.sourceforge.net/projects.php">DevIL</ulink>,
-      <ulink url="https://sourceforge.net/projects/lasi/">libLASi</ulink>, and
-      <ulink url="https://www.freedesktop.org/wiki/Software/glitz">glitz</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional, to load graphic images that may be
-    displayed inside the nodes of a graph</bridgehead>
-
-    <para role="optional">
-      <filename class="libraryfile">libgs.so</filename> from
-      <xref linkend="gs"/>,
-      <xref linkend="librsvg"/>, and
-      <xref linkend="poppler"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional, to build more tools</bridgehead>
-
-    <para role="optional">
-      <xref linkend="freeglut"/> (with 
-      <ulink url="https://sourceforge.net/projects/gtkglext/">GtkGLExt</ulink> and
-      <ulink url="https://gts.sourceforge.net/">libGTS</ulink> for building
-      the <command>smyrna</command> large graph viewer, which is
-      considered experimental), and
-      &qt5-deps; (for building the <command>gvedit</command>
-      graph editor.)
-    </para>
-
-    <bridgehead renderas="sect4">Optional (To Build Language Bindings)</bridgehead>
-    <para role="optional">
-      <xref linkend="swig"/> (<application>SWIG</application> must be
-      installed or no bindings will be built),
-      <xref linkend="gcc"/> (for the go compiler),
-      <xref linkend="guile"/>,
-      <xref linkend="openjdk"/>,
-      <xref linkend="lua"/>,
-      <xref linkend="php"/>,
-      <xref linkend="ruby"/>,
-      <xref linkend="tk"/>,
-      <ulink url="https://iolanguage.org/">Io</ulink>,
-      <ulink url="https://www.mono-project.com/Main_Page">Mono</ulink>,
-      <ulink url="https://ocaml.org/">OCaml</ulink>, and
-      <ulink url="https://www.r-project.org/">R</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (building tools)</bridgehead>
-    <para role="optional">
-      <ulink url="https://github.com/Snaipe/Criterion">Criterion</ulink>
-          (framework for tests) and
-      <ulink url="https://linux.softpedia.com/get/Programming/Debuggers/Electric-Fence-3305.shtml/">Electric Fence</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (for building the pdf documentation)</bridgehead>
-    <para role="optional">
-      <xref linkend="gs"/> (for the <command>ps2pdf</command> command)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Graphviz</title>
-
-    <para>
-      Install <application>Graphviz</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i '/LIBPOSTFIX="64"/s/64//' configure.ac &amp;&amp;
-
-./autogen.sh              &amp;&amp;
-./configure --prefix=/usr \
-            --docdir=/usr/share/doc/graphviz-&graphviz-version;</userinput></screen>
-
-    <note>
-      <para>
-        A warning is generated by <command>autogen.sh</command> because the
-        build tree is not a git repository. As a result, the build date is set
-        to 0. To get a meaningful date in the version string, you can run:
-      </para>
-
-<screen><userinput>sed -i "s/0/$(date +%Y%m%d)/" builddate.h</userinput></screen>
-    </note>
-
-    <para>
-      Whether or not you fix the date, proceed to compile the package:
-    </para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite that provides
-      meaningful results.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed ... configure.ac</command>: This command is needed to
-      avoid installing files in /usr/lib64.
-    </para>
-    <para>
-      <option>--with-javaincludedir="$JAVA_HOME/include
-                                   -I$JAVA_HOME/include/linux"</option>:
-      If you have built <xref linkend="openjdk"/> in /opt, and you want to
-      build the JAVA bindings, it is necessary to specify the location of the
-      JAVA header files to configure. The configure switch is designed for
-      only one directory, but two directories need to be included.
-      This is possible nevertheless by using the -I switch inside the variable.
-    </para>
-
-    <para>
-      <option>--with-webp</option>: Even if <xref linkend="libwebp"/> is
-      installed, it is not included in the build without this option.
-    </para>
-
-    <para>
-      <option>--with-smyrna</option>: Even if the needed dependencies are
-      installed, the interactive graph viewer <command>smyrna</command> is not
-      built without this option.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Graphviz</title>
-
-    <sect3 id="graphviz-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/usr/lib/graphviz/config</filename>
-      </para>
-
-      <indexterm zone="graphviz graphviz-config">
-        <primary sortas="e-usr-share-graphviz-config">/usr/share/graphviz/config</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        There are no specific configuration requirements for
-        <application>Graphviz</application>. You may consider installing the
-        additional plugins and tools available from the download page at
-        <ulink url="https://graphviz.org/download/source/"/> for additional
-        capabilities. If additional plugins are installed, you can run
-        <command>dot -c</command> (as the
-        <systemitem class="username">root</systemitem> user) to update the
-        <filename>config</filename> file in
-        <filename class="directory">/usr/lib/graphviz</filename>.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          acyclic, bcomps, ccomps, circo, cluster, dijkstra,
-          dot, dot2gxl, dot_builtins, edgepaint, fdp, gc, gml2gv,
-          graphml2gv, gv2gml, gv2gxl, gvcolor, gvedit, gvgen, gvmap, gvmap.sh,
-          gvpack, gvpr, gxl2dot, gxl2gv, mm2gv, neato, nop,
-          osage, patchwork, prune, sccmap, sfdp, tred, twopi,
-          unflatten, and vimdot
-        </seg>
-        <seg>
-          libcdt.so, libcgraph.so, libgvc.so, libgvpr.so, liblab_gamut.so,
-          libpathplan.so, libxdot.so, and several plugins in /usr/lib/graphviz.
-          There are also several in subdirectories of
-          /usr/lib/{lua,perl5,php,python&python3-majorver;,tcl8.6}.
-          Unfortunately, some libraries are duplicated.
-        </seg>
-        <seg>
-          /usr/include/graphviz,
-          /usr/lib/graphviz,
-          /usr/lib/tcl8.6/graphviz,
-          /usr/share/doc/graphviz-&graphviz-version;, and
-          /usr/share/graphviz
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="acyclic">
-        <term><command>acyclic</command></term>
-        <listitem>
-          <para>
-            is a filter that takes a directed graph as input and outputs a
-            copy of the graph with sufficient edges reversed to make the
-            graph acyclic
-          </para>
-          <indexterm zone="graphviz acyclic">
-            <primary sortas="b-acyclic">acyclic</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bcomps">
-        <term><command>bcomps</command></term>
-        <listitem>
-          <para>
-            decomposes graphs into their biconnected components,
-            printing the components to standard output
-          </para>
-          <indexterm zone="graphviz bcomps">
-            <primary sortas="b-bcomps">bcomps</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ccomps">
-        <term><command>ccomps</command></term>
-        <listitem>
-          <para>
-            decomposes graphs into their connected components,
-            printing the components to standard output
-          </para>
-          <indexterm zone="graphviz ccomps">
-            <primary sortas="b-ccomps">ccomps</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="circo">
-        <term><command>circo</command></term>
-        <listitem>
-          <para>
-            draws graphs using a circular layout
-          </para>
-          <indexterm zone="graphviz circo">
-            <primary sortas="b-circo">circo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cluster">
-        <term><command>cluster</command></term>
-        <listitem>
-          <para>
-            takes a graph in DOT format as input, finds node clusters
-            and then augments the graph with this information
-          </para>
-          <indexterm zone="graphviz cluster">
-            <primary sortas="b-cluster">cluster</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="diffimg">
-        <term><command>diffimg</command></term>
-        <listitem>
-          <para>
-            (needs <ulink url="https://www.libgd.org/">GD Library</ulink>)
-            generates an image where each pixel is the
-            difference between the corresponding pixel in
-            each of the two source images
-          </para>
-          <indexterm zone="graphviz diffimg">
-            <primary sortas="b-diffimg">diffimg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dijkstra">
-        <term><command>dijkstra</command></term>
-        <listitem>
-          <para>
-            reads a stream of graphs and for each computes the distance of
-            every node from sourcenode
-          </para>
-          <indexterm zone="graphviz dijkstra">
-            <primary sortas="b-dijkstra">dijkstra</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dot">
-        <term><command>dot</command></term>
-        <listitem>
-          <para>
-            draws directed graphs. It works well on DAGs and other graphs
-            that can be drawn as hierarchies. It reads attributed graph files and
-            writes drawings. By default, the output format dot is the input file
-            with layout coordinates appended
-          </para>
-          <indexterm zone="graphviz dot">
-            <primary sortas="b-dot">dot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dot2gxl">
-        <term><command>dot2gxl</command></term>
-        <listitem>
-          <para>
-            converts between graphs represented in GXL and in the DOT
-            language. Unless a conversion type is specified using a flag,
-            <command>gxl2dot</command> will deduce the type of conversion from
-            the suffix of the input file, a
-            <filename class="extension">.dot</filename> suffix causing a
-            conversion from DOT to GXL, and a
-            <filename class="extension">.gxl</filename> suffix causing a
-            conversion from GXL to DOT
-          </para>
-          <indexterm zone="graphviz dot2gxl">
-            <primary sortas="b-dot2gxl">dot2gxl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <!--
-      <varlistentry id="dotty">
-        <term><command>dotty</command></term>
-        <listitem>
-          <para>
-            is a graph editor for the X Window System. It may be run as a
-            standalone editor, or as a front end for applications that use
-            graphs. It can control multiple windows viewing different graphs
-          </para>
-          <indexterm zone="graphviz dotty">
-            <primary sortas="b-dotty">dotty</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      -->
-      <varlistentry id="edgepaint">
-        <term><command>edgepaint</command></term>
-        <listitem>
-          <para>
-            performs edge coloring to disambiguate crossing edges
-          </para>
-          <indexterm zone="graphviz edgepaint">
-            <primary sortas="b-edgepaint">edgepaint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fdp">
-        <term><command>fdp</command></term>
-        <listitem>
-          <para>
-            draws undirected graphs using a <quote>spring</quote> model. It
-            relies on a force-directed approach in the spirit of Fruchterman
-            and Reingold
-          </para>
-          <indexterm zone="graphviz fdp">
-            <primary sortas="b-fdp">fdp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gc-graphviz">
-        <term><command>gc</command></term>
-        <listitem>
-          <para>
-            is a graph analogue to <command>wc</command> in that it prints
-            to standard output the number of nodes, edges, connected components
-            or clusters contained in the input files. It also prints a total
-            count for all graphs if more than one graph is given
-          </para>
-          <indexterm zone="graphviz gc-graphviz">
-            <primary sortas="b-gc">gc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gml2gv">
-        <term><command>gml2gv</command></term>
-        <listitem>
-          <para>
-            converts a graph specified in the GML format to
-            a graph in the GV (formerly DOT) format
-          </para>
-          <indexterm zone="graphviz gml2gv">
-            <primary sortas="b-gml2gv">gml2gv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="graphml2gv">
-        <term><command>graphml2gv</command></term>
-        <listitem>
-          <para>
-            converts a graph specified in the GRAPHML format to a graph in
-            the GV (formerly DOT) format
-          </para>
-          <indexterm zone="graphviz graphml2gv">
-            <primary sortas="b-graphml2gv">graphml2gv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gv2gml">
-        <term><command>gv2gml</command></term>
-        <listitem>
-          <para>
-            converts a graph specified in the GV format to a graph in the GML format
-          </para>
-          <indexterm zone="graphviz gv2gml">
-            <primary sortas="b-gv2gml">gv2gml</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gv2gxl">
-        <term><command>gv2gxl</command></term>
-        <listitem>
-          <para>
-            converts a graph specified in the GV format to a graph in the GXL format
-          </para>
-          <indexterm zone="graphviz gv2gxl">
-            <primary sortas="b-gv2gxl">gv2gxl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvcolor">
-        <term><command>gvcolor</command></term>
-        <listitem>
-          <para>
-            is a filter that sets node colors from initial seed values.
-            Colors flow along edges from tail to head, and are averaged (as HSB
-            vectors) at nodes
-          </para>
-          <indexterm zone="graphviz gvcolor">
-            <primary sortas="b-gvcolor">gvcolor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvedit">
-        <term><command>gvedit</command></term>
-        <listitem>
-          <para>
-            provides a simple graph editor and viewer. It allows many
-            graphs to be viewed at the same time. The text of each
-            graph is displayed in its own text window
-          </para>
-          <indexterm zone="graphviz gvedit">
-            <primary sortas="b-gvedit">gvedit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvgen">
-        <term><command>gvgen</command></term>
-        <listitem>
-          <para>
-            generates a variety of simple, regularly-structured
-            abstract graphs
-          </para>
-          <indexterm zone="graphviz gvgen">
-            <primary sortas="b-gvgen">gvgen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvmap">
-        <term><command>gvmap</command></term>
-        <listitem>
-          <para>
-            takes as input a graph in DOT format, finds node
-            clusters and produces a rendering of the graph as
-            a geographic-style map, with clusters highlighted,
-            in xdot format
-          </para>
-          <indexterm zone="graphviz gvmap">
-            <primary sortas="b-gvmap">gvmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvmap.sh">
-        <term><command>gvmap.sh</command></term>
-        <listitem>
-          <para>
-            is a pipeline for running gvmap
-          </para>
-          <indexterm zone="graphviz gvmap.sh">
-            <primary sortas="b-gvmap.sh">gvmap.sh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvpack">
-        <term><command>gvpack</command></term>
-        <listitem>
-          <para>
-            reads in a stream of graphs, combines the graphs into a single layout,
-            and produces a single graph serving as the union of the input graphs
-          </para>
-          <indexterm zone="graphviz gvpack">
-            <primary sortas="b-gvpack">gvpack</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gvpr">
-        <term><command>gvpr</command></term>
-        <listitem>
-          <para>
-            is a graph stream editor inspired by <command>awk</command>. It
-            copies input graphs to its output, possibly transforming their
-            structure and attributes, creating new graphs, or printing arbitrary
-            information
-          </para>
-          <indexterm zone="graphviz gvpr">
-            <primary sortas="b-gvpr">gvpr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gxl2dot">
-        <term><command>gxl2dot</command></term>
-        <listitem>
-          <para>
-            converts between graphs represented in GXL and in the DOT
-            language. Unless a conversion type is specified using a flag,
-            <command>gxl2dot</command> will deduce the type of conversion from
-            the suffix of the input file, a
-            <filename class="extension">.dot</filename> suffix causing a
-            conversion from DOT to GXL, and a
-            <filename class="extension">.gxl</filename> suffix causing a
-            conversion from GXL to DOT
-          </para>
-          <indexterm zone="graphviz gxl2dot">
-            <primary sortas="b-gxl2dot">gxl2dot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gxl2gv">
-        <term><command>gxl2gv</command></term>
-        <listitem>
-          <para>
-            converts between graphs represented in GXL and in
-            the GV language
-          </para>
-          <indexterm zone="graphviz gxl2gv">
-            <primary sortas="b-gxl2gv">gxl2gv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <!--
-      <varlistentry id="lefty">
-        <term><command>lefty</command></term>
-        <listitem>
-          <para>
-            is a two-view graphics editor for technical pictures
-          </para>
-          <indexterm zone="graphviz lefty">
-            <primary sortas="b-lefty">lefty</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lneato">
-        <term><command>lneato</command></term>
-        <listitem>
-          <para>
-            is a graph editor for the X Window System. It may be run as a
-            standalone editor, or as a front end for applications that use
-            graphs. It can control multiple windows viewing different graphs
-          </para>
-          <indexterm zone="graphviz lneato">
-            <primary sortas="b-lneato">lneato</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      -->
-      <varlistentry id="mm2gv">
-        <term><command>mm2gv</command></term>
-        <listitem>
-          <para>
-            converts a sparse matrix of the Matrix Market format
-            to a graph in the GV (formerly DOT) format
-          </para>
-          <indexterm zone="graphviz mm2gv">
-            <primary sortas="b-mm2gv">mm2gv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="neato">
-        <term><command>neato</command></term>
-        <listitem>
-          <para>
-            draws undirected graphs using <quote>spring</quote> models. Input
-            files must be formatted in the <command>dot</command>  attributed
-            graph language. By default, the output of <command>neato</command>
-            is the input graph with layout coordinates appended
-          </para>
-          <indexterm zone="graphviz neato">
-            <primary sortas="b-neato">neato</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nop">
-        <term><command>nop</command></term>
-        <listitem>
-          <para>
-            reads a stream of graphs and prints each in pretty-printed (canonical)
-            format on stdout. If no files are given, it reads from stdin
-          </para>
-          <indexterm zone="graphviz nop">
-            <primary sortas="b-nop">nop</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="osage">
-        <term><command>osage</command></term>
-        <listitem>
-          <para>
-            draws clustered graphs. It takes any graph in DOT format as input
-          </para>
-          <indexterm zone="graphviz osage">
-            <primary sortas="b-osage">osage</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="patchwork">
-        <term><command>patchwork</command></term>
-        <listitem>
-          <para>
-            draws clustered graphs using a squarified treemap layout.
-            It takes any graph in DOT format as input
-          </para>
-          <indexterm zone="graphviz patchwork">
-            <primary sortas="b-patchwork">patchwork</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="prune">
-        <term><command>prune</command></term>
-        <listitem>
-          <para>
-            reads directed graphs in the same format used by
-            <command>dot</command> and removes subgraphs rooted at nodes
-            specified on the command line via options
-          </para>
-          <indexterm zone="graphviz prune">
-            <primary sortas="b-prune">prune</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sccmap">
-        <term><command>sccmap</command></term>
-        <listitem>
-          <para>
-            decomposes digraphs into strongly connected components and an
-            auxiliary map of the relationship between components. In this map,
-            each component is collapsed into a node. The resulting graphs are
-            printed to stdout
-          </para>
-          <indexterm zone="graphviz sccmap">
-            <primary sortas="b-sccmap">sccmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sfdp">
-        <term><command>sfdp</command></term>
-        <listitem>
-          <para>
-            draws undirected graphs using the <quote>spring</quote> model,
-            but it uses a multi-scale approach to produce layouts of large
-            graphs in a reasonably short time
-          </para>
-          <indexterm zone="graphviz sfdp">
-            <primary sortas="b-sfdp">sfdp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tred">
-        <term><command>tred</command></term>
-        <listitem>
-          <para>
-            computes the transitive reduction of directed graphs, and
-            prints the resulting graphs to standard output. This removes edges
-            implied by transitivity. Nodes and subgraphs are not otherwise
-            affected
-          </para>
-          <indexterm zone="graphviz tred">
-            <primary sortas="b-tred">tred</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="twopi">
-        <term><command>twopi</command></term>
-        <listitem>
-          <para>
-            draws graphs using a radial layout. Basically, one node is
-            chosen as the center and put at the origin. The remaining nodes are
-            placed on a sequence of concentric circles centered about the origin,
-            each a fixed radial distance from the previous circle
-          </para>
-          <indexterm zone="graphviz twopi">
-            <primary sortas="b-twopi">twopi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unflatten">
-        <term><command>unflatten</command></term>
-        <listitem>
-          <para>
-            is a preprocessor to <command>dot</command> that is used to
-            improve the aspect ratio of graphs having many leaves or disconnected
-            nodes. The usual layout for such a graph is generally very wide or tall
-          </para>
-          <indexterm zone="graphviz unflatten">
-            <primary sortas="b-unflatten">unflatten</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vimdot">
-        <term><command>vimdot</command></term>
-        <listitem>
-          <para>
-            is a simple script which launches the <command>gvim</command>
-            or <command>vim</command> editor along with a GUI window
-            showing the <command>dot</command> output of the edited file
-          </para>
-          <indexterm zone="graphviz vimdot">
-            <primary sortas="b-vimdot">vimdot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcdt">
-        <term><filename class="libraryfile">libcdt.so</filename></term>
-        <listitem>
-          <para>
-            manages run-time dictionaries using standard container data
-            types: unordered set/multiset, ordered set/multiset, list, stack,
-            and queue
-          </para>
-          <indexterm zone="graphviz libcdt">
-            <primary sortas="c-libcdt">libcdt.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcgraph">
-        <term><filename class="libraryfile">libcgraph.so</filename></term>
-        <listitem>
-          <para>
-            supports graph programming by maintaining graphs in memory and
-            reading and writing graph files. Graphs are composed of nodes,
-            edges, and nested subgraphs
-          </para>
-          <indexterm zone="graphviz libcgraph">
-            <primary sortas="c-libcgraph">libcgraph.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgvc">
-        <term><filename class="libraryfile">libgvc.so</filename></term>
-        <listitem>
-          <para>
-            provides a context for applications wishing to manipulate
-            and render graphs. It provides command line parsing interfaces,
-            common rendering code, and a plugin mechanism for renderers
-          </para>
-          <indexterm zone="graphviz libgvc">
-            <primary sortas="c-libgvc">libgvc.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpathplan">
-        <term><filename class="libraryfile">libpathplan.so</filename></term>
-        <listitem>
-          <para>
-            contains functions to find the shortest path between two points
-            in a simple polygon
-          </para>
-          <indexterm zone="graphviz libpathplan">
-            <primary sortas="c-libpathplan">libpathplan.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libxdot">
-        <term><filename class="libraryfile">libxdot.so</filename></term>
-        <listitem>
-          <para>
-            provides support for parsing and deparsing graphical
-            operations specified by the xdot language
-          </para>
-          <indexterm zone="graphviz libxdot">
-            <primary sortas="c-libxdot">libxdot.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genutils/gtk-doc.xml
===================================================================
--- general/genutils/gtk-doc.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,214 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gtk-doc-download-http "&gnome-download-http;/gtk-doc/&gtk-doc-major;/gtk-doc-&gtk-doc-version;.tar.xz">
-  <!ENTITY gtk-doc-download-ftp  " ">
-  <!ENTITY gtk-doc-md5sum        "f0e7385ba25eddb6ce0953e8cf63d1bf">
-  <!ENTITY gtk-doc-size          "484 KB">
-  <!ENTITY gtk-doc-buildsize     "14 MB (with tests)">
-  <!ENTITY gtk-doc-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="gtk-doc" xreflabel="GTK-Doc-&gtk-doc-version;">
-  <?dbhtml filename="gtk-doc.html"?>
-
-
-  <title>GTK-Doc-&gtk-doc-version;</title>
-
-  <indexterm zone="gtk-doc">
-    <primary sortas="a-GTK-Doc">GTK-Doc</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GTK-Doc</title>
-
-    <para>
-      The <application>GTK-Doc</application> package contains a code
-      documenter. This is useful for extracting specially formatted comments
-      from the code to create API documentation. This package is
-      <emphasis>optional</emphasis>; if it is not installed, packages will
-      not build the documentation. This does not mean that you will not have
-      any documentation. If <application>GTK-Doc</application> is not
-      available, the install process will copy any pre-built documentation
-      to your system.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gtk-doc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gtk-doc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gtk-doc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gtk-doc-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gtk-doc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gtk-doc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch to allow building <xref linkend="glib2"/>
-          documentation:
-          <ulink url="&patch-root;/gtk-doc-&gtk-doc-version;-glib2_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">GTK-Doc Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="DocBook"/>,
-      <xref linkend="docbook-xsl"/>,
-      <xref linkend="itstool"/>, and
-      <xref linkend="libxslt"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref role="runtime" linkend="pygments"/> at run time
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      For tests:
-      <ulink url="https://sourceforge.net/projects/dblatex/">dblatex</ulink> or
-      <xref linkend="fop"/> (XML PDF support),
-      <xref linkend="glib2"/>,
-      <xref linkend="which"/>, and
-      Python modules
-      <xref linkend="lxml"/>,
-      <!--<ulink url="https://anytree.readthedocs.io/en/latest/">anytree</ulink>,-->
-      <ulink url="https://pypi.org/project/parameterized/">parameterized</ulink>,
-      and <ulink url="&gnome-download-http;/yelp-tools">yelp-tools</ulink>
-    </para>
-
-    <note>
-      <para>
-      The optional python modules above can be easily installed with
-      the <command>pip3</command> command.
-      </para>
-    </note>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GTK-Doc</title>
-
-    <para>
-      Install <application>GTK-Doc</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>mkdir -p build &amp;&amp;
-cd       build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      The test suite will hang if the package (or a previous version)
-      is not already installed.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-      Some tests will fail depending on optionally installed packages.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gtkdocize,
-          gtkdoc-check,
-          gtkdoc-depscan,
-          gtkdoc-fixxref,
-          gtkdoc-mkdb,
-          gtkdoc-mkhtml,
-          gtkdoc-mkhtml2,
-          gtkdoc-mkman,
-          gtkdoc-mkpdf,
-          gtkdoc-rebase,
-          gtkdoc-scan, and
-          gtkdoc-scangobj
-        </seg>
-
-        <seg>None</seg>
-
-        <seg>
-          /usr/share/gtk-doc and
-          /usr/share/cmake/GtkDoc
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gtkdoc">
-        <term><command>gtkdoc*</command></term>
-        <listitem>
-          <para>
-            these are all shell, or
-            <application>Python</application> scripts used by
-            package <filename>Makefile</filename> scripts to generate
-            documentation for the package being built
-          </para>
-          <indexterm zone="gtk-doc gtkdoc">
-            <primary sortas="b-gtkdoc*">gtkdoc*</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genutils/highlight.xml
===================================================================
--- general/genutils/highlight.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,212 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 highlight-download-http "http://www.andre-simon.de/zip/highlight-&highlight-version;.tar.bz2">
-  <!ENTITY highlight-download-ftp  " ">
-  <!ENTITY highlight-md5sum        "187a16136f7aa4310e57eecb994b7ac4">
-  <!ENTITY highlight-size          "1.4 MB">
-  <!ENTITY highlight-buildsize     "24 MB (with gui)">
-  <!ENTITY highlight-time          "0.3 SBU (Using parallelism=4; with gui)">
-]>
-
-<sect1 id="highlight" xreflabel="Highlight-&highlight-version;">
-  <?dbhtml filename="highlight.html"?>
-
-
-  <title>Highlight-&highlight-version;</title>
-
-  <indexterm zone="highlight">
-    <primary sortas="a-Highlight">Highlight</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Highlight</title>
-
-    <para>
-      <application>Highlight</application> is an utility that converts
-      source code to formatted text with syntax highlighting.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&highlight-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&highlight-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &highlight-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &highlight-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &highlight-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &highlight-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Highlight Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="boost"/> and
-      <xref linkend="lua"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <!-- make apidocs fails because there is no Doxyfile
-      <xref linkend="doxygen"/> (to build the API documentation) and -->
-      &qt5-deps; (to build the GUI front-end)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Highlight</title>
-
-    <para>
-      For consistency, do not compress man pages.
-    </para>
-
-<screen><userinput>sed -i '/GZIP/s/^/#/' makefile</userinput></screen>
-
-    <para>
-      To build <application>Highlight</application> run the following
-      command:
-    </para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>
-      To build the <application>Qt5</application> GUI front-end, run the
-      following command:
-    </para>
-
-<screen role="nodump"><userinput>make doc_dir=/usr/share/doc/highlight-&highlight-version;/ gui</userinput></screen>
-<!--
-    <para>
-      To build the API documentation, run the following command:
-    </para>
-
-<screen><userinput>make apidocs</userinput></screen>
--->
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      To install <application>Highlight</application>, run the
-      following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make doc_dir=/usr/share/doc/highlight-&highlight-version;/ install</userinput></screen>
-
-    <para>
-      To install the GUI program, run the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="nodump"><userinput>make install-gui</userinput></screen>
-<!--
-    <para>
-      To install the API documentation, run the following command
-      as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cp -rv apidocs/html /usr/share/doc/highlight/apidocs</userinput></screen>
--->
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>doc_dir=/usr/share/doc/highlight-&highlight-version;/</parameter>:
-      installs the highlight documentation into a versioned directory. This
-      parameter is also needed for <command>make gui</command>, because
-      its value would be hardcoded into the gui executable.  Note that the
-      trailing <quote>/</quote> is necessary.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          highlight and highlight-gui (optional)
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /etc/highlight,
-          /usr/share/doc/highlight-&highlight-version;, and
-          /usr/share/highlight
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="highlight-prog">
-        <term><command>highlight</command></term>
-        <listitem>
-          <para>
-            is a universal source code to formatted text converter
-          </para>
-          <indexterm zone="highlight highlight-prog">
-            <primary sortas="b-highlight">highlight</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="highlight-gui">
-        <term><command>highlight-gui</command></term>
-        <listitem>
-          <para>
-            is the <application>Qt5</application> interface to
-            <command>highlight</command>.
-          </para>
-          <indexterm zone="highlight highlight-gui">
-            <primary sortas="b-highlight-gui">highlight-gui</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genutils/ibus.xml
===================================================================
--- general/genutils/ibus.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,382 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 ibus-download-http "https://github.com/ibus/ibus/archive/&ibus-version;/ibus-&ibus-version;.tar.gz">
-  <!ENTITY ibus-download-ftp  " ">
-  <!ENTITY ibus-md5sum        "2e29a7fb0f8c5ffcf42462fda45348fd">
-  <!ENTITY ibus-size          "1.4 MB">
-  <!ENTITY ibus-buildsize     "54 MB (add 3 MB for tests)">
-  <!ENTITY ibus-time          "0.3 SBU (Using parallelism=4; add 0.6 SBU for tests)">
-<!-- Since UCD.zip can be used by gucharmap too, let's use the same version:
-     This prevents version mismatches, since UCD.zip filename is not versioned.
--->
-  <!ENTITY ucd-download-http  "https://www.unicode.org/Public/zipped/&gucharmap-major-version;.0/UCD.zip">
-]>
-
-<sect1 id="ibus" xreflabel="ibus-&ibus-version;">
-  <?dbhtml filename="ibus.html"?>
-
-
-  <title>ibus-&ibus-version;</title>
-
-  <indexterm zone="ibus">
-    <primary sortas="a-ibus">ibus</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ibus</title>
-
-    <para>
-      <application>ibus</application> is an Intelligent Input Bus. It is a new
-      input framework for the Linux OS. It provides a fully featured and user
-      friendly input method user interface.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&ibus-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&ibus-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &ibus-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &ibus-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &ibus-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &ibus-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Unicode Character Database:
-          <ulink url="&ucd-download-http;"> &ucd-download-http;</ulink>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">ibus Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dconf"/>,
-      <!-- needed since we're using autogen.sh -->
-      <xref linkend="iso-codes"/>, and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection;,
-      <xref linkend="gtk3"/>, and
-      <xref linkend="libnotify"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk4"/> (to build IM module for it),
-      <xref linkend="gtk-doc"/> (for generating API documentation),
-      <xref linkend="dbus-python"/> and
-      <xref linkend="pygobject3"/> (both to build the Python support library),
-      <!--<xref linkend="pyxdg" role="runtime"/>
-      (runtime, for the <command>ibus-setup</command>), and
-      NOTE: The reference to the 'xdg' python module is commented out in the source -->
-      <xref linkend="libxkbcommon"/>,
-      <xref linkend="wayland"/> (both to build the Wayland support programs),
-      <ulink url="https://www.joypixels.com/">EmojiOne</ulink>, and
-      <ulink url="https://github.com/AyatanaIndicators/libdbusmenu">libdbusmenu</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ibus</title>
-
-<!--
-    <para>
-      If the optional Unicode Character Database was downloaded, install it
-      now as the <systemitem class="username">root</systemitem> user:
-    </para>
--->
-
-    <para>
-      First, install the Unicode Character Database as the &root; user:
-    </para>
-
-<screen role="root"><userinput>mkdir -p               /usr/share/unicode/ucd &amp;&amp;
-unzip -o ../UCD.zip -d /usr/share/unicode/ucd</userinput></screen>
-
-<!--
-    <note>
-      <para>
-        Be sure to also remove the - -disable-unicode-dict in
-        the configure step below.
-      </para>
-    </note>
--->
-    <para>
-      Fix an issue with deprecated schema entries:
-    </para>
-
-<screen><userinput>sed -e 's@/desktop/ibus@/org/freedesktop/ibus@g' \
-    -i data/dconf/org.freedesktop.ibus.gschema.xml</userinput></screen>
-
-    <para>
-      If <xref linkend='gtk-doc'/> is not installed, remove the references
-      to it:
-    </para>
-
-<screen><userinput>if ! [ -e /usr/bin/gtkdocize ]; then
-  sed '/docs/d;/GTK_DOC/d' -i Makefile.am configure.ac
-fi</userinput></screen>
-
-    <para>
-      Install <application>ibus</application> by running the following
-      commands:
-    </para>
-
-<screen revision='sysv'><userinput>SAVE_DIST_FILES=1 NOCONFIGURE=1 ./autogen.sh &amp;&amp;
-
-PYTHON=python3                     \
-./configure --prefix=/usr          \
-            --sysconfdir=/etc      \
-            --disable-python2      \
-            --disable-appindicator \
-            --disable-emoji-dict   \
-            --disable-gtk2         \
-            --disable-systemd-services &amp;&amp;
-make</userinput></screen>
-
-<screen revision='systemd'><userinput>SAVE_DIST_FILES=1 NOCONFIGURE=1 ./autogen.sh &amp;&amp;
-
-PYTHON=python3                     \
-./configure --prefix=/usr          \
-            --sysconfdir=/etc      \
-            --disable-python2      \
-            --disable-appindicator \
-            --disable-gtk2         \
-            --disable-emoji-dict   &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make -k check</command>.
-      The test named ibus-compose fails because it uses some locales
-      not installed in LFS.
-      <!-- The log says "No idea to simulate key events in Wayland"
-           in a Mutter wayland session.  DO NOT REMOVE UNLESS TESTED
-           IN WAYLAND.  -->
-      The test named ibus-keypress will fail if running in a Wayland
-      session.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-appindicator</parameter>: This switch disables
-      use of libdbusmenu. Omit if you installed the optional dependency.
-    </para>
-
-    <para>
-      <parameter>--disable-emoji-dict</parameter>: This switch disables the
-      use of emoticon dictionaries. Omit if you installed the optional
-      package.
-    </para>
-
-    <para>
-      <parameter>--disable-gtk2</parameter>: This switch removes the dependency
-      on <application>GTK+-2</application>.
-    </para>
-
-    <para>
-      <option>--enable-gtk4</option>: This switch enables building
-      the <application>GTK 4</application> immodule. Use it if
-      you have installed <application>GTK 4</application>.
-    </para>
-
-    <para>
-      <option>--enable-python-library</option>: This switch enables
-      building the <application>Python</application> support
-      library. Use it if you have installed the optional Python modules.
-    </para>
-
-    <para>
-      <option>--enable-wayland</option>: This switch enables building
-      the <application>Wayland</application> support programs.
-      It's automatically enabled if both <xref linkend='libxkbcommon'/> and
-      <xref linkend='wayland'/> are installed.
-    </para>
-
-    <para>
-      <envar>NOCONFIGURE=1</envar>: Prevent <command>autogen.sh</command>
-      from running the generated <command>configure</command> script.  We'll
-      run the script manually instead of relying on
-      <command>autogen.sh</command> to run it, because
-      <command>autogen.sh</command> would set <option>-fsanitize=address
-      -fsanitize=leak</option> in <envar>CFLAGS</envar> running
-      <command>configure</command>, but those compiler options are not
-      suitable for productive use and they may also cause a build failure.
-      <!-- GCC security policy: "Libraries like libvtv and the sanitizers
-           are intended to be used in diagnostic cases and not intended for
-           use in sensitive environments."  In my build it also causes
-           "compose/sequences-little-endian" bail out with a sanitizer
-           warning and the package to FTBFS.  -->
-    </para>
-
-    <para>
-      <envar>PYTHON=python3</envar>: This environment variable makes
-      the <command>configure</command> script look for
-      <application>Python 3</application>. Use it if you want
-      to build the <application>Python 3</application> support
-      library.
-    </para>
-
-    <para>
-      <envar>SAVE_DIST_FILES=1</envar>: This environment variable makes
-      the <command>autogen.sh</command> script save some pre-generated
-      header files instead of overwriting them when it is run. This prevents
-      build failures when generating <filename>ibusemojigen.h</filename>.
-      <!-- This is needed because we do not have the Emoji dictionary.-->
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-<!--
-    <para>
-      <command>gzip -dfv ...</command>: Decompress installed man pages
-      in accordance with other man pages.
-    </para>
--->
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Ibus</title>
-
-    <para>
-      If GTK+-3 or GTK+-2 are installed and
-      <option>--disable-gtk{3,2}</option> are not used, the ibus IM module
-      for GTK+-3 or GTK+-2 will be installed.  As the &root; user,
-      update a cache file of GTK+-3 or GTK+-2 so the GTK-based applications
-      can find the newly installed IM module and use ibus as an input
-      method:
-    </para>
-
-    <screen role='nodump'><userinput>gtk-query-immodules-3.0 --update-cache</userinput></screen>
-
-    <para>
-      The command above updates the cache file for GTK+-3.  For GTK+-2,
-      use <command>gtk-query-immodules-2.0</command> instead of
-      <command>gtk-query-immodules-3.0</command>.  GTK-4 does not require
-      a cache file for IM modules.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          ibus,
-          ibus-daemon, and
-          ibus-setup
-        </seg>
-        <seg>
-          libibus-1.0.so and
-          im-ibus.so (<application>GTK+ Immodule</application>)
-        </seg>
-        <seg>
-          /etc/dconf/db/ibus.d,
-          /usr/include/ibus-1.0,
-          /usr/share/gtk-doc/html/ibus, and
-          /usr/share/ibus
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ibus-daemon">
-        <term><command>ibus-daemon</command></term>
-        <listitem>
-          <para>
-            is the Intelligent Input Bus Daemon
-          </para>
-          <indexterm zone="ibus ibus-daemon">
-            <primary sortas="b-ibus-daemon">ibus-daemon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ibus-setup">
-        <term><command>ibus-setup</command></term>
-        <listitem>
-          <para>
-            is the <application>GTK+</application> program used to configure
-            the <command>ibus-daemon</command>
-          </para>
-          <indexterm zone="ibus ibus-setup">
-            <primary sortas="b-ibus-setup">ibus-setup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libibus-1.0">
-        <term><filename class="libraryfile">libibus-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>ibus</application> API functions
-          </para>
-          <indexterm zone="ibus libibus-1.0">
-            <primary sortas="c-libibus-1.0">libibus-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genutils/imagemagick.xml
===================================================================
--- general/genutils/imagemagick.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,611 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 imagemagick-patch-version "28">
-
-  <!ENTITY imagemagick-download-http "https://www.imagemagick.org/archive/releases/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.xz">
-  <!ENTITY imagemagick-download-ftp  " ">
-  <!ENTITY imagemagick-md5sum        "954931222003bbc79c976db4d79e934c">
-  <!ENTITY imagemagick-size          "11 MB">
-  <!ENTITY imagemagick-buildsize     "210 MB, 45 MB installed (with typical dependencies; add 10 MB for checks)">
-  <!ENTITY imagemagick-time          "0.7 SBU (with typical dependencies; add 0.7 SBU for checks, both using  parallelism=4)">
-]>
-
-<!-- Editors: It is highly unlikely that the buildsize (disk space used) will
-     be less than the figure shown above. Unless you have installed *all* the
-     delegate dependencies, you will see a smaller buildsize, but what is
-     currently listed above is the space one would require if all the
-     dependencies available in the book are installed.
-
-     Marked as 'typical' because nobody builds ALL the optional extras [ken]
-
-     [bdubbs] I do; at least the internal ones.  I still got only 141 MB.
-
-     [pierre 2017-02-14, v7.0.4-8]. I did too, and got 184 MB. I added the
-     all the corresponding switches to configure, that may make a difference.
-     All 6733 tests passed.
-
-     Saved the "full" 450MB as a comment - feel free to update this iff you
-     do build all dependencies, it's probably a lot bigger now.
-
-     [bdubbs] Just removed it.  I don't think it adds anything.
-
-     [ken] Comparing 7.0.10-27 to 7.0.10-57 on the same machine: for -27 my
-     timings and space matched the book (well, make check was marginally
-     faster on this machine), but for -57 the compiled source, installed
-     files and extra space for make check were all much smaller.
-
-     Also, please look over the output from the configure command for any
-     additional dependencies that need to be listed, as ImageMagick is
-     constantly adding additional features and dependencies. Or diff the
-     configure script against the previous version.
-
-     For those of us who touch this infrequently:
-     DPS/dpsXclient is from apple so not relevant to linux builds
-     GVC is part of Graphviz and documented in the explanations
-     iLQR is Liquid Rescale
-     ufraw-batch (ufraw) is unmaintained and does not build with current exiv2  -->
-
-<sect1 id="imagemagick" xreflabel="ImageMagick-&imagemagick-version;-&imagemagick-patch-version;">
-  <?dbhtml filename="imagemagick.html"?>
-
-
-  <title>ImageMagick-&imagemagick-version;-&imagemagick-patch-version;</title>
-
-  <indexterm zone="imagemagick">
-    <primary sortas="a-ImageMagick">ImageMagick</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ImageMagick</title>
-
-    <para>
-      <application>ImageMagick</application> is a collection of tools and
-      libraries to read, write, and manipulate an image in various image
-      formats.  Image processing operations are available from the command line.
-      Bindings for Perl and C++ are also available.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&imagemagick-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&imagemagick-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &imagemagick-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &imagemagick-size;</para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &imagemagick-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &imagemagick-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <note>
-      <para>
-        The <application>ImageMagick</application> source releases are updated
-        frequently and the version shown above may no longer be available from
-        the download locations. You can download a more recent version and use
-        the existing BLFS instructions to install it. Chances are that it will
-        work just fine, but this has not been tested by the BLFS team. If the
-        package version shown above is not available from the locations shown
-        above, you can download it from the BLFS package server at Oregon State
-        University: <ulink url="https://ftp.osuosl.org/pub/blfs/conglomeration/ImageMagick/"/>.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">ImageMagick Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <para>
-      The optional dependencies listed below should be installed if you need
-      support for the specific format or the conversion tool the dependency
-      provides. <!-- No such section in 7.1.0-4
-                Many of the dependencies' capabilities and uses are described in
-      the <quote>MAGICK DELEGATES</quote> section of the
-      <filename>README.txt</filename> file located in the source tree. -->
-      Additional information about the dependencies can be found in the
-      <filename>Install-unix.txt</filename> file located in the source tree as
-      well as issuing the <command>./configure --help</command> command. A
-      summary of this information, as well as some additional notes can be
-      viewed on-line at <ulink
-      url="https://imagemagick.org/script/install-source.php"/>.
-    </para>
-
-    <bridgehead renderas="sect4">Optional System Utilities</bridgehead>
-    <para role="optional">
-      Clang from <xref linkend="llvm"/>,
-      <xref linkend="cups"/>,
-      <xref linkend="curl"/>,
-      <xref linkend="ffmpeg"/>,
-      <xref linkend="fftw"/>,
-      <xref linkend="p7zip"/> (LZMA),
-      <xref linkend="sane"/>,
-      <xref linkend="wget"/>,
-      <xref linkend="xdg-utils"/>,
-      <xref linkend="xterm2"/>,
-      <ulink url="https://dmalloc.com/">Dmalloc</ulink>,
-      <ulink url="https://linux.softpedia.com/get/Programming/Debuggers/Electric-Fence-3305.shtml/">Electric Fence</ulink> and
-      <ulink url="https://www.openpgp.org/about/">PGP</ulink> or
-      <xref linkend="gnupg2"/>
-      (you'll have to do some hacking to use <application>GnuPG</application>),
-      <ulink url="https://imagemagick.org/archive/delegates/">Profiles</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional Graphics Libraries</bridgehead>
-    <para role="optional">
-      <xref linkend="jasper"/>,
-      <xref linkend="lcms2"/>,
-      <!-- although libexif may have been used in the past, I can find no
-          evidence that it has been used in imagemagick-7.  ken
-      <xref linkend="libexif"/>,-->
-      <xref linkend="libgxps"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libjxl"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libraw"/> (for dng files, needs the thread-safe libraw_r),
-      <xref linkend="librsvg"/>,
-      <xref linkend="libtiff"/>,
-      <xref linkend="libwebp"/>,
-      <xref linkend="openjpeg2"/>,
-      <xref linkend="pango"/>,
-      <ulink url="https://djvu.sourceforge.net/">DjVuLibre</ulink>,
-      <ulink url="https://imagemagick.org/archive/delegates/">
-      FlashPIX (libfpx)</ulink>,
-      <ulink url="https://github.com/FLIF-hub/FLIF/releases">FLIF</ulink>,
-      <ulink url="https://www.cl.cam.ac.uk/~mgk25/jbigkit/">JBIG-KIT</ulink>,
-      <!--<ulink url="&gnome-download-http;/libgxps/">libgxps</ulink>,-->
-      <ulink url="https://github.com/strukturag/libheif/">libheif</ulink> with
-      <ulink url="https://github.com/strukturag/libde265/">libde265</ulink>
-      (both needed if converting macOS heic images),
-      <!--<ulink url="https://github.com/libjxl/libjxl/">libjxl</ulink>,-->
-      <ulink url="https://github.com/HOST-Oman/libraqm/">libraqm</ulink>,
-      <ulink url="http://liblqr.wikidot.com/en:download-page">Liquid Rescale</ulink>,
-      <ulink url="https://www.openexr.com/">OpenEXR</ulink>, and
-      <ulink url="http://www.agocg.ac.uk/train/cgm/ralcgm.htm">RALCGM</ulink>
-      (or <ulink url="http://www.mcmurchy.com/ralcgm/ralcgm-3.51.tar.gz">ralcgm</ulink>)
-    </para>
-
-    <bridgehead renderas="sect4">Optional Graphics Utilities</bridgehead>
-    <para role="optional">
-      <xref linkend="dejavu-fonts"/>,
-      <xref linkend="gs"/>,
-      <xref linkend="gimp"/>,
-      <xref linkend="graphviz"/>,
-      <xref linkend="inkscape"/>,
-      <ulink url="https://www.blender.org/">Blender</ulink>,
-      <ulink url="https://corefonts.sourceforge.net/">corefonts</ulink>,
-      <ulink url="https://ghostscript.com/releases/gpcldnld.html">GhostPCL</ulink>,
-      <ulink url="http://www.gnuplot.info/">Gnuplot</ulink>,
-      <ulink url="https://www.povray.org/">POV-Ray</ulink>, and
-      <ulink url="https://www.radiance-online.org/">Radiance</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional Conversion Tools</bridgehead>
-    <para role="optional">
-      <xref linkend="enscript"/>,
-      <xref linkend="potrace"/>,
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
-      <ulink url="https://autotrace.sourceforge.net/">AutoTrace</ulink>,
-      <ulink url="https://www.extensis.com/">
-      GeoExpress Command Line Utilities, AKA MrSID Utilities (binary package)</ulink>,
-      <ulink url="https://www.gnu.org/software/hp2xx/">hp2xx</ulink>,
-      <!-- not accessible
-      <ulink url="https://user.it.uu.se/~jan/html2ps.html">html2ps</ulink>,
-      -->
-      <ulink url="https://wvware.sourceforge.net/">libwmf</ulink>,
-      <ulink url="https://sk1project.net/uc2/">
-      UniConvertor</ulink>,
-      <!-- ufraw-batch was a delegate program, the delegate library coders/dng.so
-      is used if librar_r is present, ufraw now ftbfs with exiv2-0.28, and IM-7.1.1
-      in any case (if no libraw) invokes it to ask for a temp png file, but then
-      tries to open the temp file using a ppm suffix, which of course fails.
-      <ulink url="https://ufraw.sourceforge.net/">ufraw</ulink> (for dng files,
-      see
-      <ulink url="https://imagemagick.org/script/formats.php">
-      https://imagemagick.org/script/formats.php</ulink> for some special switches)
-      -->
-      and
-      <ulink url="https://www.cs.utah.edu/gdc/projects/urt/">Utah Raster Toolkit</ulink>
-      (or <ulink url="http://www.mcmurchy.com/urt/urt-3.1b.tar.gz">URT-3.1b</ulink>)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ImageMagick</title>
-
-    <para>
-      Install <application>ImageMagick</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr     \
-            --sysconfdir=/etc \
-            --enable-hdri     \
-            --with-modules    \
-            --with-perl       \
-            --disable-static  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make DOCUMENTATION_PATH=/usr/share/doc/imagemagick-&imagemagick-version; install</userinput></screen>
-
-    <para>
-      To test the installation, issue: <command>make check</command>.
-              <!-- seems to have been dropped                         A more
-      comprehensive test is the <application>ImageMagick</application>
-      validation suite. If <command>make check</command> has not been executed,
-      run <command>make tests/validate</command> to compile it.  Issue
-      <command>tests/validate 2>&amp;1 | tee validate.log</command> to run the
-      validation suite.--> <!-- summary is last line of output
-       The result summary may be obtained with <command>grep
-      "validation suite" validate.log</command>. -->
-     <!-- I'm not convinced that Helvetica is required, I don't install the gs
-      fonts. But lots of references to it. Surely fontconfig provides it? ken -->
-                                                 Note that the EPS, PS, and PDF
-      tests require a working <application>Ghostscript</application>. One test
-      in 'make check' needs <quote>Helvetica</quote> from <quote>Ghostscript
-      Standard Fonts</quote>, which are optionally installed in
-      <xref linkend="gs"/> - that test, and one other, might fail, but all the
-      validation can still pass.
-    </para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-hdri</parameter>: Enables building of a
-      high dynamic range version of ImageMagick.
-    </para>
-
-    <para>
-      <parameter>--with-modules</parameter>: Enables support for
-      dynamically loadable modules.
-    </para>
-
-    <para>
-      <parameter>--with-perl</parameter>: Enables building and
-      installing of PerlMagick.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <option>--with-fftw</option>: Enables support for the
-      <application>FFTW</application> shared library.
-    </para>
-
-    <para>
-      <option>--with-rsvg</option>: Enables support for the
-      <application>librsvg</application> library.
-    </para>
-
-    <para>
-      <option>--with-autotrace</option>: Enables support for
-      the <application>Autotrace</application> library.
-    </para>
-
-    <para>
-      <option>--with-wmf</option>: Enables support for the
-      <application>libwmf</application> library.
-    </para>
-
-    <para>
-      <option>--with-gvc</option>: Enables support for
-      <application>GraphViz</application>.
-    </para>
-
-    <para>
-      <option>--with-security-policy=open|limited|secure|websafe</option>:
-      If you wish to enforce a policy other than the default 'open' see
-      <filename>www/security-policy.html</filename> in the source for
-     details.
-    </para>
-
-    <para>
-      <option>--with-windows-font-dir=
-      <replaceable>&lt;Some/Directory&gt;</replaceable></option>:
-      This option specifies the directory where the Windows CoreFonts are
-      installed.
-    </para>
-
-    <para>
-      <option>--with-dejavu-font-dir=
-      <replaceable>&lt;Some/Directory&gt;</replaceable></option>:
-      This option specifies the directory where the DejaVu fonts are
-      installed.
-    </para>
-
-    <para>
-      The options and parameters listed above are the only ones you should
-      have to pass to the <command>configure</command> script to activate all
-      the delegate dependencies. All other dependencies will be automatically
-      detected and utilized in the build if they are installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          magick, Magick++-config, MagickCore-config, and MagickWand-config.
-          (animate, compare, composite, conjure, convert, display,
-          identify, import, magick-script, mogrify, montage, and stream
-          are all symbolic links to magick)
-        </seg>
-        <seg>
-          libMagickCore-7.Q16HDRI.so,
-          libMagickWand-7.Q16HDRI.so and
-          libMagick++-7.Q16HDRI.so
-        </seg>
-        <seg>
-          /etc/ImageMagick-7,
-          /usr/include/ImageMagick-7,
-          /usr/lib/ImageMagick-&imagemagick-version;,
-          /usr/lib/perl5/site_perl/&lfs-perl-version;/{,auto}/Image/Magick,
-          /usr/share/doc/ImageMagick-&imagemagick-version;, and
-          /usr/share/ImageMagick-7
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-    <varlistentry id="animate">
-      <term><command>animate</command></term>
-      <listitem>
-        <para>
-          animates a sequence of images
-        </para>
-        <indexterm zone="imagemagick animate">
-          <primary sortas="b-animate">animate</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="compare">
-      <term><command>compare</command></term>
-      <listitem>
-        <para>
-          compares an image to a reconstructed image
-        </para>
-        <indexterm zone="imagemagick compare">
-          <primary sortas="b-compare">compare</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="composite">
-      <term><command>composite</command></term>
-      <listitem>
-        <para>
-          composites various images into the given base image
-        </para>
-        <indexterm zone="imagemagick composite">
-          <primary sortas="b-composite">composite</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="conjure">
-      <term><command>conjure</command></term>
-      <listitem>
-        <para>
-          processes a MSL script to create an image
-        </para>
-        <indexterm zone="imagemagick conjure">
-          <primary sortas="b-conjure">conjure</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="convert">
-      <term><command>convert</command></term>
-      <listitem>
-        <para>
-          converts image(s) from one format to another
-        </para>
-        <indexterm zone="imagemagick convert">
-          <primary sortas="b-convert">convert</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="display">
-      <term><command>display</command></term>
-      <listitem>
-        <para>
-          displays an image
-        </para>
-        <indexterm zone="imagemagick display">
-          <primary sortas="b-display">display</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="identify">
-      <term><command>identify</command></term>
-      <listitem>
-        <para>
-          describes the format and characteristics of an image file
-        </para>
-        <indexterm zone="imagemagick identify">
-          <primary sortas="b-identify">identify</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="import">
-      <term><command>import</command></term>
-      <listitem>
-        <para>
-          captures an X window
-        </para>
-        <indexterm zone="imagemagick import">
-          <primary sortas="b-import">import</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="magick">
-      <term><command>magick</command></term>
-      <listitem>
-        <para>
-          convert between image formats as well as resize an image,
-          blur, crop, despeckle, dither, draw on, flip, join, re-sample
-          and much more
-        </para>
-        <indexterm zone="imagemagick magick">
-          <primary sortas="b-magick">magick</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="magick-config">
-      <term><command>Magick{++,Core,Wand}-config</command></term>
-      <listitem>
-        <para>
-          show information about the installed versions of the
-          <application>ImageMagick</application> libraries
-        </para>
-        <indexterm zone="imagemagick magick-config">
-          <primary sortas="b-Magick-config">Magick-config</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="mogrify">
-      <term><command>mogrify</command></term>
-      <listitem>
-        <para>
-          transforms an image
-        </para>
-        <indexterm zone="imagemagick mogrify">
-          <primary sortas="b-mogrify">mogrify</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="montage">
-      <term><command>montage</command></term>
-      <listitem>
-        <para>
-          composites various images into a new image
-        </para>
-        <indexterm zone="imagemagick montage">
-          <primary sortas="b-montage">montage</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="stream">
-      <term><command>stream</command></term>
-      <listitem>
-        <para>
-          streams one or more pixel components of an image or
-          portion of the image to your choice of storage formats
-        </para>
-        <indexterm zone="imagemagick stream">
-          <primary sortas="b-stream">stream</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="perlmagick">
-      <term><filename class="libraryfile">Image::Magick</filename></term>
-      <listitem>
-        <para>
-          allows the reading, manipulation and writing of a large number of
-          image file formats using the <application>ImageMagick</application>
-          library. Run <command>make</command> in the
-          <filename class="directory">PerlMagick/demo</filename> directory of
-          the package source tree after the package is installed to see a nice
-          demo of the module's capabilities
-        </para>
-        <indexterm zone="imagemagick perlmagick">
-          <primary sortas="g-Image-Magick">Image::Magick</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="libMagickCore-7.Q16HDRI">
-      <term><filename class="libraryfile">libMagickCore-7.Q16HDRI.so</filename></term>
-      <listitem>
-        <para>
-          provides the C API for ImageMagick
-        </para>
-        <indexterm zone="imagemagick libMagickCore-7.Q16HDRI">
-          <primary sortas="c-libMagickCore-7.Q16HDRI">libMagickCore-7.Q16HDRI.so</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="libMagickWand-7.Q16HDRI">
-      <term><filename class="libraryfile">libMagickWand-7.Q16HDRI.so</filename></term>
-      <listitem>
-        <para>
-          is the recommended C API for ImageMagick. Unlike the MagickCore API it
-          uses  only a few opaque types
-        </para>
-        <indexterm zone="imagemagick libMagickWand-7.Q16HDRI">
-          <primary sortas="c-libMagickWand-7.Q16HDRI">libMagickWand-7.Q16HDRI.so</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="libMagickpp-7.Q16HDRI">
-      <term><filename class="libraryfile">libMagick++-7.Q16HDRI.so</filename></term>
-      <listitem>
-        <para>
-          provides the C++ API for ImageMagick
-        </para>
-        <indexterm zone="imagemagick libMagickpp-7.Q16HDRI">
-          <primary sortas="c-libMagick++-7.Q16HDRI">libMagick++-7.Q16HDRI.so</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genutils/iso-codes.xml
===================================================================
--- general/genutils/iso-codes.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,133 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 iso-codes-download-http "https://ftp.debian.org/debian/pool/main/i/iso-codes/iso-codes_&iso-codes-version;.orig.tar.xz">
-  <!ENTITY iso-codes-download-ftp  " ">
-  <!ENTITY iso-codes-md5sum        "5760b5a359301397cc3ab2baa165c31c">
-  <!ENTITY iso-codes-size          "3.7 MB">
-  <!ENTITY iso-codes-buildsize     "95 MB">
-  <!ENTITY iso-codes-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="iso-codes" xreflabel="ISO Codes-&iso-codes-version;">
-  <?dbhtml filename="iso-codes.html"?>
-
-
-  <title>ISO Codes-&iso-codes-version;</title>
-
-  <indexterm zone="iso-codes">
-    <primary sortas="a-ISO-Codes">ISO Codes</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ISO Codes</title>
-
-    <para>
-      The <application>ISO Codes</application> package contains a list of
-      country, language and currency names and it is used as a central
-      database for accessing this data.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&iso-codes-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&iso-codes-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &iso-codes-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &iso-codes-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &iso-codes-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &iso-codes-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ISO Codes</title>
-
-    <para>
-      The directory is called iso-codes-&iso-codes-version;.
-    </para>
-
-    <para>
-      Install <application>ISO Codes</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>
-
-    <note>
-      <para>
-        If you install <application>ISO codes</application> over a previous
-        installed version, the install step will fail when creating some
-        symlinks. In order to properly update them, run:
-      </para>
-
-<screen><userinput>sed -i '/^LN_S/s/s/sfvn/' */Makefile</userinput></screen>
-
-    </note>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/iso-codes, /usr/share/xml/iso-codes
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: general/genutils/lsof-test-kernel.xml
===================================================================
--- general/genutils/lsof-test-kernel.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,7 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>G</emphasis>eneral setup ---&gt;
-  [*] <emphasis role='blue'>P</emphasis>OSIX Message Queues                                        [POSIX_MQUEUE]</screen>
Index: general/genutils/lsof.xml
===================================================================
--- general/genutils/lsof.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,210 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 lsof-download-http "https://github.com/lsof-org/lsof/releases/download/&lsof-version;/lsof-&lsof-version;.tar.gz">
-<!ENTITY lsof-download-ftp  " ">
-<!ENTITY lsof-md5sum        "8c858675f6d6e137df9b4e26ad6c46e8">
-<!ENTITY lsof-size          "1.1 MB">
-<!ENTITY lsof-buildsize     "14 MB (with tests)">
-<!ENTITY lsof-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="lsof" xreflabel="lsof-&lsof-version;">
-  <?dbhtml filename="lsof.html"?>
-
-
-  <title>lsof-&lsof-version;</title>
-
-  <indexterm zone="lsof">
-    <primary sortas="a-lsof">lsof</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to lsof</title>
-
-    <para>
-      The <application>lsof</application> package is useful to LiSt Open
-      Files for a given running application or process.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lsof-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lsof-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lsof-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lsof-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lsof-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lsof-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">lsof Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libtirpc"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="nmap"/> (with a symbolic link <command>nc</command>
-      pointing to <command>ncat</command> in <filename class="directory">
-      /usr/bin</filename>; used in tests)
-    </para>
-
-  </sect2>
-
-  <sect2 role="kernel" id="lsof-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      To run the tests, the following option should be enabled in the kernel
-      configuration:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="lsof-test-kernel.xml"/>
-
-    <indexterm zone="lsof lsof-kernel">
-      <primary sortas="d-lsof">lsof (testing)</primary>
-    </indexterm>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of lsof</title>
-
-    <para>
-      Install <application>lsof</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      The tests should be run as the <systemitem
-      class="username">root</systemitem> user. They require that the
-      POSIX message queues are enabled in the kernel, and that <xref
-      linkend="nmap"/> be installed with a symbolic link
-      <filename>/usr/bin/nc</filename> pointing to <command>ncat</command>.
-    </para>
-
-<screen role="root"
-        remap="test"><userinput>make check</userinput></screen>
-
-<!--
-    <para>
-      One test, case-20-ux-socket-endpoint, is known to fail.
-      Other test may fail if the tests are run in a script.
-    </para>
--->
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-<!--
-    <para>
-      <command>./Configure -n linux</command>: Avoid AFS, customization, and
-      inventory checks, and use the linux dialect.
-    </para>
-
-    <para>
-      <command>install -m4755 ...</command>: <command>lsof</command> should
-      be suid root to allow users to list all files. This may be a security
-      threat on some systems. In that case change to <option>-m755</option>
-      and use <command>sudo</command> to run the program.
-    </para>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>lsof</seg>
-        <seg>liblsof.so</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lsof-app">
-        <term><command>lsof</command></term>
-        <listitem>
-          <para>
-            lists open files for running processes
-          </para>
-          <indexterm zone="lsof lsof-app">
-            <primary sortas="b-lsof">lsof</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="liblsof">
-        <term><filename class="libraryfile">liblsof.so</filename></term>
-        <listitem>
-          <para>
-            contains an interface for applications to list open files
-          </para>
-          <indexterm zone="lsof liblsof">
-            <primary sortas="c-liblsof">liblsof.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genutils/mandoc.xml
===================================================================
--- general/genutils/mandoc.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,128 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 mandoc-download-http "https://mandoc.bsd.lv/snapshots/mandoc-&mandoc-version;.tar.gz">
-  <!ENTITY mandoc-download-ftp  " ">
-  <!ENTITY mandoc-md5sum        "f0adf24e8fdef5f3e332191f653e422a">
-  <!ENTITY mandoc-size          "684 KB">
-  <!ENTITY mandoc-buildsize     "22 MB (with tests)">
-  <!ENTITY mandoc-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="mandoc" xreflabel="mandoc-&mandoc-version;">
-  <?dbhtml filename="mandoc.html"?>
-
-
-  <title>mandoc-&mandoc-version;</title>
-
-  <indexterm zone="mandoc">
-    <primary sortas="a-mandoc">mandoc</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to mandoc</title>
-
-    <para>
-      mandoc is an utility to format manual pages.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&mandoc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&mandoc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &mandoc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &mandoc-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &mandoc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &mandoc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of mandoc</title>
-
-    <para>
-      Many utilities provided by <application>mandoc</application> conflicts
-      with <application>Man-DB</application> in LFS.  Only build the
-      <command>mandoc</command> command:
-    </para>
-
-<screen><userinput>./configure &amp;&amp;
-make mandoc</userinput></screen>
-
-    <para>
-      To test the package, issue: <command>make regress</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -vm755 mandoc   /usr/bin &amp;&amp;
-install -vm644 mandoc.1 /usr/share/man/man1</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-
-      <seglistitem>
-        <seg>
-          mandoc
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mandoc-prog">
-        <term><command>mandoc</command></term>
-        <listitem>
-          <para>
-            Formats manual pages
-          </para>
-          <indexterm zone="mandoc mandoc-prog">
-            <primary sortas="b-mandoc-prog">mandoc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genutils/pinentry.xml
===================================================================
--- general/genutils/pinentry.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,298 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 pinentry-download-http "&gnupg-http;/pinentry/pinentry-&pinentry-version;.tar.bz2">
-  <!ENTITY pinentry-download-ftp  " ">
-  <!ENTITY pinentry-md5sum        "ccae9619032fda53b234849c7c2253ac">
-  <!ENTITY pinentry-size          "600 KB">
-  <!ENTITY pinentry-buildsize     "17 MB">
-  <!ENTITY pinentry-time          "0.2 SBU">
-]>
-
-<sect1 id="pinentry" xreflabel="pinentry-&pinentry-version;">
-  <?dbhtml filename="pinentry.html"?>
-
-
-  <title>pinentry-&pinentry-version;</title>
-
-  <indexterm zone="pinentry">
-    <primary sortas="a-PIN-Entry">PIN-Entry</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to PIN-Entry</title>
-
-    <para>
-      The <application>PIN-Entry</application> package contains a
-      collection of simple PIN or pass-phrase entry dialogs which utilize the
-      Assuan protocol as described by the
-      <ulink url="https://www.gnupg.org/aegypten/">Ägypten project</ulink>.
-      <application>PIN-Entry</application> programs are usually invoked by
-      the <command>gpg-agent</command> daemon, but can be run from the command
-      line as well. There are programs for various text-based and GUI
-      environments, including interfaces designed for
-      <application>Ncurses</application> (text-based), and for the common
-      <application>GTK</application> and <application>Qt</application>
-      toolkits.
-    </para>
-
-    &lfs121_checked;
-
-    <!-- For testing this package, use: "echo GETPIN | pinentry-qt5" -->
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&pinentry-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&pinentry-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &pinentry-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &pinentry-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &pinentry-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &pinentry-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">PIN-Entry Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libassuan"/> and
-      <xref linkend="libgpg-error"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="emacs"/>,
-      <xref linkend="fltk"/>,
-      <xref linkend="gcr4"/> (or <xref role="nodep" linkend="gcr"/>),
-      <!--<xref linkend="gtk 2"/>, We don't wan to reference this any more -->
-      <!-- <xref linkend="libcap-pam"/>, This is in LFS already. PAM is not
-      necessary. -->
-      <xref linkend="kf6-frameworks"/> (or <xref linkend="lxqt-kwayland"/>),
-      <!-- If Qt5 is present, it will look for KWayland for Wayland support.-->
-      <xref linkend="libsecret"/>,
-      &qt5-deps;, and
-      <ulink url="https://www.enlightenment.org/about-efl">efl</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of PIN-Entry</title>
-
-    <para>
-      Install <application>PIN-Entry</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr          \
-            --enable-pinentry-tty  \
-            --disable-pinentry-qt5 \
-            &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--disable-pinentry-qt5</option>: Don't use qt5 even if 
-      it is available.  Qt5 is deprecated.
-    </para>
-
-    <para>
-      <option>--enable-inside-emacs=yes/no</option>: Default is no.
-    </para>
-
-    <para>
-      <option>--enable-pinentry-qt=yes/no</option>: Default is yes.
-    </para>
-
-    <para>
-      <option>--enable-pinentry-gtk2=yes/no</option>: Default is yes. Even if
-      other <command>pinentry-*</command> is installed,
-      <command>pinentry</command> will be a symlink to
-      <command>pinentry-gtk-2</command>.
-    </para>
-
-    <para>
-      <option>--enable-pinentry-gnome3=yes/no</option>: Default is yes.
-      Actually, it uses <xref linkend='gcr4'/> (or
-      <xref linkend='gcr'/> if the former is not installed) for the pinentry
-      dialog.
-    </para>
-
-    <para>
-      <parameter>--enable-pinentry-tty</parameter>: Default is 'maybe'.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          pinentry (symlink), pinentry-curses, pinentry-emacs, pinentry-fltk,
-          pinentry-gnome3, pinentry-gtk-2, pinentry-qt, and pinentry-tty
-        </seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pinentry-prog">
-        <term><command>pinentry</command></term>
-        <listitem>
-          <para>
-            is a symbolic link to the default
-            <application>PIN-Entry</application> program
-          </para>
-          <indexterm zone="pinentry pinentry-prog">
-            <primary sortas="b-pinentry">pinentry</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pinentry-curses">
-        <term><command>pinentry-curses</command></term>
-        <listitem>
-          <para>
-            is an <application>Ncurses</application> text-based
-            <application>PIN-Entry</application> helper program
-          </para>
-          <indexterm zone="pinentry pinentry-curses">
-            <primary sortas="b-pinentry-curses">pinentry-curses</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pinentry-emacs">
-        <term><command>pinentry-emacs</command></term>
-        <listitem>
-          <para>
-            is an <application>Emacs</application> version of the
-            <application>PIN-Entry</application> helper program
-          </para>
-          <indexterm zone="pinentry pinentry-emacs">
-            <primary sortas="b-pinentry-emacs">pinentry-emacs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pinentry-fltk">
-        <term><command>pinentry-fltk</command></term>
-        <listitem>
-          <para>
-            is a <application>FLTK</application>
-            <application>PIN-Entry</application> helper program
-          </para>
-          <indexterm zone="pinentry pinentry-fltk">
-            <primary sortas="b-pinentry-fltk">pinentry-fltk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pinentry-gnome3">
-        <term><command>pinentry-gnome3</command></term>
-        <listitem>
-          <para>
-            is a <application>GNOME-3</application>
-            <application>PIN-Entry</application> helper program
-          </para>
-          <indexterm zone="pinentry pinentry-gnome3">
-            <primary sortas="b-pinentry-gnome3">pinentry-gnome3</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pinentry-gtk-2">
-        <term><command>pinentry-gtk-2</command></term>
-        <listitem>
-          <para>
-            is a <application>GTK+2</application>
-            <application>PIN-Entry</application> helper program
-          </para>
-          <indexterm zone="pinentry pinentry-gtk-2">
-            <primary sortas="b-pinentry-gtk-2">pinentry-gtk-2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pinentry-qt">
-        <term><command>pinentry-qt</command></term>
-        <listitem>
-          <para>
-            is a <application>Qt4 or 5</application>
-            <application>PIN-Entry</application> helper program
-          </para>
-          <indexterm zone="pinentry pinentry-qt">
-            <primary sortas="b-pinentry-qt">pinentry-qt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pinentry-tty">
-        <term><command>pinentry-tty</command></term>
-        <listitem>
-          <para>
-            is a <application>tty</application>
-            <application>PIN-Entry</application> helper program
-          </para>
-          <indexterm zone="pinentry pinentry-tty">
-            <primary sortas="b-pinentry-tty">pinentry-tty</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genutils/screen.xml
===================================================================
--- general/genutils/screen.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,229 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 screen-download-http "&gnu-http;/screen/screen-&screen-version;.tar.gz">
-  <!ENTITY screen-download-ftp  " ">
-  <!ENTITY screen-md5sum        "9a9bdc956bd93e4f0cb9e48678889e26">
-  <!ENTITY screen-size          "1020 KB">
-  <!ENTITY screen-buildsize     "9.5 MB">
-  <!ENTITY screen-time          "0.1 SBU">
-]>
-
-<sect1 id="screen" xreflabel="Screen-&screen-version;">
-  <?dbhtml filename="screen.html"?>
-
-
-  <title>Screen-&screen-version;</title>
-
-  <indexterm zone="screen">
-    <primary sortas="a-Screen">Screen</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Screen</title>
-
-    <para>
-      <application>Screen</application> is a terminal multiplexor that runs
-      several separate processes, typically interactive shells, on a single
-      physical character-based terminal. Each virtual terminal emulates a DEC
-      VT100 plus several ANSI X3.64 and ISO 2022 functions and also provides
-      configurable input and output translation, serial port support,
-      configurable logging, multi-user support, and many character encodings,
-      including UTF-8. Screen sessions can be detached and resumed
-      later on a different terminal.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&screen-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&screen-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &screen-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &screen-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &screen-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &screen-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/screen-&screen-version;-upstream_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Screen Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="linux-pam"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Screen</title>
-<!--
-    <para>
-      First, apply a patch from upstream that fixes a security vulnerability:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../screen-&screen-version;-upstream_fixes-1.patch</userinput></screen>
--->
-    <para>
-      Install <application>Screen</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>sh autogen.sh                                 &amp;&amp;
-./configure --prefix=/usr                     \
-            --infodir=/usr/share/info         \
-            --mandir=/usr/share/man           \
-            --with-socket-dir=/run/screen     \
-            --with-pty-group=5                \
-            --with-sys-screenrc=/etc/screenrc &amp;&amp;
-
-sed -i -e "s%/usr/local/etc/screenrc%/etc/screenrc%" {etc,doc}/* &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -m 644 etc/etcscreenrc /etc/screenrc</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-socket-dir=/run/screen</parameter>: This option
-      places the per-user sockets in a standard location.
-    </para>
-
-    <para>
-      <parameter>--with-sys-screenrc=/etc/screenrc</parameter>: This option
-      places the global screenrc file in <filename
-      class='directory'>/etc</filename>.
-    </para>
-
-    <para>
-      <parameter>--with-pty-group=5</parameter>: This option sets the gid
-      to the value used by LFS.
-    </para>
-
-    <para>
-      <command>sed -i -e "s%/usr/local/etc/screenrc%/etc/screenrc%"
-      {etc,doc}/*</command>: This command corrects the configuration and
-      documentation files to the location that is used here for the global
-      screenrc file.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Screen</title>
-
-    <sect3 id ="screen-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/screenrc</filename> and
-        <filename>~/.screenrc</filename>
-      </para>
-
-      <indexterm zone="screen screen-config">
-        <primary sortas="e-AA.screenrc">~/.screenrc</primary>
-      </indexterm>
-
-      <indexterm zone="screen screen-config">
-        <primary sortas="e-etc-screenrc">/etc/screenrc</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        You may want to look at the example configuration file that was
-        installed and customize it for your needs.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>screen (symlink) and screen-&screen-version;</seg>
-        <seg>None</seg>
-        <seg>/usr/share/screen and /run/screen</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="screen-prog">
-        <term><command>screen</command></term>
-        <listitem>
-          <para>
-            is a terminal multiplexor with VT100/ANSI terminal emulation
-          </para>
-          <indexterm zone="screen screen-prog">
-            <primary sortas="b-screen">screen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genutils/shared-mime-info.xml
===================================================================
--- general/genutils/shared-mime-info.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,202 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 shared-mime-info-download-http
-           "https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/&shared-mime-info-version;/shared-mime-info-&shared-mime-info-version;.tar.gz">
-  <!ENTITY shared-mime-info-download-ftp  " ">
-  <!ENTITY shared-mime-info-md5sum        "aac56db912b7b12a04fb0018e28f2f36">
-  <!ENTITY shared-mime-info-size          "7.5 MB">
-  <!ENTITY shared-mime-info-buildsize     "26 MB (with tests)">
-  <!ENTITY shared-mime-info-time          "less than 0.1 SBU (with tests)">
-
-  <!ENTITY xdgmime-download-http "&sources-anduin-http;/xdgmime/xdgmime.tar.xz">
-  <!ENTITY xdgmime-md5sum        "7dfb4446705d345d3acd672024049e86">
-
-]>
-
-<sect1 id="shared-mime-info"
-xreflabel="shared-mime-info-&shared-mime-info-version;">
-  <?dbhtml filename="shared-mime-info.html" ?>
-
-
-  <title>shared-mime-info-&shared-mime-info-version;</title>
-
-  <indexterm zone="shared-mime-info">
-    <primary sortas="a-shared-mime-info">shared-mime-info</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Shared Mime Info</title>
-
-    <para>
-      The <application>Shared Mime Info</application> package contains a
-      MIME database. This allows central updates of MIME information for all
-      supporting applications.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&shared-mime-info-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&shared-mime-info-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &shared-mime-info-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &shared-mime-info-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &shared-mime-info-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &shared-mime-info-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional download, required to run the test suite:
-          <ulink url="&xdgmime-download-http;"/>
-        </para>
-        <para>
-          xdgmime md5sum: &xdgmime-md5sum;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Shared Mime Info Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> and
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="xmlto"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Shared Mime Info</title>
-
-    <para>
-      Install <application>Shared Mime Info</application> by running the
-      following commands:
-    </para>
-
-    <para>
-      If you wish to run the test suite, you must first extract the
-      <filename>xdgmime</filename> tarball into the current directory,
-      and compile it so that <command>meson</command> can find it:
-    </para>
-
-<screen remap="test"><userinput>tar -xf ../xdgmime.tar.xz &amp;&amp;
-make -C xdgmime</userinput></screen>
-
-    <para>
-      Now build the package:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release -Dupdate-mimedb=true .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para role="optional">
-      If you have followed the instructions above to build
-      <application>xdgmime</application>, to test the result issue
-      <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <parameter>-Dupdate-mimedb=true</parameter>: This parameter tells
-      the build system to run <command>update-mime-database</command> during
-      installation. Otherwise, this must be done manually in order to be
-      able to use the MIME database.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          update-mime-database
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/mime
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="update-mime-database">
-        <term><command>update-mime-database</command></term>
-        <listitem>
-          <para>
-            assists in adding MIME data to the database
-          </para>
-          <indexterm zone="shared-mime-info update-mime-database">
-            <primary sortas="b-update-mime-database">update-mime-database</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genutils/sharutils.xml
===================================================================
--- general/genutils/sharutils.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,186 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 sharutils-download-http "&gnu-http;/sharutils/sharutils-&sharutils-version;.tar.xz">
-  <!ENTITY sharutils-download-ftp  " ">
-  <!ENTITY sharutils-md5sum        "5975ce21da36491d7aa6dc2b0d9788e0">
-  <!ENTITY sharutils-size          "1.1 MB">
-  <!ENTITY sharutils-buildsize     "22 MB (with the test suite)">
-  <!ENTITY sharutils-time          "0.4 SBU (with the test suite)">
-]>
-
-<sect1 id="sharutils" xreflabel="Sharutils-&sharutils-version;">
-  <?dbhtml filename="sharutils.html"?>
-
-
-  <title>Sharutils-&sharutils-version;</title>
-
-  <indexterm zone="sharutils">
-    <primary sortas="a-Sharutils">Sharutils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Sharutils</title>
-
-    <para>
-      The <application>Sharutils</application> package contains
-      utilities that can create 'shell' archives.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&sharutils-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&sharutils-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &sharutils-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &sharutils-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &sharutils-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &sharutils-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Sharutils</title>
-
-    <para>
-      Fix a heap buffer overflow, and an issue exposed by GCC-10:
-    </para>
-
-<screen><userinput>sed -i 's/BUFSIZ/rw_base_size/' src/unshar.c &amp;&amp;
-sed -i '/program_name/s/^/extern /' src/*opts.h</userinput></screen>
-
-    <para>
-      Install <application>Sharutils</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>sed -i 's/IO_ftrylockfile/IO_EOF_SEEN/' lib/*.c        &amp;&amp;
-echo "#define _IO_IN_BACKUP 0x100" >> lib/stdio-impl.h &amp;&amp;
-
-./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          shar, unshar, uudecode and uuencode
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="shar">
-        <term><command>shar</command></term>
-        <listitem>
-          <para>
-            creates "shell archives" (or shar files) which are in
-            text format and can be mailed
-          </para>
-          <indexterm zone="sharutils shar">
-            <primary sortas="b-shar">shar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unshar">
-        <term><command>unshar</command></term>
-        <listitem>
-          <para>
-            unpacks a shar file
-          </para>
-          <indexterm zone="sharutils unshar">
-            <primary sortas="b-unshar">unshar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uudecode">
-        <term><command>uudecode</command></term>
-        <listitem>
-          <para>
-            reads a file (or by default the standard input) and writes an
-            encoded  version to the standard output. The encoding uses only
-            printing ASCII characters
-          </para>
-          <indexterm zone="sharutils uudecode">
-            <primary sortas="b-uudecode">uudecode</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uuencode">
-        <term><command>uuencode</command></term>
-        <listitem>
-          <para>
-            reads a file (or by default the standard input) and decodes
-            the uuencoded version to the standard output
-          </para>
-          <indexterm zone="sharutils uuencode">
-            <primary sortas="b-uuencode">uuencode</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genutils/telepathy-mission-control.xml
===================================================================
--- general/genutils/telepathy-mission-control.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,217 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 telepathy-mission-control-download-http
-           "https://telepathy.freedesktop.org/releases/telepathy-mission-control/telepathy-mission-control-&telepathy-mission-control-version;.tar.gz">
-  <!ENTITY telepathy-mission-control-download-ftp  " ">
-  <!ENTITY telepathy-mission-control-md5sum        "911e990c7755eb98a8022223f649405d">
-  <!ENTITY telepathy-mission-control-size          "1.1 MB">
-  <!ENTITY telepathy-mission-control-buildsize     "28 MB">
-  <!ENTITY telepathy-mission-control-time          "0.2 SBU">
-]>
-
-<sect1 id="telepathy-mission-control" xreflabel="telepathy-mission-control-&telepathy-mission-control-version;">
-  <?dbhtml filename="telepathy-mission-control.html"?>
-
-
-  <title>telepathy-mission-control-&telepathy-mission-control-version;</title>
-
-  <indexterm zone="telepathy-mission-control">
-    <primary sortas="a-telepathy-mission-control">telepathy-mission-control</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Telepathy Mission Control</title>
-
-    <para>
-      <application>Telepathy Mission Control</application> is an account manager
-      and channel dispatcher for the <application>Telepathy</application>
-      framework, allowing user interfaces  and other clients to share connections
-      to real-time communication services without conflicting.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&telepathy-mission-control-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&telepathy-mission-control-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &telepathy-mission-control-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &telepathy-mission-control-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &telepathy-mission-control-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &telepathy-mission-control-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Telepathy Mission Control Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="telepathy-glib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="NetworkManager"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="dbus-python"/> (for the <quote>twisted</quote> tests),
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="upower"/>, and
-      <ulink url="https://pypi.org/project/Twisted/">Twisted</ulink>
-         (for the <quote>twisted</quote> tests)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Telepathy Mission Control</title>
-
-    <para>
-      Install <application>Telepathy Mission Control</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>PYTHON=python3 \
-./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>PYTHON=python3</command>: prevents using Python2 if it
-      is installed.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          mc-tool, mc-wait-for-name and mission-control-5 (library executable)
-        </seg>
-        <seg>
-          libmission-control-plugins.so
-        </seg>
-        <seg>
-          /usr/include/mission-control-5.5 and
-          /usr/share/gtk-doc/html/mission-control-plugins
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mc-tool">
-        <term><command>mc-tool</command></term>
-        <listitem>
-          <para>
-            is a command line tool used to manipulate Mission Control accounts
-          </para>
-          <indexterm zone="telepathy-mission-control mc-tool">
-            <primary sortas="b-mc-tool">mc-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mc-wait-for-name">
-        <term><command>mc-wait-for-name</command></term>
-        <listitem>
-          <para>
-            waits for a D-Bus bus name that will be provided
-            automatically by the desktop session
-          </para>
-          <indexterm zone="telepathy-mission-control mc-wait-for-name">
-            <primary sortas="b-mc-wait-for-name">mc-wait-for-name</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mission-control-5">
-        <term><command>mission-control-5</command></term>
-        <listitem>
-          <para>
-            is a <application>D-Bus</application> service which runs on the session
-            bus to implement AccountManager and ChannelDispatcher services described
-            in the <application>Telepathy</application> D-Bus specification
-          </para>
-          <indexterm zone="telepathy-mission-control mission-control-5">
-            <primary sortas="b-mission-control-5">mission-control-5</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmission-control-plugins">
-        <term><filename class="libraryfile">libmission-control-plugins.so</filename></term>
-        <listitem>
-          <para>
-            contains <application>Telepathy Mission Control</application> plugin API functions
-          </para>
-          <indexterm zone="telepathy-mission-control libmission-control-plugins">
-            <primary sortas="c-libmission-control-plugins">libmission-control-plugins.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genutils/tidy-html5.xml
===================================================================
--- general/genutils/tidy-html5.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,221 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 tidy-html5-download-http "https://github.com/htacg/tidy-html5/archive/&tidy-html5-version;/tidy-html5-&tidy-html5-version;.tar.gz">
-  <!ENTITY tidy-html5-download-ftp  " ">
-  <!ENTITY tidy-html5-md5sum        "0f6c55ef651e258adbe5750f555af50f">
-  <!ENTITY tidy-html5-size          "992 KB">
-  <!ENTITY tidy-html5-buildsize     "11 MB">
-  <!ENTITY tidy-html5-time          "0.2 SBU">
-]>
-
-<sect1 id="tidy-html5" xreflabel="tidy-html5-&tidy-html5-version;">
-  <?dbhtml filename="tidy-html5.html"?>
-
-
-  <title>tidy-html5-&tidy-html5-version;</title>
-
-  <indexterm zone="tidy-html5">
-    <primary sortas="a-Tidy-HTML5">Tidy HTML5</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Tidy HTML5</title>
-
-    <para>
-      The <application>Tidy HTML5</application> package contains a
-      command line tool and libraries used to read HTML, XHTML and XML files
-      and write cleaned up markup. It detects and corrects many common coding
-      errors and strives to produce visually equivalent markup that is both
-      W3C compliant and compatible with most browsers.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&tidy-html5-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&tidy-html5-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &tidy-html5-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &tidy-html5-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &tidy-html5-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &tidy-html5-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Tidy HTML5 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libxslt"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Tidy HTML5</title>
-
-    <para>
-      Install <application>Tidy HTML5</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>cd build/cmake &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      -DBUILD_TAB2SPACE=ON        \
-      ../..    &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-rm -fv /usr/lib/libtidy.a &amp;&amp;
-install -v -m755 tab2space /usr/bin</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used to
-      build the release library without any debug `assert` in the code.
-    </para>
-
-    <para>
-      <parameter>-DBUILD_TAB2SPACE=ON</parameter>: This switch is used to enable
-      building the <command>tab2space</command> utility.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Tidy HTML5</title>
-
-    <sect3>
-      <title>Config Files</title>
-
-      <para>
-        The absolute path of the file specified in <envar>HTML_TIDY</envar>.
-      </para>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        The default configuration options can be set in the file defined in
-        <envar>HTML_TIDY</envar>. Additional configuration options can be
-        passed to <command>tidy</command> via command line parameters or the
-        <option>-config &lt;file&gt;</option> parameter.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-    <segtitle>Installed Programs</segtitle>
-    <segtitle>Installed Library</segtitle>
-    <segtitle>Installed Directory</segtitle>
-    <seglistitem>
-    <seg>tab2space and tidy</seg>
-    <seg>libtidy.so</seg>
-    <seg>/usr/share/doc/tidy-&tidy-html5-version;</seg>
-    </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="tab2space">
-        <term><command>tab2space</command></term>
-        <listitem>
-          <para>
-            is a utility to expand tabs and ensure consistent line endings
-          </para>
-          <indexterm zone="tidy-html5 tab2space">
-            <primary sortas="b-tab2space">tab2space</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tidy">
-        <term><command>tidy</command></term>
-        <listitem>
-          <para>
-            validates, corrects, and pretty-prints HTML files
-          </para>
-          <indexterm zone="tidy-html5 tidy">
-            <primary sortas="b-tidy">tidy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtidy">
-        <term>
-          <filename class="libraryfile">libtidy.so</filename>
-        </term>
-        <listitem>
-          <para>
-            library provides the <application>Tidy HTML5</application> API
-            functions to <command>tidy</command> and can also be called by other
-            programs
-          </para>
-          <indexterm zone="tidy-html5 libtidy">
-            <primary sortas="c-libtidy">libtidy.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genutils/time.xml
===================================================================
--- general/genutils/time.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,140 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 time-download-http "&gnu-http;/time/time-&time-version;.tar.gz">
-  <!ENTITY time-download-ftp  " ">
-  <!ENTITY time-md5sum        "d2356e0fe1c0b85285d83c6b2ad51b5f">
-  <!ENTITY time-size          "584 KB">
-  <!ENTITY time-buildsize     "4.0 MB (with tests)">
-  <!ENTITY time-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="time" xreflabel="time-&time-version;">
-  <?dbhtml filename="time.html"?>
-
-
-  <title>Time-&time-version;</title>
-
-  <indexterm zone="time">
-    <primary sortas="a-time">time</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Time</title>
-
-    <para>
-      The <application>time</application> utility is a program that
-      measures many of the CPU resources, such as time and memory, that
-      other programs use.  The GNU version can format the output in
-      arbitrary ways by using a printf-style format string to include
-      various resource measurements.
-    </para>
-    <para>
-      Although the shell has a builtin command providing similar
-      functionalities, this utility is required by the LSB.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&time-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&time-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &time-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &time-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &time-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &time-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Time</title>
-
-    <para>
-      Install <application>Time</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          time
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="time-prog">
-        <term><command>time</command></term>
-        <listitem>
-          <para>
-            reports various statistics about an executed command
-          </para>
-          <indexterm zone="time time-prog">
-            <primary sortas="b-time">time</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/genutils/tree.xml
===================================================================
--- general/genutils/tree.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,133 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 tree-download-http "https://gitlab.com/OldManProgrammer/unix-tree/-/archive/&tree-version;/unix-tree-&tree-version;.tar.bz2">
-<!ENTITY tree-download-ftp  " ">
-<!ENTITY tree-md5sum        "85f9a6d1e48f1d5262a9b2d58d47431f">
-<!ENTITY tree-size          "52 KB">
-<!ENTITY tree-buildsize     "732 KB">
-<!ENTITY tree-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="tree" xreflabel="tree-&tree-version;">
-  <?dbhtml filename="tree.html"?>
-
-
-  <title>tree-&tree-version;</title>
-
-  <indexterm zone="tree">
-    <primary sortas="a-tree">tree</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to tree</title>
-
-    <para>
-      The <application>tree</application> application is useful to display a
-      dictionary tree's contents, including files, directories, and links.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&tree-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&tree-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &tree-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &tree-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &tree-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &tree-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of tree</title>
-
-    <para>
-      Install <application>tree</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-    <!-- Without MANDIR=/usr/share/man, it'll create /usr/share/man1/man1 and
-         install 'tree.1' there. Also, without prefix=/usr, it'll install the
-         'tree' command in /usr/local/bin. -->
-
-<screen role="root"><userinput>make PREFIX=/usr MANDIR=/usr/share/man install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>tree</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="tree-app">
-        <term><command>tree</command></term>
-        <listitem>
-          <para>
-            displays a directory tree in a terminal
-          </para>
-          <indexterm zone="tree tree-app">
-            <primary sortas="b-tree">tree</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genutils/unixodbc.xml
===================================================================
--- general/genutils/unixodbc.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,290 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 unixodbc-download-http "https://github.com/lurcher/unixODBC/releases/download/&unixodbc-version;/unixODBC-&unixodbc-version;.tar.gz">
-  <!ENTITY unixodbc-download-ftp  " ">
-  <!ENTITY unixodbc-md5sum        "d62167d85bcb459c200c0e4b5a63ee48">
-  <!ENTITY unixodbc-size          "1.7 MB">
-  <!ENTITY unixodbc-buildsize     "28 MB">
-  <!ENTITY unixodbc-time          "0.2 SBU (using parallelism=4)">
-]>
-
-<sect1 id="unixodbc" xreflabel="unixODBC-&unixodbc-version;">
-  <?dbhtml filename="unixodbc.html"?>
-
-
-  <title>unixODBC-&unixodbc-version;</title>
-
-  <indexterm zone="unixodbc">
-    <primary sortas="a-unixODBC">unixODBC</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to unixODBC</title>
-
-    <para>
-      The <application>unixODBC</application> package is an Open Source
-      ODBC (Open DataBase Connectivity) sub-system and an ODBC SDK for Linux, Mac
-      OSX, and UNIX. ODBC is an open specification for providing application
-      developers with a predictable API with which to access data sources. Data
-      sources include optional SQL Servers and any data source with an ODBC Driver.
-      <application>unixODBC</application> contains the following components used
-      to assist with the manipulation of ODBC data sources: a driver manager, an
-      installer library and command line tool, command line tools to help install
-      a driver and work with SQL, drivers and driver setup libraries.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&unixodbc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&unixodbc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &unixodbc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &unixodbc-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &unixodbc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &unixodbc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">unixODBC Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://hughestech.com.au/products/msql/">Mini SQL</ulink> 
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of unixODBC</title>
-
-    <para>
-      Install <application>unixODBC</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc/unixODBC &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-
-find doc -name "Makefile*" -delete                &amp;&amp;
-chmod 644 doc/{lst,ProgrammerManual/Tutorial}/*   &amp;&amp;
-
-install -v -m755 -d /usr/share/doc/unixODBC-&unixodbc-version; &amp;&amp;
-cp      -v -R doc/* /usr/share/doc/unixODBC-&unixodbc-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--enable-drivers</option>: This parameter enables building
-      the drivers that were installed by default in previous versions.
-    </para>
-
-    <para>
-      <option>--enable-drivers-conf</option>: This parameter enables
-      building the driver configuration libraries that were installed
-      by default in previous versions.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring unixODBC</title>
-
-    <sect3 id="unixodbc-config">
-      <title>Config Files</title>
-      <para>
-        <filename>/etc/unixODBC/*</filename>
-      </para>
-
-        <indexterm zone="unixodbc unixodbc-config">
-          <primary sortas="e-etc-unixODBC-">/etc/unixODBC/*</primary>
-        </indexterm>
-    </sect3>
-
-    <sect3><title>Configuration Information</title>
-
-      <para>
-        The files in <filename class='directory'>/etc/unixODBC</filename>
-        are meant to be configured by the system administrator (or the ODBC site
-        administrator if appropriate privileges are granted to
-        <filename class='directory'>/etc/unixODBC</filename>). These files
-        are not meant to be directly edited. The ODBC installer library is
-        responsible for reading and writing the
-        <application>unixODBC</application> config files.
-      </para>
-
-      <para>
-        Unfortunately, there are not many <command>man</command>, or any
-        <command>info</command> pages for the various programs available in the
-        <application>unixODBC</application> package. Along with the information
-        in the <quote>Short Descriptions</quote> below and the documentation
-        installed in <filename
-        class='directory'>/usr/share/doc/unixODBC-&unixodbc-version;</filename>,
-        there are many <filename>README</filename> files throughout the source
-        tree where the use and functionality of the programs can be found.
-        Additionally, you can use the parameter <option>-?</option> for syntax
-        and usage information. Lastly, the <application>unixODBC</application>
-        web site at <ulink url="http://www.unixodbc.org/"/> has very good
-        information.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          dltest, isql, iusql, odbc_config, odbcinst, and slencheck
-        </seg>
-        <seg>
-          libodbc.so, libodbccr.so, and libodbcinst.so
-        </seg>
-        <seg>
-          /etc/unixODBC and
-          /usr/share/doc/unixODBC-&unixodbc-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="dltest">
-        <term><command>dltest</command></term>
-        <listitem>
-          <para>
-            is a utility used to check a shared library to see if it can be
-            loaded and if a given symbol exists in it
-          </para>
-          <indexterm zone="unixodbc dltest">
-            <primary sortas="b-dltest">dltest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="isql">
-        <term><command>isql</command></term>
-        <listitem>
-          <para>
-            is a utility which can be used to submit SQL to a data source and
-            to format/output results. It can be used in batch or interactive
-            mode
-          </para>
-          <indexterm zone="unixodbc isql">
-            <primary sortas="b-isql">isql</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="iusql">
-        <term><command>iusql</command></term>
-        <listitem>
-          <para>
-            provides the same functionality as the <command>isql</command>
-            program
-          </para>
-          <indexterm zone="unixodbc iusql">
-            <primary sortas="b-iusql">iusql</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="odbc_config">
-        <term><command>odbc_config</command></term>
-        <listitem>
-          <para>
-            is used to find out details about the installation of
-            the <application>unixODBC</application> package
-          </para>
-          <indexterm zone="unixodbc odbc_config">
-            <primary sortas="b-odbc_config">odbc_config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="odbcinst">
-        <term><command>odbcinst</command></term>
-        <listitem>
-          <para>
-            is a utility created for install script/RPM writers. It is a
-            command line interface to key functionality in the
-            <filename class="libraryfile">libodbcinst</filename> library. It does
-            not copy any files (i.e., libraries) but it will modify the ODBC
-            System Information for the user
-          </para>
-          <indexterm zone="unixodbc odbcinst">
-            <primary sortas="b-odbcinst">odbcinst</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="slencheck">
-        <term><command>slencheck</command></term>
-        <listitem>
-          <para>
-            is a utility which attempts to check whether an ODBC driver
-            was built with 32-bit or 64-bit SQLLEN types
-          </para>
-          <indexterm zone="unixodbc slencheck">
-            <primary sortas="b-slencheck">slencheck</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genutils/xdg-dbus-proxy.xml
===================================================================
--- general/genutils/xdg-dbus-proxy.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,152 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xdg-dbus-proxy-download-http "https://github.com/flatpak/xdg-dbus-proxy/releases/download/&xdg-dbus-proxy-version;/xdg-dbus-proxy-&xdg-dbus-proxy-version;.tar.xz">
-  <!ENTITY xdg-dbus-proxy-download-ftp  "">
-  <!ENTITY xdg-dbus-proxy-md5sum        "b496f34b0fa4747a66eb5adb63b7d626">
-  <!ENTITY xdg-dbus-proxy-size          "124 KB">
-  <!ENTITY xdg-dbus-proxy-buildsize     "1.4 MB">
-  <!ENTITY xdg-dbus-proxy-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="xdg-dbus-proxy" xreflabel="xdg-dbus-proxy-&xdg-dbus-proxy-version;">
-  <?dbhtml filename="xdg-dbus-proxy.html"?>
-
-  <title>xdg-dbus-proxy-&xdg-dbus-proxy-version;</title>
-
-  <indexterm zone="xdg-dbus-proxy">
-    <primary sortas="a-xdg-dbus-proxy">xdg-dbus-proxy</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xdg-dbus-proxy</title>
-
-    <para>
-      The <application>xdg-dbus-proxy</application> package contains a
-      filtering proxy for D-Bus connections. This is useful for forwarding data
-      in and out of a sandbox.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xdg-dbus-proxy-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xdg-dbus-proxy-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xdg-dbus-proxy-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xdg-dbus-proxy-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xdg-dbus-proxy-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xdg-dbus-proxy-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">xdg-dbus-proxy Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xdg-dbus-proxy</title>
-
-    <para>
-      Install <application>xdg-dbus-proxy</application> by running the following
-      commands:
-    </para>
-
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          xdg-dbus-proxy
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xdg-dbus-proxy-prog">
-        <term><command>xdg-dbus-proxy</command></term>
-        <listitem>
-          <para>
-            is a filtering proxy for D-Bus connections
-          </para>
-          <indexterm zone="xdg-dbus-proxy xdg-dbus-proxy-prog">
-            <primary sortas="b-xdg-dbus-proxy">xdg-dbus-proxy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: general/genutils/xdg-user-dirs.xml
===================================================================
--- general/genutils/xdg-user-dirs.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,201 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xdg-user-dirs-download-http "https://user-dirs.freedesktop.org/releases/xdg-user-dirs-&xdg-user-dirs-version;.tar.gz">
-  <!ENTITY xdg-user-dirs-download-ftp  " ">
-  <!ENTITY xdg-user-dirs-md5sum        "dc7decea7ffb58cd067eff1fe1798cae">
-  <!ENTITY xdg-user-dirs-size          "267 KB">
-  <!ENTITY xdg-user-dirs-buildsize     "3.0 MB">
-  <!ENTITY xdg-user-dirs-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="xdg-user-dirs" xreflabel="Xdg-user-dirs-&xdg-user-dirs-version;">
-  <?dbhtml filename="xdg-user-dirs.html"?>
-
-
-  <!-- No other tags inside any title.
-       Use Title Case in All Titles -->
-  <title>Xdg-user-dirs-&xdg-user-dirs-version;</title>
-
-  <indexterm zone="xdg-user-dirs">
-    <primary sortas="a-xdg-user-dirs">xdg-user-dirs</primary>
-  </indexterm>
-
-  <!--Required section-->
-  <sect2 role="package">
-    <title>Introduction to Xdg-user-dirs</title>
-
-    <para>
-      <application>Xdg-user-dirs</application> is a tool to help manage <quote>well
-      known</quote> user directories like the desktop folder and the music folder.
-      It also handles localization (i.e. translation) of the filenames.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xdg-user-dirs-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xdg-user-dirs-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xdg-user-dirs-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xdg-user-dirs-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xdg-user-dirs-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xdg-user-dirs-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xdg-user-dirs Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="DocBook"/>,
-      <xref linkend="docbook-xsl"/>, and
-      <xref linkend="libxslt"/> (all three for building the man pages)
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Xdg-user-dirs</title>
-
-    <para>
-      Install <application>xdg-user-dirs</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr           \
-            --sysconfdir=/etc       \
-            --disable-documentation &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-documentation</parameter>: Disable the
-      installation of the man pages.  Remove this switch if you've installed
-      the optional dependencies and you wish to install the man pages of
-      this package.
-    </para>
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Xdg-user-dirs</title>
-
-    <sect3 id="xdg-user-dirs-config">
-      <title>Config Files</title>
-      <para>
-        <filename>~/.config/user-dirs.dirs</filename>,
-        <filename>/etc/xdg/user-dirs.conf</filename>, and
-        <filename>/etc/xdg/user-dirs.defaults</filename>. Those default
-        locations can be overridden by <envar>XDG_CONFIG_HOME</envar> and
-        <envar>XDG_CONFIG_DIRS</envar>
-      </para>
-
-      <indexterm zone="xdg-user-dirs xdg-user-dirs-config">
-        <primary sortas="e-AA.config-user-dirs.dirs">~/.config/user-dirs.dirs</primary>
-      </indexterm>
-
-      <indexterm zone="xdg-user-dirs xdg-user-dirs-config">
-        <primary
-        sortas="e-etc-xdg-user-dirs.conf">/etc/xdg/user-dirs.conf</primary>
-      </indexterm>
-
-      <indexterm zone="xdg-user-dirs xdg-user-dirs-config">
-        <primary
-        sortas="e-etc-xdg-user-dirs.defaults">/etc/xdg/user-dirs.defaults</primary>
-      </indexterm>
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          xdg-user-dir and xdg-user-dirs-update
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xdg-user-dir">
-        <term><command>xdg-user-dir</command></term>
-        <listitem>
-          <para>
-            looks up the current path for one of the XDG user directories
-          </para>
-          <indexterm zone="xdg-user-dirs xdg-user-dir">
-            <primary sortas="b-xdg-user-dir">xdg-user-dir</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xdg-user-dirs-update">
-        <term><command>xdg-user-dirs-update</command></term>
-        <listitem>
-          <para>
-            creates localized versions of the user directories
-          </para>
-          <indexterm zone="xdg-user-dirs xdg-user-dirs-update">
-            <primary sortas="b-xdg-user-dirs-update">xdg-user-dirs-update</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/graphlib/aalib.xml
===================================================================
--- general/graphlib/aalib.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,224 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 aalib-download-http "&sourceforge-dl;/aa-project/aalib-&aalib-version;.tar.gz">
-  <!ENTITY aalib-download-ftp  " ">
-  <!ENTITY aalib-md5sum        "9801095c42bba12edebd1902bcf0a990">
-  <!ENTITY aalib-size          "388 KB">
-  <!ENTITY aalib-buildsize     "6.5 MB">
-  <!ENTITY aalib-time          "0.1 SBU">
-]>
-
-<sect1 id="aalib" xreflabel="AAlib-&aalib-version;">
-  <?dbhtml filename="aalib.html"?>
-
-
-  <title>AAlib-&aalib-version;</title>
-
-  <indexterm zone="aalib">
-    <primary sortas="a-AAlib">AAlib</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to AAlib</title>
-
-    <para>
-      <application>AAlib</application> is a library to render any graphic into
-      ASCII Art.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&aalib-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&aalib-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &aalib-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &aalib-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &aalib-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &aalib-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">AAlib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="xorg7-lib"/>,
-      <xref linkend="xorg7-font"/> (runtime),
-      <xref linkend="slang"/>, and
-      <xref linkend="gpm"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of AAlib</title>
-
-    <para>
-      Fix a minor problem with the included m4 file:
-    </para>
-
-<screen><userinput>sed -i -e '/AM_PATH_AALIB,/s/AM_PATH_AALIB/[&amp;]/' aalib.m4</userinput></screen>
-
-    <para>
-      Change the default X11 font from <xref linkend='xorg7-legacy'/> to
-      <xref linkend='xorg7-font'/>:
-    </para>
-
-<screen><userinput>sed -e 's/8x13bold/-*-luxi mono-bold-r-normal--13-120-*-*-m-*-*-*/' \
-    -i src/aax.c</userinput></screen>
-
-    <para>
-      Install <application>AAlib</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr             \
-            --infodir=/usr/share/info \
-            --mandir=/usr/share/man   \
-            --with-ncurses=/usr       \
-            --disable-static          &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>aafire, aainfo, aalib-config, aasavefont, and aatest</seg>
-        <seg>libaa.so</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="aafire">
-        <term><command>aafire</command></term>
-        <listitem>
-          <para>
-            is a demo of <application>AAlib</application>, rendering
-            an animated fire in ASCII Art
-          </para>
-          <indexterm zone="aalib aafire">
-            <primary sortas="b-aafire">aafire</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aainfo">
-        <term><command>aainfo</command></term>
-        <listitem>
-          <para>
-            provides information for your current settings related to
-            <application>AAlib</application>
-          </para>
-          <indexterm zone="aalib aainfo">
-            <primary sortas="b-aainfo">aainfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aalib-config">
-        <term><command>aalib-config</command></term>
-        <listitem>
-          <para>
-            provides configuration info for <application>AAlib</application>
-          </para>
-          <indexterm zone="aalib aalib-config">
-            <primary sortas="b-aalib-config">aalib-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aasavefont">
-        <term><command>aasavefont</command></term>
-        <listitem>
-          <para>
-            saves a font to a file
-          </para>
-          <indexterm zone="aalib aasavefont">
-            <primary sortas="b-aasavefont">aasavefont</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aatest">
-        <term><command>aatest</command></term>
-        <listitem>
-          <para>
-            shows the abilities of <application>AAlib</application>
-            in a little test
-          </para>
-          <indexterm zone="aalib aatest">
-            <primary sortas="b-aatest">aatest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libaa">
-        <term><filename class="libraryfile">libaa.so</filename></term>
-        <listitem>
-          <para>
-            is a collection of routines to render any graphical input in
-            portable format to ASCII Art. It can be used through many programs
-            and has a very well documented API, so you can easily put it into
-            your own programs
-          </para>
-          <indexterm zone="aalib libaa">
-            <primary sortas="c-libaa">libaa.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/graphlib/babl.xml
===================================================================
--- general/graphlib/babl.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,171 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 babl-download-http "https://download.gimp.org/pub/babl/0.1/babl-&babl-version;.tar.xz">
-  <!ENTITY babl-download-ftp  " ">
-  <!ENTITY babl-md5sum        "749169721b551882332a64ac17735de6">
-  <!ENTITY babl-size          "312 KB">
-  <!ENTITY babl-buildsize     "13 MB (with tests)">
-  <!ENTITY babl-time          "0.1 SBU (Using parallelism=4; with tests)">
-]>
-
-<sect1 id="babl" xreflabel="babl-&babl-version;">
-  <?dbhtml filename="babl.html"?>
-
-
-  <title>babl-&babl-version;</title>
-
-  <indexterm zone="babl">
-    <primary sortas="a-Babl">Babl</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Babl</title>
-
-    <para>
-      The <application>Babl</application> package is a dynamic, any to any,
-      pixel format translation library.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&babl-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&babl-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &babl-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &babl-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &babl-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &babl-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Babl Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection; and
-      <xref linkend="librsvg"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="lcms2"/> and
-      <ulink url="&w3m-url;">w3m</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Babl</title>
-
-<!--
-    <para>
-      First, fix a typo that causes Meson to fail to run:
-    </para>
-
-<screen><userinput remap="pre">sed -i '/check:/d' meson.build</userinput></screen>
--->
-
-    <para>
-      Install <application>Babl</application> by running the following commands:
-    </para>
-
-<screen><userinput>mkdir bld &amp;&amp;
-cd    bld &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja </userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install &amp;&amp;
-
-install -v -m755 -d                         /usr/share/gtk-doc/html/babl/graphics &amp;&amp;
-install -v -m644 docs/*.{css,html}          /usr/share/gtk-doc/html/babl          &amp;&amp;
-install -v -m644 docs/graphics/*.{html,svg} /usr/share/gtk-doc/html/babl/graphics</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>install -v -m755 -d
-      /usr/share/gtk-doc/html/babl/graphics</command>: This and the subsequent
-      commands install the library html documentation under
-      <filename class="directory">/usr/share/gtk-doc/html</filename> where
-      other gtk packages put the programmer-oriented documentation.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libbabl-0.1.so and libraries in /usr/lib/babl-0.1</seg>
-        <seg>
-          /usr/{include,lib}/babl-0.1 and
-          /usr/share/gtk-doc/html/babl
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libbabl">
-        <term><filename class="libraryfile">libbabl-0.1.so</filename></term>
-        <listitem>
-          <para>
-            contains functions to access BablFishes to convert between formats
-          </para>
-          <indexterm zone="babl libbabl">
-            <primary sortas="c-libbabl">libbabl-0.1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/graphlib/exiv2.xml
===================================================================
--- general/graphlib/exiv2.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,228 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 exiv2-download-http "https://github.com/Exiv2/exiv2/archive/v&exiv2-version;/exiv2-&exiv2-version;.tar.gz">
-  <!ENTITY exiv2-download-ftp  " ">
-  <!ENTITY exiv2-md5sum        "75a8766216a15ad104f09ab4a0eab7ca">
-  <!ENTITY exiv2-size          "43 MB">
-  <!ENTITY exiv2-buildsize     "127 MB (with tests)">
-  <!ENTITY exiv2-time          "0.3 SBU (Using parallelism=4, with tests)">
-]>
-
-<sect1 id="exiv2" xreflabel="Exiv2-&exiv2-version;">
-  <?dbhtml filename="exiv2.html"?>
-
-
-  <title>Exiv2-&exiv2-version;</title>
-
-  <indexterm zone="exiv2">
-    <primary sortas="a-Exiv2">Exiv2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Exiv2</title>
-
-    <para>
-      <application>Exiv2</application> is a C++ library and a command
-      line utility for managing image and video metadata.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&exiv2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&exiv2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &exiv2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &exiv2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &exiv2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &exiv2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-   <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/exiv2-&exiv2-version;-security_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">Exiv2 dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="brotli"/>,
-      <xref linkend="curl"/>, and
-      <xref linkend="inih"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://www.libssh.org/">libssh</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional for documentation</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>,
-      <xref linkend="graphviz"/>, and
-      <xref linkend="libxslt"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Exiv2</title>
-<!--
-    <para>
-      First, disable building a sample program that fails:
-    </para>
-
-<screen><userinput>sed -i '/conntest/s/^/#/' samples/CMakeLists.txt</userinput></screen>
--->
-    <para>
-      Install <application>Exiv2</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr  \
-      -DCMAKE_BUILD_TYPE=Release   \
-      -DEXIV2_ENABLE_VIDEO=yes     \
-      -DEXIV2_ENABLE_WEBREADY=yes  \
-      -DEXIV2_ENABLE_CURL=yes      \
-      -DEXIV2_BUILD_SAMPLES=no     \
-      -G "Unix Makefiles" .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DEXIV2_ENABLE_VIDEO=yes</parameter>:
-      This switch enables managing video metadata.
-    </para>
-
-    <para>
-      <parameter>-DEXIV2_ENABLE_WEBREADY=yes</parameter>:
-      This switch enables managing web image metadata.
-    </para>
-
-    <para>
-      <parameter>-DEXIV2_BUILD_SAMPLES=no</parameter>:
-      This switch is necessary to suppress building and installing
-      sample programs.  If the sample programs are built, 34 additional
-      programs are installed in /usr/bin.
-    </para>
-
-    <para>
-      <parameter>-DEXIV2_ENABLE_CURL=yes</parameter>:
-      This switch is necessary to enable network/http capabilities.
-    </para>
-
-    <para>
-      <option>-DEXIV2_ENABLE_INIH=no</option>:
-      Use this switch if you have not installed <xref linkend="inih"/>.
-    </para>
-
-    <para>
-      <option>-DEXIV2_ENABLE_BROTLI=no</option>:
-      Use this switch if you have not installed <xref linkend="brotli"/>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          exiv2
-        </seg>
-        <seg>
-          libexiv2.so <!-- and
-          libexiv2-xmp.a -->
-        </seg>
-        <seg>
-          /usr/include/exiv2 and
-          /usr/lib/cmake/exiv2
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="exiv2-prog">
-        <term><command>exiv2</command></term>
-        <listitem>
-          <para>
-            is a utility used to dump Exif data
-          </para>
-          <indexterm zone="exiv2 exiv2-prog">
-            <primary sortas="b-exiv2">exiv2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/graphlib/fontconfig.xml
===================================================================
--- general/graphlib/fontconfig.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,422 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 fontconfig-download-http
-           "https://www.freedesktop.org/software/fontconfig/release/fontconfig-&fontconfig-version;.tar.xz">
-  <!ENTITY fontconfig-download-ftp  " ">
-  <!ENTITY fontconfig-md5sum        "5bb3a2829aecb22ae553c39099bd0d6a">
-  <!ENTITY fontconfig-size          "1.4 MB">
-  <!ENTITY fontconfig-buildsize     "17 MB (with tests)">
-  <!ENTITY fontconfig-time          "0.4 SBU (with tests)">
-]>
-
-<sect1 id="fontconfig" xreflabel="Fontconfig-&fontconfig-version;">
-  <?dbhtml filename="fontconfig.html"?>
-
-
-  <title>Fontconfig-&fontconfig-version;</title>
-
-  <indexterm zone="fontconfig">
-    <primary sortas="a-Fontconfig">Fontconfig</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Fontconfig</title>
-
-    <para>
-      The <application>Fontconfig</application> package contains
-      a library and support programs used for configuring and
-      customizing font access.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&fontconfig-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&fontconfig-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &fontconfig-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &fontconfig-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &fontconfig-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &fontconfig-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/fontconfig-&fontconfig-version;-gperf-3.1-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Fontconfig Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="freetype2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="bubblewrap"/> (used by some tests),
-      <xref linkend="curl"/> and <xref linkend="unzip"/>
-      (both used by some tests for downloading and extracting test files),
-      <xref linkend="json-c"/>,
-      <xref linkend="docbook-utils"/> and
-      <xref linkend="libxml2"/>,
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
-    </para>
-
-    &test-use-internet;
-
-    <note>
-      <para>
-        If you have <application>DocBook Utils</application> installed and
-        you remove the <parameter>--disable-docs</parameter> parameter from
-        the <command>configure</command> command below, you must have
-        <xref linkend="perl-sgmlspm"/> and <xref linkend="texlive"/> installed
-        also, or the <application>Fontconfig</application> build will fail.
-      </para>
-    </note>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Fontconfig</title>
-
-    <para>
-      Install <application>Fontconfig</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr        \
-            --sysconfdir=/etc    \
-            --localstatedir=/var \
-            --disable-docs       \
-            --docdir=/usr/share/doc/fontconfig-&fontconfig-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.  One test
-      is known to fail if the kernel does not support user namespaces.  Some
-      tests will download some font files via Internet.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you did not remove the <parameter>--disable-docs</parameter>
-      parameter from the <command>configure</command> command, you can install
-      the pre-generated documentation by using the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -dm755 \
-        /usr/share/{man/man{1,3,5},doc/fontconfig-&fontconfig-version;/fontconfig-devel} &amp;&amp;
-install -v -m644 fc-*/*.1         /usr/share/man/man1 &amp;&amp;
-install -v -m644 doc/*.3          /usr/share/man/man3 &amp;&amp;
-install -v -m644 doc/fonts-conf.5 /usr/share/man/man5 &amp;&amp;
-install -v -m644 doc/fontconfig-devel/* \
-                                  /usr/share/doc/fontconfig-&fontconfig-version;/fontconfig-devel &amp;&amp;
-install -v -m644 doc/*.{pdf,sgml,txt,html} \
-                                  /usr/share/doc/fontconfig-&fontconfig-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-docs</parameter>: This switch avoids building the
-      documentation (the release tarball includes pre-generated
-      documentation).
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Fontconfig</title>
-
-    <sect3 id="fontconfig-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>
-          /etc/fonts/*,
-          /etc/fonts/conf.d/* and
-          /usr/share/fontconfig/conf.avail/*
-        </filename>
-      </para>
-
-      <indexterm zone="fontconfig fontconfig-config">
-        <primary sortas="e-etc-fonts">/etc/fonts/*</primary>
-      </indexterm>
-
-      <indexterm zone="fontconfig fontconfig-config">
-        <primary sortas="e-etc-fonts-conf.d">/etc/fonts/conf.d/*</primary>
-      </indexterm>
-
-      <indexterm zone="fontconfig fontconfig-config">
-        <primary sortas="e-usr-share-fontconfig-conf.avail">/usr/share/fontconfig/conf.avail/*</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        The main configuration file for <application>Fontconfig</application> is
-        <filename>/etc/fonts/fonts.conf</filename>. Generally you do not want
-        to edit this file. It will also read <filename>/etc/fonts/local.conf</filename>
-        and any files in <filename class="directory">/etc/fonts/conf.d</filename>.
-        To put a new font directory in the configuration, create
-        (or update) the <filename>/etc/fonts/local.conf</filename> file with your
-        local information or add a new file in
-        <filename class="directory">/etc/fonts/conf.d</filename>. The default
-        location of fonts in <application>Fontconfig</application> is:
-      </para>
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            /usr/share/fonts
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            ~/.local/share/fonts
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            ~/.fonts <emphasis>(this is now deprecated, but for the moment
-            it still works)</emphasis>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <para>
-        <application>Fontconfig</application> also ships many example
-        configuration files in the
-        <filename class="directory">/usr/share/fontconfig/conf.avail</filename>
-        directory. Symlinking specific files to
-        <filename class="directory">/etc/fonts/conf.d</filename>
-        will enable them. The default setup is generally good enough for
-        most users. See <filename>/etc/fonts/conf.d/README</filename>
-        for a description of the configuration files.
-      </para>
-
-      <indexterm zone="fontconfig fontconfig-config">
-        <primary sortas="e-usr-share-fonts">/usr/share/fonts</primary>
-      </indexterm>
-
-      <indexterm zone="fontconfig fontconfig-config">
-        <primary sortas="e-AA.fonts">~/.fonts</primary>
-      </indexterm>
-
-      <para>
-        More information about configuring <application>Fontconfig</application>
-        can be found in the user's manual in <ulink
-        url="file:///usr/share/doc/fontconfig-&fontconfig-version;/fontconfig-user.html"/>.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          fc-cache, fc-cat, fc-conflist, fc-list, fc-match, fc-pattern,
-          fc-query, fc-scan, and fc-validate
-        </seg>
-        <seg>
-          libfontconfig.so
-        </seg>
-        <seg>
-          /etc/fonts,
-          /usr/include/fontconfig,
-          /usr/share/doc/fontconfig-&fontconfig-version;,
-          /usr/share/fontconfig,
-          /usr/share/xml/fontconfig, and
-          /var/cache/fontconfig
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="fc-cache">
-        <term><command>fc-cache</command></term>
-        <listitem>
-          <para>
-            is used to create font information caches
-          </para>
-          <indexterm zone="fontconfig fc-cache">
-            <primary sortas="b-fc-cache">fc-cache</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fc-cat">
-        <term><command>fc-cat</command></term>
-        <listitem>
-          <para>
-            is used to read font information caches
-          </para>
-          <indexterm zone="fontconfig fc-cat">
-            <primary sortas="b-fc-cat">fc-cat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fc-conflist">
-        <term><command>fc-conflist</command></term>
-        <listitem>
-          <para>
-            shows the ruleset files' information on the system
-          </para>
-          <indexterm zone="fontconfig fc-conflist">
-            <primary sortas="b-fc-conflist">fc-conflist</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fc-list">
-        <term><command>fc-list</command></term>
-        <listitem>
-          <para>
-            is used to create font lists
-          </para>
-          <indexterm zone="fontconfig fc-list">
-            <primary sortas="b-fc-list">fc-list</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fc-match">
-        <term><command>fc-match</command></term>
-        <listitem>
-          <para>
-            is used to match available fonts, or find fonts that match
-            a given pattern
-          </para>
-          <indexterm zone="fontconfig fc-match">
-            <primary sortas="b-fc-match">fc-match</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fc-pattern">
-        <term><command>fc-pattern</command></term>
-        <listitem>
-          <para>
-            is used to parse pattern (empty pattern by default) and show
-            the parsed result
-          </para>
-          <indexterm zone="fontconfig fc-pattern">
-            <primary sortas="b-fc-pattern">fc-pattern</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fc-query">
-        <term><command>fc-query</command></term>
-        <listitem>
-          <para>
-            is used to query fonts files and print resulting patterns
-          </para>
-          <indexterm zone="fontconfig fc-query">
-            <primary sortas="b-fc-query">fc-query</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fc-scan">
-        <term><command>fc-scan</command></term>
-        <listitem>
-          <para>
-            is used to scan font files and directories, and print resulting
-            patterns
-          </para>
-          <indexterm zone="fontconfig fc-scan">
-            <primary sortas="b-fc-scan">fc-scan</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fc-validate">
-        <term><command>fc-validate</command></term>
-        <listitem>
-          <para>
-            is used to validate font files
-          </para>
-          <indexterm zone="fontconfig fc-validate">
-            <primary sortas="b-fc-validate">fc-validate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfontconfig">
-        <term><filename class="libraryfile">libfontconfig.so</filename></term>
-        <listitem>
-          <para>
-            contains functions used by the <application>Fontconfig</application>
-            programs and also by other programs to configure or customize font
-            access
-          </para>
-          <indexterm zone="fontconfig libfontconfig">
-            <primary sortas="c-libfontconfig">libfontconfig.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/graphlib/freetype2.xml
===================================================================
--- general/graphlib/freetype2.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,257 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 freetype2-download-http "&sourceforge-dl;/freetype/freetype-&freetype2-version;.tar.xz">
-  <!ENTITY freetype2-download-ftp  " ">
-  <!ENTITY freetype2-md5sum        "1f625f0a913c449551b1e3790a1817d7">
-  <!ENTITY freetype2-size          "2.4 MB">
-  <!ENTITY freetype2-buildsize     "33 MB (with additional documentation)">
-  <!ENTITY freetype2-time          "0.2 SBU (with additional documentation)">
-
-  <!ENTITY freetype2-doc-version   "&freetype2-version;">
-  <!ENTITY freetype2-doc-download-http "&sourceforge-dl;/freetype/freetype-doc-&freetype2-doc-version;.tar.xz">
-  <!ENTITY freetype2-doc-download-ftp  " ">
-  <!ENTITY freetype2-doc-md5sum        "e6466f08934ebf2d7f711b0464d7a6cf">
-  <!ENTITY freetype2-doc-size          "2.1 MB">
-]>
-
-<sect1 id="freetype2" xreflabel="FreeType-&freetype2-version;">
-  <?dbhtml filename="freetype2.html"?>
-
-
-  <title>FreeType-&freetype2-version;</title>
-
-  <indexterm zone="freetype2">
-    <primary sortas="a-FreeType">FreeType</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to FreeType2</title>
-
-    <para>
-      The <application>FreeType2</application> package contains
-      a library which allows applications to properly render
-      <application>TrueType</application> fonts.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&freetype2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&freetype2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &freetype2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &freetype2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &freetype2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &freetype2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <title>Additional Documentation</title>
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&freetype2-doc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &freetype2-doc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &freetype2-doc-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">FreeType2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="harfbuzz"/>
-      (first, install without it, after it is installed, reinstall
-      <xref linkend="freetype2"/>),
-      <xref linkend="libpng"/>, and
-      <xref linkend="which"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="brotli"/> and
-      <xref linkend="librsvg"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (for documentation)</bridgehead>
-    <para role="optional">
-      <ulink url="https://pypi.org/project/docwriter/">docwriter</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of FreeType2</title>
-
-    <para>
-      If you downloaded the additional documentation, unpack it into the
-      source tree using the following command:
-    </para>
-
-<screen><userinput>tar -xf ../freetype-doc-&freetype2-doc-version;.tar.xz --strip-components=2 -C docs</userinput></screen>
-
-    <para>
-      Install <application>FreeType2</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -ri "s:.*(AUX_MODULES.*valid):\1:" modules.cfg &amp;&amp;
-
-sed -r "s:.*(#.*SUBPIXEL_RENDERING) .*:\1:" \
-    -i include/freetype/config/ftoption.h  &amp;&amp;
-
-./configure --prefix=/usr --enable-freetype-config --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you downloaded the optional documentation, install it as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cp -v -R docs -T /usr/share/doc/freetype-&freetype2-version; &amp;&amp;
-rm -v /usr/share/doc/freetype-&freetype2-version;/freetype-config.1</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -ri ...</command>: First command enables GX/AAT and OpenType
-      table validation and second command enables Subpixel Rendering. Note that
-      Subpixel Rendering may have patent issues.  Be sure to read the
-      <literal>'Other patent issues'</literal> part of <ulink
-      url="https://freetype.org/patents.html"/> before enabling this option.
-    </para>
-
-    <para>
-      <parameter>--enable-freetype-config</parameter>: This switch
-      ensure that the man page for freetype-config is installed.
-    </para>
-
-    <para>
-      <option>--without-harfbuzz</option>: If
-      <application>harfbuzz</application> is installed prior to
-      <application>freetype</application> without
-      <application>freetype</application> support, use this switch to avoid a
-      build failure.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-    <!-- No longer valid with 2.10.1, /usr/bin/freetype-config is installed
-         by the 'make install' command.
-    <para>
-      <command>cp builds/unix/freetype-config /usr/bin</command>: Manually
-      place the freetype configureation program needed by other programs when
-      using the freetype library.
-    </para>
-    -->
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          freetype-config
-        </seg>
-        <seg>
-          libfreetype.so
-        </seg>
-        <seg>
-          /usr/include/freetype2 and
-          /usr/share/doc/freetype-&freetype2-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="freetype-config">
-        <term><command>freetype-config</command></term>
-        <listitem>
-          <para>
-            is used to get <application>FreeType</application> compilation
-            and linking information
-          </para>
-          <indexterm zone="freetype2 freetype-config">
-            <primary sortas="b-freetype-config">freetype2-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfreetype">
-        <term><filename class="libraryfile">libfreetype.so</filename></term>
-        <listitem>
-          <para>
-            contains functions for rendering various font types, such
-            as TrueType and Type1
-          </para>
-          <indexterm zone="freetype2 libfreetype">
-            <primary sortas="c-libfreetype">libfreetype.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/graphlib/fribidi.xml
===================================================================
--- general/graphlib/fribidi.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,170 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 fribidi-download-http "https://github.com/fribidi/fribidi/releases/download/v&fribidi-version;/fribidi-&fribidi-version;.tar.xz">
-  <!ENTITY fribidi-download-ftp  " ">
-  <!ENTITY fribidi-md5sum        "49b17442e0d8fa2e97b5c898078f6f51">
-  <!ENTITY fribidi-size          "1.1 MB">
-  <!ENTITY fribidi-buildsize     "21 MB (with tests)">
-  <!ENTITY fribidi-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="fribidi" xreflabel="FriBidi-&fribidi-version;">
-  <?dbhtml filename="fribidi.html"?>
-
-
-  <title>FriBidi-&fribidi-version;</title>
-
-  <indexterm zone="fribidi">
-    <primary sortas="a-FriBidi">FriBidi</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to FriBidi</title>
-
-    <para>
-      The <application>FriBidi</application> package is an implementation
-      of the <ulink url="https://www.unicode.org/reports/tr9/">Unicode
-      Bidirectional Algorithm (BIDI)</ulink>. This is useful for supporting
-      Arabic and Hebrew alphabets in other packages.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&fribidi-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&fribidi-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &fribidi-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &fribidi-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &fribidi-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &fribidi-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">FriBidi Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://www.ciselant.de/c2man/c2man.html">c2man (to build man pages)</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of FriBidi</title>
-
-    <para>
-      Install <application>FriBidi</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          fribidi
-        </seg>
-        <seg>
-          libfribidi.so
-        </seg>
-        <seg>
-          /usr/include/fribidi
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="fribidi-prog">
-        <term><command>fribidi</command></term>
-        <listitem>
-          <para>
-            is a command-line interface to the
-            <filename class="libraryfile">libfribidi</filename> library and
-            can be used to convert a logical string to visual output
-          </para>
-          <indexterm zone="fribidi fribidi-prog">
-            <primary sortas="b-fribidi">fribidi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfribidi">
-        <term><filename class="libraryfile">libfribidi.so</filename></term>
-        <listitem>
-          <para>
-            contains functions used to implement the
-            <ulink url="https://www.unicode.org/reports/tr9/">Unicode
-            Bidirectional Algorithm</ulink>
-          </para>
-          <indexterm zone="fribidi libfribidi">
-            <primary sortas="c-libfribidi">libfribidi.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/graphlib/gegl.xml
===================================================================
--- general/graphlib/gegl.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,290 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gegl-download-http "https://download.gimp.org/pub/gegl/0.4/gegl-&gegl-version;.tar.xz">
-  <!ENTITY gegl-download-ftp  " ">
-  <!ENTITY gegl-md5sum        "a96ae32d46855ab4eefa1fce2dbefda1">
-  <!ENTITY gegl-size          "5.5 MB">
-  <!ENTITY gegl-buildsize     "80 MB (Add 4 MB for tests)">
-  <!ENTITY gegl-time          "0.7 SBU (add 0.1 SBU for tests, both with parallelism=4)">
-]>
-
-<sect1 id="gegl" xreflabel="gegl-&gegl-version;">
-  <?dbhtml filename="gegl.html"?>
-
-
-  <title>gegl-&gegl-version;</title>
-
-  <indexterm zone="gegl">
-    <primary sortas="a-Gegl">Gegl</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to gegl</title>
-
-    <para>
-      This package provides the GEneric Graphics Library, which is a graph based
-      image processing format.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gegl-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gegl-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gegl-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gegl-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gegl-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gegl-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/gegl-&gegl-version;-ffmpeg5_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">gegl Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="babl"/> and 
-      <xref linkend="json-glib"/>
-      <!-- These are marked obsolete - no effect in meson_options.txt
-      <xref linkend="libjpeg"/>, and
-      <xref linkend="libpng"/>-->
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection;,
-      <xref linkend="graphviz"/> (build with pango),
-      <!-- EDITORS NOTE: Graphviz is required for the gegl:introspect
-      function. Without this function, GIMP will not start. You'll get the
-      following error:
-
-      "GEGL Operation Missing! GIMP rqeuires the GEGL operation
-      'gegl:introspect'. This operation cannot be found. Check your GEGL
-      install and ensure it has been compiled with any dependencies required
-      for GIMP."
-
-      Reference: https://gitlab.gnome.org/GNOME/gegl/-/commit/1f50456de59c686941a861d299a63bfcd4126ee5
-      -->
-      <xref linkend="pygments"/>, and
-      <xref linkend="pygobject3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="asciidoc"/>,
-      <xref linkend="cairo"/>,
-      <xref linkend="ffmpeg"/>,
-      <xref linkend="gdk-pixbuf"/>,
-      <xref linkend="gexiv2"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="jasper"/>,
-      <xref linkend="lcms2"/>,
-      <xref linkend="libraw"/>,
-      <xref linkend="librsvg"/>,
-      <xref linkend="libtiff"/>,
-      <xref linkend="libwebp"/>,
-      <xref linkend="pango"/>,
-      <xref linkend="poppler"/>,
-      <xref linkend="ruby"/>,
-      <xref linkend="sdl2"/>,
-      <xref linkend="v4l-utils"/>,
-      <xref linkend="vala"/>,
-      <xref linkend="libspiro"/>,
-      <ulink url="https://luajit.org/luajit.html">LuaJIT</ulink>,
-      <ulink url="https://lensfun.github.io/">lensfun</ulink>,
-      <ulink url="https://luajit.org/luajit.html">LuaJIT</ulink>,
-      <ulink url="https://www.netsurf-browser.org/projects/libnsgif/">libnsgif</ulink>,
-      <ulink url="https://faculty.cse.tamu.edu/davis/suitesparse.html">libumfpack</ulink>,
-      <ulink url="https://github.com/gerddie/maxflow">maxflow</ulink>,
-      <ulink url="https://github.com/hodefoting/mrg/releases">MRG</ulink>,
-      <ulink url="https://www.khronos.org/opencl/">OpenCL</ulink>,
-      <ulink url="https://www.openexr.com">OpenEXR</ulink>,
-      <ulink url="https://github.com/KyleLink/poly2tri-c">poly2tri-c</ulink>,
-      <ulink url="https://www.gnu.org/software/src-highlite/">source-highlight</ulink>, and
-      <ulink url="https://w3m.sourceforge.net/">w3m</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of gegl</title>
-
-    <para>
-      If installing over a previous version of <application>gegl</application>,
-      one module needs to be removed.  As the <systemitem class="username">root</systemitem>
-      user, run:
-    </para>
-
-<screen role="root"><userinput>rm -f /usr/lib/gegl-0.4/vector-fill.so</userinput></screen>
-
-    <para>
-      Install <application>gegl</application> by running the following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release -Dlibav=disabled .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To run the tests, issue: <command>ninja test</command>. <!--This should
-      indicate no failures, but will skip many tests depending on optional
-      dependencies installed on the system.--> 7 tests in the
-      <filename>gegl:ff-load-save</filename> portion of the test suite are
-      known to fail due to incompatibilities with ffmpeg-6.0.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>-Ddocs=true</option>: Build and
-      install documentation (requires <xref linkend="gtk-doc"/>).
-
-      <option>-Dlibav=disabled</option>: Disable FFMpeg support
-      as the build fails with <xref linkend="ffmpeg"/>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>gegl and
-             gegl-imgcmp
-        </seg>
-        <seg>libgegl-0.4.so,
-             libgegl-npd-0.4.so,
-         <!--libgegl-sc-0.4.so,--> and
-             modules in /usr/lib/gegl-0.4
-        </seg>
-        <seg>/usr/lib/gegl-0.4 and
-             /usr/include/gegl-0.4
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gegl-prog">
-        <term><command>gegl</command></term>
-        <listitem>
-          <para>
-            is a commandline tool for working with the XML data model
-          </para>
-          <indexterm zone="gegl gegl-prog">
-            <primary sortas="b-gegl">gegl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gegl-imgcmp">
-        <term><command>gegl-imgcmp</command></term>
-        <listitem>
-          <para>
-            is a simple image difference detection tool for use in regression
-            testing
-          </para>
-          <indexterm zone="gegl gegl-imgcmp">
-            <primary sortas="b-gegl-imgcmp">gegl-imgcmp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgegl-0.4">
-        <term><filename class="libraryfile">libgegl-0.4.so</filename></term>
-        <listitem>
-          <para>
-            provides infrastructure to do demand based cached non destructive
-            image editing on larger than RAM buffers
-          </para>
-          <indexterm zone="gegl libgegl-0.4">
-            <primary sortas="c-libgegl-0.4">libgegl-0.4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgegl-npd-0.4">
-        <term><filename class="libraryfile">libgegl-npd-0.4.so</filename></term>
-        <listitem>
-          <para>
-            is the GEGL N-point image deformation library
-          </para>
-          <indexterm zone="gegl libgegl-npd-0.4">
-            <primary sortas="c-libgegl-npd-0.4">libgegl-npd-0.4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!--
-      <varlistentry id="libgegl-sc-0.4">
-        <term><filename class="libraryfile">libgegl-sc-0.4.so</filename></term>
-        <listitem>
-          <para>
-            is the GEGL Seamless Cloning library
-          </para>
-          <indexterm zone="gegl libgegl-sc-0.4">
-            <primary sortas="c-libgegl-sc-0.4">libgegl-sc-0.4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/graphlib/giflib.xml
===================================================================
--- general/graphlib/giflib.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,273 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 giflib-download-http "https://sourceforge.net/projects/giflib/files/giflib-&giflib-version;.tar.gz">
-  <!ENTITY giflib-download-ftp  " ">
-  <!ENTITY giflib-http-md5sum   "913dd251492134e235ee3c9a91987a4d">
-  <!ENTITY giflib-http-size     "440 KB">
-  <!ENTITY giflib-buildsize     "4.0 MB (with documentation)">
-  <!ENTITY giflib-time          "less than 0.1 SBU (with documentation)">
-]>
-
-<sect1 id="giflib" xreflabel="giflib-&giflib-version;">
-  <?dbhtml filename="giflib.html"?>
-
-
-  <title>giflib-&giflib-version;</title>
-
-  <indexterm zone="giflib">
-    <primary sortas="a-giflib">giflib</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to giflib</title>
-
-    <para>
-      The <application>giflib</application> package contains libraries
-      for reading and writing GIFs as well as programs for converting and
-      working with GIF files.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&giflib-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&giflib-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &giflib-http-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &giflib-http-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &giflib-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &giflib-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/giflib-&giflib-version;-upstream_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">giflib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xmlto"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of giflib</title>
-
-    <para>
-      First, prevent the build process from installing XML files instead of man
-      pages:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../giflib-&giflib-version;-upstream_fixes-1.patch</userinput></screen>
-
-    <para>
-      Next, remove an unnecessary dependency on <xref linkend="imagemagick"/>
-      by moving a file into an expected location:
-    </para>
-
-<screen><userinput remap="pre">cp pic/gifgrid.gif doc/giflib-logo.gif</userinput></screen>
-
-    <para>
-      Install <application>giflib</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>make</userinput></screen>
-
-<!--    <para>
-      To test the results, issue: <command>make check-TESTS</command>. Test
-      suite results are kept in <filename>test.sh.log</filename>.
-    </para>
-    There doesn't seem to be a test suite in 5.1.6 -->
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make PREFIX=/usr install &amp;&amp;
-
-rm -fv /usr/lib/libgif.a &amp;&amp;
-
-find doc \( -name Makefile\* -o -name \*.1 \
-         -o -name \*.xml \) -exec rm -v {} \; &amp;&amp;
-
-install -v -dm755 /usr/share/doc/giflib-&giflib-version; &amp;&amp;
-cp -v -R doc/* /usr/share/doc/giflib-&giflib-version;</userinput></screen>
-<!--
-    <para>
-      If <xref linkend="xmlto"/> is installed, then the API documentation has
-      been built.  If you wish to install the distributed and the just built
-      documentations, issue, as the <systemitem
-      class="username">root</systemitem> user:
-    </para>
--->
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>rm -fv /usr/lib/libgif.a</command>: This command removes a
-      static library which is not used by any BLFS package.
-    </para>
-
-    <para>
-      <command>find doc ... -exec rm -v {} \;</command>: This command removes
-      <filename>Makefiles</filename>, man and xml files from the documentation
-      directory that would otherwise be installed by the commands that follow.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>gif2rgb, gifbuild, gifclrmp, giffix, giftext, and giftool</seg>
-        <seg>libgif.so</seg>
-        <seg>/usr/share/doc/giflib-&giflib-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gif2rgb">
-        <term><command>gif2rgb</command></term>
-        <listitem>
-          <para>
-            converts images saved as GIF to 24-bit RGB images
-          </para>
-          <indexterm zone="giflib gif2rgb">
-            <primary sortas="b-gif2rgb">gif2rgb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gifbuild">
-        <term><command>gifbuild</command></term>
-        <listitem>
-          <para>
-            dumps GIF data in a textual format, or undumps it to a GIF
-          </para>
-          <indexterm zone="giflib gifbuild">
-            <primary sortas="b-gifbuild">gifbuild</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gifclrmp">
-        <term><command>gifclrmp</command></term>
-        <listitem>
-          <para>
-            modifies GIF image colormaps
-          </para>
-          <indexterm zone="giflib gifclrmp">
-            <primary sortas="b-gifclrmp">gifclrmp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="giffix">
-        <term><command>giffix</command></term>
-        <listitem>
-          <para>
-            clumsily attempts to fix truncated GIF images
-          </para>
-          <indexterm zone="giflib giffix">
-            <primary sortas="b-giffix">giffix</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="giftext">
-        <term><command>giftext</command></term>
-        <listitem>
-          <para>
-            prints (text only) general information about a GIF file
-          </para>
-          <indexterm zone="giflib giftext">
-            <primary sortas="b-giftext">giftext</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="giftool">
-        <term><command>giftool</command></term>
-        <listitem>
-          <para>
-            is a GIF transformation tool
-          </para>
-          <indexterm zone="giflib giftool">
-            <primary sortas="b-giftool">giftool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgif">
-        <term><filename class="libraryfile">libgif.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions required by the
-            <application>giflib</application> programs and any other programs
-            needing library functionality to read, write and manipulate GIF
-            images
-          </para>
-          <indexterm zone="giflib libgif">
-            <primary sortas="c-libgif">libgif.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/graphlib/glad.xml
===================================================================
--- general/graphlib/glad.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,147 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 glad-download-http "https://github.com/Dav1dde/glad/archive/v&glad-version;/glad-&glad-version;.tar.gz">
-  <!ENTITY glad-download-ftp  " ">
-  <!ENTITY glad-md5sum        "350c34126e47988f378285adf4cf2efc">
-  <!ENTITY glad-size          "620 KB">
-  <!ENTITY glad-buildsize     "14 MB">
-  <!ENTITY glad-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="glad" xreflabel="Glad-&glad-version;">
-  <?dbhtml filename="glad.html"?>
-
-  <title>Glad-&glad-version;</title>
-
-  <indexterm zone="glad">
-    <primary sortas="a-glad">Glad</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Glad</title>
-
-    <para>
-      The <application>Glad</application> package contains a generator for
-      loading Vulkan, OpenGL, EGL, GLES, and GLX contexts.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&glad-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&glad-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &glad-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &glad-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &glad-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &glad-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Glad Dependencies</bridgehead>
-
-    <!-- Nothing required other than Jinja2, which is in LFS -->
-    
-    <!-- Tests cannot be run without these dependencies -->
-    <bridgehead renderas="sect4">Optional (required to run the tests)</bridgehead>
-    <para role="optional">
-      <xref linkend="pytest"/>,
-      <xref linkend="rust"/>,
-      <xref linkend="xorg7-lib"/>,
-      <ulink url="https://www.glfw.org/">glfw</ulink>, and
-      <ulink url="http://winehq.org/">WINE</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Glad</title>
-
-    <para>
-      Install <application>Glad</application> by running the following
-      commands:
-    </para>
-
-&build-wheel;
-
-    <para>
-      This package comes with a test suite, but it cannot be run without
-      installing the external dependencies listed above.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; glad2</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          glad
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/python&python3-majorver;/site-packages/glad and
-          /usr/lib/python&python3-majorver;/site-packages/glad2-&glad-version;.dist-info
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="glad-prog">
-        <term><command>glad</command></term>
-        <listitem>
-          <para>
-            generates loaders for Vulkan, OpenGL, EGL, GLES, and GLX contexts
-          </para>
-          <indexterm zone="glad glad-prog">
-            <primary sortas="b-glad">glad</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: general/graphlib/glm.xml
===================================================================
--- general/graphlib/glm.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,138 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 glm-download-http "https://github.com/g-truc/glm/archive/&glm-version;/glm-&glm-version;.tar.gz">
-  <!ENTITY glm-download-ftp  " ">
-  <!ENTITY glm-md5sum        "f824ac50e16310a95279032f82cbd341">
-  <!ENTITY glm-size          "4.4 MB">
-  <!ENTITY glm-buildsize     "44 MB">
-  <!ENTITY glm-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="glm" xreflabel="GLM-&glm-version;">
-  <?dbhtml filename="glm.html"?>
-
-
-  <title>GLM-&glm-version;</title>
-
-  <indexterm zone="glm">
-    <primary sortas="a-GLM">GLM</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GLM</title>
-
-    <para>
-      OpenGL Mathematics (<application>GLM</application>) is a header-only C++
-      mathematics library for graphics software based on the OpenGL Shading
-      Language (GLSL) specifications. An extension system provides extended
-      capabilities such as matrix transformations and quaternions.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&glm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&glm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &glm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &glm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &glm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &glm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">GLM Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>-->
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GLM</title>
-
-    <note>
-      <para>
-        This package is unusual as it includes its functionality in
-        header files.  We just copy them into position.
-      </para>
-    </note>
-
-    <para>
-      As the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cp -r glm /usr/include/ &amp;&amp;
-cp -r doc /usr/share/doc/glm-&glm-version;</userinput></screen>
-  </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>-DCMAKE_INSTALL_LIBDIR=lib ..</command>: Although no compiled
-      libraries are installed, this command ensures that the
-      <application>cmake</application> and
-      <application>pkg-config</application> files are installed into
-      <filename class="directory">/usr/lib</filename>.
-    </para>
-
-  </sect2>
--->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/include/glm and
-          /usr/share/doc/glm-&glm-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <!-- this package has no programs or libraries to describe -->
-
-  </sect2>
-
-</sect1>
Index: general/graphlib/graphite2.xml
===================================================================
--- general/graphlib/graphite2.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,256 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 graphite2-download-http
-           "https://github.com/silnrsi/graphite/releases/download/&graphite2-version;/graphite2-&graphite2-version;.tgz">
-  <!ENTITY graphite2-download-ftp  " ">
-  <!ENTITY graphite2-md5sum        "1bccb985a7da01092bfb53bb5041e836">
-  <!ENTITY graphite2-size          "6.3 MB">
-  <!ENTITY graphite2-buildsize     "30 MB (with tests)">
-  <!ENTITY graphite2-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="graphite2" xreflabel="Graphite2-&graphite2-version;">
-  <?dbhtml filename="graphite2.html"?>
-
-
-  <title>Graphite2-&graphite2-version;</title>
-
-  <indexterm zone="graphite2">
-    <primary sortas="a-Graphite2">Graphite2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Graphite2</title>
-
-    <para>
-      <application>Graphite2</application> is a rendering engine for graphite
-      fonts. These are TrueType fonts with additional tables containing smart
-      rendering information and were originally developed to support complex
-      non-Roman writing systems.  They may contain rules for e.g. ligatures,
-      glyph substitution, kerning, justification - this can make them useful
-      even on text written in Roman writing systems such as English.  Note that
-      <application>firefox</application> by default provides an internal copy of
-      the graphite engine and cannot use a system version (although it can now
-      be patched to use it), but it too should benefit from the availability of
-      graphite fonts.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&graphite2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&graphite2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &graphite2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &graphite2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &graphite2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &graphite2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Graphite2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="freetype2"/>,
-      <ulink url="https://sourceforge.net/projects/silgraphite/files/silgraphite/2.3.1/">silgraphite</ulink>
-      to build the <command>comparerender</command> test and benchmarking tool,
-      and if that is present, and
-      <xref linkend="harfbuzz"/> to add more functionality to it (this is a
-      circular dependency, you would need to first build
-      <application>graphite2</application> without
-      <application>harfbuzz</application>).
-    </para>
-
-    <para role="optional">
-      To build the documentation:
-      <xref linkend="asciidoc"/>,
-      <xref linkend="doxygen"/>,
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>), and
-      <ulink url="https://dblatex.sourceforge.net/">
-      dblatex</ulink>  (for PDF docs)
-    </para>
-
-    <para role="optional">
-      To execute the test suite you will need
-      <ulink url="https://pypi.python.org/pypi/FontTools">FontTools</ulink>
-      (Python 3 module), otherwise, the "cmp" tests fail.
-    </para>
-
-    <bridgehead renderas="sect4">Optional (at runtime)</bridgehead>
-    <para role="optional">
-      You will need at least one suitable <ulink role="runtime"
-      url="https://scripts.sil.org/cms/scripts/page.php?site_id=projects&amp;item_id=graphite_fonts">graphite font</ulink>
-      for the package to be useful.
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Graphite2</title>
-
-    <para>
-      Some tests fail if
-      <ulink url="https://pypi.python.org/pypi/FontTools">FontTools</ulink>
-      (Python 3 module) is not installed. These tests can be removed with:
-    </para>
-
-<screen><userinput>sed -i '/cmptest/d' tests/CMakeLists.txt</userinput></screen>
-
-    <para>
-      Install <application>Graphite2</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you wish to build the documentation, issue:
-    </para>
-
-<screen remap="doc"><userinput>make docs</userinput></screen>
-
-    <!-- https://github.com/silnrsi/graphite/pull/74 -->
-    <para>
-      To test the results, issue: <command>make test</command>.
-      One test named <filename>nametabletest</filename> is known to fail.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you built the documentation, install, as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -v -d -m755 /usr/share/doc/graphite2-&graphite2-version; &amp;&amp;
-<!-- doc/doxygen seems to have gone, so I removed the api dir, but now both html
-and pdf for the GTF and the manual
-cp      -v -r -f    doc/doxygen/{html,latex/refman.pdf} \
-                    /usr/share/doc/graphite2-&graphite2-version;/api &amp;&amp;-->
-cp      -v -f    doc/{GTF,manual}.html \
-                    /usr/share/doc/graphite2-&graphite2-version; &amp;&amp;
-cp      -v -f    doc/{GTF,manual}.pdf \
-                    /usr/share/doc/graphite2-&graphite2-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>-DCMAKE_VERBOSE_MAKEFILE=ON</option>: This switch turns on
-      build verbose mode.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gr2fonttest, and optionally comparerender
-        </seg>
-        <seg>
-          libgraphite2.so
-        </seg>
-        <seg>
-          /usr/{include,share}/graphite2 and optionally
-          /usr/share/doc/graphite2-&graphite2-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="comparerender">
-        <term><command>comparerender</command></term>
-        <listitem>
-          <para>
-            is a test and benchmarking tool
-          </para>
-          <indexterm zone="graphite2 comparerender">
-            <primary sortas="b-comparerender">comparerender</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gr2fonttest">
-        <term><command>gr2fonttest</command></term>
-        <listitem>
-          <para>
-            is a diagnostic console tool for graphite fonts
-          </para>
-          <indexterm zone="graphite2 gr2fonttest">
-            <primary sortas="b-gr2fonttest">gr2fonttest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgraphite2">
-        <term><filename class="libraryfile">libgraphite2.so</filename></term>
-        <listitem>
-          <para>
-            is a rendering engine for graphite fonts
-          </para>
-          <indexterm zone="graphite2 libgraphite2">
-            <primary sortas="c-libgraphite2">libgraphite2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/graphlib/graphlib.xml
===================================================================
--- general/graphlib/graphlib.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ general/graphlib/graphlib.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,60 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
+<chapter id="general-graphlib">
+<?dbhtml filename="graphlib.html" dir="general"?>
+<title>Graphics Libraries</title>
 
-<chapter id="general-graphlib">
-  <?dbhtml filename="graphlib.html"?>
+<para>Depending on what your system will be used for, you may or
+may not require the graphics libraries.  Most desktop machines will 
+want them for use with graphical applications.  Most servers on the 
+other hand, will not require them.</para>
 
-  <title>Graphics and Font Libraries</title>
-
-  <para>
-    Depending on what your system will be used for, you may or
-    may not require the graphics and font libraries. Most desktop machines will
-    want them for use with graphical applications.  Most servers on the
-    other hand, will not require them.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aalib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="babl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="exiv2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="freetype2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fontconfig.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fribidi.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gegl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="giflib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glad.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="graphite2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="harfbuzz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="jasper.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lcms2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libavif.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libexif.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgxps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libjpeg-turbo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libjxl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmypaint.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libraw.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="librsvg.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libspiro.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libtiff.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libwebp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mypaint-brushes.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="newt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="opencv.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openjpeg2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pixman.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="poppler.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="potrace.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qpdf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qrencode.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sassc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webp-pixbuf-loader.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="woff2.xml"/>
+&lcms;
+&libjpeg;
+&libpng;
+&libtiff;
+&libungif;
+&libmng;
+&imlib;
 
 </chapter>
Index: general/graphlib/harfbuzz.xml
===================================================================
--- general/graphlib/harfbuzz.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,346 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 harfbuzz-download-http
-           "https://github.com/harfbuzz/harfbuzz/releases/download/&harfbuzz-version;/harfbuzz-&harfbuzz-version;.tar.xz">
-  <!ENTITY harfbuzz-download-ftp  " ">
-  <!ENTITY harfbuzz-md5sum        "961e77201ff4738382ea06e9f15ade70">
-  <!ENTITY harfbuzz-size          "18 MB">
-  <!ENTITY harfbuzz-buildsize     "149 MB (With tests)">
-  <!ENTITY harfbuzz-time          "0.8 SBU (With tests; both using parallelism=4)">
-]>
-
-<sect1 id="harfbuzz" xreflabel="harfBuzz-&harfbuzz-version;">
-  <?dbhtml filename="harfbuzz.html"?>
-
-
-  <title>harfBuzz-&harfbuzz-version;</title>
-
-  <indexterm zone="harfbuzz">
-    <primary sortas="a-HarfBuzz">HarfBuzz</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Harfbuzz</title>
-
-    <para>
-      The <application>HarfBuzz</application> package contains an OpenType text
-      shaping engine.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&harfbuzz-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&harfbuzz-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &harfbuzz-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &harfbuzz-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &harfbuzz-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &harfbuzz-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">HarfBuzz Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="glib2"/> (required for Pango; GObject Introspection
-      required for building GNOME),
-      <xref role="first" linkend="graphite2"/> (required for building
-        <xref role="nodep" linkend="texlive"/> or
-        <xref role="nodep" linkend="libreoffice"/> with system harfbuzz),
-      <xref linkend="icu"/>, and
-      <xref role="first" linkend="freetype2"/>
-      (after <xref role="nodep" linkend="harfbuzz"/> is installed, reinstall
-      <xref role="nodep" linkend="freetype2"/>)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cairo"/> (circular: build cairo and all its recommended
-      dependencies, including harfbuzz, first, then rebuild harfbuzz if the
-      cairo backend is needed),
-      <xref linkend="git"/>,
-      <xref linkend="gtk-doc"/>,
-      <ulink url="https://pypi.org/project/FontTools/">FontTools</ulink>
-      (Python 3 module, for the test suite),
-      <ulink url="https://www.colm.net/open-source/ragel/">ragel</ulink>,
-      and <ulink url="https://github.com/bytecodealliance/wasm-micro-runtime">wasm-micro-runtime</ulink>
-    </para>
-
-    <warning>
-      <para>
-        Recommended dependencies are not strictly required to build
-        the package. However, you might not get expected results at
-        runtime if you don't install them. Please do not report bugs
-        with this package if you <emphasis>have not</emphasis>
-        installed the recommended dependencies.
-      </para>
-    </warning>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of HarfBuzz</title>
-
-    <para>
-      Install <application>HarfBuzz</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..            \
-      --prefix=/usr       \
-      --buildtype=release \
-      -Dcpp_std=c++17     \
-      -Dgraphite2=enabled &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <parameter>-Dcpp_std=c++17</parameter>: This switch ensures compiling
-      the C++ code following the C++17 standard, overriding the default of
-      this package (C++11).  It's required to build this package with
-      <xref linkend='icu'/> installed because some ICU headers use C++17
-      features.  It is unnecessary if <xref linkend='icu'/> is not
-      installed, but does no harm anyway.
-    </para>
-
-    <para>
-      <parameter>-Dgraphite2=enabled</parameter>: This switch enables
-      <application>Graphite2</application> support, which is required for
-      building <xref linkend="texlive"/> or <xref linkend="libreoffice"/>
-      with system harfbuzz.
-    </para>
-<!--
-    <para>
-      <parameter>-Dbenchmark=disabled</parameter>: This switch disables
-      downloading and building the <application>google-benchmark</application>
-      subproject, which requires <xref linkend="git"/>, and is of no
-      use for non developers.
-    </para>
--->
-    <para>
-      <option>-Ddocs=disabled</option>: If <xref linkend="gtk-doc"/> is
-      installed, the documentation is built and installed. This switch
-      prevents that.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          hb-info,
-          hb-ot-shape-closure,
-          hb-shape,
-          hb-subset, and
-          hb-view (only if Cairo is installed)
-        </seg>
-        <seg>
-          libharfbuzz.so,
-          libharfbuzz-cairo.so (only if Cairo is installed),
-          libharfbuzz-gobject.so,
-          libharfbuzz-icu.so, and
-          libharfbuzz-subset.so
-        </seg>
-        <seg>
-          /usr/include/harbuzz,
-          /usr/lib/cmake/harfbuzz, and
-          /usr/share/gtk-doc/html/harfbuzz (optional)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-     <varlistentry id="hb-info">
-       <term><command>hb-info</command></term>
-       <listitem>
-         <para>
-           is used for gathering information about fonts installed on the
-           system
-         </para>
-         <indexterm zone="harfbuzz hb-info">
-           <primary sortas="b-hb-info">hb-info</primary>
-         </indexterm>
-       </listitem>
-     </varlistentry>
-
-     <varlistentry id="hb-ot-shape-closure">
-        <term><command>hb-ot-shape-closure</command></term>
-        <listitem>
-          <para>
-            gives the set of characters contained in a string, represented as
-            single characters and/or single character names. Example:
-            <command>hb-ot-shape-closure
-              /usr/share/fonts/dejavu/DejaVuSans.ttf "Hello World."</command>
-          </para>
-          <indexterm zone="harfbuzz hb-ot-shape-closure">
-            <primary sortas="b-hb-ot-shape-closure">hb-ot-shape-closure</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hb-shape">
-        <term><command>hb-shape</command></term>
-        <listitem>
-          <para>
-            is used for the conversion of text strings into positioned glyphs
-          </para>
-          <indexterm zone="harfbuzz hb-shape">
-            <primary sortas="b-hb-shape">hb-shape</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hb-subset">
-        <term><command>hb-subset</command></term>
-        <listitem>
-          <para>
-            is used to create subsets of fonts, and display text using them
-          </para>
-          <indexterm zone="harfbuzz hb-subset">
-            <primary sortas="b-hb-subset">hb-subset</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hb-view">
-        <term><command>hb-view</command></term>
-        <listitem>
-          <para>
-            displays a graphical view of a string shape using a
-            particular font as a set of glyphs. The output format is
-            automatically defined by the file extension, the supported ones
-            being ansi/png/svg/pdf/ps/eps. For example:
-            <command>hb-view --output-file=hello.png
-              /usr/share/fonts/dejavu/DejaVuSans.ttf "Hello World."</command>
-          </para>
-          <indexterm zone="harfbuzz hb-view">
-            <primary sortas="b-hb-view">hb-view</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libharfbuzz">
-        <term><filename class="libraryfile">libharfbuzz.so</filename></term>
-        <listitem>
-          <para>
-            is the HarfBuzz text shaping library
-          </para>
-          <indexterm zone="harfbuzz libharfbuzz">
-            <primary sortas="c-libharfbuzz">libharfbuzz.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libharfbuzz-cairo">
-        <term><filename class="libraryfile">libharfbuzz-cairo.so</filename></term>
-        <listitem>
-          <para>
-            provides Cairo integration for the Harfbuzz text shaping library
-          </para>
-          <indexterm zone="harfbuzz libharfbuzz-cairo">
-            <primary sortas="c-libharfbuzz-cairo">libharfbuzz-cairo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libharfbuzz-gobject">
-        <term><filename class="libraryfile">libharfbuzz-gobject.so</filename></term>
-        <listitem>
-          <para>
-            provides GObject integration for the HarfBuzz text shaping library
-          </para>
-          <indexterm zone="harfbuzz libharfbuzz-gobject">
-            <primary sortas="c-libharfbuzz-gobject">libharfbuzz-gobject.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libharfbuzz-icu">
-        <term><filename class="libraryfile">libharfbuzz-icu.so</filename></term>
-        <listitem>
-          <para>
-            provides ICU integration for the HarfBuzz text shaping library
-          </para>
-          <indexterm zone="harfbuzz libharfbuzz-icu">
-            <primary sortas="c-libharfbuzz-icu">libharfbuzz-icu.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libharfbuzz-subset">
-        <term><filename class="libraryfile">libharfbuzz-subset.so</filename></term>
-        <listitem>
-          <para>
-            provides API functions for performing subsetting operations on font
-            files
-          </para>
-          <indexterm zone="harfbuzz libharfbuzz-subset">
-            <primary sortas="c-libharfbuzz-subset">libharfbuzz-subset.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/graphlib/imlib.xml
===================================================================
--- general/graphlib/imlib.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/imlib.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect1 id="imlib" xreflabel="imlib-&imlib-version;">
+<?dbhtml filename="imlib.html" dir="general"?>
+<title>imlib-&imlib-version;</title>
+
+&imlib-intro;
+&imlib-inst;
+&imlib-config;
+&imlib-desc;
+
+</sect1>
+
Index: general/graphlib/imlib/imlib-config.xml
===================================================================
--- general/graphlib/imlib/imlib-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/imlib/imlib-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Configuring imlib</title>
+
+<sect3><title>Configuration Information</title>
+
+&library-config;
+
+</sect3>
+
+</sect2>
+
Index: general/graphlib/imlib/imlib-desc.xml
===================================================================
--- general/graphlib/imlib/imlib-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/imlib/imlib-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Contents</title>
+
+<para>The imlib package contains <userinput>imlib libraries</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>imlib libraries</title>
+<para>imlib provides the functions for programs to display and edit a
+wide variety of image data formats.</para></sect3>
+
+
+</sect2>
+
Index: general/graphlib/imlib/imlib-inst.xml
===================================================================
--- general/graphlib/imlib/imlib-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/imlib/imlib-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,23 @@
+<sect2>
+<title>Installation of imlib</title>
+
+<para>Install imlib by running the following commands:</para>
+
+<para><screen><userinput>CPPFLAGS=-w ./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
+
+<sect2>
+<title>Command explanations</title>
+ 
+<para><userinput>CPPFLAGS=-w :</userinput>
+This
+disables gcc 3.1 warnings that confuse configure.</para>
+
+<para><userinput>./configure --prefix=/usr:</userinput>
+This compiles and installs imlib into the <filename>/usr</filename>
+hierarchy instead of <filename>/usr/local</filename>.</para>
+</sect2>
Index: general/graphlib/imlib/imlib-intro.xml
===================================================================
--- general/graphlib/imlib/imlib-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/imlib/imlib-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,17 @@
+<sect2>
+<title>Introduction to imlib</title>
+
+<screen>Download location:              <ulink url= "&imlib-download;"/>
+Version used:                   &imlib-version;
+Package size:                   &imlib-size;
+Estimated Disk space required:  &imlib-buildsize;</screen>
+
+<para>The imlib package contains image libraries. These are useful for
+loading, rendering and dithering a wide variety of image data formats.</para>
+
+<screen>imlib depends on: 
+<xref linkend="xfree86"/>, <xref linkend="libjpeg"/>, <xref linkend="libtiff"/>, <xref linkend="libungif"/> and <xref linkend="libpng"/>
+imlib will utilize: 
+glib, gtk and gtk-config if installed prior to imlib.</screen>
+
+</sect2>
Index: general/graphlib/imlib/imlib.ent
===================================================================
--- general/graphlib/imlib/imlib.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/imlib/imlib.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<!ENTITY imlib SYSTEM "../imlib.xml">
+<!ENTITY imlib-intro SYSTEM "imlib-intro.xml">
+<!ENTITY imlib-inst SYSTEM "imlib-inst.xml">
+<!ENTITY imlib-desc SYSTEM "imlib-desc.xml">
+<!ENTITY imlib-config SYSTEM "imlib-config.xml">
+<!ENTITY imlib-buildsize "8.6 MB">
+<!ENTITY imlib-version "1.9.14">
+<!ENTITY imlib-download "ftp://ftp.gnome.org/pub/GNOME/stable/sources/imlib/imlib-1.9.14.tar.gz">
+<!ENTITY imlib-size "736 KB">
Index: general/graphlib/jasper.xml
===================================================================
--- general/graphlib/jasper.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,246 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 jasper-download-http "https://github.com/jasper-software/jasper/archive/version-&jasper-version;/jasper-&jasper-version;.tar.gz">
-  <!ENTITY jasper-download-ftp  " ">
-  <!ENTITY jasper-md5sum        "a1ba86fdad2e800d0cb233c13cd13cb3">
-  <!ENTITY jasper-size          "1.9 MB">
-  <!ENTITY jasper-buildsize     "9.4 MB (with tests)">
-  <!ENTITY jasper-time          "0.3 SBU (with tests)">
-]>
-
-<sect1 id="jasper" xreflabel="JasPer-&jasper-version;">
-  <?dbhtml filename="jasper.html"?>
-
-
-  <title>JasPer-&jasper-version;</title>
-
-  <indexterm zone="jasper">
-    <primary sortas="a-jasper-&jasper-version;">JasPer</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to JasPer</title>
-
-    <para>
-      The <application>JasPer</application> Project is an open-source
-      initiative to provide a free software-based reference implementation
-      of the JPEG-2000 codec.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&jasper-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&jasper-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &jasper-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &jasper-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &jasper-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &jasper-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">JasPer Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libjpeg"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="freeglut"/> (required for <command>jiv</command>),
-      <xref linkend="doxygen"/> (needed for generating html documentation), and
-      <xref linkend="texlive"/> (needed to regenerate the pdf documentation)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of JasPer</title>
-
-    <note>
-      <para>
-        The tarball <emphasis>jasper-&jasper-version;.tar.gz</emphasis> will
-        extract to
-        <emphasis>jasper-version-&jasper-version;</emphasis>.
-      </para>
-    </note>
-<!--
-    <para>
-      First, fix a problem that happens due to cmake-3.22:
-    </para>
-
-<screen><userinput remap="pre">sed -i '/GLUT_glut_LIBRARY/s/^/#/' build/cmake/modules/JasOpenGL.cmake</userinput></screen>
--->
-    <para>
-      Install <application>JasPer</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir BUILD &amp;&amp;
-cd    BUILD &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr    \
-      -DCMAKE_BUILD_TYPE=Release     \
-      -DCMAKE_SKIP_INSTALL_RPATH=YES \
-      -DJAS_ENABLE_DOC=NO            \
-      -DALLOW_IN_SOURCE_BUILD=YES    \
-      -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/jasper-&jasper-version; \
-      ..  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue:  <command>make test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DCMAKE_SKIP_INSTALL_RPATH=YES</parameter>: This option
-      removes embedded library search paths.
-    </para>
-
-    <para>
-      <parameter>-DJAS_ENABLE_DOC=NO</parameter>: This option disables
-      rebuilding the pdf documentation if <xref linkend="texlive"/>
-      is installed.
-    </para>
-
-    <para>
-      <parameter>-DALLOW_IN_SOURCE_BUILD=YES</parameter>: This switch allows
-      building from within the source tree. In our case, this is needed to
-      allow us to build inside of the BUILD directory instead of needing to
-      create another directory outside of the source tree.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>imgcmp, imginfo, jasper, and jiv</seg>
-        <seg>libjasper.so</seg>
-        <seg>/usr/include/jasper and /usr/share/doc/jasper-&jasper-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="imgcmp">
-        <term><command>imgcmp</command></term>
-        <listitem>
-          <para>
-            compares two images of the same geometry
-          </para>
-          <indexterm zone="jasper imgcmp">
-            <primary sortas="b-imgcmp">imgcmp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="imginfo">
-        <term><command>imginfo</command></term>
-        <listitem>
-          <para>
-            displays information about an image
-          </para>
-          <indexterm zone="jasper imginfo">
-            <primary sortas="b-imginfo">imginfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jasper-command">
-        <term><command>jasper</command></term>
-        <listitem>
-          <para>
-            converts images between formats (BMP, JPS, JPC, JPG, PGX, PNM, MIF,
-            and RAS)
-          </para>
-          <indexterm zone="jasper jasper">
-            <primary sortas="b-jasper">jasper</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jiv">
-        <term><command>jiv</command></term>
-        <listitem>
-          <para>
-            displays images
-          </para>
-          <indexterm zone="jasper jiv">
-            <primary sortas="b-jiv">jiv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jasper-lib">
-        <term><filename class="libraryfile">libjasper.so</filename></term>
-        <listitem>
-          <para>
-            is a library used by programs for reading and writing
-            JPEG2000 format files
-          </para>
-          <indexterm zone="jasper jasper-lib">
-            <primary sortas="c-libjasper">libjasper.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/graphlib/lcms.xml
===================================================================
--- general/graphlib/lcms.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/lcms.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,12 @@
+<sect1 id="lcms" xreflabel="lcms-&lcms-version;">
+<?dbhtml filename="lcms.html" dir="general"?>
+<title>lcms-&lcms-version;</title>
+
+&lcms-intro;
+&lcms-inst;
+&lcms-exp;
+&lcms-config;
+&lcms-desc;
+
+</sect1>
+
Index: general/graphlib/lcms/lcms-config.xml
===================================================================
--- general/graphlib/lcms/lcms-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/lcms/lcms-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Configuring lcms</title>
+
+<sect3><title>Configuration Information</title>
+
+&library-config;
+
+</sect3>
+
+</sect2>
+
Index: general/graphlib/lcms/lcms-desc.xml
===================================================================
--- general/graphlib/lcms/lcms-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/lcms/lcms-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,15 @@
+<sect2>
+<title>Contents</title>
+
+<para>The lcms package contains the <userinput>lcms library</userinput></para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>lcms library</title>
+<para>The lcms library is used by other programs to provide color
+management facilities.</para></sect3>
+
+</sect2>
+
Index: general/graphlib/lcms/lcms-exp.xml
===================================================================
--- general/graphlib/lcms/lcms-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/lcms/lcms-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>CC="gcc $CFLAGS" :</userinput> This makes lcms use 
+the CFLAGS set in your environment.</para>
+
+</sect2>
+
Index: general/graphlib/lcms/lcms-inst.xml
===================================================================
--- general/graphlib/lcms/lcms-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/lcms/lcms-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<sect2>
+<title>Installation of lcms</title>
+
+<para>Install lcms by running the following commands:</para>
+
+<para><screen><userinput>make CC="gcc $CFLAGS" &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
Index: general/graphlib/lcms/lcms-intro.xml
===================================================================
--- general/graphlib/lcms/lcms-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/lcms/lcms-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,12 @@
+<sect2>
+<title>Introduction to lcms</title>
+
+<screen>Download location:              &lcms-download;
+Version used:                   &lcms-version;
+Package size:                   &lcms-size;
+Estimated Disk space required:  &lcms-buildsize;</screen>
+
+<para>The lcms library is used by other programs to provide
+color management facilities.</para>
+
+</sect2>
Index: general/graphlib/lcms/lcms.ent
===================================================================
--- general/graphlib/lcms/lcms.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/lcms/lcms.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<!ENTITY lcms SYSTEM "../lcms.xml">
+<!ENTITY lcms-intro SYSTEM "lcms-intro.xml">
+<!ENTITY lcms-inst SYSTEM "lcms-inst.xml">
+<!ENTITY lcms-exp SYSTEM "lcms-exp.xml">
+<!ENTITY lcms-desc SYSTEM "lcms-desc.xml">
+<!ENTITY lcms-config SYSTEM "lcms-config.xml">
+<!ENTITY lcms-buildsize "3.7 MB">
+<!ENTITY lcms-version "1.08">
+<!ENTITY lcms-download "http://www.littlecms.com/lcms-1.08.tar.gz">
+<!ENTITY lcms-size "158 KB">
Index: general/graphlib/lcms2.xml
===================================================================
--- general/graphlib/lcms2.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,214 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 lcms2-download-http "https://github.com/mm2/Little-CMS/releases/download/lcms&lcms2-version;/lcms2-&lcms2-version;.tar.gz">
-  <!ENTITY lcms2-download-ftp  " ">
-  <!ENTITY lcms2-md5sum        "7f7baa3e605c961b9301135105ee9a34">
-  <!ENTITY lcms2-size          "7.1 MB">
-  <!ENTITY lcms2-buildsize     "20 MB (with the tests)">
-  <!ENTITY lcms2-time          "0.2 SBU (with the tests)">
-]>
-
-<sect1 id="lcms2" xreflabel="Little CMS-&lcms2-version;">
-  <?dbhtml filename="lcms2.html"?>
-
-
-  <title>Little CMS-&lcms2-version;</title>
-
-  <indexterm zone="lcms2">
-    <primary sortas="a-little-cms2">Little CMS2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Little CMS2</title>
-
-    <para>
-      The Little Color Management System is a small-footprint color management
-      engine, with special focus on accuracy and performance. It uses
-      the International Color Consortium standard (ICC), which is the modern
-      standard for color management.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lcms2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lcms2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lcms2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lcms2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lcms2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lcms2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Little CMS2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libjpeg"/> and
-      <xref linkend="libtiff"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Little CMS2</title>
-
-    <!-- Will be fixed in the next release (2.15 or 2.14.1?)
-         https://github.com/mm2/Little-CMS/commit/93629504f8175e0002 -->
-    <para>
-      Apply the upstream fix for an issue breaking colord:
-    </para>
-
-<screen><userinput>sed '/BufferSize &lt; TagSize/,+1 s/goto Error/TagSize = BufferSize/' \
-    -i src/cmsio0.c</userinput></screen>
-
-    <para>
-      Install <application>Little CMS2</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>jpgicc, linkicc, psicc, tificc, and transicc</seg>
-        <seg>liblcms2.so</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="jpgicc">
-        <term><command>jpgicc</command></term>
-        <listitem>
-          <para>
-            is the Little CMS ICC profile applier for JPEG
-          </para>
-          <indexterm zone="lcms2 jpgicc">
-            <primary sortas="b-jpgicc">jpgicc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="linkicc">
-        <term><command>linkicc</command></term>
-        <listitem>
-          <para>
-            is the Little CMS ICC device link generator
-          </para>
-          <indexterm zone="lcms2 linkicc">
-            <primary sortas="b-linkicc">linkicc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="psicc">
-        <term><command>psicc</command></term>
-        <listitem>
-          <para>
-            is the Little CMS ICC PostScript generator
-          </para>
-          <indexterm zone="lcms2 psicc">
-            <primary sortas="b-psicc">psicc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tificc">
-        <term><command>tificc</command></term>
-        <listitem>
-          <para>
-            is the Little CMS ICC tiff generator
-          </para>
-          <indexterm zone="lcms2 tificc">
-            <primary sortas="b-tificc">tificc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="transicc">
-        <term><command>transicc</command></term>
-        <listitem>
-          <para>
-            is the Little CMS ColorSpace conversion calculator
-          </para>
-          <indexterm zone="lcms2 transicc">
-            <primary sortas="b-transicc">transicc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="liblcms2">
-        <term><filename class="libraryfile">liblcms2.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that implement the lcms2 API
-          </para>
-          <indexterm zone="lcms2 liblcms2">
-            <primary sortas="c-liblcms2">liblcms2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/graphlib/libavif.xml
===================================================================
--- general/graphlib/libavif.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,219 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libavif-download-http "https://github.com/AOMediaCodec/libavif/archive/v&libavif-version;/libavif-&libavif-version;.tar.gz">
-  <!ENTITY libavif-download-ftp  " ">
-  <!ENTITY libavif-md5sum        "8c786fd21f8757ace8cc011401e4d420">
-  <!ENTITY libavif-size          "11 MB">
-  <!ENTITY libavif-buildsize     "16 MB">
-  <!ENTITY libavif-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libavif" xreflabel="libavif-&libavif-version;">
-  <?dbhtml filename="libavif.html"?>
-
-  <title>libavif-&libavif-version;</title>
-
-  <indexterm zone="libavif">
-    <primary sortas="a-libavif">libavif</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libavif</title>
-
-    <para>
-      The <application>libavif</application> package contains a library used
-      for encoding and decoding AVIF files.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libavif-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libavif-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libavif-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libavif-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libavif-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libavif-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libavif Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libaom"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gdk-pixbuf"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://github.com/google/googletest">gtest</ulink>,
-      <ulink url="https://code.videolan.org/videolan/dav1d">libdav1d</ulink>,
-      <ulink url="https://chromium.googlesource.com/libyuv/libyuv/">libyuv</ulink>,
-      <ulink url="https://github.com/xiph/rav1e">rav1e</ulink>, and
-      <ulink url="https://gitlab.com/AOMediaCodec/SVT-AV1">svt-av1</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libavif</title>
-
-    <para>
-      Install <application>libavif</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      -DAVIF_CODEC_AOM=ON         \
-      -DAVIF_BUILD_GDK_PIXBUF=ON  \
-      -G Ninja .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package does come with a test suite, but it requires
-      <ulink url="https://github.com/google/googletest">gtest</ulink>, which
-      is not part of BLFS.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para>
-      The AV1 format needs to be added to the loaders cache. As the
-      &root; user:
-    </para>
-
-<screen role="root"><userinput>gdk-pixbuf-query-loaders --update-cache</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DAVIF_CODEC_AOM=ON</parameter>: This switch enables using
-      the AOM codec. This package is useless without at least one codec
-      built in.
-    </para>
-
-    <para>
-      <parameter>-DAVIF_BUILD_GDK_PIXBUF=ON</parameter>: This switch builds
-      the AVIF loader for applications which use gdk-pixbuf. Remove it if you
-      have not installed <xref role="nodep" linkend="gdk-pixbuf"/>.
-    </para>
-
-    <para>
-      <option>-DAVIF_CODEC_DAV1D=ON</option>: Use this switch if you have
-      installed <ulink url="https://code.videolan.org/videolan/dav1d">libdav1d</ulink>
-      and wish to use it as a codec.
-    </para>
-
-    <para>
-      <option>-DAVIF_CODEC_RAV1E=ON</option>: Use this switch if you have
-      installed <ulink url="https://github.com/xiph/rav1e">rav1e</ulink> and
-      wish to use it as a codec.
-    </para>
-
-    <para>
-      <option>-DAVIF_CODEC_SVT=ON</option>: Use this switch if you have
-      installed <ulink url="https://gitlab.com/AOMediaCodec/SVT-AV1">svt-av1</ulink>
-      and wish to use it as a codec.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libavif.so and
-          libpixbbufloader-avif.so (in /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders)
-        </seg>
-        <seg>
-          /usr/include/avif and
-          /usr/lib/cmake/libavif
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libavif-lib">
-        <term><filename class="libraryfile">libavif.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide a portable C implementation of the
-            AV1 Image Format
-          </para>
-          <indexterm zone="libavif-lib libavif">
-            <primary sortas="c-libavif">libavif.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpixbufloader-avif">
-        <term><filename class="libraryfile">libpixbufloader-avif.so</filename></term>
-        <listitem>
-          <para>
-            allows applications which use gdk-pixbuf to read AVIF images
-          </para>
-          <indexterm zone="libavif libpixbufloader-avif">
-            <primary sortas="c-libpixbufloader-avif">libpixbufloader-avif.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: general/graphlib/libexif.xml
===================================================================
--- general/graphlib/libexif.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,182 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
-
-  <!-- Because the maintainer of libexif is releasing versions in a scheme such
-       as this: libexif-0_6_22-release/libexif-0.6.22.tar.xz, let's keep the
-       0_6_22 as a separate entity. -->
-  <!--<!ENTITY dl-version "0_6_22">
-      not used in version 0.6.23 -->
-
-  <!ENTITY libexif-download-http "https://github.com/libexif/libexif/releases/download/v&libexif-version;/libexif-&libexif-version;.tar.bz2">
-  <!ENTITY libexif-download-ftp  " ">
-  <!ENTITY libexif-md5sum        "00ea6e7ff62d3fd41ea9b2139746703c">
-  <!ENTITY libexif-size          "1.9 MB">
-  <!ENTITY libexif-buildsize     "17 MB">
-  <!ENTITY libexif-time          "0.1 SBU">
-]>
-
-<sect1 id="libexif" xreflabel="libexif-&libexif-version;">
-  <?dbhtml filename="libexif.html"?>
-
-
-  <title>libexif-&libexif-version;</title>
-
-  <indexterm zone="libexif">
-    <primary sortas="a-libexif">libexif</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libexif</title>
-
-    <para>
-      The <application>libexif</application> package contains a library for
-      parsing, editing, and saving EXIF data. Most digital cameras produce
-      EXIF files, which are JPEG files with extra tags that contain information
-      about the image. All EXIF tags described in EXIF standard 2.1 are
-      supported.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libexif-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libexif-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libexif-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libexif-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libexif-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libexif-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libexif Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional (to Build Documentation)</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> and
-      <xref linkend="graphviz"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libexif</title>
-
-<!--
-    <para>
-      First, apply a patch to fix a security issue (integer overflow leading to
-      Out Of Buffer write):
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../libexif-&libexif-version;-security_fixes-1.patch</userinput></screen>
--->
-
-    <para>
-      Install <application>libexif</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static \
-            --with-doc-dir=/usr/share/doc/libexif-&libexif-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      Documentation was built and installed if you have the dependencies
-      shown above installed. If you don't have the dependencies installed,
-      there is a compressed tarball in the source tree
-      <filename class="directory">doc</filename> directory that can be
-      unpacked into /usr/share/doc/libexif-&libexif-version;.
-    </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 Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libexif.so
-        </seg>
-        <seg>
-          /usr/include/libexif and
-          /usr/share/doc/libexif-&libexif-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libexif-lib">
-        <term><filename class="libraryfile">libexif.so</filename></term>
-        <listitem>
-          <para>
-            contains functions used for parsing, editing, and saving
-            EXIF data
-          </para>
-          <indexterm zone="libexif libexif-lib">
-            <primary sortas="c-libexif">libexif.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/graphlib/libgxps.xml
===================================================================
--- general/graphlib/libgxps.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,221 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libgxps-download-http "&gnome-download-http;/libgxps/0.3/libgxps-&libgxps-version;.tar.xz">
-  <!ENTITY libgxps-download-ftp  " ">
-  <!ENTITY libgxps-md5sum        "0527ac7c8c405445e96a5baa6019a0c3">
-  <!ENTITY libgxps-size          "80 KB">
-  <!ENTITY libgxps-buildsize     "5.4 MB">
-  <!ENTITY libgxps-time          "0.1 SBU">
-]>
-
-<sect1 id="libgxps" xreflabel="libgxps-&libgxps-version;">
-  <?dbhtml filename="libgxps.html"?>
-
-
-  <title>Libgxps-&libgxps-version;</title>
-
-  <indexterm zone="libgxps">
-    <primary sortas="a-libgxps">libgxps</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgxps</title>
-
-    <para>
-      The <application>libgxps</application> package provides an interface
-      to manipulate XPS documents.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libgxps-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libgxps-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libgxps-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libgxps-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libgxps-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libgxps-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Libgxps Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>,
-      <xref linkend="lcms2"/>,
-      <xref linkend="libarchive"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libtiff"/>, and
-      <xref linkend="libxslt"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="git"/> and
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Libgxps</title>
-
-    <para>
-      Install <application>Libgxps</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          xpstojpeg, xpstopdf, xpstopng, xpstops, and xpstosvg
-        </seg>
-        <seg>
-          libgxps.so
-        </seg>
-        <seg>
-          /usr/include/libgxps
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xpstojpeg">
-        <term><command>xpstojpeg</command></term>
-        <listitem>
-          <para>
-            converts XPS documents to a JPEG image
-          </para>
-          <indexterm zone="libgxps xpstojpeg">
-            <primary sortas="b-xpstojpeg">xpstojpeg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xpstopdf">
-        <term><command>xpstopdf</command></term>
-        <listitem>
-          <para>
-            converts XPS documents to PDF format
-          </para>
-          <indexterm zone="libgxps xpstopdf">
-            <primary sortas="b-xpstopdf">xpstopdf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xpstopng">
-        <term><command>xpstopng</command></term>
-        <listitem>
-          <para>
-            converts XPS documents to a PNG image
-          </para>
-          <indexterm zone="libgxps xpstopng">
-            <primary sortas="b-xpstopng">xpstopng</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xpstops">
-        <term><command>xpstops</command></term>
-        <listitem>
-          <para>
-            converts XPS documents to PostScript
-          </para>
-          <indexterm zone="libgxps xpstops">
-            <primary sortas="b-xpstops">xpstops</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xpstosvg">
-        <term><command>xpstosvg</command></term>
-        <listitem>
-          <para>
-            converts XPS documents to SVG images
-          </para>
-          <indexterm zone="libgxps xpstosvg">
-            <primary sortas="b-xpstosvg">xpstosvg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgxps-lib">
-        <term><filename class="libraryfile">libgxps.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for manipulating XPS documents
-          </para>
-          <indexterm zone="libgxps libgxps-lib">
-            <primary sortas="c-libgxps">libgxps.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/graphlib/libjpeg-turbo.xml
===================================================================
--- general/graphlib/libjpeg-turbo.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,256 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libjpeg-download-http "&sourceforge-dl;/libjpeg-turbo/libjpeg-turbo-&libjpeg-turbo-version;.tar.gz">
-  <!ENTITY libjpeg-download-ftp  " ">
-  <!ENTITY libjpeg-md5sum        "1fdc6494521a8724f5f7cf39b0f6aff3">
-  <!ENTITY libjpeg-size          "2.7 MB">
-  <!ENTITY libjpeg-buildsize     "55 MB (with tests)">
-  <!ENTITY libjpeg-time          "0.5 SBU (with tests; both using parallelism=4)">
-]>
-
-<sect1 id="libjpeg" xreflabel="libjpeg-turbo-&libjpeg-turbo-version;">
-  <?dbhtml filename="libjpeg.html"?>
-
-
-  <title>libjpeg-turbo-&libjpeg-turbo-version;</title>
-
-  <indexterm zone="libjpeg">
-    <primary sortas="a-libjpeg-turbo">libjpeg-turbo</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libjpeg-turbo</title>
-
-    <para>
-      <application>libjpeg-turbo</application> is a fork of the original
-      IJG <application>libjpeg</application> which uses SIMD to accelerate
-      baseline JPEG compression and decompression.
-      <application>libjpeg</application> is a library that implements JPEG
-      image encoding, decoding and transcoding.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libjpeg-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libjpeg-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libjpeg-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libjpeg-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libjpeg-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libjpeg-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libjpeg-turbo Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="nasm"/> or <xref linkend="yasm"/>
-      (for building the package with optimized assembly routine)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libjpeg-turbo</title>
-
-    <para>
-      Install <application>libjpeg-turbo</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr        \
-      -DCMAKE_BUILD_TYPE=RELEASE         \
-      -DENABLE_STATIC=FALSE              \
-      -DCMAKE_INSTALL_DEFAULT_LIBDIR=lib \
-      -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/libjpeg-turbo-&libjpeg-turbo-version; \
-      .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-    </para>
-<!--
-    <note><para>
-      If installing <application>libjpeg-turbo</application> over an older jpeg
-      installation, not all library symbolic links are updated properly.  To fix
-      this before installation, run the following as the <systemitem
-      class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>rm -f /usr/lib/libjpeg.so*</userinput></screen>
-
-    </note>
--->
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>-DWITH_JPEG8=ON</option>: This switch enables compatibility
-      with <application>libjpeg</application> version 8.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          cjpeg, djpeg, jpegtran, rdjpgcom, tjbench, and wrjpgcom
-        </seg>
-        <seg>
-          libjpeg.so and libturbojpeg.so
-        </seg>
-        <seg>
-          /usr/share/doc/libjpeg-turbo-&libjpeg-turbo-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cjpeg">
-        <term><command>cjpeg</command></term>
-        <listitem>
-          <para>
-            compresses image files to produce a JPEG/JFIF file on the
-            standard output. Currently supported input file formats are: PPM
-            (PBMPLUS color format), PGM (PBMPLUS gray-scale format),
-            BMP, and Targa
-          </para>
-          <indexterm zone="libjpeg cjpeg">
-            <primary sortas="b-cjpeg">cjpeg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="djpeg">
-        <term><command>djpeg</command></term>
-        <listitem>
-          <para>
-            decompresses image files from JPEG/JFIF format to either
-            PPM (PBMPLUS color format), PGM (PBMPLUS gray-scale format),
-            BMP, or Targa format
-          </para>
-          <indexterm zone="libjpeg djpeg">
-            <primary sortas="b-djpeg">djpeg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jpegtran">
-        <term><command>jpegtran</command></term>
-        <listitem>
-          <para>
-            is used for lossless transformation of JPEG files
-          </para>
-          <indexterm zone="libjpeg jpegtran">
-            <primary sortas="b-jpegtran">jpegtran</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rdjpgcom">
-        <term><command>rdjpgcom</command></term>
-        <listitem>
-          <para>
-            displays text comments from within a JPEG file
-          </para>
-          <indexterm zone="libjpeg rdjpgcom">
-            <primary sortas="b-rdjpgcom">rdjpgcom</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tjbench">
-        <term><command>tjbench</command></term>
-        <listitem>
-          <para>
-            is used to benchmark the performance of libjpeg-turbo
-          </para>
-          <indexterm zone="libjpeg tjbench">
-            <primary sortas="b-tjbench">tjbench</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wrjpgcom">
-        <term><command>wrjpgcom</command></term>
-        <listitem>
-          <para>
-            inserts text comments into a JPEG file
-          </para>
-          <indexterm zone="libjpeg wrjpgcom">
-            <primary sortas="b-wrjpgcom">wrjpgcom</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libjpeg-lib">
-        <term><filename class="libraryfile">libjpeg.so</filename></term>
-        <listitem>
-          <para>
-            contains functions used for reading and writing JPEG images
-        </para>
-          <indexterm zone="libjpeg libjpeg-lib">
-            <primary sortas="c-libjpeg">libjpeg.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/graphlib/libjpeg.xml
===================================================================
--- general/graphlib/libjpeg.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libjpeg.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,12 @@
+<sect1 id="libjpeg" xreflabel="libjpeg-&libjpeg-version;">
+<?dbhtml filename="libjpeg.html" dir="general"?>
+<title>libjpeg-&libjpeg-version;</title>
+
+&libjpeg-intro;
+&libjpeg-inst;
+&libjpeg-exp;
+&libjpeg-config;
+&libjpeg-desc;
+
+</sect1>
+
Index: general/graphlib/libjpeg/libjpeg-config.xml
===================================================================
--- general/graphlib/libjpeg/libjpeg-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libjpeg/libjpeg-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Configuring libjpeg</title>
+
+<sect3><title>Configuration Information</title>
+
+&library-config;
+
+</sect3>
+
+</sect2>
+
Index: general/graphlib/libjpeg/libjpeg-desc.xml
===================================================================
--- general/graphlib/libjpeg/libjpeg-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libjpeg/libjpeg-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,38 @@
+<sect2>
+<title>Contents</title>
+
+<para>The libjpeg package contains <userinput>cjpeg, djpeg, jpegtran,
+rdjpgcom, wrjpgcom</userinput> and the <userinput>jpeg
+libraries</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>cjpeg</title>
+<para>cjpeg compresses image files to produce a JPEG/JFIF file on the standard
+output.  Currently supported input file formats are: PPM (PBMPLUS color
+format), PGM (PBMPLUS gray-scale format), BMP, and Targa</para></sect3>
+
+<sect3><title>djpeg</title>
+<para>djpeg decompresses image files from JPEG/JFIF format to either PPM 
+(PBMPLUS color format), PGM (PBMPLUS gray-scale format), BMP, or Targa
+format.</para></sect3>
+
+<sect3><title>jpegtran</title>
+<para>jpegtran is used for lossless transformation of JPEG
+files</para></sect3>
+
+<sect3><title>rdjpgcom</title>
+<para>rdjpgcom displays text comments from within a JPEG
+file</para></sect3>
+
+<sect3><title>wrjpgcom</title>
+<para>wrjpgcom inserts text comments into a JPEG file</para></sect3>
+
+<sect3><title>jpeg libraries</title>
+<para>These libraries are used by many programs for reading and writing
+jpeg format files.</para></sect3>
+
+</sect2>
+
Index: general/graphlib/libjpeg/libjpeg-exp.xml
===================================================================
--- general/graphlib/libjpeg/libjpeg-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libjpeg/libjpeg-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>./configure --enable-static --enable-shared --prefix=/usr</userinput> 
+This command tells libjpeg to build both shared and
+static libraries and to install them with a base of /usr.</para>
+
+</sect2>
+
Index: general/graphlib/libjpeg/libjpeg-inst.xml
===================================================================
--- general/graphlib/libjpeg/libjpeg-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libjpeg/libjpeg-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of libjpeg</title>
+
+<para>Install libjpeg by running the following commands:</para>
+
+<para><screen><userinput>./configure --enable-static --enable-shared --prefix=/usr &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install</userinput></screen></para>
+
+</sect2>
+
Index: general/graphlib/libjpeg/libjpeg-intro.xml
===================================================================
--- general/graphlib/libjpeg/libjpeg-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libjpeg/libjpeg-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,13 @@
+<sect2>
+<title>Introduction to libjpeg</title>
+
+<screen>Download location:              &libjpeg-download;
+Version used:                   &libjpeg-version;
+Package size:                   &libjpeg-size;
+Estimated Disk space required:  &libjpeg-buildsize;</screen>
+
+<para>The libjpeg package contains the jpeg libraries.  These allow compression
+of image files based on the Joint Photographic Experts Group standard.  It is a
+"lossy" compression algorithm.</para>
+
+</sect2>
Index: general/graphlib/libjpeg/libjpeg.ent
===================================================================
--- general/graphlib/libjpeg/libjpeg.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libjpeg/libjpeg.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<!ENTITY libjpeg SYSTEM "../libjpeg.xml">
+<!ENTITY libjpeg-intro SYSTEM "libjpeg-intro.xml">
+<!ENTITY libjpeg-inst SYSTEM "libjpeg-inst.xml">
+<!ENTITY libjpeg-exp SYSTEM "libjpeg-exp.xml">
+<!ENTITY libjpeg-desc SYSTEM "libjpeg-desc.xml">
+<!ENTITY libjpeg-config SYSTEM "libjpeg-config.xml">
+<!ENTITY libjpeg-buildsize "3.7 MB">
+<!ENTITY libjpeg-version "6b">
+<!ENTITY libjpeg-download "ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v6b.tar.gz">
+<!ENTITY libjpeg-size "599 KB">
Index: general/graphlib/libjxl.xml
===================================================================
--- general/graphlib/libjxl.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,337 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libjxl-download-http "https://github.com/libjxl/libjxl/archive/v&libjxl-version;/libjxl-&libjxl-version;.tar.gz">
-  <!ENTITY libjxl-md5sum        "e383b622cb2caef4dfcc8047f5a0fe72">
-  <!ENTITY libjxl-size          "1.8 MB">
-  <!ENTITY libjxl-buildsize     "53 MB">
-  <!ENTITY libjxl-time          "0.8 SBU (with parallelism=4)">
-
-]>
-
-<sect1 id="libjxl" xreflabel="libjxl-&libjxl-version;">
-  <?dbhtml filename="libjxl.html"?>
-
-  <title>libjxl-&libjxl-version;</title>
-
-  <indexterm zone="libjxl">
-    <primary sortas="a-libjxl">libjxl</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libjxl</title>
-
-    <para>
-      The <application>libjxl</application> package contains the reference
-      implementation of the JPEG XL image format.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libjxl-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libjxl-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libjxl-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libjxl-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libjxl-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libjxl Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="brotli"/>,
-      <xref linkend="cmake"/>,
-      <xref linkend="giflib"/>,
-      <xref linkend="highway"/>,
-      <xref linkend="lcms2"/>,
-      <xref linkend="libjpeg"/>, and
-      <xref linkend="libpng"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gdk-pixbuf"/> (for the plugin)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> and <xref linkend="graphviz"/>
-      (for documentation),
-      <xref linkend="gimp"/> (for the plugin),
-      <xref linkend="java"/> (for the JAR),
-      <xref linkend="libavif"/>,
-      <xref linkend="libwebp"/>,
-      <ulink url="https://www.openexr.com/">OpenEXR</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libjxl</title>
-
-    <para>
-      Install <application>libjxl</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr             \
-      -D CMAKE_BUILD_TYPE=Release              \
-      -D BUILD_TESTING=OFF                     \
-      -D BUILD_SHARED_LIBS=ON                  \
-      -D JPEGXL_ENABLE_SKCMS=OFF               \
-      -D JPEGXL_ENABLE_SJPEG=OFF               \
-      -D JPEGXL_ENABLE_PLUGINS=ON              \
-      -D JPEGXL_INSTALL_JARDIR=/usr/share/java \
-      -G Ninja ..                              &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package does come with a test suite, but it requires
-      <ulink url="https://github.com/google/googletest">gtest</ulink>, which
-      is not in BLFS.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>ninja install &amp;&amp;
-gdk-pixbuf-query-loaders --update-cache</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>gdk-pixbuf-query-loaders --update-cache</command>: This command
-      regenerates the <application>GDK Pixbuf</application> loader cache so
-      that it is aware of the JPEG-XL loader.
-    </para>
-
-    <para>
-      <parameter>-DBUILD_TESTING=OFF</parameter>: This parameter disables the
-      tests because they require
-      <ulink url="https://github.com/google/googletest">gtest</ulink>, which
-      is not in BLFS. If you wish to run the tests and have
-      <ulink url="https://github.com/google/googletest">gtest</ulink> installed,
-      remove this parameter.
-    </para>
-
-    <para>
-      <parameter>-DBUILD_SHARED_LIBS=ON</parameter>: This parameter enables
-      building shared versions of the libraries instead of static ones.
-    </para>
-    
-    <para>
-      <parameter>-DJPEGXL_ENABLE_SKCMS=OFF</parameter>: This parameter disables
-      building support for Skia's <application>skcms</application> since it is
-      not necessary for BLFS purposes and requires
-      <ulink url="https://skia.googlesource.com/skcms/">skcms</ulink>.
-    </para>
-    
-    <para>
-      <parameter>-DJPEGXL_ENABLE_SJPEG=OFF</parameter>: This parameter disables
-      support for SimpleJPEG since it is not necessary for BLFS purposes and
-      requires <ulink url="https://github.com/webmproject/sjpeg">sjpeg</ulink>.
-    </para>
-    
-    <para>
-      <parameter>-DJPEGXL_ENABLE_PLUGINS=ON</parameter>: This parameter enables
-      Plugin support, which creates plugins for <xref linkend="gimp"/> and 
-      <xref linkend="gdk-pixbuf"/> if those packages are installed.
-    </para>
-
-    <para>
-      <parameter>-DJPEGXL_INSTALL_JARDIR=/usr/share/java</parameter>: This
-      parameter places the JAR file for JPEG XL support in the correct 
-      directory if <xref linkend="java"/> is installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          benchmark_xl,
-          cjxl,
-          djxl, and
-          jxlinfo
-        </seg>
-        <seg>
-          libjxl.so,
-          libjxl_cms.so,
-          libjxl_extras_codec.so,
-          libjxl_jni.so,
-          libjxl_threads.so, and
-          libpixbufloader-jxl.so (in /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders),
-        </seg>
-        <seg>
-          /usr/include/jxl
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="benchmark_xl">
-        <term><command>benchmark_xl</command></term>
-        <listitem>
-          <para>
-            runs performance benchmarks against libjxl
-          </para>
-          <indexterm zone="libjxl benchmark_xl">
-            <primary sortas="b-benchmark_xl">benchmark_xl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cjxl">
-        <term><command>cjxl</command></term>
-        <listitem>
-          <para>
-            compresses images into JPEG XL format
-          </para>
-          <indexterm zone="libjxl cjxl">
-            <primary sortas="b-cjxl">cjxl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="djxl">
-        <term><command>djxl</command></term>
-        <listitem>
-          <para>
-            decompresses images from JPEG XL format into other formats
-          </para>
-          <indexterm zone="libjxl djxl">
-            <primary sortas="b-djxl">djxl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jxlinfo">
-        <term><command>jxlinfo</command></term>
-        <listitem>
-          <para>
-            displays information about JPEG XL images
-          </para>
-          <indexterm zone="libjxl jxlinfo">
-            <primary sortas="b-jxlinfo">jxlinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libjxl-lib">
-        <term><filename class="libraryfile">libjxl.so</filename></term>
-        <listitem>
-          <para>
-            contains the reference implementation of the JPEG XL standard
-          </para>
-          <indexterm zone="libjxl libjxl-lib">
-            <primary sortas="c-libjxl">libjxl.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libjxl_cms">
-        <term><filename class="libraryfile">libjxl_cms.so</filename></term>
-        <listitem>
-          <para>
-            contains support for Little CMS in libjxl
-          </para>
-          <indexterm zone="libjxl libjxl_cms">
-            <primary sortas="c-libjxl_cms">libjxl_cms.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      
-      <varlistentry id="libjxl_extras_codec">
-        <term><filename class="libraryfile">libjxl_extras_codec.so</filename></term>
-        <listitem>
-          <para>
-            contains additional codec support for JPEG XL images
-          </para>
-          <indexterm zone="libjxl libjxl_extras_codec">
-            <primary sortas="c-libjxl_extras_codec">libjxl_extras_codec.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      
-      <varlistentry id="libjxl_jni">
-        <term><filename class="libraryfile">libjxl_jni.so</filename></term>
-        <listitem>
-          <para>
-            contains a Java interface to support JPEG XL on systems where
-            <xref linkend="java"/> was installed at build time
-          </para>
-          <indexterm zone="libjxl libjxl_jni">
-            <primary sortas="c-libjxl_jni">libjxl_jni.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      
-      <varlistentry id="libjxl_threads">
-        <term><filename class="libraryfile">libjxl_threads.so</filename></term>
-        <listitem>
-          <para>
-            contains threading functions for JPEG XL
-          </para>
-          <indexterm zone="libjxl libjxl_threads">
-            <primary sortas="c-libjxl_threads">libjxl_threads.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      
-      <varlistentry id="libpixbufloader-jxl">
-        <term><filename class="libraryfile">libpixbufloader-jxl.so</filename></term>
-        <listitem>
-          <para>
-            contains a loader for gdk-pixbuf to allow it to load JPEG XL images
-          </para>
-          <indexterm zone="libjxl libpixbufloader-jxl">
-            <primary sortas="c-libpixbufloader-jxl">libpixbufloader-jxl.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: general/graphlib/libmng.xml
===================================================================
--- general/graphlib/libmng.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ general/graphlib/libmng.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,152 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
+<sect1 id="libmng" xreflabel="libmng-&libmng-version;">
+<?dbhtml filename="libmng.html" dir="general"?>
+<title>libmng-&libmng-version;</title>
 
-  <!ENTITY libmng-download-http "&sourceforge-dl;/libmng/libmng-&libmng-version;.tar.xz">
-  <!ENTITY libmng-download-ftp  " ">
-  <!ENTITY libmng-md5sum        "e9e899adb1b681b17f14d91e261878c5">
-  <!ENTITY libmng-size          "932 KB">
-  <!ENTITY libmng-buildsize     "15 MB">
-  <!ENTITY libmng-time          "0.1 SBU">
-]>
-
-<sect1 id="libmng" xreflabel="libmng-&libmng-version;">
-  <?dbhtml filename="libmng.html"?>
-
-
-  <title>libmng-&libmng-version;</title>
-
-  <indexterm zone="libmng">
-    <primary sortas="a-Libmng">Libmng</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libmng</title>
-
-    <para>
-      The <application>libmng</application> libraries are used by
-      programs wanting to read and write Multiple-image Network Graphics
-      (MNG) files which are the animation equivalents to PNG files.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libmng-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libmng-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libmng-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libmng-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libmng-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libmng-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libmng Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libjpeg"/> and
-      <xref linkend="lcms2"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libmng</title>
-
-    <para>
-      Install <application>libmng</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-
-install -v -m755 -d        /usr/share/doc/libmng-&libmng-version; &amp;&amp;
-install -v -m644 doc/*.txt /usr/share/doc/libmng-&libmng-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libmng.so</seg>
-        <seg>/usr/share/doc/libmng-&libmng-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libmng-lib">
-        <term><filename class="libraryfile">libmng.so</filename></term>
-        <listitem>
-          <para>
-            provides functions for programs wishing to read and write MNG
-            files which are animation files without the patent problems
-            associated with certain other formats
-          </para>
-          <indexterm zone="libmng libmng-lib">
-            <primary sortas="c-libmng">libmng.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+&libmng-intro;
+&libmng-inst;
+&libmng-exp;
+&libmng-config;
+&libmng-desc;
 
 </sect1>
+
Index: general/graphlib/libmng/libmng-config.xml
===================================================================
--- general/graphlib/libmng/libmng-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libmng/libmng-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Configuring libmng</title>
+
+<sect3><title>Configuration Information</title>
+
+&library-config;
+
+</sect3>
+
+</sect2>
+
Index: general/graphlib/libmng/libmng-desc.xml
===================================================================
--- general/graphlib/libmng/libmng-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libmng/libmng-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,17 @@
+<sect2>
+<title>Contents</title>
+
+<para>The libmng package contains the <userinput>mng
+libraries</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>mng libraries</title>
+<para>libmng provides functions for programs wishing to read and write mng 
+files which are animation files without the patent problems associated with
+certain other formats.</para></sect3>
+
+</sect2>
+
Index: general/graphlib/libmng/libmng-exp.xml
===================================================================
--- general/graphlib/libmng/libmng-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libmng/libmng-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,19 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>sed 's/lcms\/lcms.h/lcms.h/' configure.bak &gt;
+configure :</userinput> This change is to make the libmng configure
+routine look in the right place for the lcms header files.</para>
+
+<para><screen><userinput>./configure --prefix=/usr --with-zlib \
+--with-jpeg --with-lcms </userinput></screen>
+
+This command sets the install directory and also tells the configuration
+routine to look and find zlib, libjpeg and lcms.</para>
+
+<para><userinput>cp doc/man/*.X /usr/share/man/manX :</userinput> The
+install procedure doesn't properly install the man pages so we do it
+manually.</para>
+
+</sect2>
+
Index: general/graphlib/libmng/libmng-inst.xml
===================================================================
--- general/graphlib/libmng/libmng-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libmng/libmng-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Installation of libmng</title>
+
+<para>Install libmng by running the following commands:</para>
+
+<para><screen><userinput>cp configure configure.bak &amp;&amp;
+sed 's/lcms\/lcms.h/lcms.h/' configure.bak &gt; configure &amp;&amp;
+./configure --prefix=/usr --with-zlib \
+   --with-jpeg --with-lcms &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+cp doc/man/*.3 /usr/share/man/man3 &amp;&amp;
+cp doc/man/*.5 /usr/share/man/man5</userinput></screen></para>
+
+</sect2>
+
Index: general/graphlib/libmng/libmng-intro.xml
===================================================================
--- general/graphlib/libmng/libmng-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libmng/libmng-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,14 @@
+<sect2>
+<title>Introduction to libmng</title>
+
+<screen>Download location:              &libmng-download;
+Version used:                   &libmng-version;
+Package size:                   &libmng-size;
+Estimated Disk space required:  &libmng-buildsize;</screen>
+
+<para>The libmng libraries are used by programs wanting to read and
+write mng files which are the animation equivalents to png files.</para>
+
+<screen>libmng depends on: <xref linkend="zlib"></xref>, <xref linkend="libjpeg"></xref> and <xref linkend="lcms"></xref></screen>
+
+</sect2>
Index: general/graphlib/libmng/libmng.ent
===================================================================
--- general/graphlib/libmng/libmng.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libmng/libmng.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<!ENTITY libmng SYSTEM "../libmng.xml">
+<!ENTITY libmng-intro SYSTEM "libmng-intro.xml">
+<!ENTITY libmng-inst SYSTEM "libmng-inst.xml">
+<!ENTITY libmng-exp SYSTEM "libmng-exp.xml">
+<!ENTITY libmng-desc SYSTEM "libmng-desc.xml">
+<!ENTITY libmng-config SYSTEM "libmng-config.xml">
+<!ENTITY libmng-buildsize "4.6 MB">
+<!ENTITY libmng-version "1.0.3">
+<!ENTITY libmng-download "http://www.libmng.com/download/libmng-1.0.3.tar.gz">
+<!ENTITY libmng-size "516 KB">
Index: general/graphlib/libmypaint.xml
===================================================================
--- general/graphlib/libmypaint.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,154 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libmypaint-download-http "https://github.com/mypaint/libmypaint/releases/download/v&libmypaint-version;/libmypaint-&libmypaint-version;.tar.xz">
-  <!ENTITY libmypaint-download-ftp  " ">
-  <!ENTITY libmypaint-md5sum        "7f1dab2d30ce8a3f494354c7c77a2977">
-  <!ENTITY libmypaint-size          "508 KB">
-  <!ENTITY libmypaint-buildsize     "11 MB (add 1 MB for tests)">
-  <!ENTITY libmypaint-time          "0.1 SBU (add 0.3 SBU for tests)">
-]>
-
-<sect1 id="libmypaint" xreflabel="libmypaint-&libmypaint-version;">
-  <?dbhtml filename="libmypaint.html"?>
-
-
-  <title>libmypaint-&libmypaint-version;</title>
-
-  <indexterm zone="libmypaint">
-    <primary sortas="a-libmypaint">libmypaint</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libmypaint</title>
-
-    <para>
-      The <application>libmypaint</application> package, a.k.a. "brushlib", is a
-      library for making brushstrokes which is used by MyPaint and other
-      projects.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libmypaint-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libmypaint-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libmypaint-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libmypaint-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libmypaint-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libmypaint-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libmypaint Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="json-c"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection;
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> (to create XML docs),
-      <ulink url="https://download.gimp.org/pub/gegl/0.3/">gegl (0.3 versions only)</ulink> and
-      <ulink url="https://github.com/gperftools/gperftools">gperftools</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libmypaint</title>
-
-    <para>
-      Install <application>libmypaint</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None.
-        </seg>
-        <seg>
-          libmypaint.so (and optionally libmypaint-gegl.so which is not
-          used by any packages in this book).
-        </seg>
-        <seg>
-          /usr/include/libmypaint
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libmypaint-lib">
-        <term><filename class="libraryfile">libmypaint.so</filename></term>
-        <listitem>
-          <para>
-            contains functions for making brushstrokes
-          </para>
-          <indexterm zone="libmypaint libmypaint-lib">
-            <primary sortas="c-libmypaint">libmypaint.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/graphlib/libpng.xml
===================================================================
--- general/graphlib/libpng.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ general/graphlib/libpng.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,221 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
+<sect1 id="libpng" xreflabel="libpng-&libpng-version;">
+<?dbhtml filename="libpng.html" dir="general"?>
+<title>libpng-&libpng-version;</title>
 
-  <!ENTITY libpng-download-http "&sourceforge-dl;/libpng/libpng-&libpng-version;.tar.xz">
-  <!ENTITY libpng-download-ftp  " ">
-  <!ENTITY libpng-md5sum        "22b8362d16c3724eba9c1fb8d187320a">
-  <!ENTITY libpng-size          "1.0 MB">
-  <!ENTITY libpng-buildsize     "15 MB (with tests)">
-  <!ENTITY libpng-time          "0.1 SBU (add 0.5 SBU for tests)">
-
-  <!ENTITY apng-version "1.6.43">
-  <!ENTITY apng-md5sum  "fc21268c9c583c5d2e7ead8a9ec17240">
-
-  <!ENTITY apng-patch
-        "&sourceforge-dl;/sourceforge/libpng-apng/libpng-&apng-version;-apng.patch.gz">
-]>
-
-<sect1 id="libpng" xreflabel="libpng-&libpng-version;">
-  <?dbhtml filename="libpng.html"?>
-
-
-  <title>libpng-&libpng-version;</title>
-
-  <indexterm zone="libpng">
-    <primary sortas="a-libpng">libpng</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libpng</title>
-
-    <para>
-      The <application>libpng</application> package contains libraries used
-      by other programs for reading and writing PNG files. The PNG format
-      was designed as a replacement for GIF and, to a lesser extent, TIFF,
-      with many improvements and extensions and lack of patent problems.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libpng-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libpng-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libpng-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libpng-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libpng-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libpng-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Recommended patch to include animated png functionality in
-          <application>libpng</application> (required to use the system
-          <application>libpng</application> in
-          <application>Firefox</application>,
-          <application>Seamonkey</application>, and
-          <application>Thunderbird</application>): <ulink url="&apng-patch;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Patch md5sum: &apng-md5sum;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libpng</title>
-
-    <para>
-      If you want to patch libpng to support apng files, apply it here:
-    </para>
-
-<screen><userinput>gzip -cd ../libpng-&apng-version;-apng.patch.gz | patch -p1</userinput></screen>
-
-    <para>
-      Install <application>libpng</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-mkdir -v /usr/share/doc/libpng-&libpng-version; &amp;&amp;
-cp -v README libpng-manual.txt /usr/share/doc/libpng-&libpng-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          libpng-config (symlink), libpng16-config, pngfix and png-fix-itxt
-        </seg>
-        <seg>
-          libpng.so
-        </seg>
-        <seg>
-          /usr/include/libpng16 and
-          /usr/share/doc/libpng-&libpng-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pngfix">
-        <term><command>pngfix</command></term>
-        <listitem>
-          <para>
-            tests, optimizes and optionally fixes the zlib header in PNG files.
-            Optionally, when fixing, strips ancillary chunks from the file
-          </para>
-          <indexterm zone="libpng pngfix">
-            <primary sortas="b-pngfix">pngfix</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="png-fix-itxt">
-        <term><command>png-fix-itxt</command></term>
-        <listitem>
-          <para>
-            fixes PNG files that have an incorrect length field in the
-            iTXt chunks
-          </para>
-          <indexterm zone="libpng png-fix-itxt">
-            <primary sortas="b-png-fix-itxt">png-fix-itxt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpng-config">
-        <term><command>libpng-config</command></term>
-        <listitem>
-          <para>
-            is a shell script that provides configuration information
-            for applications wanting to use
-            <application>libpng</application>
-          </para>
-          <indexterm zone="libpng libpng-config">
-            <primary sortas="b-libpng-config">libpng-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpng-lin">
-        <term><filename class="libraryfile">libpng.so</filename></term>
-        <listitem>
-          <para>
-            contain routines used to create and manipulate PNG
-            format graphics files
-          </para>
-          <indexterm zone="libpng libpng-lin">
-            <primary sortas="c-libpng">libpng.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+&libpng-intro;
+&libpng-inst;
+&libpng-exp;
+&libpng-config;
+&libpng-desc;
 
 </sect1>
+
Index: general/graphlib/libpng/libpng-config.xml
===================================================================
--- general/graphlib/libpng/libpng-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libpng/libpng-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Configuring libpng</title>
+
+<sect3><title>Configuration Information</title>
+
+&library-config;
+
+</sect3>
+
+</sect2>
+
Index: general/graphlib/libpng/libpng-desc.xml
===================================================================
--- general/graphlib/libpng/libpng-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libpng/libpng-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,18 @@
+<sect2>
+<title>Contents</title>
+
+<para>The libpng package contains the <userinput>png
+libraries</userinput> .</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>png libraries</title>
+<para>The PNG library is a collection of routines used to create and
+manipulate PNG format graphics files. The PNG format was designed as a
+replacement for GIF and, to a lesser extent, TIFF, with many
+improvements and extensions and lack of patent problems.</para></sect3>
+
+</sect2>
+
Index: general/graphlib/libpng/libpng-exp.xml
===================================================================
--- general/graphlib/libpng/libpng-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libpng/libpng-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,18 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>CC="gcc $CFLAGS" :</userinput> This makes libpng use
+CFLAGS when compiling.</para>
+
+<para><userinput>ZLIBINC=/usr/include ZLIBLIB=/usr/lib
+:</userinput> This forces libpng to look for the zlib includes and
+libraries where we have them installed.</para>
+
+<para><userinput>-f scripts/makefile.linux :</userinput> This points
+make at the the Linux version of the makefile as libpng doesn't use a
+autoconf routine instead coming with various makefiles for different
+platforms.</para>
+
+
+</sect2>
+
Index: general/graphlib/libpng/libpng-inst.xml
===================================================================
--- general/graphlib/libpng/libpng-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libpng/libpng-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of libpng</title>
+
+<para>Install libpng by running the following commands:</para>
+
+<para><screen><userinput>make prefix=/usr CC="gcc $CFLAGS" \
+   ZLIBINC=/usr/include ZLIBLIB=/usr/lib -f scripts/makefile.linux &amp;&amp;
+make prefix=/usr install -f scripts/makefile.linux</userinput></screen></para>
+
+</sect2>
+
Index: general/graphlib/libpng/libpng-intro.xml
===================================================================
--- general/graphlib/libpng/libpng-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libpng/libpng-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Introduction to libpng</title>
+
+<screen>Download location - HTTP:       <ulink url="&libpng-download;"/>
+Download location - FTP:	<ulink url="&libpng-download-ftp;"/>
+Version used:                   &libpng-version;
+Package size:                   &libpng-size;
+Estimated Disk space required:  &libpng-buildsize;</screen>
+
+<para>The libpng package contains the libpng libraries.  These are used
+by other programs for reading and writing png files.</para>
+
+<screen>libpng depends on: 
+<xref linkend="zlib"></xref></screen>
+
+</sect2>
Index: general/graphlib/libpng/libpng.ent
===================================================================
--- general/graphlib/libpng/libpng.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libpng/libpng.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<!ENTITY libpng SYSTEM "../libpng.xml">
+<!ENTITY libpng-intro SYSTEM "libpng-intro.xml">
+<!ENTITY libpng-inst SYSTEM "libpng-inst.xml">
+<!ENTITY libpng-exp SYSTEM "libpng-exp.xml">
+<!ENTITY libpng-desc SYSTEM "libpng-desc.xml">
+<!ENTITY libpng-config SYSTEM "libpng-config.xml">
+<!ENTITY libpng-buildsize "3.5 MB">
+<!ENTITY libpng-version "1.2.3">
+<!ENTITY libpng-download "http://www.libpng.org/pub/png/src/libpng-1.2.3.tar.gz">
+<!ENTITY libpng-download-ftp "ftp://swrinde.nde.swri.edu/pub/png/src/libpng-1.2.3.tar.gz">
+<!ENTITY libpng-size "481 KB">
Index: general/graphlib/libraw.xml
===================================================================
--- general/graphlib/libraw.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,324 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libraw-download-http "https://www.libraw.org/data/LibRaw-&libraw-version;.tar.gz">
-  <!ENTITY libraw-download-ftp  " ">
-  <!ENTITY libraw-md5sum        "0533724bad17c0fde22e642e4594e45d">
-  <!ENTITY libraw-size          "1.6 MB">
-  <!ENTITY libraw-buildsize     "30 MB">
-  <!ENTITY libraw-time          "0.2 SBU (Using parallelism=4)">
-  <!ENTITY dcraw-manpage-url    "https://linux.die.net/man/1/dcraw">
-]>
-
-<sect1 id="libraw" xreflabel="libraw-&libraw-version;">
-  <?dbhtml filename="libraw.html"?>
-
-
-  <title>libraw-&libraw-version;</title>
-
-  <indexterm zone="libraw">
-    <primary sortas="a-libraw">libraw</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libraw</title>
-
-    <para>
-      <application>Libraw</application> is a library for reading RAW files
-      obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libraw-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libraw-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libraw-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libraw-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libraw-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libraw-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libraw Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libjpeg"/>,
-      <xref linkend="jasper"/>, and
-      <xref linkend="lcms2"/>
-    </para>
-<!--
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="http://www.libraw.org/download">LibRaw-demosaic-pack-GPL2</ulink> and
-      <ulink url="http://www.libraw.org/download">LibRaw-demosaic-pack-GPL3</ulink>
-    </para>
--->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libraw</title>
-
-    <para>
-      Install <application>libraw</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>autoreconf -fiv              &amp;&amp;
-./configure --prefix=/usr    \
-            --enable-jpeg    \
-            --enable-jasper  \
-            --enable-lcms    \
-            --disable-static \
-            --docdir=/usr/share/doc/libraw-&libraw-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-jpeg</parameter>: This switch enables
-      support for jpeg. Remove if you don't have
-      <xref linkend="libjpeg"/> installed.
-    </para>
-
-    <para>
-      <parameter>--enable-jasper</parameter>: This switch enables
-      support for jasper. Remove if you don't have
-      <xref linkend="jasper"/> installed.
-    </para>
-
-    <para>
-      <parameter>--enable-lcms</parameter>: This switch enables
-      support for Little CMS2. Remove if you don't have
-      <xref linkend="lcms2"/> installed.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-      <note>
-         <para>
-           All the installed programs are examples of using libraw.
-         </para>
-      </note>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          4channels, dcraw_emu, dcraw_half, half_mt, mem_image,
-          multirender_test, postprocessing_benchmark, raw-identify,
-          simple_dcraw, and unprocessed_raw
-        </seg>
-        <seg>
-          libraw.so and libraw_r.so
-        </seg>
-        <seg>
-          /usr/include/libraw and
-          /usr/share/doc/libraw-&libraw-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="_4channels">
-        <term><command>4channels</command></term>
-        <listitem>
-          <para>
-            generates four TIFF files from RAW data, one file per channel
-          </para>
-          <indexterm zone="libraw _4channels">
-            <primary sortas="b-_4channels">4channels</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dcraw_half">
-        <term><command>dcraw_half</command></term>
-        <listitem>
-          <para>
-            emulates "dcraw -h" (see
-            <ulink url="&dcraw-manpage-url;"> DCRAW manpage</ulink>)
-          </para>
-          <indexterm zone="libraw dcraw_half">
-            <primary sortas="b-dcraw_half">dcraw_half</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mem_image">
-        <term><command>mem_image</command></term>
-        <listitem>
-          <para>
-            emulates "dcraw [-4] [-6] [-e]" (see
-            <ulink url="&dcraw-manpage-url;"> DCRAW manpage</ulink>)
-          </para>
-          <indexterm zone="libraw mem_image">
-            <primary sortas="b-mem_image">mem_image</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="postprocessing_benchmark">
-        <term><command>postprocessing_benchmark</command></term>
-        <listitem>
-          <para>
-            creates eight different renderings from one source file.
-            The first and fourth one should be identical
-          </para>
-          <indexterm zone="libraw postprocessing_benchmark">
-            <primary sortas="b-postprocessing_benchmark">
-            postprocessing_benchmark</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="simple_dcraw">
-        <term><command>simple_dcraw</command></term>
-        <listitem>
-          <para>
-            emulates call to "dcraw  [-D]  [-T] [-v] [-e] [-4]"  (see
-            <ulink url="&dcraw-manpage-url;"> DCRAW manpage</ulink>)
-          </para>
-          <indexterm zone="libraw simple_dcraw">
-            <primary sortas="b-simple_dcraw">simple_dcraw</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dcraw_emu">
-        <term><command>dcraw_emu</command></term>
-        <listitem>
-          <para>
-            is an almost complete dcraw emulator (see
-            <ulink url="&dcraw-manpage-url;"> DCRAW manpage</ulink>)
-          </para>
-          <indexterm zone="libraw dcraw_emu">
-            <primary sortas="b-dcraw_emu">dcraw_emu</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="half_mt">
-        <term><command>half_mt</command></term>
-        <listitem>
-          <para>
-            emulates call to "dcraw -h [-w] [-a] [-v]"  (see
-            <ulink url="&dcraw-manpage-url;">DCRAW manpage</ulink>)
-          </para>
-          <indexterm zone="libraw half_mt">
-            <primary sortas="b-half_mt">half_mt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="multirender_test">
-        <term><command>multirender_test</command></term>
-        <listitem>
-          <para>
-            creates eight different renderings from one source file.
-            The first and fourth one should be identical
-          </para>
-          <indexterm zone="libraw multirender_test">
-            <primary sortas="b-multirender_test">multirender_test</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="raw-identify">
-        <term><command>raw-identify</command></term>
-        <listitem>
-          <para>
-            emulates call to "dcraw -i [-v]"  (see
-            <ulink url="&dcraw-manpage-url;"> DCRAW manpage</ulink>)
-          </para>
-          <indexterm zone="libraw raw-identify">
-            <primary sortas="b-raw-identify">half_mt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unprocessed_raw">
-        <term><command>unprocessed_raw</command></term>
-        <listitem>
-          <para>
-            generates unprocessed raw image: with masked pixels and without
-            black subtraction
-          </para>
-          <indexterm zone="libraw unprocessed_raw">
-            <primary sortas="b-unprocessed_raw">unprocessed_raw</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!--      <varlistentry id="libraw-lib">
-        <term><filename class='libraryfile'>libraw.so</filename></term>
-        <listitem>
-          <para>
-            contains functions used for parsing, editing, and saving
-            data.
-          </para>
-          <indexterm zone="libraw libraw-lib">
-            <primary sortas="c-libraw">libraw.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry> -->
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/graphlib/librsvg.xml
===================================================================
--- general/graphlib/librsvg.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,246 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 librsvg-download-http "&gnome-download-http;/librsvg/&librsvg-minor;/librsvg-&librsvg-version;.tar.xz">
-  <!ENTITY librsvg-download-ftp  " ">
-  <!ENTITY librsvg-md5sum        "21b2957a2e7ceeb7ddbd207aa2c7ed29">
-  <!ENTITY librsvg-size          "5.5 MB">
-  <!ENTITY librsvg-buildsize     "778 MB (17 MB installed), add 545 MB for tests">
-  <!ENTITY librsvg-time          "1.0 SBU (add 0.8 SBU for tests; both using parallelism=4)">
-]>
-
-<sect1 id="librsvg" xreflabel="librsvg-&librsvg-version;">
-  <?dbhtml filename="librsvg.html"?>
-
-
-  <title>librsvg-&librsvg-version;</title>
-
-  <indexterm zone="librsvg">
-    <primary sortas="a-librsvg">librsvg</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to librsvg</title>
-
-    <para>
-      The <application>librsvg</application> package contains
-      a library and tools used to manipulate, convert and view
-      Scalable Vector Graphic (SVG) images.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&librsvg-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&librsvg-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &librsvg-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &librsvg-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &librsvg-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &librsvg-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">librsvg Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cairo"/>,
-      <xref linkend="gdk-pixbuf"/>,
-      <xref linkend="pango"/>, and
-      <xref linkend="rust"/>
-    </para>
-
-    &build-use-internet;
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection; and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="docutils"/> (for man pages),
-      <xref linkend="gi-docgen"/> (for documentation), and
-      <xref linkend="xorg7-font"/> (for tests)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of librsvg</title>
-
-    <para>
-      Install <application>librsvg</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --enable-vala    \
-            --disable-static \
-            --docdir=/usr/share/doc/librsvg-&librsvg-version; &amp;&amp;
-make</userinput></screen>
-
-    <!-- With some locales (zh_CN.UTF-8) 31 tests fail.  With LC_ALL=C only
-         one failure.
-         https://gitlab.gnome.org/GNOME/librsvg/-/issues/1021 -->
-    <para>
-      To test the results, issue: <command>LC_ALL=C make -k check</command>.
-      <!-- https://gitlab.gnome.org/GNOME/librsvg/-/issues/1063
-           The test is broken due to missing font, but it's only revealed
-           after a pango update.  -->
-      One test named <literal>tests::rtl_tspan_svg</literal> is known to
-      fail with pango 1.52.1 or later.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make DOC_INSTALL_DIR='$(docdir)' install</userinput></screen>
-
-    <note>
-      <para>
-        If you installed the package on to your system using a
-        <quote>DESTDIR</quote> method, an important file was not installed and
-        should be copied and/or generated. Generate it using the following
-        command as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>gdk-pixbuf-query-loaders --update-cache</userinput></screen>
-    </note>
-
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-vala</parameter>: This switch enables
-      building of the Vala bindings. Remove this switch if you don't have
-      <xref linkend="vala"/> installed.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <parameter>DOC_INSTALL_DIR='$(docdir)'</parameter>: This override
-      ensures installing the API documentation into the expected location
-      if <xref linkend='gi-docgen'/> is installed.
-    </para>
-
-    <para>
-      <option>--disable-introspection</option>: Use this switch if you have
-      not installed <application>Gobject Introspection</application>.
-    </para>
-
-    <para>
-      <option>--disable-gtk-doc</option>: This switch prevents building
-      the API documentation, even if <xref linkend="gi-docgen"/> (despite
-      the name of the option) is available.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          rsvg-convert
-        </seg>
-        <seg>
-          librsvg-2.so and
-          libpixbufloader-svg.so (installed in /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders)
-        </seg>
-        <seg>
-          /usr/include/librsvg-2.0 and
-          /usr/share/doc/librsvg-&librsvg-version;
-<!--      /usr/share/gtk-doc/html/rsvg-2.0 not built with
-               current instructions (needs gi-docgen)-->
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="rsvg-convert">
-        <term><command>rsvg-convert</command></term>
-        <listitem>
-          <para>
-            is used to convert images into PNG, PDF, PS, SVG and other formats
-          </para>
-          <indexterm zone="librsvg rsvg-convert">
-            <primary sortas="b-rsvg-convert">rsvg-convert</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="librsvg-2">
-        <term><filename class="libraryfile">librsvg-2.so</filename></term>
-        <listitem>
-          <para>
-            provides the functions to render Scalable Vector Graphics
-          </para>
-          <indexterm zone="librsvg librsvg-2">
-            <primary sortas="c-librsvg-2">librsvg-2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpixbufloader-svg">
-        <term><filename class="libraryfile">libpixbufloader-svg.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>Gdk Pixbuf</application> plugin that allows
-            <application>GTK+</application> applications to render Scalable
-            Vector Graphics images
-          </para>
-          <indexterm zone="librsvg libpixbufloader-svg">
-            <primary sortas="c-libpixbufloader-svg">libpixbufloader-svg.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/graphlib/libspiro.xml
===================================================================
--- general/graphlib/libspiro.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,144 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libspiro-download-http "https://github.com/fontforge/libspiro/releases/download/&libspiro-version;/libspiro-dist-&libspiro-version;.tar.gz">
-  <!ENTITY libspiro-download-ftp  " ">
-  <!ENTITY libspiro-md5sum        "c21f86e6c1ad65ed4cb1f754f6d7563c">
-  <!ENTITY libspiro-size          "428 KB">
-  <!ENTITY libspiro-buildsize     "5.1 MB (add 1.3 MB if running the tests)">
-  <!ENTITY libspiro-time          "0.1 SBU">
-]>
-
-<!-- Try to keep the indentation used in this file-->
-<sect1 id="libspiro" xreflabel="libspiro-&libspiro-version;">
-  <?dbhtml filename="libspiro.html"?>
-
-
-  <title>Libspiro-&libspiro-version;</title>
-
-  <indexterm zone="libspiro">
-    <primary sortas="a-libspiro">libspiro</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libspiro</title>
-
-    <para>
-      <application>Libspiro</application> will take an array of spiro control
-      points and convert them into a series of bezier splines which can then be
-      used in the myriad of ways the world has come to use beziers.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libspiro-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libspiro-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libspiro-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libspiro-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libspiro-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libspiro-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libspiro</title>
-
-    <para>
-      Install <application>libspiro</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libspiro.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libspiro-lib">
-        <term><filename class="libraryfile">libspiro.so</filename></term>
-        <listitem>
-          <para>
-            is a shareable library that can be used by programs to do the Spiro
-            computations for you
-          </para>
-          <indexterm zone="libspiro libspiro-lib">
-            <primary sortas="c-libspiro">libspiro.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/graphlib/libtiff.xml
===================================================================
--- general/graphlib/libtiff.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ general/graphlib/libtiff.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,266 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
+<sect1 id="libtiff" xreflabel="libtiff-&libtiff-version;">
+<?dbhtml filename="libtiff.html" dir="general"?>
+<title>libtiff-&libtiff-version;</title>
 
-  <!ENTITY libtiff-download-http
-           "https://download.osgeo.org/libtiff/tiff-&libtiff-version;.tar.gz">
-  <!ENTITY libtiff-download-ftp  " ">
-  <!ENTITY libtiff-md5sum        "fc7d49a9348b890b29f91a4ecadd5b49">
-  <!ENTITY libtiff-size          "3.4 MB">
-  <!ENTITY libtiff-buildsize     "46 MB (with tests)">
-  <!ENTITY libtiff-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="libtiff" xreflabel="libtiff-&libtiff-version;">
-  <?dbhtml filename="libtiff.html"?>
-
-
-  <title>libtiff-&libtiff-version;</title>
-
-  <indexterm zone="libtiff">
-    <primary sortas="a-libtiff">libtiff</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libtiff</title>
-
-    <para>
-      The <application>libtiff</application> package contains the TIFF
-      libraries and associated utilities. The libraries are used by many
-      programs for reading and writing TIFF files and the utilities are
-      used for general work with TIFF files.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libtiff-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libtiff-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libtiff-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libtiff-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libtiff-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libtiff-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/tiff-&libtiff-version;-upstream_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">libtiff Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="cmake"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="freeglut"/> (required for <command>tiffgt</command>),
-      <xref linkend="libjpeg"/>,
-      <xref linkend="sphinx"/>,
-      <xref linkend="libwebp"/>,
-      <ulink url="https://www.cl.cam.ac.uk/~mgk25/jbigkit/">JBIG-KIT</ulink>, and
-      <ulink url="https://www.osgeo.org/projects/lerc-limited-error-raster-compression/">LERC</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libtiff</title>
-
-<!--
-    <para>
-      First fix several security issues identified upstream:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../tiff-&libtiff-version;-upstream_fixes-1.patch</userinput></screen>
--->
-
-    <para>
-      Install <application>libtiff</application> by running the following
-      commands:
-    </para>
-
-<!-- "build" exists in the source tree -->
-<screen><userinput>mkdir -p libtiff-build &amp;&amp;
-cd       libtiff-build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/libtiff-&libtiff-version; \
-      -DCMAKE_INSTALL_PREFIX=/usr -G Ninja .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-<!-- libtiff-4.6.0 removed most of the programs that this package
-     previously installed due to lack of maintenance and security concerns. The
-     only ones remaining are tiffcp, tiffdump, tiffinfo, tiffset, and tiffsplit.
-     See Ticket #18550 for more details. -->
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          tiffcp,
-          tiffdump,
-          tiffinfo,
-          tiffset, and
-          tiffsplit
-        </seg>
-        <seg>
-          libtiff.so and libtiffxx.so
-        </seg>
-        <seg>
-          /usr/share/doc/tiff-&libtiff-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="tiffcp">
-        <term><command>tiffcp</command></term>
-        <listitem>
-          <para>
-            copies (and possibly converts) a TIFF file
-          </para>
-          <indexterm zone="libtiff tiffcp">
-            <primary sortas="b-tiffcp">tiffcp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tiffdump">
-        <term><command>tiffdump</command></term>
-        <listitem>
-          <para>
-            prints verbatim information about TIFF files
-          </para>
-          <indexterm zone="libtiff tiffdump">
-            <primary sortas="b-tiffdump">tiffdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tiffinfo">
-        <term><command>tiffinfo</command></term>
-        <listitem>
-          <para>
-            prints information about TIFF files
-          </para>
-          <indexterm zone="libtiff tiffinfo">
-            <primary sortas="b-tiffinfo">tiffinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tiffset">
-        <term><command>tiffset</command></term>
-        <listitem>
-          <para>
-            sets the value of a TIFF header to a specified value
-          </para>
-          <indexterm zone="libtiff tiffset">
-            <primary sortas="b-tiffset">tiffset</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tiffsplit">
-        <term><command>tiffsplit</command></term>
-        <listitem>
-          <para>
-            splits a multi-image TIFF into single-image TIFF files
-          </para>
-          <indexterm zone="libtiff tiffsplit">
-            <primary sortas="b-tiffsplit">tiffsplit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtiff-lib">
-        <term><filename class="libraryfile">libtiff.so</filename></term>
-        <listitem>
-          <para>
-            contains the API functions used by the
-            <application>libtiff</application> programs as well as other
-            programs to read and write TIFF files
-          </para>
-          <indexterm zone="libtiff libtiff-lib">
-            <primary sortas="c-libtiff">libtiff.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtiffxx">
-        <term><filename class="libraryfile">libtiffxx.so</filename></term>
-        <listitem>
-          <para>
-            contains the C++ API functions used
-            by programs to read and write TIFF files
-          </para>
-          <indexterm zone="libtiff libtiffxx">
-            <primary sortas="c-libtiffxx">libtiffxx.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+&libtiff-intro;
+&libtiff-inst;
+&libtiff-exp;
+&libtiff-config;
+&libtiff-desc;
 
 </sect1>
+
Index: general/graphlib/libtiff/libtiff-config.xml
===================================================================
--- general/graphlib/libtiff/libtiff-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libtiff/libtiff-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Configuring libtiff</title>
+
+<sect3><title>Configuration Information</title>
+
+&library-config;
+
+</sect3>
+
+</sect2>
+
Index: general/graphlib/libtiff/libtiff-desc.xml
===================================================================
--- general/graphlib/libtiff/libtiff-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libtiff/libtiff-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,80 @@
+<sect2>
+<title>Contents</title>
+
+<para>The libtiff package contains <userinput>fax2ps, fax2tiff, gif2tiff, 
+pal2rgb, ppm2tiff, ras2tiff, rgb2ycbcr, thumbnail, tiff2bw, tiff2ps,
+tiff2rgba, tiffcmp, tiffcp, tiffdither, tiffdump, tiffinfo, tiffmedian,
+tiffsplit</userinput> and the <userinput>tiff libraries</userinput></para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>fax2ps</title>
+<para>fac2ps converts a TIFF facsimile to compressed postscript 
+file</para></sect3>
+
+<sect3><title>fax2tiff</title>
+<para>fax2tiff creates a TIFF Class F fax file from raw fax 
+data</para></sect3>
+
+<sect3><title>gif2tiff</title>
+<para>gif2tiff creates a TIFF file from a GIF87 format image 
+file</para></sect3>
+
+<sect3><title>pal2rgb</title>
+<para>pal2rgb converts a palette color TIFF image to a full 
+color image</para></sect3>
+
+<sect3><title>ppm2tiff</title>
+<para>ppm2tiff creates a TIFF file from a PPM image file</para></sect3>
+
+<sect3><title>ras2tiff</title>
+<para>ras2tiff creates a TIFF file from a Sun rasterfile</para></sect3>
+
+<sect3><title>rgb2ycbcr</title>
+<para>rgb2ycbcr converts non-YCbCr TIFF images to a YCbCr TIFF 
+image</para></sect3>
+
+<sect3><title>thumbnail</title>
+<para>thumbnail creates a TIFF file with thumbnail images</para></sect3>
+
+<sect3><title>tiff2bw</title>
+<para>tiff2bw converts a color TIFF image to greyscale</para></sect3>
+
+<sect3><title>tiff2ps</title>
+<para>tiff2ps converts a TIFF image to a postscript file</para></sect3>
+
+<sect3><title>tiff2rgba</title>
+<para>No description available</para></sect3>
+
+<sect3><title>tiffcmp</title>
+<para>tiffcmp compares two TIFF files</para></sect3>
+
+<sect3><title>tiffcp</title>
+<para>tiffcp copies (and possibly converts) a TIFF file</para></sect3>
+
+<sect3><title>tiffdither</title>
+<para>tiffdither converts a greyscale image to bilevel using 
+dithering</para></sect3>
+
+<sect3><title>tiffdump</title>
+<para>tiffdump prints verbatim information about TIFF files</para></sect3>
+
+<sect3><title>tiffinfo</title>
+<para>tiffinfo prints information about TIFF files</para></sect3>
+
+<sect3><title>tiffmedian</title>
+<para>tiffmedian applies the median cut algorithm to data in a 
+TIFF file</para></sect3>
+
+<sect3><title>tiffsplit</title>
+<para>tiffsplit splits a multi-image TIFF into single-image 
+TIFF files</para></sect3>
+
+<sect3><title>tiff libraries</title>
+<para>The tiff libraries are used by many programs to read and write
+tiff files</para></sect3>
+
+</sect2>
+
Index: general/graphlib/libtiff/libtiff-exp.xml
===================================================================
--- general/graphlib/libtiff/libtiff-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libtiff/libtiff-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,19 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>--noninteractive :</userinput> This switch is used to
+avoid the configuration routine asking for confirmation of the
+directories to install to (which we pass using switches to configure
+anyways).</para> 
+
+<para><userinput>--with-GCOPTS="$CFLAGS" :</userinput> This switch
+causes libtiff to be built using the options we have set in $CFLAGS
+(which most other packages handle automatically).</para>
+
+<para><userinput>--with-DIR_MAN=/usr/share/man :</userinput> This is
+used because despite the fact we pass --prefix=/usr, the configure
+routine tries to install the man-pages in /usr/local/man instead of the
+correct place.</para>
+
+</sect2>
+
Index: general/graphlib/libtiff/libtiff-inst.xml
===================================================================
--- general/graphlib/libtiff/libtiff-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libtiff/libtiff-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,12 @@
+<sect2>
+<title>Installation of libtiff</title>
+
+<para>Install libtiff by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr --noninteractive \
+   --with-GCOPTS="$CFLAGS" --with-DIR_MAN=/usr/share/man &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
Index: general/graphlib/libtiff/libtiff-intro.xml
===================================================================
--- general/graphlib/libtiff/libtiff-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libtiff/libtiff-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,14 @@
+<sect2>
+<title>Introduction to libtiff</title>
+
+<screen>Download location:              <ulink url="&libtiff-download;"/>
+Version used:                   &libtiff-version;
+Package size:                   &libtiff-size;
+Estimated Disk space required:  &libtiff-buildsize;</screen>
+
+<para>The libtiff package contains the tiff libraries and associated
+utilities.  The libraries are used by many programs for reading and
+writing tiff files and the utilities are useful for general work with
+tiff files.</para>
+
+</sect2>
Index: general/graphlib/libtiff/libtiff.ent
===================================================================
--- general/graphlib/libtiff/libtiff.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libtiff/libtiff.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<!ENTITY libtiff SYSTEM "../libtiff.xml">
+<!ENTITY libtiff-intro SYSTEM "libtiff-intro.xml">
+<!ENTITY libtiff-inst SYSTEM "libtiff-inst.xml">
+<!ENTITY libtiff-exp SYSTEM "libtiff-exp.xml">
+<!ENTITY libtiff-desc SYSTEM "libtiff-desc.xml">
+<!ENTITY libtiff-config SYSTEM "libtiff-config.xml">
+<!ENTITY libtiff-buildsize "5.9 MB">
+<!ENTITY libtiff-version "3.5.7">
+<!ENTITY libtiff-download "ftp://ftp.remotesensing.org/pub/libtiff/tiff-v3.5.7.tar.gz">
+<!ENTITY libtiff-size "928 KB">
Index: general/graphlib/libungif.xml
===================================================================
--- general/graphlib/libungif.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libungif.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect1 id="libungif" xreflabel="libungif-&libungif-version;">
+<?dbhtml filename="libungif.html" dir="general"?>
+<title>libungif-&libungif-version;</title>
+
+&libungif-intro;
+&libungif-inst;
+&libungif-config;
+&libungif-desc;
+
+</sect1>
+
Index: general/graphlib/libungif/libungif-config.xml
===================================================================
--- general/graphlib/libungif/libungif-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libungif/libungif-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<sect2>
+<title>Configuring libungif</title>
+
+<sect3><title>Configuration Information</title>
+
+&library-config;
+
+</sect3>
+
+</sect2>
Index: general/graphlib/libungif/libungif-desc.xml
===================================================================
--- general/graphlib/libungif/libungif-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libungif/libungif-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,106 @@
+<sect2>
+<title>Contents</title>
+
+<para>The libungif package contains <userinput>gif2epsn, gif2ps, gif2rgb, 
+gifasm, gifbg, gifburst, gifclip, gifclrmp, gifcolor, gifcomb, gifcompose, 
+giffiltr, giffix, gifflip, gifhisto, gifinfo, gifinter, gifinto, gifovly, 
+gifpos, gifrotat, gifrsize, gifspnge, giftext, gifwedge, icon2gif, raw2gif, 
+rgb2gif, text2gif</userinput> and the <userinput>ungif
+libraries</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>gif2epsn</title>
+<para>Dumps images saved as GIF files on Epson type printers.</para></sect3>
+
+<sect3><title>gif2ps</title>
+<para>Print GIF file on laser printers supporting PostScript.</para></sect3>
+
+<sect3><title>gif2rgb</title>
+<para>Convert images saved as GIF to 24-bit RGB image(s).</para></sect3>
+
+<sect3><title>gifasm</title>
+<para>assemble multiple GIFs into one, or burst a 
+multiple-image GIF.</para></sect3>
+
+<sect3><title>gifbg</title>
+<para>Generate a single-color test pattern GIF.</para></sect3>
+
+<sect3><title>gifburst</title>
+<para>Burst a GIF image into subrectangles.</para></sect3>
+
+<sect3><title>gifclip</title>
+<para>Clip or crop a GIF image.</para></sect3>
+
+<sect3><title>gifclrmp</title>
+<para>Modify GIF image colormaps.</para></sect3>
+
+<sect3><title>gifcolor</title>
+<para>Generate color test patterns.</para></sect3>
+
+<sect3><title>gifcomb</title>
+<para>Combine 2 GIF images of exactly the same size into one.</para></sect3>
+
+<sect3><title>gifcompose</title>
+<para>Use (un)giflib tools to compose images.</para></sect3>
+
+<sect3><title>giffiltr</title>
+<para>Template code for filtering a GIF sequentially.</para></sect3>
+
+<sect3><title>giffix</title>
+<para>Clumsily attempts to fix truncated GIF images.</para></sect3>
+
+<sect3><title>gifflip</title>
+<para>Flip GIF image along X or Y axis or rotate by 90 degrees.</para></sect3>
+
+<sect3><title>gifhisto</title>
+<para>Generate color-frequency histogram from a GIF.</para></sect3>
+
+<sect3><title>gifinfo</title>
+<para>Gives information on a GIF file.</para></sect3>
+
+<sect3><title>gifinter</title>
+<para>Convert between interlaced and non interlaced images.</para></sect3>
+
+<sect3><title>gifinto</title>
+<para>End-of-pipe fitting for GIF-processing pipelines.</para></sect3>
+
+<sect3><title>gifovly</title>
+<para>Generate one composite GIF from a multiple-image GIF.</para></sect3>
+
+<sect3><title>gifpos</title>
+<para>Change a GIF's screen size or recondition it.</para></sect3>
+
+<sect3><title>gifrotat</title>
+<para>Rotate a GIF through any desired angle.</para></sect3>
+
+<sect3><title>gifrsize</title>
+<para>Resize a GIF by deletion or duplication of bits.</para></sect3>
+
+<sect3><title>gifspnge</title>
+<para>Template code for filtering a GIF with in-core operations.</para></sect3>
+
+<sect3><title>giftext</title>
+<para>Print (text only) general information about a GIF</para></sect3>
+
+<sect3><title>gifwedge</title>
+<para>Create a test GIF image resembling a color monitor test
+pattern.</para></sect3>
+
+<sect3><title>icon2gif</title>
+<para>Converter/deconverter to/from an editable text format.</para></sect3>
+
+<sect3><title>raw2gif</title>
+<para>Convert raw 8-bit image data into GIF files.</para></sect3>
+
+<sect3><title>rgb2gif</title>
+<para>Convert 24 bit images to a GIF image using color 
+quantization.</para></sect3>
+
+<sect3><title>text2gif</title>
+<para>Generate GIF images out of regular text in 8x8 font.</para></sect3>
+
+</sect2>
+
Index: general/graphlib/libungif/libungif-inst.xml
===================================================================
--- general/graphlib/libungif/libungif-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libungif/libungif-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,15 @@
+<sect2>
+<title>Installation of libungif</title>
+
+<para>Install libungif by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+<note><para>If you get an error during the make portion compiling lib/qprinf.c,
+edit the file and comment out or remove line 14: #include &lt;config.h&gt; 
+</para></note>
+
+</sect2>
+
Index: general/graphlib/libungif/libungif-intro.xml
===================================================================
--- general/graphlib/libungif/libungif-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libungif/libungif-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,25 @@
+<sect2>
+<title>Introduction to libungif</title>
+
+<screen>Download location:              <ulink url="&libungif-download;"/>
+Version used:                   &libungif-version;
+Package size:                   &libungif-size;
+Estimated Disk space required:  &libungif-buildsize;</screen>
+
+<para>The libungif package contains libraries for reading all gifs and
+writing uncompressed ones as well as programs for converting and working
+with gif files.  The libraries are useful for any graphics program
+wishing to deal with gif files while the programs are useful for
+conversion purposes as well as cleaning up images.</para>
+
+<para>The reason libungif only writes uncompressed gifs is due to a
+legal issue with LZW compression (which Unisys claims a patent on).
+Reading gifs is not a problem as the uncompression routines do not seem
+to be limited in this way.  Note that this has in the past been
+disputed.  The best way to avoid this whole mess is to simply use
+libungif for looking at gif images on the web, whilst in any pages which
+you design, use the open source png format instead (which uses, not
+surprisingly, the libpng library) which has no patent issues at
+all.</para>
+
+</sect2>
Index: general/graphlib/libungif/libungif.ent
===================================================================
--- general/graphlib/libungif/libungif.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/graphlib/libungif/libungif.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<!ENTITY libungif SYSTEM "../libungif.xml">
+<!ENTITY libungif-intro SYSTEM "libungif-intro.xml">
+<!ENTITY libungif-inst SYSTEM "libungif-inst.xml">
+<!ENTITY libungif-desc SYSTEM "libungif-desc.xml">
+<!ENTITY libungif-config SYSTEM "libungif-config.xml">
+<!ENTITY libungif-buildsize "3.1 MB">
+<!ENTITY libungif-version "4.1.0b1">
+<!ENTITY libungif-download "http://www.linuxpackages.net/packages/Slackware-8/robert/libungif-4.1.0b1/source/libungif-4.1.0b1.tar.gz">
+<!ENTITY libungif-size "343 KB">
Index: general/graphlib/libwebp.xml
===================================================================
--- general/graphlib/libwebp.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,285 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libwebp-download-http "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-&libwebp-version;.tar.gz">
-  <!ENTITY libwebp-download-ftp  " ">
-  <!ENTITY libwebp-md5sum        "07daaa13bef03b7be07f11977b159cb8">
-  <!ENTITY libwebp-size          "4.0 MB">
-  <!ENTITY libwebp-buildsize     "45 MB">
-  <!ENTITY libwebp-time          "0.1 SBU (with parallelism=4)">
-]>
-
-<sect1 id="libwebp" xreflabel="libwebp-&libwebp-version;">
-  <?dbhtml filename="libwebp.html"?>
-
-
-  <title>libwebp-&libwebp-version;</title>
-
-  <indexterm zone="libwebp">
-    <primary sortas="a-libwebp">libwebp</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libwebp</title>
-
-    <para>
-      The <application>libwebp</application> package contains a library
-      and support programs to encode and decode images in WebP format.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libwebp-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libwebp-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libwebp-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libwebp-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libwebp-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libwebp-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-    <!-- applied in 1.3.2
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/libwebp-&libwebp-version;-security_update-2.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-    -->
-    <bridgehead renderas="sect3">libwebp Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libtiff"/>, and
-      <xref linkend="sdl"/> (for improved 3D Acceleration)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="freeglut"/> and
-      <xref linkend="giflib"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libwebp</title>
-<!-- applied in 1.3.2
-    <para>
-      Fix a security issue identified upstream:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../libwebp-&libwebp-version;-security_update-2.patch</userinput></screen>
--->
-    <para>
-      Install <application>libwebp</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr           \
-            --enable-libwebpmux     \
-            --enable-libwebpdemux   \
-            --enable-libwebpdecoder \
-            --enable-libwebpextras  \
-            --enable-swap-16bit-csp \
-            --disable-static        &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-
-    <para>
-      <parameter>--enable-swap-16bit-csp</parameter>: This switch enables byte
-      swap for 16 bit colorspaces.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          cwebp,
-          dwebp,
-          gif2webp,
-          img2webp,
-          vwebp,
-          webpinfo,
-          and webpmux
-        </seg>
-        <seg>
-          libsharpyuv.so,
-          libwebpdecoder.so,
-          libwebpdemux.so,
-          libwebpmux.so,
-          and libwebp.so
-        </seg>
-        <seg>
-          /usr/include/webp
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cwebp">
-        <term><command>cwebp</command></term>
-        <listitem>
-          <para>
-            compresses an image using the WebP format
-          </para>
-          <indexterm zone="libwebp cwebp">
-            <primary sortas="b-cwebp">cwebp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dwebp">
-        <term><command>dwebp</command></term>
-        <listitem>
-          <para>
-            decompresses WebP files into PNG, PAM, PPM or PGM images
-          </para>
-          <indexterm zone="libwebp dwebp">
-            <primary sortas="b-dwebp">dwebp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gif2webp">
-        <term><command>gif2webp</command></term>
-        <listitem>
-          <para>
-            converts a GIF image to a WebP image
-          </para>
-          <indexterm zone="libwebp gif2webp">
-            <primary sortas="b-gif2webp">gif2webp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="img2webp">
-        <term><command>img2webp</command></term>
-        <listitem>
-          <para>
-            creates an animated WebP file from a sequence of input images
-          </para>
-          <indexterm zone="libwebp img2webp">
-            <primary sortas="b-img2webp">img2webp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vwebp">
-        <term><command>vwebp</command></term>
-        <listitem>
-          <para>
-            decompresses a WebP file and displays it in a window
-          </para>
-          <indexterm zone="libwebp vwebp">
-            <primary sortas="b-vwebp">vwebp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="webpinfo">
-        <term><command>webpinfo</command></term>
-        <listitem>
-          <para>
-            prints out the cunk level structure of WebP files along with
-            performing basic integrity checks
-          </para>
-          <indexterm zone="libwebp webpinfo">
-            <primary sortas="b-webpinfo">webpinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="webpmux">
-        <term><command>webpmux</command></term>
-        <listitem>
-          <para>
-            creates animated WebP files from non-animated WebP images, extracts
-            frames from animated WebP images, and manages XMP/EXIF metadata and
-            the ICC profile
-          </para>
-          <indexterm zone="libwebp webpmux">
-            <primary sortas="b-webpmux">webpmux</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwebp-lib">
-        <term><filename class="libraryfile">libwebp.so</filename></term>
-        <listitem>
-          <para>
-            contains the API functions for WebP encoding and decoding
-          </para>
-          <indexterm zone="libwebp libwebp-lib">
-            <primary sortas="c-libwebp">libwebp.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/graphlib/mypaint-brushes.xml
===================================================================
--- general/graphlib/mypaint-brushes.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,134 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 mypaint-brushes-download-http "https://github.com/mypaint/mypaint-brushes/releases/download/v&mypaint-brushes-version;/mypaint-brushes-&mypaint-brushes-version;.tar.xz">
-  <!ENTITY mypaint-brushes-download-ftp  " ">
-  <!ENTITY mypaint-brushes-md5sum        "7241032d814cb91d2baae7d009a2a2e0">
-  <!ENTITY mypaint-brushes-size          "1.3 MB">
-  <!ENTITY mypaint-brushes-buildsize     "3.4 MB">
-  <!ENTITY mypaint-brushes-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="mypaint-brushes" xreflabel="mypaint-brushes-&mypaint-brushes-version;">
-  <?dbhtml filename="mypaint-brushes.html"?>
-
-
-  <title>mypaint-brushes-&mypaint-brushes-version;</title>
-
-  <indexterm zone="mypaint-brushes">
-    <primary sortas="a-mypaint-brushes">mypaint-brushes</primary>
-  </indexterm>
-
-  <!--Required section-->
-  <sect2 role="package">
-    <title>Introduction to mypaint-brushes</title>
-
-    <para>
-      The <application>mypaint-brushes</application> package contains brushes
-      used by packages which use libmypaint.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&mypaint-brushes-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&mypaint-brushes-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &mypaint-brushes-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &mypaint-brushes-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &mypaint-brushes-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &mypaint-brushes-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/mypaint-brushes-&mypaint-brushes-version;-automake_1.16-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">mypaint-brushes Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required at runtime</bridgehead>
-    <para role="required">
-      <xref role="runtime" linkend="libmypaint"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of mypaint-brushes</title>
-
-    <para>
-      Install <application>mypaint-brushes</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None.
-        </seg>
-        <seg>
-          None.
-        </seg>
-        <seg>
-          /usr/share/mypaint-data.
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: general/graphlib/newt.xml
===================================================================
--- general/graphlib/newt.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,187 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 newt-download-http "https://releases.pagure.org/newt/newt-&newt-version;.tar.gz">
-  <!ENTITY newt-download-ftp  " ">
-  <!ENTITY newt-md5sum        "9a0630e2f59eaa3037aec94989c36c4a">
-  <!ENTITY newt-size          "176 KB">
-  <!ENTITY newt-buildsize     "3.0 MB">
-  <!ENTITY newt-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="newt" xreflabel="newt-&newt-version;">
-  <?dbhtml filename="newt.html"?>
-
-
-  <title>newt-&newt-version;</title>
-
-  <indexterm zone="newt">
-    <primary sortas="a-newt">newt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to newt</title>
-
-    <para>
-      <application>Newt</application> is a programming library for color text
-      mode, widget based user interfaces.  It can be used to add stacked
-      windows, entry widgets, checkboxes, radio buttons, labels, plain text
-      fields, scrollbars, etc., to text mode user interfaces.
-      <application>Newt</application> is based on the S-Lang library.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&newt-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&newt-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &newt-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &newt-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &newt-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &newt-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Newt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="popt"/> and
-      <xref linkend="slang"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <!-- <xref linkend="tcl"/> and -->
-      <xref role="runtime" linkend="gpm"/> (runtime)
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of newt</title>
-
-    <para>
-      Install <application>newt</application> by running the following
-      command:
-    </para>
-
-<screen><userinput>sed -e '/install -m 644 $(LIBNEWT)/ s/^/#/' \
-    -e '/$(LIBNEWT):/,/rv/ s/^/#/'          \
-    -e 's/$(LIBNEWT)/$(LIBNEWTSH)/g'        \
-    -i Makefile.in                          &amp;&amp;
-
-./configure --prefix=/usr           \
-            --with-gpm-support      \
-            --with-python=python&python3-majorver; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -e ... -i Makefile.in</command>: Disables installation of a
-      static library.
-    </para>
-
-    <para>
-      <parameter>--with-gpm-support</parameter>: This switch enables mouse support for newt
-      applications through GPM.
-    </para>
-
-    <para>
-      <parameter>--with-python=python&python3-majorver;</parameter>: By giving
-      explicitly the name of the directory where python modules reside, this
-      switch prevents building the python2 module.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg> whiptail </seg>
-        <seg> libnewt.so, whiptcl.so, and
-        /usr/lib/python&python3-majorver;/site-packages/_snack.so </seg>
-        <seg> None </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="whiptail-prog">
-        <term><command>whiptail</command></term>
-        <listitem>
-          <para>
-            displays dialog boxes from shell scripts
-          </para>
-          <indexterm zone="newt whiptail-prog">
-            <primary sortas="b-whiptail">whiptail</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnewt-lib">
-        <term><filename class="libraryfile">libnewt.so</filename></term>
-        <listitem>
-          <para>
-            is the library for color text mode, widget based user interfaces
-          </para>
-          <indexterm zone="newt libnewt-lib">
-            <primary sortas="b-libnewt-lib">libnewt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/graphlib/opencv.xml
===================================================================
--- general/graphlib/opencv.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,263 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 opencv-download-http     "https://github.com/opencv/opencv/archive/&opencv-version;/opencv-&opencv-version;.tar.gz">
-  <!ENTITY opencv-download-ftp      " ">
-  <!ENTITY opencv-md5sum            "153b4b8dd103b1bfe447f7dd1f22eac0">
-  <!ENTITY opencv-size              "88 MB">
-  <!ENTITY opencv-buildsize         "820 MB">
-  <!ENTITY opencv-time              "7.4 SBU (using parallelism=4)">
-
-  <!ENTITY opencv-contrib-download "https://github.com/opencv/opencv_contrib/archive/&opencv-version;/opencv_contrib-&opencv-contrib-version;.tar.gz">
-]>
-
-<sect1 id="opencv" xreflabel="opencv-&opencv-version;">
-  <?dbhtml filename="opencv.html"?>
-
-
-  <title>opencv-&opencv-version;</title>
-
-  <indexterm zone="opencv">
-    <primary sortas="a-opencv">opencv</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to opencv</title>
-
-    <para>
-      The <application>opencv</application> package contains graphics libraries
-      mainly aimed at real-time computer vision.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&opencv-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&opencv-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &opencv-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &opencv-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &opencv-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &opencv-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional additional modules: <ulink
-          url="&opencv-contrib-download;"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <note>
-      <para>
-        One additional file that starts with "ippicv" (integrated
-        performance primitives) will be automatically downloaded during the
-        cmake portion of the build procedure. This download is specific to the
-        system architecture.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">opencv Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/> and
-      <xref linkend="unzip"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="ffmpeg"/>,
-      <xref linkend="gst10-plugins-base"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="jasper"/>,
-      <xref linkend="libexif"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libtiff"/>,
-      <xref linkend="libwebp"/>,
-      <xref linkend="openjpeg2"/>,
-      <xref linkend="v4l-utils"/>, and
-      <xref linkend="xine-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="apache-ant"/>,
-      <xref linkend="doxygen"/>,
-      <xref linkend="java"/>,
-      <xref linkend="numpy"/>,
-      <xref linkend="protobuf"/>,
-      <ulink url="https://math-atlas.sourceforge.net/">ATLAS</ulink>,
-      <ulink url="https://www.netlib.org/blas/">blas</ulink>,
-      <ulink url="https://developer.nvidia.com/cuda-zone">Cuda</ulink>,
-      <ulink url="https://eigen.tuxfamily.org/">Eigen</ulink>,
-      <ulink url="https://www.openexr.com/">OpenEXR</ulink>,
-      <ulink url="https://www.gdal.org/">GDAL</ulink>,
-      <ulink url="https://www.netlib.org/lapack/">lapack</ulink>,
-      <ulink url="https://sourceforge.net/projects/libdc1394/">libdc1394</ulink>,
-<!--  <ulink url="https://www.numpy.org/">NumPy</ulink>, -->
-      <ulink url="https://github.com/oneapi-src/oneTBB">Threading Building Blocks (TBB)</ulink>, and
-      <ulink url="https://vtk.org/">VTK - The Visualization Toolkit</ulink>,
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of opencv</title>
-
-    <para>
-      If you downloaded the optional modules, unpack them now:
-    </para>
-
-<screen><userinput>tar -xf ../opencv_contrib-&opencv-contrib-version;.tar.gz</userinput></screen>
-
-    <para>
-      Install <application>opencv</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr      \
-      -DCMAKE_BUILD_TYPE=Release       \
-      -DENABLE_CXX11=ON                \
-      -DBUILD_PERF_TESTS=OFF           \
-      -DWITH_XINE=ON                   \
-      -DBUILD_TESTS=OFF                \
-      -DENABLE_PRECOMPILED_HEADERS=OFF \
-      -DCMAKE_SKIP_RPATH=ON            \
-      -DBUILD_WITH_DEBUG_INFO=OFF      \
-      -Wno-dev  ..                     &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      The package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DWITH_XINE=ON</parameter>: This option instructs the make
-      procedure to use <xref linkend="xine-lib"/>.
-    </para>
-
-    <para>
-      <parameter>-DENABLE_PRECOMPILED_HEADERS=OFF</parameter>: This option
-      is needed for compatibility with gcc-6.1 and later.
-    </para>
-
-    <para>
-      <option>-DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-&opencv-version;/modules</option>:
-      instructs the build system to build additional modules.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          opencv_annotation,
-          opencv_interactive-calibration,
-          opencv_model_diagnostics,
-          opencv_version,
-          opencv_visualisation, and
-          setup_vars_opencv4.sh
-        </seg>
-        <seg>
-          libopencv_calib3d.so,
-          libopencv_core.so,
-          libopencv_dnn.so,
-          libopencv_features2d.so,
-          libopencv_flann.so,
-          libopencv_gapi.so,
-          libopencv_highgui.so,
-          libopencv_imgcodecs.so,
-          libopencv_imgproc.so,
-          libopencv_ml.so,
-          libopencv_objdetect.so,
-          libopencv_photo.so,
-          libopencv_stitching.so,
-          libopencv_video.so, and
-          libopencv_videoio.so
-        </seg>
-        <seg>
-          /usr/include/opencv4,
-          /usr/lib/cmake/opencv4,
-          /usr/lib/python&python3-majorver;/site-packages/cv2,
-          /usr/share/licenses/opencv4,
-          /usr/share/opencv4, and
-          /usr/share/java/opencv4
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="opencv_annotation">
-        <term><command>opencv_annotation</command></term>
-        <listitem>
-          <para>
-            ???
-          </para>
-          <indexterm zone="opencv opencv_annotation">
-            <primary sortas="b-opencv">opencv_annotation</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
-  </sect2>
-
-</sect1>
Index: general/graphlib/openjpeg2.xml
===================================================================
--- general/graphlib/openjpeg2.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,194 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 openjpeg2-download-http "https://github.com/uclouvain/openjpeg/archive/v&openjpeg2-version;/openjpeg-&openjpeg2-version;.tar.gz">
-  <!ENTITY openjpeg2-download-ftp  " ">
-  <!ENTITY openjpeg2-md5sum        "f9ee64845881a15109ed0aa73a12202f">
-  <!ENTITY openjpeg2-size          "1.8 MB">
-  <!ENTITY openjpeg2-buildsize     "13 MB (add 1.7GB for tests)">
-  <!ENTITY openjpeg2-time          "0.2 SBU (add 0.8 SBU for tests)">
-]>
-
-<sect1 id="openjpeg2" xreflabel="OpenJPEG-&openjpeg2-version;">
-  <?dbhtml filename="openjpeg2.html"?>
-
-
-  <title>OpenJPEG-&openjpeg2-version;</title>
-
-  <indexterm zone="openjpeg2">
-    <primary sortas="a-openjpeg2">OpenJPEG</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to OpenJPEG</title>
-
-    <para>
-      <application>OpenJPEG</application> is an open-source implementation of
-      the JPEG-2000 standard. OpenJPEG fully respects the JPEG-2000
-      specifications and can compress/decompress lossless 16-bit images.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&openjpeg2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&openjpeg2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &openjpeg2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &openjpeg2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &openjpeg2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &openjpeg2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">OpenJPEG Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="git"/> (for tests),
-      <xref linkend="lcms2"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libtiff"/>, and
-      <xref linkend="doxygen"/> (to build the API documentation)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of OpenJPEG</title>
-
-    <para>
-      Install <application>OpenJPEG</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir -v build &amp;&amp;
-cd       build &amp;&amp;
-
-cmake -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DBUILD_STATIC_LIBS=OFF .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you wish to run the tests, some additional files are required. Download
-      these files and run the tests using the following commands, but note that
-      8 tests are known to fail:
-    </para>
-
-<screen remap="test"><userinput>git clone https://github.com/uclouvain/openjpeg-data.git --depth 1 &amp;&amp;
-OPJ_DATA_ROOT=$PWD/openjpeg-data cmake -DBUILD_TESTING=ON ..       &amp;&amp;
-make                                                               &amp;&amp;
-make test</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-cp -rv ../doc/man -T /usr/share/man</userinput></screen>
-
-  </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>-DBUILD_TESTING=ON</option>: This switch enables
-      building the test suite.
-    </para>
-
-  </sect2>-->
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>opj_compress, opj_decompress, and opj_dump</seg>
-        <seg>libopenjp2.so</seg>
-        <seg>/usr/include/openjpeg-&openjpeg2-majmin-version; and /usr/lib/openjpeg-&openjpeg2-majmin-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="opj_compress">
-        <term><command>opj_compress</command></term>
-        <listitem>
-          <para>
-            converts various image formats to the jpeg2000 format
-          </para>
-          <indexterm zone="openjpeg2 opj_compress">
-            <primary sortas="b-opj_compress">opj_compress</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="opj_decompress">
-        <term><command>opj_decompress</command></term>
-        <listitem>
-          <para>
-            converts jpeg2000 images to other image types
-          </para>
-          <indexterm zone="openjpeg2 opj_decompress">
-            <primary sortas="b-opj_decompress">opj_decompress</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="opj_dump">
-        <term><command>opj_dump</command></term>
-        <listitem>
-          <para>
-            reads in a jpeg2000 image and dumps the contents to stdout
-          </para>
-          <indexterm zone="openjpeg2 opj_dump">
-            <primary sortas="b-opj_dump">opj_dump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/graphlib/pixman.xml
===================================================================
--- general/graphlib/pixman.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,157 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 pixman-download-http "https://www.cairographics.org/releases/pixman-&pixman-version;.tar.gz">
-  <!ENTITY pixman-download-ftp  " ">
-  <!ENTITY pixman-md5sum        "21b18058dea39ad48f32d3199b8ffe40">
-  <!ENTITY pixman-size          "776 KB">
-  <!ENTITY pixman-buildsize     "27 MB (With tests)">
-  <!ENTITY pixman-time          "0.2 SBU (Using parallelism=4; with tests)">
-]>
-
-<sect1 id="pixman" xreflabel="Pixman-&pixman-version;">
-  <?dbhtml filename="pixman.html"?>
-
-
-  <title>Pixman-&pixman-version;</title>
-
-  <indexterm zone="pixman">
-    <primary sortas="a-Pixman">Pixman</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Pixman</title>
-
-    <para>
-      The <application>Pixman</application> package contains a library that
-      provides low-level pixel manipulation features such as image
-      compositing and trapezoid rasterization.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&pixman-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&pixman-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &pixman-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &pixman-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &pixman-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &pixman-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Pixman Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk2"/> and
-      <xref linkend="libpng"/> (for tests and demos)
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Pixman</title>
-
-    <para>
-      Install <application>Pixman</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libpixman-1.so
-        </seg>
-        <seg>
-          /usr/include/pixman-1
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libpixman">
-        <term><filename class="libraryfile">libpixman-1.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide low-level pixel manipulation
-            features
-          </para>
-          <indexterm zone="pixman libpixman">
-            <primary sortas="c-libpixman">libpixman-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/graphlib/poppler.xml
===================================================================
--- general/graphlib/poppler.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,542 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 poppler-download-http "https://poppler.freedesktop.org/poppler-&poppler-version;.tar.xz">
-  <!ENTITY poppler-download-ftp  " ">
-  <!ENTITY poppler-md5sum        "61ccc0892c0afe886ce31eae87bf8625">
-  <!ENTITY poppler-size          "1.8 MB">
-  <!ENTITY poppler-buildsize     "81 MB (with Qt6 library; add 13 MB for tests)">
-  <!ENTITY poppler-time          "0.9 SBU (with parallelism=4 and Qt5 library; add 2.7 SBU for tests)">
-  <!-- Time increase might be due to git.freedesktop.org -->
-
-  <!ENTITY poppler-data-version       "0.4.12">
-
-  <!ENTITY poppler-data-download-http "https://poppler.freedesktop.org/poppler-data-&poppler-data-version;.tar.gz">
-  <!ENTITY poppler-data-md5sum        "67ee4a40aa830b1f6e2560ce5f6471ba">
-  <!ENTITY poppler-data-size          "4.3 MB">
-  <!ENTITY poppler-data-buildsize     "26 MB">
-  <!ENTITY poppler-data-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="poppler" xreflabel="Poppler-&poppler-version;">
-  <?dbhtml filename="poppler.html"?>
-
-
-  <title>Poppler-&poppler-version;</title>
-
-  <indexterm zone="poppler">
-    <primary sortas="a-Poppler">Poppler</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Poppler</title>
-
-    <para>
-      The <application>Poppler</application> package contains a PDF rendering
-      library and command line tools used to manipulate PDF files. This is
-      useful for providing PDF rendering functionality as a shared library.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&poppler-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&poppler-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &poppler-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &poppler-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &poppler-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &poppler-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-
-    <itemizedlist spacing="compact">
-      <title>Poppler Encoding Data</title>
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&poppler-data-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &poppler-data-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &poppler-data-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &poppler-data-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &poppler-data-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para>
-      The additional package consists of encoding files for use with
-      <application>Poppler</application>. The encoding files are optional and
-      <application>Poppler</application> will automatically read them if they
-      are present. When installed, they enable
-      <application>Poppler</application> to render CJK and Cyrillic properly.
-    </para>
-
-    <bridgehead renderas="sect3">Poppler Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>,
-      <xref linkend="fontconfig"/>, and
-      &gobject-introspection;
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="boost"/>,
-      <xref linkend="cairo"/>,
-      <xref linkend="gpgme"/>,
-      <xref linkend="lcms2"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libtiff"/>,
-      <xref linkend="nss"/>,
-      <xref linkend="openjpeg2"/>, and
-      &qt5-deps;
-      (required for PDF support in <xref role="nodep" linkend="okular"/>)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="curl"/>,
-      <xref linkend="gdk-pixbuf"/>,
-      <xref linkend="git"/> (for downloading test files),
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="gtk3"/>, and
-      <xref linkend="qt6"/>
-      <!-- Nothing really uses this yet, but it will be used in KDE 6 -->
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Poppler</title>
-
-    <para>
-      Install <application>Poppler</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build                         &amp;&amp;
-cd    build                         &amp;&amp;
-
-cmake  -DCMAKE_BUILD_TYPE=Release   \
-       -DCMAKE_INSTALL_PREFIX=/usr  \
-       -DTESTDATADIR=$PWD/testfiles \
-       -DENABLE_QT6=OFF             \
-       -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \
-       ..                           &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      In order to run the test suite, some testcases are needed and can
-      be obtained only from a git repository. The command to download
-      them is:
-<command>git clone --depth 1 https://gitlab.freedesktop.org/poppler/test.git testfiles</command>.
-      Then issue: <command>LC_ALL=en_US.UTF-8 make test</command>.
-      One test, check_qt5_signature_basics, is known to fail.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      To install the documentation, run the following commands as
-      <systemitem class="username">root</systemitem>:
-    </para>
-
-<screen role="root"><userinput>install -v -m755 -d           /usr/share/doc/poppler-&poppler-version; &amp;&amp;
-cp -vr ../glib/reference/html /usr/share/doc/poppler-&poppler-version;</userinput></screen>
-
-<!-- ==== Poppler Data ====== -->
-    <bridgehead renderas="sect3">Poppler Data</bridgehead>
-
-    <para>
-      If you downloaded the additional encoding data package, install it by
-      issuing the following commands:
-    </para>
-
-<screen><userinput>tar -xf ../../poppler-data-&poppler-data-version;.tar.gz &amp;&amp;
-cd poppler-data-&poppler-data-version;</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make prefix=/usr install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used
-      to apply a higher level of compiler optimizations.
-    </para>
-
-    <para>
-      <parameter>-DTESTDATADIR=$PWD/testfiles</parameter>: Tells the test
-      programs where the auxiliary files are located.
-    </para>
-
-    <para>
-      <parameter>-DENABLE_QT6=OFF</parameter>: This switch is needed to
-      prevent an error when Qt6 is not installed. Remove it if you
-      have installed <xref linkend="qt6" role="nodep"/>.
-    </para>
-
-    <para>
-      <parameter>-DENABLE_UNSTABLE_API_ABI_HEADERS=ON</parameter>: Installs some old
-      <application>Xpdf</application> headers required by certain programs.
-      <!--(e.g. <application>Inkscape</application>).-->
-    </para>
-
-    <para>
-      <option>-DENABLE_GTK_DOC=ON</option>: Use this parameter if
-      GTK-Doc <!--and Pygments--> is installed and you wish to rebuild and
-      install the API documentation.
-    </para>
-
-    <para>
-      <option>-DENABLE_QT5=OFF</option>: Use this parameter if
-      &qt5-deps; is not installed. 
-    </para>
-
-    <para>
-      <option>-DENABLE_BOOST=OFF</option>: Use this parameter if you have
-      not installed <application>boost</application> (the Splash backend for
-      Qt5 recommends boost).
-    </para>
-
-    <para>
-      <option>-DENABLE_NSS3=OFF</option>: Use this parameter if you have
-      not installed <application>nss</application>.
-    </para>
-
-    <para>
-      <option>-DENABLE_GPGME=OFF</option>: Use this parameter if you have
-      not installed <application>gpgme</application>.
-    </para>
-
-    <para>
-      <option>-DENABLE_LIBTIFF=OFF</option>: Use this parameter if you have
-      not installed <application>libtiff</application>.
-    </para>
-
-    <para>
-      <command>LC_ALL=en_US.UTF-8 make test</command>: Runs the test suite.
-      The environment variable LC_ALL=en_US.UTF-8 is only needed if the
-      default locale does not include UTF-8.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          pdfattach, pdfdetach, pdffonts, pdfimages, pdfinfo, pdfseparate,
-          pdfsig, pdftocairo, pdftohtml, pdftoppm, pdftops, pdftotext, and
-          pdfunite
-        </seg>
-        <seg>
-          libpoppler.so,
-          libpoppler-cpp.so,
-          libpoppler-glib.so,
-          libpoppler-qt5.so, and
-          (optionally) libpoppler-qt6.so
-        </seg>
-        <seg>
-          /usr/include/poppler,
-          /usr/share/poppler, and
-          /usr/share/doc/poppler-&poppler-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pdfattach">
-        <term><command>pdfattach</command></term>
-        <listitem>
-          <para>
-            adds a new embedded file to an existing PDF file
-          </para>
-          <indexterm zone="poppler pdfattach">
-            <primary sortas="b-pdfattach">pdfattach</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdfdetach">
-        <term><command>pdfdetach</command></term>
-        <listitem>
-          <para>
-            lists or extracts embedded files from PDF files
-          </para>
-          <indexterm zone="poppler pdfdetach">
-            <primary sortas="b-pdfdetach">pdfdetach</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdffonts">
-        <term><command>pdffonts</command></term>
-        <listitem>
-          <para>
-            lists the fonts used in a PDF file along with various information
-            for each font
-          </para>
-          <indexterm zone="poppler pdffonts">
-            <primary sortas="b-pdffonts">pdffonts</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdfimages">
-        <term><command>pdfimages</command></term>
-        <listitem>
-          <para>
-            saves images from a PDF file as PPM, PBM, or JPEG files
-          </para>
-          <indexterm zone="poppler pdfimages">
-            <primary sortas="b-pdfimages">pdfimages</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdfinfo">
-        <term><command>pdfinfo</command></term>
-        <listitem>
-          <para>
-            prints the contents of the 'Info' dictionary (plus some other useful
-            information) from a PDF file
-          </para>
-          <indexterm zone="poppler pdfinfo">
-            <primary sortas="b-pdfinfo">pdfinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdfseparate">
-        <term><command>pdfseparate</command></term>
-        <listitem>
-          <para>
-            extracts single pages from a PDF file
-          </para>
-          <indexterm zone="poppler pdfseparate">
-            <primary sortas="b-pdseparate">pdfseparate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdfsig">
-        <term><command>pdfsig</command></term>
-        <listitem>
-          <para>
-            verifies the digital signatures in a PDF document
-          </para>
-          <indexterm zone="poppler pdfsig">
-            <primary sortas="b-pdseparate">pdfsig</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdftocairo">
-        <term><command>pdftocairo</command></term>
-        <listitem>
-          <para>
-            converts a PDF file to one of several formats (PNG, JPEG, PDF, PS,
-            EPS, SVG) using the cairo output device of the poppler library
-          </para>
-          <indexterm zone="poppler pdftocairo">
-            <primary sortas="b-pdftocairo">pdftocairo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdftohtml">
-        <term><command>pdftohtml</command></term>
-        <listitem>
-          <para>
-            converts a PDF file to HTML
-          </para>
-          <indexterm zone="poppler pdftohtml">
-            <primary sortas="b-pdftohtml">pdftohtml</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdftoppm">
-        <term><command>pdftoppm</command></term>
-        <listitem>
-          <para>
-            converts PDF files to PBM, PGM and PPM formats
-          </para>
-          <indexterm zone="poppler pdftoppm">
-            <primary sortas="b-pdftoppm">pdftoppm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdftops">
-        <term><command>pdftops</command></term>
-        <listitem>
-          <para>
-            converts PDF files to Postscript format
-          </para>
-          <indexterm zone="poppler pdftops">
-            <primary sortas="b-pdftops">pdftops</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdftotext">
-        <term><command>pdftotext</command></term>
-        <listitem>
-          <para>
-            converts PDF files to plain text
-          </para>
-          <indexterm zone="poppler pdftotext">
-            <primary sortas="b-pdftotext">pdftotext</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdfunite">
-        <term><command>pdfunite</command></term>
-        <listitem>
-          <para>
-            merges several PDF files, in the order of their occurrence on the
-            command line, to one PDF output file
-          </para>
-          <indexterm zone="poppler pdfunite">
-            <primary sortas="b-pdfunite">pdfunite</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpoppler">
-        <term><filename class="libraryfile">libpoppler.so</filename></term>
-        <listitem>
-          <para>
-            contains the API functions to render PDF files
-          </para>
-          <indexterm zone="poppler libpoppler">
-            <primary sortas="c-libpoppler">libpoppler.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpoppler-cpp">
-        <term><filename class="libraryfile">libpoppler-cpp.so</filename></term>
-        <listitem>
-          <para>
-            is a C++ backend for rendering PDF files
-          </para>
-          <indexterm zone="poppler libpoppler-cpp">
-            <primary sortas="c-libpoppler-cpp">libpoppler-cpp.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpoppler-glib">
-        <term><filename class="libraryfile">libpoppler-glib.so</filename></term>
-        <listitem>
-          <para>
-            is a wrapper library used to interface the PDF rendering functions
-            with <application>GTK+</application>
-          </para>
-          <indexterm zone="poppler libpoppler-glib">
-            <primary sortas="c-libpoppler-glib">libpoppler-glib.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpoppler-qt5">
-        <term><filename class="libraryfile">libpoppler-qt5.so</filename></term>
-        <listitem>
-          <para>
-            is a wrapper library used to interface the PDF rendering functions
-            with <application>Qt</application>5
-          </para>
-          <indexterm zone="poppler libpoppler-qt5">
-            <primary sortas="c-libpoppler-qt5">libpoppler-qt5.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpoppler-qt6">
-        <term><filename class="libraryfile">libpoppler-qt6.so</filename></term>
-        <listitem>
-          <para>
-            is a wrapper library used to interface the PDF rendering functions
-            with <application>Qt</application>6
-          </para>
-          <indexterm zone="poppler libpoppler-qt6">
-            <primary sortas="c-libpoppler-qt6">libpoppler-qt6.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/graphlib/potrace.xml
===================================================================
--- general/graphlib/potrace.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,195 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 potrace-download-http "&sourceforge-dl;/potrace/potrace-&potrace-version;.tar.gz">
-  <!ENTITY potrace-download-ftp  " ">
-  <!ENTITY potrace-md5sum        "5f0bd87ddd9a620b0c4e65652ef93d69">
-  <!ENTITY potrace-size          "644 KB">
-  <!ENTITY potrace-buildsize     "7.1 MB (including tests)">
-  <!ENTITY potrace-time          "less than 0.1 SBU (including tests)">
-]>
-
-<sect1 id="potrace" xreflabel="Potrace-&potrace-version;">
-  <?dbhtml filename="potrace.html"?>
-
-
-  <title>Potrace-&potrace-version;</title>
-
-  <indexterm zone="potrace">
-    <primary sortas="a-Potrace">Potrace</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Potrace</title>
-
-    <para>
-      <!-- summarized from the home page, where Potrace(TM) is used -->
-      <application>Potrace™</application> is a tool for transforming a bitmap
-      (PBM, PGM, PPM, or BMP format) into one of several vector file formats.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&potrace-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&potrace-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &potrace-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &potrace-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &potrace-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &potrace-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Potrace Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="llvm"/> (including <command>clang</command>)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Potrace</title>
-
-    <para>
-      Install <application>Potrace</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr                        \
-            --disable-static                     \
-            --docdir=/usr/share/doc/potrace-&potrace-version; \
-            --enable-a4                          \
-            --enable-metric                      \
-            --with-libpotrace                    &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To run the test suite, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-a4</parameter>: Use A4 as the default paper size.
-    </para>
-
-    <para>
-      <!-- american spelling as in the configure script -->
-      <parameter>--enable-metric</parameter>: Use metric units (centimeters)
-      as default
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <parameter>--with-libpotrace</parameter>: Install the library and headers.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          mkbitmap, potrace
-        </seg>
-        <seg>
-          libpotrace.so
-        </seg>
-        <seg>
-          /usr/share/doc/potrace-&potrace-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mkbitmap">
-        <term><command>mkbitmap</command></term>
-        <listitem>
-          <para>
-            transforms images into bitmaps with scaling and filtering
-          </para>
-          <indexterm zone="potrace mkbitmap">
-            <primary sortas="b-mkbitmap">mkbitmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="potrace-prog">
-        <term><command>potrace</command></term>
-        <listitem>
-          <para>
-            transforms bitmaps into vector graphics
-          </para>
-          <indexterm zone="potrace potrace-prog">
-            <primary sortas="b-potrace-prog">potrace</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpotrace">
-        <term><filename class="libraryfile">libpotrace.so</filename></term>
-        <listitem>
-          <para>
-            is a library for transforming bitmaps into vector graphics
-          </para>
-          <indexterm zone="potrace libpotrace">
-            <primary sortas="c-libpotrace">libpotrace.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/graphlib/qpdf.xml
===================================================================
--- general/graphlib/qpdf.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,208 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 qpdf-download-http "https://github.com/qpdf/qpdf/releases/download/v&qpdf-version;/qpdf-&qpdf-version;.tar.gz">
-  <!ENTITY qpdf-download-ftp  " ">
-  <!ENTITY qpdf-md5sum        "479befd15a61516ef3b2634f63ec684a">
-  <!ENTITY qpdf-size          "18 MB">
-  <!ENTITY qpdf-buildsize     "263 MB (add 1 MB for tests)">
-  <!ENTITY qpdf-time          "0.5 SBU (using parallelism=4; add 0.5 SBU for tests)">
-]>
-
-<sect1 id="qpdf" xreflabel="Qpdf-&qpdf-version;">
-  <?dbhtml filename="qpdf.html"?>
-
-
-  <title>Qpdf-&qpdf-version;</title>
-
-  <indexterm zone="qpdf">
-    <primary sortas="a-Qpdf">Qpdf</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Qpdf</title>
-
-    <para>
-      The <application>Qpdf</application> package contains command-line
-      programs and a library that does structural, content-preserving
-      transformations on PDF files.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qpdf-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qpdf-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qpdf-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qpdf-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &qpdf-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qpdf-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Qpdf Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libjpeg"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gs"/>,
-      <xref linkend="gnutls"/>,
-      <xref linkend="libtiff"/>,
-      <xref linkend="sphinx"/> with <xref linkend="sphinx_rtd_theme"/>, and
-      <xref linkend="texlive"/> or <xref linkend="tl-installer"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Qpdf</title>
-
-    <para>
-      Install <application>Qpdf</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      -DBUILD_STATIC_LIBS=OFF     \
-      -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/qpdf-&qpdf-version; \
-      .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ctest</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
--->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          fix-qdf, qpdf, and zlib-flate
-        </seg>
-        <seg>
-          libqpdf.so
-        </seg>
-        <seg>
-          /usr/lib/cmake/qpdf,
-          /usr/include/qpdf, and
-          /usr/share/doc/qpdf-&qpdf-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="fix-qdf">
-        <term><command>fix-qdf</command></term>
-        <listitem>
-          <para>
-            is used to repair PDF files in QDF form after
-            editing
-          </para>
-          <indexterm zone="qpdf fix-qdf">
-            <primary sortas="b-fix-qdf">fix-qdf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qpdf-prog">
-        <term><command>qpdf</command></term>
-        <listitem>
-          <para>
-            is used to convert one PDF file to another equivalent
-            PDF file
-          </para>
-          <indexterm zone="qpdf qpdf-prog">
-            <primary sortas="b-qpdf">qpdf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zlib-flate">
-        <term><command>zlib-flate</command></term>
-        <listitem>
-          <para>
-            is a raw zlib compression program
-          </para>
-          <indexterm zone="qpdf zlib-flate">
-            <primary sortas="b-qpdf">zlib-flate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libqpdf">
-        <term><filename class="libraryfile">libqpdf.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Qpdf</application> API functions
-          </para>
-          <indexterm zone="qpdf libqpdf">
-            <primary sortas="c-libqpdf">libqpdf.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/graphlib/qrencode.xml
===================================================================
--- general/graphlib/qrencode.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,196 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 qrencode-download-http "https://fukuchi.org/works/qrencode/qrencode-&qrencode-version;.tar.bz2">
-  <!ENTITY qrencode-download-ftp  " ">
-  <!ENTITY qrencode-md5sum        "de7185bcab635a34730e1b73d4efa705">
-  <!ENTITY qrencode-size          "451 KB">
-  <!ENTITY qrencode-buildsize     "5.0 MB (with documentation, add 5 MB for tests)">
-  <!ENTITY qrencode-time          "less than 0.1 SBU, add 0.1 SBU for tests">
-]>
-
-<sect1 id="qrencode" xreflabel="qrencode-&qrencode-version;">
-  <?dbhtml filename="qrencode.html"?>
-
-
-  <title>qrencode-&qrencode-version;</title>
-
-  <indexterm zone="qrencode">
-    <primary sortas="a-libqrencode">libqrencode</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to qrencode</title>
-
-    <para>
-      <application>Qrencode</application> is a fast and compact library
-      for encoding data in a QR Code symbol, a 2D symbology that can be
-      scanned by handheld terminals such as a mobile phone with a CCD sensor.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qrencode-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qrencode-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qrencode-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qrencode-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &qrencode-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qrencode-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Qrencode Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libpng"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> for generating documentation, and
-      <xref linkend="sdl2"/> for tests
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of qrencode</title>
-
-    <para>
-      Install <application>libqrencode</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have installed <xref linkend="doxygen"/>, you can build
-      the documentation by issuing:
-    </para>
-
-<screen remap="doc"><userinput>doxygen</userinput></screen>
-
-    <para>
-      The tests must be run after installing the package.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you have built the optional documentation, install it as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -vdm 755 /usr/share/doc/qrencode-&qrencode-version; &amp;&amp;
-mv html/* /usr/share/doc/qrencode-&qrencode-version;</userinput></screen>
-
-    <para>
-      To test the results, if you have passed the <option>--with-tests</option>
-      option to <command>configure</command>, issue:
-      <command>make check</command>.
-    </para>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--with-tests</option>: This option allows building the test
-      programs. It requires <xref linkend="sdl2"/>.
-    </para>
-
-    <para>
-      <option>--without-tools</option>: This option prevents building the
-      <command>qrencode</command> executable, removing the need for
-      <xref linkend="libpng"/>.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          qrencode
-        </seg>
-        <seg>
-          libqrencode.so
-        </seg>
-        <seg>
-          /usr/share/doc/qrencode-&qrencode-version; (optional)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="qrencode-prog">
-        <term><command>qrencode</command></term>
-        <listitem>
-          <para>
-            encodes input data in a QR Code and saves it as a PNG or EPS image
-          </para>
-          <indexterm zone="qrencode qrencode-prog">
-            <primary sortas="b-qrencode">qrencode</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libqrencode">
-        <term><filename class="libraryfile">libqrencode.so</filename></term>
-        <listitem>
-          <para>
-            contains functions for encoding data in a QR code symbol
-          </para>
-          <indexterm zone="qrencode libqrencode">
-            <primary sortas="c-libqrencode">libqrencode.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/graphlib/sassc.xml
===================================================================
--- general/graphlib/sassc.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,202 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 sassc-download-http
-           "https://github.com/sass/sassc/archive/&sassc-version;/sassc-&sassc-version;.tar.gz">
-  <!ENTITY sassc-download-ftp  " ">
-  <!ENTITY sassc-md5sum        "4c3b06ce2979f2a9f0a35093e501d8bb">
-  <!ENTITY sassc-size          "28 KB">
-  <!ENTITY sassc-buildsize     "5.1 MB">
-  <!ENTITY sassc-time          "less than 0.1 SBU">
-
-  <!ENTITY libsass-download-http
-           "https://github.com/sass/libsass/archive/&libsass-version;/libsass-&libsass-version;.tar.gz">
-  <!ENTITY libsass-download-ftp  " ">
-  <!ENTITY libsass-md5sum        "afda97284d75a030cabadf5b9f998a3b">
-  <!ENTITY libsass-size          "336 KB">
-  <!ENTITY libsass-buildsize     "135 MB">
-  <!ENTITY libsass-time          "0.4 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="sassc" xreflabel="sassc-&sassc-version;">
-  <?dbhtml filename="sassc.html"?>
-
-
-  <title>sassc-&sassc-version;</title>
-
-  <indexterm zone="sassc">
-    <primary sortas="a-sassc">sassc</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to sassc</title>
-
-    <para>
-      SassC is a wrapper around libsass, a CSS pre-processor language.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&sassc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&sassc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &sassc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &sassc-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &sassc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &sassc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libsass-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libsass-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libsass-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libsass-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libsass-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libsass-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of sassc</title>
-
-    <para>
-      First, build the library:
-    </para>
-
-<screen><userinput>tar -xf ../libsass-&libsass-version;.tar.gz &amp;&amp;
-pushd libsass-&libsass-version; &amp;&amp;
-
-autoreconf -fi &amp;&amp;
-
-./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      Build the command line wrapper:
-    </para>
-
-<screen><userinput>popd &amp;&amp;
-autoreconf -fi &amp;&amp;
-
-./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          sassc
-        </seg>
-       <seg>
-          libsass.so
-        </seg>
-        <seg>
-          /usr/include/sass
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="sassc-prog">
-        <term><command>sassc</command></term>
-        <listitem>
-          <para>
-            provides a command line interface to the libsass library
-          </para>
-          <indexterm zone="sassc sassc-prog">
-            <primary sortas="b-sassc">sassc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/graphlib/webp-pixbuf-loader.xml
===================================================================
--- general/graphlib/webp-pixbuf-loader.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,162 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 webp-pixbuf-loader-download-http "https://github.com/aruiz/webp-pixbuf-loader/archive/&webp-pixbuf-loader-version;/webp-pixbuf-loader-&webp-pixbuf-loader-version;.tar.gz">
-  <!ENTITY webp-pixbuf-loader-download-ftp  " ">
-  <!ENTITY webp-pixbuf-loader-md5sum        "e97025dc70178877dbd041776f151947">
-  <!ENTITY webp-pixbuf-loader-size          "8.8 MB">
-  <!ENTITY webp-pixbuf-loader-buildsize     "9.7 MB">
-  <!ENTITY webp-pixbuf-loader-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="webp-pixbuf-loader" xreflabel="webp-pixbuf-loader-&webp-pixbuf-loader-version;">
-  <?dbhtml filename="webp-pixbuf-loader.html"?>
-
-  <title>webp-pixbuf-loader-&webp-pixbuf-loader-version;</title>
-
-  <indexterm zone="webp-pixbuf-loader">
-    <primary sortas="a-webp-pixbuf-loader">webp-pixbuf-loader</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to webp-pixbuf-loader</title>
-
-    <para>
-      The <application>webp-pixbuf-loader</application> package contains a
-      library that allows gdk-pixbuf to load and process webp images.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&webp-pixbuf-loader-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&webp-pixbuf-loader-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &webp-pixbuf-loader-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &webp-pixbuf-loader-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &webp-pixbuf-loader-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &webp-pixbuf-loader-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">webp-pixbuf-loader Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gdk-pixbuf"/> and
-      <xref linkend="libwebp"/>
-    </para>
-
-  </sect2>
-  
-  <sect2 role="installation">
-    <title>Installation of webp-pixbuf-loader</title>
-
-    <para>
-      Install <application>webp-pixbuf-loader</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para>
-      The webp format needs to be added to the loaders cache:
-    </para>
-
-<screen role="root"><userinput>gdk-pixbuf-query-loaders --update-cache</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <command>gdk-pixbuf-query-loaders --update-cache</command>: This command
-      updates the gdk-pixbuf loader cache so that it knows the webp loader has
-      been installed.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libpixbufloader-webp.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libpixbufloader-webp">
-        <term><filename class="libraryfile">libpixbufloader-webp.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that allow gdk-pixbuf to load webp images
-          </para>
-          <indexterm zone="webp-pixbuf-loader libpixbufloader-webp">
-            <primary sortas="c-libpixbufloader-webp">libpixbufloader-webp.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: general/graphlib/woff2.xml
===================================================================
--- general/graphlib/woff2.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,185 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 woff2-download-http "https://github.com/google/woff2/archive/v&woff2-version;/woff2-&woff2-version;.tar.gz">
-  <!ENTITY woff2-download-ftp  " ">
-  <!ENTITY woff2-md5sum        "793c8844845351cb80730a74937e411b">
-  <!ENTITY woff2-size          "39 KB">
-  <!ENTITY woff2-buildsize     "1.6 MB">
-  <!ENTITY woff2-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="woff2" xreflabel="WOFF2-&woff2-version;">
-  <?dbhtml filename="woff2.html"?>
-
-
-  <title>woff2-&woff2-version;</title>
-
-  <indexterm zone="woff2">
-    <primary sortas="a-woff2">woff2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to WOFF2</title>
-
-    <para>
-      <application>WOFF2</application> is a library for converting fonts from
-      the TTF format to the WOFF 2.0 format. It also allows decompression from
-      WOFF 2.0 to TTF. The WOFF 2.0 format uses the Brotli compression algorithm
-      to compress fonts suitable for downloading in CSS @font-face rules.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&woff2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&woff2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &woff2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &woff2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &woff2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &woff2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <note>
-      <para>
-        The <application>WOFF2</application> source tarball shown above
-        downloads with the correct name, woff2-&woff2-version;.tar.gz,
-        if using a browser such as Firefox. If you prefer to use a command line
-        program such as wget, you normally would obtain
-        v&woff2-version;.tar.gz. To obtain this package with the proper
-        filename, run:
-
-<screen><userinput>wget -c https://github.com/google/woff2/v&brotli-version;.tar.gz \
-     -O woff2-&woff2-version;.tar.gz</userinput></screen>.
-      </para>
-    </note>
--->
-    <bridgehead renderas="sect3">WOFF2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="brotli"/> and
-      <xref linkend="cmake"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of WOFF2</title>
-
-    <para>
-      Install <application>WOFF2</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir out                           &amp;&amp;
-cd    out                           &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libwoff2common.so, libwoff2dec.so and libwoff2enc.so
-        </seg>
-        <seg>
-          /usr/include/woff2
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libwoff2common">
-        <term><filename class="libraryfile">libwoff2common.so</filename></term>
-        <listitem>
-          <para>
-            provides shared data used by the libwoff2dec and libwoff2enc libraries
-          </para>
-          <indexterm zone="woff2 libwoff2common">
-            <primary sortas="c-libwoff2common">libwoff2common.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwoff2dec">
-        <term><filename class="libraryfile">libwoff2dec.so</filename></term>
-        <listitem>
-          <para>
-            is the WOFF2 decoder library
-          </para>
-          <indexterm zone="woff2 libwoff2dec">
-            <primary sortas="c-libwoff2dec">libwoff2dec.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwoff2enc">
-        <term><filename class="libraryfile">libwoff2enc.so</filename></term>
-        <listitem>
-          <para>
-            is the WOFF2 encoder library
-          </para>
-          <indexterm zone="woff2 libwoff2enc">
-            <primary sortas="c-libwoff2common">libwoff2enc.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/prog/apache-ant.xml
===================================================================
--- general/prog/apache-ant.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,360 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY apache-ant-download-http "https://archive.apache.org/dist/ant/source/apache-ant-&apache-ant-version;-src.tar.xz">
-  <!ENTITY apache-ant-download-ftp  " ">
-  <!ENTITY apache-ant-md5sum        "055843219f487edb3a6db554ad1355ef">
-  <!ENTITY apache-ant-size          "3.6 MB">
-  <!ENTITY apache-ant-buildsize     "195 MB">
-  <!ENTITY apache-ant-time          "0.3 SBU (excluding download time)">
-]>
-
-<sect1 id="apache-ant" xreflabel="apache-ant-&apache-ant-version;">
-  <?dbhtml filename="apache-ant.html"?>
-
-
-  <title>apache-ant-&apache-ant-version;</title>
-
-  <indexterm zone="apache-ant">
-   <primary sortas="a-Apache-Ant">Apache Ant</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Apache Ant</title>
-
-    <para>
-      The <application>Apache Ant</application> package is a
-      <application>Java</application>-based build tool. In theory, it is
-      like the <command>make</command> command, but without
-      <command>make</command>'s wrinkles. <application>Ant</application> is
-      different. Instead of a model that is extended with shell-based commands,
-      <application>Ant</application> is extended using
-      <application>Java</application> classes. Instead of writing shell
-      commands, the configuration files are XML-based, calling out a target
-      tree that executes various tasks. Each task is run by an object that
-      implements a particular task interface.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&apache-ant-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&apache-ant-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &apache-ant-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &apache-ant-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &apache-ant-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &apache-ant-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required file: <ulink
-             url="https://repository.jboss.org/nexus/content/repositories/thirdparty-releases/javax/media/jai-core/1.1.3/jai-core-1.1.3.jar"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Required file: <ulink
-             url="https://repository.jboss.org/nexus/content/repositories/thirdparty-releases/com/sun/media/jai-codec/1.1.3/jai-codec-1.1.3.jar"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Required file: <ulink
-             url="http://central.maven.org/maven2/org/tukaani/xz/1.0/xz-1.0.jar"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Required file: <ulink
-             url="http://www.netrexx.org/files/NetRexx-3.06-GA.zip"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Apache Ant Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      A JDK (<xref linkend="java-bin"/> or <xref linkend="openjdk"/>) and
-      <xref linkend="glib2"/>
-    </para>
-
-    &build-use-internet;
-
-<!--    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="junit"/>
-    </para>
--->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Apache Ant</title>
-
-    <para>
-      Build a limited bootstrap version of <application>Apache
-      Ant</application> using the following command:
-    </para>
-
-<screen><userinput>./bootstrap.sh</userinput></screen>
-
-<!-- No longer needed in 1.10.14.
-    <para>
-      Now fix a problem when the next command tries to download a file from
-      a problem site:
-    </para>
-
-<screen><userinput>sed -e 's|ftp.software.ibm.com|anduin.linuxfromscratch.org|' \
-    -e 's|software/awdtools/netrexx|BLFS/apache-ant|'        \
-    -i fetch.xml </userinput></screen>
--->
-
-    <para>
-      Download the runtime dependencies using the
-      <filename>fetch.xml</filename> ant build script:
-    </para>
-
-<screen><userinput>bootstrap/bin/ant -f fetch.xml -Ddest=optional</userinput></screen>
-
-    <para>
-      Build <application>Apache Ant</application> by running the following
-      command:
-    </para>
-
-<screen><userinput>./build.sh -Ddist.dir=$PWD/ant-&apache-ant-version; dist</userinput></screen>
-
-    <para>
-      Install, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cp -rv ant-&apache-ant-version; /opt/            &amp;&amp;
-chown -R root:root /opt/ant-&apache-ant-version; &amp;&amp;
-ln -sfv ant-&apache-ant-version; /opt/ant</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>bootstrap/bin/ant -f fetch.xml -Ddest=optional</command>:
-      Downloads the missing dependencies to the user's home directory, and
-      copies them into the source tree (in the <filename>lib/optional</filename>
-      directory, where <command>ant</command> picks them up at build time).
-    </para>
-
-    <para>
-      <command>./build.sh -Ddist.dir=$PWD/ant-&apache-ant-version;
-      dist</command>: This command builds, tests, then installs the package
-      into a temporary directory.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Apache Ant</title>
-
-    <sect3 id="apache-ant-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/ant/ant.conf</filename>,
-        <filename>~/.ant/ant.conf</filename>, and
-        <filename>~/.antrc</filename>
-      </para>
-
-      <indexterm zone="apache-ant apache-ant-config">
-        <primary sortas="e-AA.ant-ant.conf">~/.ant/ant.conf</primary>
-      </indexterm>
-
-      <indexterm zone="apache-ant apache-ant-config">
-        <primary sortas="e-AA.antrc">~/.antrc</primary>
-      </indexterm>
-
-      <indexterm zone="apache-ant apache-ant-config">
-        <primary sortas="e-etc-ant-ant.conf">/etc/ant/ant.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Some packages will require <command>ant</command> to be in the
-        search path and the <envar>ANT_HOME</envar> environment variable
-        defined. Satisfy these requirements by issuing, as the <systemitem
-        class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/ant.sh &lt;&lt; EOF
-<literal># Begin /etc/profile.d/ant.sh
-
-pathappend /opt/ant/bin
-export ANT_HOME=/opt/ant
-
-# End /etc/profile.d/ant.sh</literal>
-EOF</userinput></screen>
-
-      <para>
-        The above instructions assume you have configured your system as
-        described in <xref linkend="postlfs-config-profile"/>.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          ant, antRun, antRun.pl, complete-ant-cmd.pl, runant.pl, and runant.py         </seg>
-        <seg>
-          Numerous <filename>ant*.jar</filename>  and dependent libraries in
-          <envar>$ANT_HOME</envar><filename>/lib</filename>
-        </seg>
-        <seg>/opt/ant-&apache-ant-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ant">
-        <term><command>ant</command></term>
-        <listitem>
-          <para>
-            is a <application>Java</application> based build tool used by
-            many packages instead of the conventional <command>make</command>
-            program
-          </para>
-          <indexterm zone="apache-ant ant">
-            <primary sortas="b-ant">ant</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="antRun">
-        <term><command>antRun</command></term>
-        <listitem>
-          <para>
-            is a support script used to start <command>ant</command>
-            build scripts in a given directory
-          </para>
-          <indexterm zone="apache-ant antRun">
-            <primary sortas="b-antRun">antRun</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="antRun.pl">
-        <term><command>antRun.pl</command></term>
-        <listitem>
-          <para>
-            is a <application>Perl</application> script that provides similar
-            functionality offered by the <command>antRun</command> script
-          </para>
-          <indexterm zone="apache-ant antRun.pl">
-            <primary sortas="b-antRun.pl">antRun.pl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="complete-ant-cmd.pl">
-        <term><command>complete-ant-cmd.pl</command></term>
-        <listitem>
-          <para>
-            is a <application>Perl</application> script that allows
-            <application>Bash</application> to complete an
-            <command>ant</command> command-line
-          </para>
-          <indexterm zone="apache-ant complete-ant-cmd.pl">
-            <primary sortas="b-complete-ant-cmd.pl">complete-ant-cmd.pl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="runant.pl">
-        <term><command>runant.pl</command></term>
-        <listitem>
-          <para>
-            is a <application>Perl</application> wrapper script used to
-            invoke <command>ant</command>
-          </para>
-          <indexterm zone="apache-ant runant.pl">
-            <primary sortas="b-runant.pl">runant.pl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="runant.py">
-        <term><command>runant.py</command></term>
-        <listitem>
-          <para>
-            is a <application>Python</application> wrapper script used to
-            invoke <command>ant</command>
-          </para>
-          <indexterm zone="apache-ant runant.py">
-            <primary sortas="b-runant.py">runant.py</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ant-star">
-        <term><filename class="libraryfile">ant*.jar</filename></term>
-        <listitem>
-          <para>
-            files are the <application>Apache Ant</application>
-            <application>Java</application> class libraries
-          </para>
-          <indexterm zone="apache-ant ant-star">
-            <primary sortas="c-ant-star">ant-*.jar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/prog/cbindgen.xml
===================================================================
--- general/prog/cbindgen.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,144 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 cbindgen-download-http "https://github.com/mozilla/cbindgen/archive/v&cbindgen-version;/cbindgen-&cbindgen-version;.tar.gz">
-  <!ENTITY cbindgen-download-ftp  " ">
-  <!ENTITY cbindgen-md5sum        "f3ef70691bc4743b8f76ca6d27847ba4">
-  <!ENTITY cbindgen-size          "216 KB">
-  <!ENTITY cbindgen-buildsize     "121 MB (add 600 MB for tests)">
-  <!ENTITY cbindgen-time          "0.5 SBU (add 0.4 SBU for tests), both on a 4-core machine">
-]>
-
-<sect1 id="cbindgen" xreflabel="Cbindgen-&cbindgen-version;">
-  <?dbhtml filename="cbindgen.html"?>
-
-
-  <title>Cbindgen-&cbindgen-version;</title>
-
-  <indexterm zone="cbindgen">
-    <primary sortas="a-cbindgen">cbindgen</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Cbindgen</title>
-
-    <para>
-      <application>Cbindgen</application> can be used to generate C bindings for
-      <application>Rust</application> code.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&cbindgen-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&cbindgen-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cbindgen-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cbindgen-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &cbindgen-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &cbindgen-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">cbindgen Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="rust"/>
-    </para>
-
-    &build-use-internet;
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of cbindgen</title>
-    <para>
-      Install <application>cbindgen</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>cargo build --release</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>cargo test --release</command>.
-      Three tests in <filename>profile.rs</filename> are known to fail.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -Dm755 target/release/cbindgen /usr/bin/</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          cbindgen
-        </seg>
-        <seg>
-          none
-        </seg>
-        <seg>
-          none
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cbindgen-prog">
-        <term><command>cbindgen</command></term>
-        <listitem>
-          <para>
-            generates C bindings for <application>Rust</application> code
-          </para>
-          <indexterm zone="cbindgen cbindgen-prog">
-            <primary sortas="b-cbindgen">cbindgen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/prog/clisp.xml
===================================================================
--- general/prog/clisp.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,245 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 clisp-download-http "&gnu-http;/clisp/latest/clisp-&clisp-version;.tar.bz2">
-  <!ENTITY clisp-download-ftp  " ">
-  <!ENTITY clisp-md5sum        "1962b99d5e530390ec3829236d168649">
-  <!ENTITY clisp-size          "7.8 MB">
-  <!ENTITY clisp-buildsize     "163 MB (add 8 MB for tests)">
-  <!ENTITY clisp-time          "0.9 SBU (1.2 SBU with tests)">
-]>
-
-<sect1 id="clisp" xreflabel="Clisp-&clisp-version;">
-  <?dbhtml filename="clisp.html"?>
-
-
-  <title>Clisp-&clisp-version;</title>
-
-  <indexterm zone="clisp">
-    <primary sortas="a-Clisp">Clisp</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Clisp</title>
-
-    <para>
-      <application>GNU Clisp</application> is a Common Lisp implementation
-      which includes an interpreter, compiler, debugger, and many extensions.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&clisp-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&clisp-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &clisp-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &clisp-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &clisp-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &clisp-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Optional patch: <ulink
-          url="&patch-root;/clisp-&clisp-version;-readline7_fixes-1.patch"/>
-          (required if building against libffcall)
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Clisp Dependencies</bridgehead>
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libsigsegv"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libnsl"/> and
-      <ulink url="https://www.gnu.org/software/libffcall/">libffcall</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Clisp</title>
-
-    <note>
-      <para>
-        This package does not support parallel build.
-      </para>
-    </note>
-
-    <para>
-      If you are building on a 32-bit system, work around a bug in GCC caused
-      by the latest version of binutils:
-    </para>
-
-<screen><userinput remap="pre">case $(uname -m) in
-    i?86) export CFLAGS="${CFLAGS:--O2 -g} -falign-functions=4" ;;
-esac</userinput></screen>
-
-    <para>
-      Remove two tests, which fail for unknown reasons:
-    </para>
-
-<screen><userinput>sed -i -e '/socket/d' -e '/"streams"/d' tests/tests.lisp</userinput></screen>
-
-    <para>
-      Install <application>Clisp</application> by running the following
-      commands:
-    </para>
-
-    <para>
-      If you are building <application>clisp</application> against
-      <application>libffcall</application>, apply the patch to fix a build failure
-      with current <application>readline</application>:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../clisp-&clisp-version;-readline7_fixes-1.patch</userinput></screen>
-
-    <para>
-      Install <application>Clisp</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-../configure --srcdir=../                       \
-             --prefix=/usr                      \
-             --docdir=/usr/share/doc/clisp-&clisp-version; \
-             --with-libsigsegv-prefix=/usr &amp;&amp;
-
-ulimit -s 16384 &amp;&amp;
-make -j1</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>ulimit -s 16384</command>: this increases the maximum stack
-      size, as recommended by the <command>configure</command>.
-    </para>
-
-    <para>
-      <command>--docdir=/usr/share/doc/clisp-&clisp-version;</command>:
-      this ensures the html documentation will go into a versioned directory
-      instead of straight into <filename
-      class="directory">/usr/share/html/</filename>.
-    </para>
-
-    <para>
-      <command>--with-libsigsegv-prefix=/usr</command>: use this to tell
-      <command>configure</command> that you have installed
-      <package>libsigsegv</package> in /usr, otherwise it will not be
-      found.
-    </para>
-
-    <para>
-      <option>--with-libffcall-prefix=/usr</option>: use this to tell
-      <command>configure</command> that you have installed the optional
-      <package>libffcall</package> in /usr, otherwise like
-      <package>libsigsegv</package> it will not be found.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          clisp, clisp-link
-        </seg>
-        <seg>
-          various static libraries in
-          <filename class="directory">/usr/lib/clisp-&clisp-version;/base/</filename>
-        </seg>
-        <seg>
-          /usr/lib/clisp-&clisp-version;
-          /usr/share/doc/clisp-&clisp-version;
-          /usr/share/emacs/site-lisp;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="clisp-prog">
-        <term><command>clisp</command></term>
-        <listitem>
-          <para>
-            is an ANSI Common Lisp compiler, interpreter, and debugger
-          </para>
-          <indexterm zone="clisp clisp-prog">
-            <primary sortas="b-clisp">clisp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="clisp-link">
-        <term><command>clisp-link</command></term>
-        <listitem>
-          <para>
-            is used to link an external module to clisp
-          </para>
-          <indexterm zone="clisp clisp-link">
-            <primary sortas="b-clisp-link">clisp-link</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/prog/cmake.xml
===================================================================
--- general/prog/cmake.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,316 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY cmake-download-http "https://cmake.org/files/v&cmake-major-version;/cmake-&cmake-version;.tar.gz">
-  <!ENTITY cmake-download-ftp  " ">
-  <!ENTITY cmake-md5sum        "0b31b30ea1357442a458a0dc6b1fc2e3">
-  <!ENTITY cmake-size          "10.7 MB">
-  <!ENTITY cmake-buildsize     "446 MB (add 1.2 GB for tests)">
-  <!ENTITY cmake-time          "2.8 SBU (add 3.9 SBU for tests, both using parallelism=4)">
-]>
-
-<sect1 id="cmake" xreflabel="CMake-&cmake-version;">
-  <?dbhtml filename="cmake.html"?>
-
-
-  <title>CMake-&cmake-version;</title>
-
-  <indexterm zone="cmake">
-    <primary sortas="a-CMake">CMake</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to CMake</title>
-
-    <para>
-      The <application>CMake</application> package contains a modern
-      toolset used for generating Makefiles. It is a successor of the
-      auto-generated <command>configure</command> script and aims to
-      be platform- and compiler-independent. A significant user of
-      <application>CMake</application> is <application>KDE</application>
-      since version 4.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&cmake-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&cmake-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cmake-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cmake-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &cmake-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &cmake-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/cmake-&cmake-version;-upstream_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">CMake Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="curl"/>,
-      <xref linkend="libarchive"/>,
-      <xref linkend="libuv"/>, and
-      <xref linkend="nghttp2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gcc"/> (for gfortran),
-      <xref linkend="git"/> (for use during tests),
-      <xref linkend="mercurial"/> (for use during tests),
-      <xref linkend="openjdk"/> (for use during tests),
-      <xref linkend="qt6"/> (for the Qt-based GUI),
-      <xref linkend="sphinx"/> (for building documents),
-      <xref linkend="subversion"/> (for testing),
-      <ulink url="https://github.com/google/cppdap/">cppdap</ulink>,
-      <ulink url="https://github.com/open-source-parsers/jsoncpp/">jsoncpp</ulink>, and
-      <ulink url="https://rhash.sourceforge.net/">rhash</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of CMake</title>
-
- <!--
-    <para>
-      First, adapt the FindBoost module to use Boost-1.80.0:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../cmake-&cmake-version;-upstream_fix-1.patch</userinput></screen>
--->
-
-    <para>
-      Install <application>CMake</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i '/"lib64"/s/64//' Modules/GNUInstallDirs.cmake &amp;&amp;
-
-./bootstrap --prefix=/usr        \
-            --system-libs        \
-            --mandir=/share/man  \
-            --no-system-jsoncpp  \
-            --no-system-cppdap   \
-            --no-system-librhash \
-            --docdir=/share/doc/cmake-&cmake-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>LC_ALL=en_US.UTF-8 bin/ctest
-      -j<replaceable>&lt;N&gt;</replaceable> -O
-      cmake-&cmake-version;-test.log</command>, where
-      <replaceable>&lt;N&gt;</replaceable> is an integer between 1 and the
-      number of system cores. Setting <envar>LC_ALL</envar> is needed to
-      prevent some test failures when some of the locale variables are
-      set to non English locales.
-      <!--
-        One test, RunCMake.FindBoost, is known to fail.
-        Now cmake-3.27.0.  All tests pass.
-      -->
-    </para>
-
-    <para>
-      If you want to investigate a problem with a given "problem1-test",
-      use <command>bin/ctest -R "problem1-test"</command> and, to omit it, use
-      <command>bin/ctest -E "problem1-test"</command>. These options can be
-      used together:
-      <command>bin/ctest -R "problem1-test" -E "problem2-test"</command>.
-      Option <option>-N</option> can be used to display all
-      available tests, and you can run <command>bin/ctest</command> for a
-      sub-set of tests by using separated by spaces names or numbers as
-      options. Option <option>--help</option> can be used to show all options.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed ... Modules/GNUInstallDirs.cmake</command>:
-      This command disables applications using cmake from attempting to
-      install files in /usr/lib64/.
-    </para>
-
-    <para>
-      <parameter>--system-libs</parameter>: This switch forces the build
-      system to link against the system installed version for all needed
-      libraries but those explicitly specified via a
-      <option>--no-system-*</option> option.
-    </para>
-
-    <para>
-      <parameter>--no-system-jsoncpp</parameter> and
-      <parameter>--no-system-cppdap</parameter>: These switches remove the
-      <application>JSON-C++</application> library from the list of system
-      libraries. A bundled version of that library is used instead.
-    </para>
-
-    <para>
-      <parameter>--no-system-librhash</parameter>: This switch removes the
-      <application>librhash</application> library from the list of system
-      libraries used. A bundled version of that library is used instead.
-    </para>
-
-    <para>
-      <option>--no-system-{curl,libarchive,libuv,nghttp2}</option>: Use
-      the corresponding option in the list for the
-      <command>bootstrap</command> if one of the recommended dependencies is
-      not installed. A bundled version of the dependency will be used instead.
-    </para>
-
-    <para>
-      <option>--qt-gui</option>: This switch enables building the
-      <application>Qt</application>-based  GUI for
-      <application>CMake</application>.
-    </para>
-
-    <para>
-      <option>--parallel=</option>: This switch enables performing the
-      <application>CMake</application> bootstrap with multiple jobs
-      at one time.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          ccmake, cmake, cmake-gui (optional), cpack, and ctest
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/cmake-&cmake-major-version; and
-          /usr/share/doc/cmake-&cmake-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ccmake">
-        <term><command>ccmake</command></term>
-        <listitem>
-          <para>
-            is a curses based interactive frontend to
-            <command>cmake</command>
-          </para>
-          <indexterm zone="cmake ccmake">
-            <primary sortas="b-ccmake">ccmake</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cmake-prog">
-        <term><command>cmake</command></term>
-        <listitem>
-          <para>
-            is the makefile generator
-          </para>
-          <indexterm zone="cmake cmake-prog">
-            <primary sortas="b-cmake">cmake</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cmake-gui">
-        <term><command>cmake-gui</command></term>
-        <listitem>
-          <para>
-            (optional) is the <application>Qt</application>-based frontend to
-            <command>cmake</command>
-          </para>
-          <indexterm zone="cmake cmake-gui">
-            <primary sortas="b-cmake-gui">cmake-gui</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cpack">
-        <term><command>cpack</command></term>
-        <listitem>
-          <para>
-            is the <application>CMake</application> packaging program
-          </para>
-          <indexterm zone="cmake cpack">
-            <primary sortas="b-cpack">cpack</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ctest">
-        <term><command>ctest</command></term>
-        <listitem>
-          <para>
-            is a testing utility for cmake-generated build trees
-          </para>
-          <indexterm zone="cmake ctest">
-            <primary sortas="b-ctest">ctest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/prog/doxygen.xml
===================================================================
--- general/prog/doxygen.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,312 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 doxygen-download-http "https://doxygen.nl/files/doxygen-&doxygen-version;.src.tar.gz">
-  <!ENTITY doxygen-download-ftp  " ">
-  <!ENTITY doxygen-md5sum        "c7455e9961c3491479929935c5087bf6">
-  <!ENTITY doxygen-size          "8.0 MB">
-  <!ENTITY doxygen-buildsize     "253 MB (with tests)">
-  <!ENTITY doxygen-time          "2.1 SBU (using parallelism=4; with tests)">
-]>
-
-<sect1 id="doxygen" xreflabel="Doxygen-&doxygen-version;">
-  <?dbhtml filename="doxygen.html"?>
-
-
-  <title>Doxygen-&doxygen-version;</title>
-
-  <indexterm zone="doxygen">
-    <primary sortas="a-Doxygen">Doxygen</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Doxygen</title>
-
-    <para>
-      The <application>Doxygen</application> package contains a documentation
-      system for C++, C, Java, Objective-C, Corba IDL and to some extent PHP,
-      C# and D. It is useful for generating HTML documentation and/or an
-      off-line reference manual from a set of documented source files. There
-      is also support for generating output in RTF, PostScript, hyperlinked
-      PDF, compressed HTML, and Unix man pages. The documentation is extracted
-      directly from the sources, which makes it much easier to keep the
-      documentation consistent with the source code.
-    </para>
-
-    <para>
-      You can also configure <application>Doxygen</application> to extract
-      the code structure from undocumented source files. This is very useful
-      to quickly find your way in large source distributions. Used along with
-      <application>Graphviz</application>, you can also visualize the relations
-      between the various elements by means of include dependency graphs,
-      inheritance diagrams, and collaboration diagrams, which are all generated
-      automatically.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&doxygen-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&doxygen-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &doxygen-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &doxygen-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &doxygen-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &doxygen-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Required patch: <ulink
-          url="&patch-root;/doxygen-&doxygen-version;-flex_2_6_0_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>-->
-
-    <bridgehead renderas="sect3">Doxygen Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/> and
-      <xref linkend="git"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="graphviz"/>,
-      <xref linkend="gs"/>,
-      <xref linkend="libxml2"/> (required for the tests),
-      <xref linkend="llvm"/> (with clang),
-      <!-- Can someone check this? With LLVM7, it fails to build. -->
-      &qt5-deps; (for doxywizard),
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>),
-      <xref linkend="xapian"/> (for doxyindexer), and
-      <ulink url="https://javacc.github.io/javacc/">javacc</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Doxygen</title>
-
-    <note>
-      <para>
-        When untarring this package, you may see messages such as
-        <quote>Ignoring unknown extended header keyword 'LIBARCHIVE.xattr.com.apple.TextEncoding'</quote>.
-        These messages are harmless, and can be safely ignored.
-      </para>
-    </note>
-
-    <para>
-      First, fix up some python scripts:
-    </para>
-
-<screen><userinput>grep -rl '^#!.*python$' | xargs sed -i '1s/python/&amp;3/'</userinput></screen>
-
-    <para>
-      Install <application>Doxygen</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir -v build &amp;&amp;
-cd       build &amp;&amp;
-
-cmake -G "Unix Makefiles"         \
-      -DCMAKE_BUILD_TYPE=Release  \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -Wno-dev .. &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make tests</command>.
-      <!--One test, 012_cite.dox, is known to fail.-->
-    </para>
-
-    <para>
-      If you wish to generate the package documentation, you must have
-      <application>Python</application>, <application>TeX Live</application>
-      (for HTML docs) and <application>Ghostscript</application> (for PDF docs)
-      installed, then issue the following command:
-    </para>
-
-<screen remap="doc"><userinput>cmake -DDOC_INSTALL_DIR=share/doc/doxygen-&doxygen-version; -Dbuild_doc=ON .. &amp;&amp;
-
-make docs</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -vm644 ../doc/*.1 /usr/share/man/man1</userinput></screen>
-
-    <para>
-      If you have generated the package documentation, then the man pages are
-      automatically installed, and you do not need to run the last
-      <command>install ...</command> command.
-    </para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>-Dbuild_wizard=ON</option>: Use this switch if
-      <application>Qt5</application> is installed and you wish to build the GUI
-      front-end.
-    </para>
-
-    <para>
-      <option>-Dbuild_search=ON</option>: Use this switch if
-      <application>xapian</application> is installed and you wish to build
-      external search tools (<command>doxysearch.cgi</command> and
-      <command>doxyindexer)</command>.
-    </para>
-<!--
-    <para>
-      <option>-Dforce_qt4=ON</option>: Use this switch to build
-      <command>doxywizard</command> with Qt4 even if Qt5 is installed.
-    </para>-->
-
-    <para>
-      <option>-Duse_libclang=ON</option>: Use this switch if
-      <application>llvm</application> with <application>clang</application> are
-      installed, to add support for libclang parsing.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Doxygen</title>
-
-    <para>
-      There is no real configuration necessary for the
-      <application>Doxygen</application> package although three additional
-      packages are required if you wish to use extended capabilities.
-      If you require formulas to create PDF
-      documentation, then you must have <xref linkend="texlive"/> installed.
-      If you require formulas to convert PostScript files to bitmaps, then
-      you must have <xref linkend="gs"/> installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          doxygen and optionally,
-          doxywizard, doxyindexer and doxysearch.cgi
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/doc/doxygen-&doxygen-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="doxygen-prog">
-        <term><command>doxygen</command></term>
-        <listitem>
-          <para>
-            is a command-line based utility used to generate template
-            configuration files and then generate documentation from these
-            templates. Use <command>doxygen --help</command> for an
-            explanation of the command-line parameters
-          </para>
-          <indexterm zone="doxygen doxygen-prog">
-            <primary sortas="b-doxygen">doxygen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="doxywizard">
-        <term><command>doxywizard</command></term>
-        <listitem>
-          <para>
-            is a GUI front-end for configuring and
-            running <command>doxygen</command>
-          </para>
-          <indexterm zone="doxygen doxywizard">
-            <primary sortas="b-doxywizard">doxywizard</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="doxyindexer">
-        <term><command>doxyindexer</command></term>
-        <listitem>
-          <para>
-            generates a search index called <filename>doxysearch.db</filename>
-            from one or more search data files produced by
-            <command>doxygen</command>. See, e.g.
-            <ulink url="https://javacc.github.io/javacc/"/>
-          </para>
-          <indexterm zone="doxygen doxyindexer">
-            <primary sortas="b-doxyindexer">doxyindexer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="doxysearch.cgi">
-        <term><command>doxysearch.cgi</command></term>
-        <listitem>
-          <para>
-            is a CGI program to search the data indexed by
-            <command>doxyindexer</command>
-          </para>
-          <indexterm zone="doxygen doxysearch.cgi">
-            <primary sortas="b-doxysearch.cgi">doxysearch.cgi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/prog/dtc.xml
===================================================================
--- general/prog/dtc.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,293 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 dtc-download-http "https://kernel.org/pub/software/utils/dtc/dtc-&dtc-version;.tar.xz">
-  <!ENTITY dtc-md5sum        "228576aceed3aa89f54283aa0f1eb820">
-  <!ENTITY dtc-size          "164 KB">
-  <!ENTITY dtc-buildsize     "14 MB">
-  <!ENTITY dtc-time          "less than 0.1 SBU">
-]>
-
-<!-- Try to keep the indentation used in this file-->
-<sect1 id="dtc" xreflabel="dtc-&dtc-version;">
-  <?dbhtml filename="dtc.html"?>
-
-  <title>Dtc-&dtc-version;</title>
-
-  <indexterm zone="dtc">
-    <primary sortas="a-dtc">dtc</primary>
-  </indexterm>
-
-  <!--Required section-->
-  <sect2 role="package">
-    <title>Introduction to Dtc</title>
-
-    <para>
-      The <application>dtc</application> package contains the Device Tree
-      Compiler for working with device tree source and binary files and also
-      libfdt, a utility library for reading and manipulating device trees
-      in the binary format.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&dtc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &dtc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &dtc-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &dtc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &dtc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Dtc Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend='libyaml'/>,
-      <xref linkend='setuptools_scm'/>,
-      <xref linkend='swig'/>, and
-      <xref linkend='texlive'/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Dtc</title>
-
-    <para>
-      Install <application>dtc</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr        \
-            --buildtype=release  \
-            -Dpython=disabled .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>meson test -v</command>.
-      <!-- https://github.com/dgibson/dtc/commit/32174a66efa4 -->
-      Two tests named <filename>cell-overflow.dts</filename> and
-      <filename>cell-overflow-results.dts</filename> are known to fail.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-    <screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para>
-      Still as the &root; user, remove the useless static library:
-    </para>
-
-    <screen role="root"><userinput>rm /usr/lib/libfdt.a</userinput></screen>
-
-    <para>
-      If you have <xref linkend='texlive'/> installed, you can build the PDF
-      format of the documentation by issuing the following command:
-    </para>
-
-    <screen remap="doc"><userinput>pushd ../Documentation
-  latexmk -bibtex --pdf dtc-paper &amp;&amp;
-  latexmk -bibtex --pdf dtc-paper -c
-popd</userinput></screen>
-
-    <para>
-      To install the documentation, as the &root; user issue the following
-      command:
-    </para>
-
-    <screen role="root"><userinput>cp -R ../Documentation -T /usr/share/doc/dtc-&dtc-version;</userinput></screen>
-
-    <para>
-      If you have installed both <xref linkend='setuptools_scm'/> and
-      <xref linkend='swig'/> and you wish to install the Python 3 binding
-      of this package, build the Python 3 module:
-    </para>
- 
-    <screen role="nodump"><userinput>sed -i '/use_scm_version/a "fallback_version": "1.7.0",' ../setup.py &amp;&amp;
-&build-wheel-cmd; ..</userinput></screen>
-
-    <para>
-      As the &root; user, install the Python 3 module:
-    </para>
-
-    <screen role="nodump"><userinput>&install-wheel;</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <parameter>-Dpython=disabled</parameter>: This switch prevents
-      building the Python 3 binding with the deprecated method
-      (running <command>setup.py</command> directly).  We will build the
-      Python 3 binding with the <command>pip3 wheel</command> command
-      separately if wanted.
-    </para>
-
-    <para>
-      <command>sed ... ../setup.py</command>: This command allows building
-      the Python 3 binding from a release tarball (instead of a Git
-      checkout).
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          convert-dtsv0, dtc, dtdiff, fdtdump, fdtget, fdtoverlay,
-          and fdtput
-        </seg>
-        <seg>
-          libfdt.so
-        </seg>
-        <seg>
-          /usr/lib/python&python3-majorver;/site-packages/libfdt-&dtc-version;.dist-info
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="convert-dtsv0">
-        <term><command>convert-dtsv0</command></term>
-        <listitem>
-          <para>
-            converts device tree v0 source to device tree v1
-          </para>
-          <indexterm zone="dtc convert-dtsv0">
-            <primary sortas="b-convert-dtsv0">convert-dtsv0</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dtc-prog">
-        <term><command>dtc</command></term>
-        <listitem>
-          <para>
-            compiles device tree source (dts) to device tree binary blob
-            (dtb), or de-compiles dtb to dts
-          </para>
-          <indexterm zone="dtc dtc-prog">
-            <primary sortas="b-dtc">dtc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dtdiff">
-        <term><command>dtdiff</command></term>
-        <listitem>
-          <para>
-            compares two different device tree
-          </para>
-          <indexterm zone="dtc dtdiff">
-            <primary sortas="b-dtdiff">dtdiff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fdtdump">
-        <term><command>fdtdump</command></term>
-        <listitem>
-          <para>
-            prints a readable version of a flat device-tree file
-          </para>
-          <indexterm zone="dtc fdtdump">
-            <primary sortas="b-fdtdump">fdtdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fdtget">
-        <term><command>fdtget</command></term>
-        <listitem>
-          <para>
-            reads values from device-tree
-          </para>
-          <indexterm zone="dtc fdtget">
-            <primary sortas="b-fdtget">fdtget</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fdtoverlay">
-        <term><command>fdtoverlay</command></term>
-        <listitem>
-          <para>
-            applies a number of overlays to a base device tree blob
-          </para>
-          <indexterm zone="dtc fdtoverlay">
-            <primary sortas="b-fdtoverlay">fdtoverlay</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fdtput">
-        <term><command>fdtput</command></term>
-        <listitem>
-          <para>
-            writes a property value to a device tree
-          </para>
-          <indexterm zone="dtc fdtput">
-            <primary sortas="b-fdtput">fdtput</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfdt">
-        <term><filename class="libraryfile">libfdt.so</filename></term>
-        <listitem>
-          <para>
-            is a utility library for reading and manipulating device trees
-            in the binary format
-          </para>
-          <indexterm zone="dtc libfdt">
-            <primary sortas="c-libfdt">libfdt.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: general/prog/dummy-java.xml
===================================================================
--- general/prog/dummy-java.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<sect1 role="dummy">
-
-
-  <title>Java</title>
-  <para/>
-</sect1>
-
Index: general/prog/gc.xml
===================================================================
--- general/prog/gc.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,213 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gc-download-http "https://github.com/ivmai/bdwgc/releases/download/v&gc-version;/gc-&gc-version;.tar.gz">
-  <!ENTITY gc-download-ftp  " ">
-  <!ENTITY gc-md5sum        "fc5351214bc2e854070ee3319181a467">
-  <!ENTITY gc-size          "1.2 MB">
-  <!ENTITY gc-buildsize     "11 MB (with tests)">
-  <!ENTITY gc-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="gc" xreflabel="GC-&gc-version;">
-  <?dbhtml filename="gc.html"?>
-
-
-  <title>GC-&gc-version;</title>
-
-  <indexterm zone="gc">
-    <primary sortas="a-GC">GC</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GC</title>
-
-    <para>
-      The <application>GC</application> package contains the Boehm-Demers-Weiser
-      conservative garbage collector, which can be used as a garbage collecting
-      replacement for the C malloc function or C++ new operator. It allows you
-      to allocate memory basically as you normally would, without explicitly
-      deallocating memory that is no longer useful. The collector automatically
-      recycles memory when it determines that it can no longer be otherwise
-      accessed. The collector is also used by a number of programming language
-      implementations that either use C as intermediate code, want to facilitate
-      easier interoperation with C libraries, or just prefer the simple
-      collector interface. Alternatively, the garbage collector may be used as a
-      leak detector for C or C++ programs, though that is not its primary goal.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gc-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libatomic_ops"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GC</title>
-
-    <para>
-      Install <application>GC</application> by running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr      \
-            --enable-cplusplus \
-            --disable-static   \
-            --docdir=/usr/share/doc/gc-&gc-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -m644 doc/gc.man /usr/share/man/man3/gc_malloc.3</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--docdir=/usr/share/doc/gc-&gc-version;</parameter>:
-      This option is used so the package will install the
-      documentation in a versioned directory.
-    </para>
-
-    <para>
-      <parameter>--enable-cplusplus</parameter>: This parameter enables the
-      building and installing of the C++ library along with the standard
-      C library.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libcord.so,
-          libgc.so,
-          libgccpp.so, and
-          libgctba.so
-        </seg>
-        <seg>
-          /usr/include/gc and
-          /usr/share/doc/gc-&gc-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libcord">
-        <term><filename class="libraryfile">libcord.so</filename></term>
-        <listitem>
-          <para>
-            contains a tree-based string library
-          </para>
-          <indexterm zone="gc libcord">
-            <primary sortas="c-libcord">libcord.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgc">
-        <term><filename class="libraryfile">libgc.so</filename></term>
-        <listitem>
-          <para>
-            contains a C interface to the conservative garbage collector,
-            primarily designed to replace the C malloc function
-          </para>
-          <indexterm zone="gc libgc">
-            <primary sortas="c-libgc">libgc.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgccpp">
-        <term><filename class="libraryfile">libgccpp.so</filename></term>
-        <listitem>
-          <para>
-            contains a C++ interface to the conservative garbage collector
-          </para>
-          <indexterm zone="gc libgccpp">
-            <primary sortas="c-libgccpp">libgccpp.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgctba">
-        <term><filename class="libraryfile">libgctba.so</filename></term>
-        <listitem>
-          <para>
-            contains a C++ interface to throw bad allocations
-          </para>
-          <indexterm zone="gc libgctba">
-            <primary sortas="c-libgctba">libgctba.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/prog/gcc.xml
===================================================================
--- general/prog/gcc.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,430 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gcc-download-http  "&gnu-http;/gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.xz">
-  <!ENTITY gcc-download-ftp   " ">
-  <!-- Update this also on the grub-uefi page -->
-  <!ENTITY gcc-md5sum         "e0e48554cc6e4f261d55ddee9ab69075">
-  <!ENTITY gcc-size           "84 MB">
-  <!ENTITY gcc-buildsize      "13 GB (2.9 GB installed with all listed languages; add 1.5 GB for tests)">
-  <!ENTITY gcc-time           "13 SBU (add 29 SBU for tests; both with parallelism=8)">
-]>
-
-<sect1 id="gcc" xreflabel="GCC-&gcc-version;">
-  <?dbhtml filename="gcc.html" ?>
-
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="gcc">
-    <primary sortas="a-gcc-5-0">GCC-&gcc-version;</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GCC</title>
-
-    <para>
-      The <application>GCC</application> package contains the GNU Compiler
-      Collection. This page describes the installation of compilers for the
-      following languages: C, C++, Fortran, Objective C, Objective C++, Go, and Modula2.
-      Since C and C++ are installed in LFS, this page is either for upgrading
-      C and C++, or for installing additional compilers.
-    </para>
-
-    <note>
-      <para>
-        Additional languages, among which D and Ada, are available in the
-        collection. D and Ada have a binary bootstrap requirement for the first
-        installation, so their installation is not described here. To install
-        them, you can proceed along the same lines as below after installing
-        the corresponding compiler from a binary package, adding
-        <option>ada</option> or <option>d</option> to the
-        <parameter>--enable-languages</parameter> line.
-      </para>
-    </note>
-
-    &lfs121_checked;
-
-    <caution>
-      <para>
-        If you are upgrading <application>GCC</application> from any other
-        version prior to &gcc-version;, then you must be careful compiling 3rd
-        party kernel modules. You should ensure that the kernel and all its
-        native modules are also compiled using the same version of
-        <application>GCC</application> that you use to build the 3rd party module.
-        This issue does not affect native kernel (and kernel modules) updates,
-        as the instructions below are a complete reinstallation of
-        <application>GCC</application>. If you have existing 3rd party modules
-        installed, ensure they are recompiled using the updated version of
-        <application>GCC</application>.
-      </para>
-    </caution>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gcc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gcc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gcc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gcc-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gcc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gcc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional patch when adding Go to the desired language list:
-          <ulink url="&patch-root;/gcc-&gcc-version;-fix_go_version-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">GCC Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gdb"/>,
-      <xref linkend="valgrind"/> (for tests), and
-      <ulink url="https://repo.or.cz/isl.git">ISL</ulink> (to enable graphite optimization)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-    <important>
-      <para>
-        Even if you specify only languages other than C and C++ to the
-        <command>./configure</command> command below, the
-        installation process will overwrite your existing
-        <application>GCC</application> C and C++ compilers and libraries.
-        Running the full suite of tests is recommended.
-      </para>
-
-      <para>
-        Do not continue with the <command>make install</command> command
-        until you are confident the build was successful. You can compare your
-        test results with those found at <ulink
-        url="https://gcc.gnu.org/ml/gcc-testresults/"/>. You may also want to
-        refer to the information found in the <application>GCC</application>
-        section of Chapter 8 in the LFS book (<ulink
-        url="&lfs-root;/chapter08/gcc.html"/>).
-      </para>
-    </important>
-
-    <para>
-      The instructions below are intentionally performing a
-      <quote>bootstrap</quote> process. Bootstrapping is needed for robustness
-      and is highly recommended when upgrading the compilers version. To disable
-      bootstrap anyway, add <parameter>--disable-bootstrap</parameter> to the
-      <command>./configure</command> options below.
-    </para>
-
-    <para>
-      Install <application>GCC</application> by running the following commands:
-    </para>
-
-<screen><userinput>case $(uname -m) in
-  x86_64)
-    sed -i.orig '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64
-  ;;
-esac
-
-mkdir build               &amp;&amp;
-cd    build               &amp;&amp;
-
-../configure              \
-    --prefix=/usr         \
-    --disable-multilib    \
-    --with-system-zlib    \
-    --enable-default-pie  \
-    --enable-default-ssp  \
-    --disable-fixincludes \
-    --enable-languages=c,c++,fortran,go,objc,obj-c++,m2 &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have installed additional packages such as
-      <application>valgrind</application> and <application>gdb</application>,
-      the <application>gcc</application> part of the test suite will run more
-      tests than in LFS. Some of those will report FAIL and others XPASS
-      (pass when expected to FAIL). As of gcc-13.2.0, about 65 FAIL occur
-      in the <quote>guality</quote> suite, as well as miscellaneous failures
-      throughout the rest of the test suite.
-      If all the compilers above are built, there will be a little over 80
-      unexpected failures out of over 546,000 tests. To run the tests, issue:
-    </para>
-
-<screen><userinput>ulimit -s 32768 &amp;&amp;
-make -k check</userinput></screen>
-<!-- The command above may error out, so using && may prevent the summary
-to be run. -->
-
-    <para>
-      The tests are very long, and the results may be hard to find in the
-      logs, specially if you use parallel jobs with make. You can get a summary
-      of the tests with:
-    </para>
-
-<screen><userinput>../contrib/test_summary</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-
-mkdir -pv /usr/share/gdb/auto-load/usr/lib              &amp;&amp;
-mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib &amp;&amp;
-
-chown -v -R root:root \
-    /usr/lib/gcc/*linux-gnu/&gcc-version;/include{,-fixed}</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>mkdir build; cd build</command>: The
-      <application>GCC</application> documentation recommends
-      building the package in a dedicated build directory.
-    </para>
-
-    <para>
-      <parameter>--disable-multilib</parameter>: This parameter ensures
-      that files are created for the specific architecture of your computer.
-    </para>
-
-    <para>
-      <parameter>--with-system-zlib</parameter>: Uses the system
-      <application>zlib</application> instead of the bundled one.
-      <application>zlib</application> is used for compressing
-      and decompressing <application>GCC</application>'s intermediate
-      language in LTO (Link Time Optimization) object files.
-    </para>
-
-    <para>
-      <parameter>--enable-default-pie</parameter>: Makes the
-      <option>-fpie</option> option the default when compiling programs.
-      Together with the <xref linkend="gASLR"/> feature enabled in the kernel,
-      this defeats some kind of attacks based on known memory layouts.
-    </para>
-
-    <para>
-      <parameter>--enable-default-ssp</parameter>: Makes the
-      <option>-fstack-protector-strong</option> option the default when
-      compiling programs. <xref linkend="gSSP"/> is a technique preventing
-      alteration of the program flow by corrupting the parameter stack.
-    </para>
-
-    <para>
-      <parameter>--enable-languages=c,c++,fortran,go,objc,obj-c++,m2</parameter>:
-      This command identifies which languages to build. You may modify
-      this command to remove undesired languages.  GCC also supports Ada
-      and D, but building GCC with Ada (or D) support needs an existing
-      Ada (or D) compiler.  So they are not enabled here.
-    </para>
-
-    <para>
-      <command>ulimit -s 32768</command>: This command prevents several
-      tests from running out of stack space.
-    </para>
-
-    <para>
-      <command>make -k check</command>: This command runs the test suite
-      without stopping if any errors are encountered.
-    </para>
-
-    <para>
-      <command>../contrib/test_summary</command>: This command will produce
-      a summary of the test suite results. You can append <command>| grep
-      -A7 Summ</command> to the command to produce an even more condensed
-      version of the summary. You may also wish to redirect the output
-      to a file for review and comparison later on.
-    </para>
-
-    <para>
-      <command>mv -v /usr/lib/*gdb.py ...</command>: The installation
-      stage puts some files used by <application>gdb</application> under the
-      <filename class="directory">/usr/lib</filename> directory. This generates
-      spurious error messages when performing <command>ldconfig</command>. This
-      command moves the files to another location.
-    </para>
-
-    <para>
-      <command>chown -v -R root:root /usr/lib/gcc/*linux-gnu/...</command>:
-      If the package is built by a user other than root, the ownership of the
-      installed <filename class="directory">include</filename> directory (and
-      its content) will be incorrect. This command changes the ownership to the
-      <systemitem class="username">root</systemitem> user and group.
-    </para>
-
-    <para>
-      <option>--enable-host-shared --enable-languages=jit</option>:
-      Build <systemitem class="library">libgccjit</systemitem>, a library
-      for embedding GCC inside programs and libraries for generating machine
-      code.  Despite <quote>JIT</quote> (just-in-time) in the name, the
-      library can be used for AOT (ahead-of-time) compilation as well.
-      <option>--enable-host-shared</option> is needed for building
-      <systemitem class="library">libgccjit</systemitem>, but it
-      significantly slows down GCC.  So
-      <systemitem class="library">libgccjit</systemitem> should be built and
-      installed separately, not as a part of the <quote>main</quote> GCC
-      installation.  If you need this library, configure GCC with
-      these two options and install the library by running
-      <!-- from Arch, not tested -->
-      <command>make -C gcc jit.install-common jit.install-info</command>
-      as the &root; user.  This library is not used by any BLFS package,
-      nor tested by the BLFS developers.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <para>
-      Some program and library names and descriptions are not listed here,
-      but can be found at
-      <ulink url="&lfs-root;/chapter08/gcc.html#contents-gcc">LFS section
-      for GCC</ulink> as they were
-      initially installed during the building of LFS.
-    </para>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gccgo, gfortran, gm2, go, and gofmt, hard-linked to architecture
-          specific names
-        </seg>
-        <seg>
-          libgfortran.{so,a}, libgm2.{so,a}
-          libgo.{so,a}, libgobegin.a, libgolibbegin.a,
-          libobjc.{so,a}, and numerous other run-time libraries and executables
-        </seg>
-        <seg>
-          /usr/lib/go
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gccgo">
-        <term><command>gccgo</command></term>
-        <listitem>
-          <para>
-            is a GCC-based compiler for the <application>Go</application>
-            language
-          </para>
-          <indexterm zone="gcc gccgo">
-            <primary sortas="b-gccgo">gccgo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gm2">
-        <term><command>gm2</command></term>
-        <listitem>
-          <para>
-            is a GCC-based compiler for the
-            <application>Modula-2</application> language
-          </para>
-          <indexterm zone="gcc gm2">
-            <primary sortas="b-gm2">gm2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="go">
-        <term><command>go</command></term>
-        <listitem>
-          <para>
-            is a tool for managing <application>Go</application> source code
-          </para>
-          <indexterm zone="gcc go">
-            <primary sortas="b-go">go</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gofmt">
-        <term><command>gofmt</command></term>
-        <listitem>
-          <para>
-            is a tool for formatting <application>Go</application> source code
-          </para>
-          <indexterm zone="gcc gofmt">
-            <primary sortas="b-gofmt">gofmt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <!--
-      <varlistentry id="gdc">
-        <term><command>gdc</command></term>
-        <listitem>
-          <para>
-            is a GCC-based compiler for the <application>D</application>
-            language
-          </para>
-          <indexterm zone="gcc gdc">
-            <primary sortas="b-gdc">gdc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      -->
-      <varlistentry id="gfortran">
-        <term><command>gfortran</command></term>
-        <listitem>
-          <para>
-            is a GCC-based compiler for the <application>Fortran</application>
-            language
-          </para>
-          <indexterm zone="gcc gfortran">
-            <primary sortas="b-gfortran">gfortran</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/prog/gdb.xml
===================================================================
--- general/prog/gdb.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,369 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gdb-download-http "&gnu-http;/gdb/gdb-&gdb-version;.tar.xz">
-  <!ENTITY gdb-download-ftp  " ">
-  <!ENTITY gdb-md5sum        "4452f575d09f94276cb0a1e95ecff856">
-  <!ENTITY gdb-size          "23 MB">
-  <!ENTITY gdb-buildsize     "964 MB (add 805 MB for docs; add 654 MB for tests)">
-  <!ENTITY gdb-time          "1.8 SBU (add 0.4 SBU for docs; add 15 SBU for tests; all using parallelism=4)">
-]>
-
-<sect1 id="gdb" xreflabel="GDB-&gdb-version;">
-  <?dbhtml filename="gdb.html"?>
-
-
-  <title>GDB-&gdb-version;</title>
-
-  <indexterm zone="gdb">
-    <primary sortas="a-GDB">GDB</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GDB</title>
-
-    <para>
-      <application>GDB</application>, the GNU Project debugger, allows you
-      to see what is going on <quote>inside</quote> another program while it
-      executes -- or what another program was doing at the moment it crashed.
-      Note that <application>GDB</application> is most effective when tracing
-      programs and libraries that were built with debugging symbols and not
-      stripped.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gdb-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gdb-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gdb-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gdb-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gdb-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gdb-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-    <!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/gdb-&gdb-version;-upstream_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-    -->
-    <bridgehead renderas="sect3">GDB Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended Runtime Dependency</bridgehead>
-    <para role="recommended">
-      <xref linkend="six"/> (Python 3 module, required at run-time to
-      use GDB scripts from various LFS/BLFS packages with Python 3
-      installed in LFS)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>,
-      <xref linkend="gcc"/> (ada, gfortran, and go are used for tests),
-      <xref linkend="guile"/>,
-      <xref linkend="rust"/> (used for some tests),
-      <xref linkend="valgrind"/>, and
-      <ulink url="https://sourceware.org/systemtap/">SystemTap</ulink>
-      (run-time, used for tests)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GDB</title>
-    <!--
-    <para>
-      First, apply a patch that fixes problems when debugging programs compiled
-      with <xref linkend="rust" role="nodep"/>:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../gdb-&gdb-version;-upstream_fixes-1.patch</userinput></screen>
--->
-    <para>
-      Install <application>GDB</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-../configure --prefix=/usr          \
-             --with-system-readline \
-             --with-python=/usr/bin/python3 &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      Optionally, to build the API documentation using
-      <xref linkend="doxygen"/>, run:
-    </para>
-
-<screen remap="doc"><userinput>make -C gdb/doc doxy</userinput></screen>
-
-    <para>
-      To test the results, issue:
-    </para>
-
-<screen remap="test"><userinput>pushd gdb/testsuite &amp;&amp;
-make  site.exp      &amp;&amp;
-echo  "set gdb_test_timeout 120" &gt;&gt; site.exp &amp;&amp;
-runtest
-popd</userinput></screen>
-
-    <para>
-      See <emphasis>gdb/testsuite/README</emphasis> and <ulink
-      url="https://sourceware.org/gdb/wiki/TestingGDB">TestingGDB</ulink>.
-      There are many problems with the test suite:
-    </para>
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          Clean directories are needed if re-running the tests.  For that
-          reason, make a copy of the compiled source code
-          directory before the tests in case you need to run the tests again.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          Results depend on installed compilers.
-        </para>
-      </listitem>
-<!-- I did not see this
-      <listitem>
-        <para>
-          There are a large number of timeouts (there is a variable
-          that can be set to increase time for timeout, but
-          changing it will result in a different number of tests being
-          run).
-        </para>
-      </listitem>
-or this
-      <listitem>
-        <para>
-          There are failures associated with system readline 6.x.
-        </para>
-      </listitem>
--->
-<!--
-      <listitem>
-        <para>
-          A few tests assume that the header file
-          <filename>&lt;sys/sdt.h&gt;</filename>, part of <ulink
-          url="https://sourceware.org/systemtap/">SystemTap</ulink>, is
-          present.
-        </para>
-      </listitem>
--->
-<!-- I don't know if this is true or not.  I tested on a Haswell.
-      <listitem>
-        <para>
-          If the test suite is run on a Skylake-based Intel CPU or newer,
-          many tests will fail due to the removal of the deprecated/problematic
-          libmpx library in GCC.
-        </para>
-      </listitem>
--->
-      <listitem>
-        <para>
-<!-- for gdb-11.1, gcc-11.2 - pierre
-          A test run of the test suite had about 1700 unexpected failures
-          (out of over 80000 tests). Over 1370 of the failures were related
-          to FORTRAN tests. -->
-<!-- for gdb-12.1, gcc-11.3.0 - bdubbs
-          A test run of the test suite had a little over 200 unexpected failures
-          out of over 94000 tests.-->
-<!-- for gdb-13.0, gcc-12.2.0 - bdubbs
-          A test run of the test suite had 33 unexpected failures
-          out of over 106000 tests. -->
-<!-- for gdb-13.2, gcc-13.1.0 - pierre
-          A test run of the test suite had 183 unexpected failures
-          out of over 105000 tests. -->
-<!-- for gdb-14.1, gcc 13.2.0 - rahul -->
-          A test run of the test suite had 51 unexpected failures
-          out of the over 106000 tests.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          On some systems, the gdb.tui test suite will fail if running over
-          SSH.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          On some AMD-based systems, over 200 additional tests
-          may fail due to a difference in the threading implementation
-          on those CPUs.
-        </para>
-      </listitem>
-
-    </itemizedlist>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make -C gdb install &amp;&amp;
-make -C gdbserver install</userinput></screen>
-
-    <para>
-      If you have built the API documentation, it is now in gdb/doc/doxy.
-      You can install it (as the <systemitem class="username">root</systemitem>
-      user):
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -d /usr/share/doc/gdb-&gdb-version; &amp;&amp;
-rm -rf gdb/doc/doxy/xml &amp;&amp;
-cp -Rv gdb/doc/doxy /usr/share/doc/gdb-&gdb-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-system-readline</parameter>: This switch forces
-      <application>GDB</application> to use the copy of
-      <application>Readline</application> installed in LFS.
-    </para>
-
-    <para>
-      <parameter>--with-python=/usr/bin/python3</parameter>: This switch
-      forces <application>GDB</application> to use Python 3.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gcore, gdb, gdbserver, and gdb-add-index
-        </seg>
-        <seg>
-          libinproctrace.so
-        </seg>
-        <seg>
-          /usr/{include,share}/gdb and /usr/share/doc/gdb-&gdb-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gcore">
-        <term><command>gcore</command></term>
-        <listitem>
-          <para>
-            generates a core dump of a running program
-          </para>
-          <indexterm zone="gdb gcore">
-            <primary sortas="b-gcore">gcore</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gdb-prog">
-        <term><command>gdb</command></term>
-        <listitem>
-          <para>
-            is the GNU Debugger
-          </para>
-          <indexterm zone="gdb gdb-prog">
-            <primary sortas="b-gdb-prog">gdb-prog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gdbserver">
-        <term><command>gdbserver</command></term>
-        <listitem>
-          <para>
-            is a remote server for the GNU debugger (it allows programs
-            to be debugged from a different machine)
-          </para>
-          <indexterm zone="gdb gdbserver">
-            <primary sortas="b-gdbserver">gdbserver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gdb-add-index">
-        <term><command>gdb-add-index</command></term>
-        <listitem>
-          <para>
-            Allows adding index files to ELF binaries. This speeds up
-            <command>gdb</command> start on large programs.
-          </para>
-          <indexterm zone="gdb gdb-add-index">
-            <primary sortas="b-gdb-add-index">gdb-add-index</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libinproctrace">
-        <term><filename class="libraryfile">libinproctrace.so</filename></term>
-        <listitem>
-          <para>
-            contains functions for the in-process tracing agent. The agent
-            allows for installing fast tracepoints, listing static tracepoint
-            markers, probing static tracepoints markers, and starting trace
-            monitoring.
-          </para>
-          <indexterm zone="gdb libinproctrace">
-            <primary sortas="c-libinproctrace">libinproctrace.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/prog/git.xml
===================================================================
--- general/prog/git.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,486 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 git-root "&kernel-dl;/software/scm/git" >
-
-  <!ENTITY git-download-http "&git-root;/git-&git-version;.tar.xz">
-  <!ENTITY git-download-ftp  " ">
-  <!ENTITY git-md5sum        "7e4eb7c45e9ba7c90fa51deeea49732f">
-
-  <!ENTITY git-size          "7.1 MB">
-  <!-- but people keep forgetting that an install not only needs the net build
-       space, it also needs the install space (or DESTDIR) -->
-  <!ENTITY git-buildsize     "307 MB (with downloaded documentation; add 18 MB for building docs)">
-  <!-- With 2.23.0, there was a large increase in time for tests. Possibly disk related? -->
-  <!-- Confirmed that it is disk related.-->
-  <!ENTITY git-time          "0.3 SBU (with parallelism=4; add 0.4 SBU for building doc, and up to 5 SBU (disk speed dependent) for tests)">
-]>
-
-<sect1 id="git" xreflabel="git-&git-version;">
-  <?dbhtml filename="git.html"?>
-
-
-  <title>Git-&git-version;</title>
-
-  <indexterm zone="git">
-    <primary sortas="a-Git">Git</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Git</title>
-
-    <para>
-      <application>Git</application> is a free and open source, distributed
-      version control system designed to handle everything from small to very
-      large projects with speed and efficiency. Every
-      <application>Git</application> clone is a full-fledged repository with
-      complete history and full revision tracking capabilities, not dependent
-      on network access or a central server. Branching and merging are fast and
-      easy to do. <application>Git</application> is used for version control of
-      files, much like tools such as <xref linkend="mercurial"/>,
-      <application>Bazaar</application>, <xref linkend="subversion"/>,
-      <ulink url="https://www.nongnu.org/cvs/">CVS</ulink>,
-      <application>Perforce</application>, and
-      <application>Team Foundation Server</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&git-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&git-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &git-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &git-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &git-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &git-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          <ulink url="&git-root;/git-manpages-&git-version;.tar.xz">
-          &git-root;/git-manpages-&git-version;.tar.xz</ulink>
-          (not needed if you've installed <xref linkend="asciidoc"/>,
-          <xref linkend="xmlto"/>, and prefer to rebuild them)
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <ulink url="&git-root;/git-htmldocs-&git-version;.tar.xz">
-          &git-root;/git-htmldocs-&git-version;.tar.xz</ulink>
-          and other docs (not needed if you've installed
-          <xref linkend="asciidoc"/> and want to rebuild the documentation).
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Git Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="curl"/> (needed to use <application>Git</application> over
-      http, https, ftp or ftps)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="apache"/> (for some tests),
-      <xref role='runtime' linkend='fcron'/> (runtime, for scheduling
-      <command>git maintenance</command> jobs),
-      <xref role="runtime" linkend="gnupg2"/> (runtime, may be used to sign
-      <application>Git</application> commits or tags, or verify the signatures
-      of them),
-      <xref role="runtime" linkend="openssh"/> (runtime, needed to use
-      <application>Git</application> over ssh),
-      <xref linkend="pcre2"/>,
-      <xref role="runtime" linkend="subversion"/> with Perl bindings
-         (runtime, for <command>git svn</command>),
-      <xref role="runtime" linkend="tk"/>
-      (gitk, a simple <application>Git</application>
-      repository viewer, uses <application>Tk</application> at runtime),
-      <xref linkend="valgrind"/>,
-      <ulink url="https://metacpan.org/pod/Authen::SASL">Authen::SASL</ulink> and
-      <ulink url="https://metacpan.org/pod/MIME::Base64">MIME::Base64</ulink>
-      (both runtime, for <command>git send-email</command>),
-      <phrase revision='sysv'>and </phrase><xref
-      linkend='perl-io-socket-ssl'/> (runtime, for
-      <command>git send-email</command> to connect to a SMTP server with
-      SSL encryption)<phrase revision='systemd'>, and
-      <xref role='runtime' linkend='systemd'/>
-      (runtime, rebuilt with <xref role='nodep' linkend='linux-pam'/>, for
-      scheduling <command>git maintenance</command> jobs)</phrase>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (to create the man pages, html docs
-    and other docs)</bridgehead>
-    <para role="optional">
-      <xref linkend="xmlto"/> and
-      <xref linkend="asciidoc"/>
-      <!-- or xref linkend="asciidoctor", doesn't work now because it needs docbook-xsl-ns -->,
-      and also
-      <ulink url="https://dblatex.sourceforge.net/">dblatex</ulink>
-      (for the PDF version of the user manual), and
-      <ulink url="https://docbook2x.sourceforge.net/">docbook2x</ulink> to
-      create info pages
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Git</title>
-
-    <para>
-      Install <application>Git</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --with-gitconfig=/etc/gitconfig \
-            --with-python=python3 &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      You can build the man pages and/or html docs, or
-      use downloaded ones. If you choose to build them, use the next two
-      instructions.
-    </para>
-
-    <para>
-      If you have installed <xref linkend="asciidoc"/> you can
-      create the html version of the man pages and other docs:
-    </para>
-
-<screen remap="doc"><userinput>make html</userinput></screen>
-
-    <para>
-      If you have installed <xref linkend="asciidoc"/>  and
-      <xref linkend="xmlto"/> you can create the man pages:
-    </para>
-
-<screen remap="doc"><userinput>make man</userinput></screen>
-
-    <para>
-      The test suite can be run in parallel mode. To run the test suite, issue:
-      <command>make test -k |&amp; tee test.log</command>.  If some test
-      fails, the list of failed tests can be shown via
-      <command>grep '^not ok' test.log | grep -v TODO</command>.
-      <!-- It looks like I'd misdiagnosed the issue.  -->
-      <!--phrase revision='systemd'>One test named <literal>start and stop
-      Linux/systemd maintenance</literal> is known to fail if the current
-      login session is not started after rebuilding
-      <xref linkend='systemd'/> with <xref linkend='linux-pam'/>
-      support, or it's a SSH session but the SSH server is not configured
-      with <option>UsePAM</option> enabled.</phrase-->
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>make perllibdir=/usr/lib/perl5/&lfs-perl-version;/site_perl install</userinput></screen>
-
-<!-- ==== Method 1 for docs ====== -->
-    <bridgehead renderas="sect3">If you created the man pages and/or html docs</bridgehead>
-
-    <para>
-      Install the man pages as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>make install-man</userinput></screen>
-
-    <para>
-      Install the html docs as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>make htmldir=/usr/share/doc/git-&git-version; install-html</userinput></screen>
-
-<!-- ==== Method 2 for docs ====== -->
-    <bridgehead renderas="sect3">If you downloaded the man pages and/or html docs</bridgehead>
-
-    <para>
-      If you downloaded the man pages untar them as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>tar -xf ../git-manpages-&git-version;.tar.xz \
-    -C /usr/share/man --no-same-owner --no-overwrite-dir</userinput></screen>
-
-    <para>
-      If you downloaded the html docs untar them as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>mkdir -vp   /usr/share/doc/git-&git-version; &amp;&amp;
-tar   -xf   ../git-htmldocs-&git-version;.tar.xz \
-      -C    /usr/share/doc/git-&git-version; --no-same-owner --no-overwrite-dir &amp;&amp;
-
-find        /usr/share/doc/git-&git-version; -type d -exec chmod 755 {} \; &amp;&amp;
-find        /usr/share/doc/git-&git-version; -type f -exec chmod 644 {} \;</userinput></screen>
-
-<!-- ==== Reorganize docs ====== -->
-    <bridgehead renderas="sect3">Reorganize text and html in the html-docs (both methods)</bridgehead>
-
-    <para>
-      For both methods, the html-docs include a lot of plain text files.
-      Reorganize the files as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>mkdir -vp /usr/share/doc/git-&git-version;/man-pages/{html,text}         &amp;&amp;
-mv        /usr/share/doc/git-&git-version;/{git*.txt,man-pages/text}     &amp;&amp;
-mv        /usr/share/doc/git-&git-version;/{git*.,index.,man-pages/}html &amp;&amp;
-
-mkdir -vp /usr/share/doc/git-&git-version;/technical/{html,text}         &amp;&amp;
-mv        /usr/share/doc/git-&git-version;/technical/{*.txt,text}        &amp;&amp;
-mv        /usr/share/doc/git-&git-version;/technical/{*.,}html           &amp;&amp;
-
-mkdir -vp /usr/share/doc/git-&git-version;/howto/{html,text}             &amp;&amp;
-mv        /usr/share/doc/git-&git-version;/howto/{*.txt,text}            &amp;&amp;
-mv        /usr/share/doc/git-&git-version;/howto/{*.,}html               &amp;&amp;
-
-sed -i '/^&lt;a href=/s|howto/|&amp;html/|' /usr/share/doc/git-&git-version;/howto-index.html &amp;&amp;
-sed -i '/^\* link:/s|howto/|&amp;html/|' /usr/share/doc/git-&git-version;/howto-index.txt</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-gitconfig=/etc/gitconfig</parameter>: This sets
-      <filename>/etc/gitconfig</filename> as the file that stores
-      the default, system wide, <application>Git</application>
-      settings.
-    </para>
-
-    <para>
-      <parameter>--with-python=python3</parameter>: Use this switch to use
-      <application>Python 3</application>, instead of the EOL'ed
-      <application>Python 2</application>. Python is used for the
-      <command>git p4</command> interface to Perforce repositories,
-      and also used in some tests.
-    </para>
-
-    <para>
-      <option>--with-libpcre2</option>: Use this switch if
-      <application>PCRE2</application> is installed.
-    </para>
-
-    <para>
-      <command>tar -xf ../git-manpages-&git-version;.tar.gz -C
-      /usr/share/man --no-same-owner</command>: This untars
-      <filename>git-manpages-&git-version;.tar.gz</filename>. The
-      <option>-C</option> option makes tar change directory to
-      <filename class="directory">/usr/share/man</filename> before
-      it starts to decompress the docs. The <option>--no-same-owner</option>
-      option stops tar from preserving the user and group details of the
-      files. This is useful as that user or group may not exist on your
-      system; this could (potentially) be a security risk.
-    </para>
-
-    <para>
-      <command>mv /usr/share/doc/git-&git-version; ...</command>: These
-      commands move some of the files into subfolders to make it easier to sort
-      through the docs and find what you're looking for.
-    </para>
-
-    <para>
-      <command>find ... chmod ...</command>: These commands correct the
-      permissions in the shipped documentation tar file.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Git</title>
-
-    <sect3 id="git-config">
-      <title>Config Files</title>
-      <para>
-        <filename>~/.gitconfig</filename> and
-        <filename>/etc/gitconfig</filename>
-      </para>
-
-      <indexterm zone="git git-config">
-        <primary sortas="e-AA.gitconfig">~/.gitconfig</primary>
-      </indexterm>
-
-      <indexterm zone="git git-config">
-        <primary sortas="e-etc-gitconfig">/etc/gitconfig</primary>
-      </indexterm>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          git, git-receive-pack, git-upload-archive, and
-          git-upload-pack (hardlinked to each
-          other), git-cvsserver, git-shell, gitk, and scalar
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/libexec/git-core,
-          /usr/lib/perl5/&lfs-perl-version;/site_perl/Git, and
-          /usr/share/{doc/git-&git-version;,git-core,git-gui,gitk,gitweb}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="git-prog">
-        <term><command>git</command></term>
-        <listitem>
-          <para>
-            is the stupid content tracker
-          </para>
-          <indexterm zone="git git-prog">
-            <primary sortas="b-git">git</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="git-cvsserver">
-        <term><command>git-cvsserver</command></term>
-        <listitem>
-          <para>
-            is a CVS server emulator for <application>Git</application>
-          </para>
-          <indexterm zone="git git-cvsserver">
-            <primary sortas="b-git-cvsserver">git-cvsserver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gitk">
-        <term><command>gitk</command></term>
-        <listitem>
-          <para>
-            is a graphical <application>Git</application> repository browser
-            (needs <xref linkend="tk"/>)
-          </para>
-          <indexterm zone="git gitk">
-            <primary sortas="b-gitk">gitk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="git-receive-pack">
-        <term><command>git-receive-pack</command></term>
-        <listitem>
-          <para>
-            is invoked by <command>git send-pack</command> and updates the
-            repository with the information fed from the remote end
-          </para>
-          <indexterm zone="git git-receive-pack">
-            <primary sortas="b-git-receive-pack">git-receive-pack</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="git-shell">
-        <term><command>git-shell</command></term>
-        <listitem>
-          <para>
-            is a login shell for SSH accounts to provide restricted Git
-            access
-          </para>
-          <indexterm zone="git git-shell">
-            <primary sortas="b-git-shell">git-shell</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="git-upload-archive">
-        <term><command>git-upload-archive</command></term>
-        <listitem>
-          <para>
-            is invoked by <command>git archive --remote</command> and sends
-            a generated archive to the other end over the git protocol
-          </para>
-          <indexterm zone="git git-upload-archive">
-            <primary sortas="b-git-upload-archive">git-upload-archive</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="git-upload-pack">
-        <term><command>git-upload-pack</command></term>
-        <listitem>
-          <para>
-            is invoked by <command>git fetch-pack</command>, it discovers
-            what objects the other side is missing, and sends them after
-            packing
-          </para>
-          <indexterm zone="git git-upload-pack">
-            <primary sortas="b-git-upload-pack">git-upload-pack</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="scalar">
-        <term><command>scalar</command></term>
-        <listitem>
-          <para>
-            is a repository management tool that optimizes Git for use in
-            large repositories
-          </para>
-          <indexterm zone="git scalar">
-            <primary sortas="b-scalar">scalar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/prog/gitserver.xml
===================================================================
--- general/prog/gitserver.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,392 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gitgid "58">
-  <!ENTITY gituid "58">
-]>
-
-<sect1 id="gitserver" xreflabel="Running a Git Server">
-  <?dbhtml filename="gitserver.html"?>
-
-
-  <title>Running a Git Server</title>
-
-  <sect2 role="package">
-    <title>Introduction</title>
-
-    <para>
-      This section will describe how to set up, administer and secure a
-      <application>git</application> server. <application>Git</application>
-      has many options available. For more detailed documentation see
-      <ulink url="https://git-scm.com/book/en/v2"/>.
-    </para>
-
-    <bridgehead renderas="sect3">Server Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="git"/> and
-      <xref linkend="openssh"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Setting up a Git Server</title>
-
-    <para>
-      The following instructions will install a
-      <application>git</application> server. It will be set
-      up to use <application>OpenSSH</application> as the secure
-      remote access method.
-    </para>
-
-    <para>
-      Configuration of the server consists of the following steps:
-    </para>
-
-    <sect3>
-      <title>1. Set Up Users, Groups, and Permissions</title>
-
-      <para>
-        You will need to be user <systemitem class='username'>root</systemitem>
-        for the initial portion of configuration. Create the <systemitem
-        class="username">git</systemitem> user and group and set and unusable
-        password hash with the following commands:
-      </para>
-
-<screen role="root"><userinput>groupadd -g &gitgid; git &amp;&amp;
-useradd -c "git Owner" -d /home/git -m -g git -s /usr/bin/git-shell -u &gituid; git &amp;&amp;
-sed -i '/^git:/s/^git:[^:]:/git:NP:/' /etc/shadow</userinput></screen>
-
-      <para>
-        Putting in an unusable password hash (replacing the <literal>!</literal>
-        by <literal>NP</literal>) unlocks the account but it cannot be used
-        to login via password authentication. That is required by
-        <application>sshd</application> to work properly.
-        Next, create some files and directories in the home directory of the git user
-        allowing access to the git repository using ssh keys.
-      </para>
-
-<screen role="root"><userinput>install -o git -g git -dm0700 /home/git/.ssh &amp;&amp;
-install -o git -g git -m0600 /dev/null /home/git/.ssh/authorized_keys</userinput></screen>
-
-      <para>
-        For any developer who should have access to the repository
-        add his/her public ssh key to <filename>/home/git/.ssh/authorized_keys</filename>.
-        First, prepend some options to prevent users from using the
-        connection to git for port forwarding to other machines
-        the git server might reach.
-      </para>
-
-<screen role="nodump"><userinput>echo -n "no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty " >> /home/git/.ssh/authorized_keys &amp;&amp;
-cat &lt;user-ssh-key&gt; &gt;&gt; /home/git/.ssh/authorized_keys</userinput></screen>
-
-      <para>
-        It is also useful to set the default name of the initial branch
-        of new repositories by modifying the git configuration. As the
-        <systemitem class='username'>root</systemitem> user, run:
-      </para>
-
-<screen role="nodump"><userinput>git config --system init.defaultBranch trunk</userinput></screen>
-
-      <para>
-        Finally add the <filename>/usr/bin/git-shell</filename> entry to
-        the <filename>/etc/shells</filename> configuration file. This shell
-        has been set in the <systemitem class='username'>git</systemitem>
-        user profile and is to make sure that only git related actions
-        can be executed:
-      </para>
-
-<screen role="root"><userinput>echo "/usr/bin/git-shell" &gt;&gt; /etc/shells</userinput></screen>
-
-    </sect3>
-
-    <sect3>
-      <title>2. Create a git repository</title>
-
-      <para>
-        The repository can be anywhere on the filesystem. It is
-        important that the git user has read/write access to that
-        location. We use <filename class="directory">/srv/git</filename>
-        as base directory. Create a new <application>git</application>
-        repository with the following commands (as the
-        <systemitem class="username">root</systemitem> user):
-      </para>
-
-      <note>
-        <para>
-          In all the instructions below, we use <emphasis>project1</emphasis>
-          as an example repository name.  You should name your repository
-          as a short descriptive name for your specific project.
-        </para>
-      </note>
-
-<screen role="root"><userinput>install -o git -g git -m755 -d /srv/git/project1.git &amp;&amp;
-cd /srv/git/project1.git                             &amp;&amp;
-git init --bare                                      &amp;&amp;
-chown -R git:git .</userinput></screen>
-
-    </sect3>
-
-    <sect3>
-      <title>3. Populate the repository from a client system</title>
-
-      <note>
-        <para>
-          All the instructions in this section and the next should
-          be done on a user system, not the server system.
-        </para>
-      </note>
-
-      <para>
-        Now that the repository is created, it can be used by the
-        developers to put some files into it. Once the ssh key of
-        the user is imported to git's <filename>authorized_keys</filename>
-        file, the user can interact with the repository.
-      </para>
-
-      <para>
-        A minimal configuration should be available on the developer's
-        system specifying its user name and the email address.
-        Create this minimal config file on client side:
-      </para>
-
-<screen role="nodump"><userinput>cat &gt; ~/.gitconfig &lt;&lt;EOF
-[user]
-        name = &lt;users-name&gt;
-        email = &lt;users-email-address&gt;
-EOF</userinput></screen>
-
-      <para>
-        On the developer's machine, set up some files to be pushed
-        to the repository as the initial content:
-      </para>
-
-      <note>
-        <para>
-          The <emphasis>gitserver</emphasis> term used below
-          should be the host name (or ip address) of the git server.
-        </para>
-      </note>
-
-<screen role="nodump"><userinput>mkdir myproject
-cd myproject
-git init --initial-branch=trunk
-git remote add origin git@gitserver:/srv/git/project1.git
-cat &gt;README &lt;&lt;EOF
-This is the README file
-EOF
-git add README
-git commit -m 'Initial creation of README'
-git push --set-upstream origin trunk</userinput></screen>
-
-      <para>The initial content is now pushed to the server and
-        is available for other users. On the current machine, the
-        argument <literal>--set-upstream origin trunk</literal> is
-        now no longer required as the local repository is now
-        connected to the remote repository. Subsequent pushes
-        can be performed as
-      </para>
-
-<screen role="nodump"><userinput>git push</userinput></screen>
-
-      <para>
-        Other developers can now clone the repository and do
-        modifications to the content (as long as their ssh keys
-        has been installed):
-      </para>
-
-<screen role="nodump"><userinput>git clone git@gitserver:/srv/git/project1.git
-cd project1
-vi README
-git commit -am 'Fix for README file'
-git push</userinput></screen>
-
-      <note>
-        <para>
-          This is a very basic server setup based on
-          <application>OpenSSH</application> access. All developers are using
-          the <systemitem class="username">git</systemitem> user to perform
-          actions on the repository and the changes users are committing can be
-          distinguished as the local user name (see
-          <filename>~/.gitconfig</filename>) is recorded in the
-          changesets.
-        </para>
-      </note>
-
-      <para>
-        Access is restricted by the public keys added to git's
-        <filename>authorized_keys</filename> file and there is no
-        option for the public to export/clone the repository. To
-        enable this, continue with step 4 to set up the git server
-        for public read-only access.
-      </para>
-
-      <para>
-        In the URL used to clone the project, the absolute path (here
-        <filename>/srv/git/project1.git</filename>) has to be specified
-        as the repository is not in git's home directory but in
-        <filename class="directory">/srv/git</filename>. To get rid of the
-        need to expose the structure of the server installation, a symlink
-        can be added in git's home directory for each project like this:
-      </para>
-<screen role="nodump"><userinput>ln -svf /srv/git/project1.git /home/git/</userinput></screen>
-
-      <para>
-        Now, the repository can be cloned using
-      </para>
-<screen role="nodump"><userinput>git clone git@gitserver:project1.git</userinput></screen>
-
-    </sect3>
-
-    <sect3 id="gitserver-init">
-      <title>4. Configure the Server</title>
-
-      <para>
-        The setup described above makes a repository available for
-        authenticated users (via providing the ssh public key file).
-        There is also a simple way to publish the
-        repository to unauthenticated users &mdash; of course without write
-        access.
-      </para>
-
-      <para>
-        The combination of access via ssh (for authenticated users) and
-        the export of repositories to unauthenticated users via the
-        daemon is in most cases enough for a development site.
-      </para>
-
-      <note>
-        <para>
-          The daemon will be reachable at port <literal>9418</literal>
-          by default. Make sure that your firewall setup allows
-          access to that port.
-        </para>
-      </note>
-
-      <para revision="sysv">
-        To start the server at boot time, install the git-daemon
-        bootscript included in the <xref linkend="bootscripts"/> package:
-      </para>
-
-      <indexterm zone="gitserver gitserver-init" revision="sysv">
-        <primary sortas="f-git">git</primary>
-      </indexterm>
-
-<screen role="root" revision="sysv"><userinput>make install-git-daemon</userinput></screen>
-
-      <para revision="systemd">
-        To start the server at boot time, install the
-        <filename>git-daemon.service</filename> unit from the
-        <xref linkend="systemd-units"/> package:
-      </para>
-
-      <indexterm zone="gitserver gitserver-init" revision="systemd">
-        <primary sortas="f-gitserve">gitserve</primary>
-      </indexterm>
-
-<screen role="root" revision="systemd"><userinput>make install-git-daemon</userinput></screen>
-
-      <para>
-        In order to allow <application>git</application> to export a
-        repository, a file named <filename>git-daemon-export-ok</filename>
-        is required in each repository directory on the server. The
-        file needs no content, just its existence enables, its absence
-        disables the export of that repository.
-      </para>
-
-<screen role="root"><userinput>touch /srv/git/project1.git/git-daemon-export-ok</userinput></screen>
-
-      <para revision="sysv">
-        The script to start the git daemon uses some default values
-        internally. Most important is the path to the repository
-        directory which is set to <filename class="directory">/srv/git</filename>.
-        In case you have for whatever reason created the repository in a
-        different location, you'll need to tell the boot script where the
-        repository is to be found. This can be achieved by creating a
-        configuration file named <filename>/etc/sysconfig/git-daemon</filename>.
-        This configuration file will be imported if it exists, meaning it is
-        optional. The file can look like:</para>
-<screen revision="sysv">
-# Begin /etc/sysconfig/git-daemon
-
-# Specify the location of the git repository
-GIT_BASE_DIR="/srv/git/"
-
-# Directories added to whitelist
-DFT_REPO_DIR="$GIT_BASE_DIR"
-
-# Add extra options which will appended to the 'git daemon'
-# command executed in the boot script
-GIT_DAEMON_OPTS=""
-
-# End /etc/sysconfig/git-daemon
-</screen>
-      <para revision="systemd">
-        Along with the <filename>git-daemon.service</filename> unit, a
-        configuration file named <filename>/etc/default/git-daemon</filename>
-        has been installed. Review this configuration file to match your
-        needs.
-      </para>
-
-      <para>
-        There are only three options to set in the configuration file:
-        <itemizedlist>
-          <listitem>
-            <para>
-              GIT_BASE_DIR=&lt;dirname&gt;
-            </para>
-            <para>Specify the location of the git repositories.
-              Relative paths used when accessing the daemon will
-              translated relative to this directory.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              DFT_REPO_DIR=&lt;dirname&gt;
-            </para>
-            <para>This directory is added to the white list of allowed
-              directories. This variable can hold multiple directory
-              names but is usually set equal to <literal>GIT_BASE_DIR</literal>.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              GIT_DAEMON_OPTS=&lt;options&gt;
-            </para>
-            <para>
-              In case special options to the <command>git daemon</command>
-              command are needed, they have to be specified in this setting.
-              One example might be to adjust the port number where daemon is
-              listening. In this case, add <literal>--port=&lt;port
-              number&gt;</literal> to this variable.  For more information
-              about which options can be set, take a look at the output of
-              <command>git daemon --help</command>.
-            </para>
-          </listitem>
-        </itemizedlist>
-      </para>
-
-      <para>
-        After starting the daemon, unauthenticated users can clone exported
-        repositories by using
-      </para>
-<screen role="nodump"><userinput>git clone git://gitserver/project1.git</userinput></screen>
-
-      <para>
-        As the base directory is <filename class="directory">/srv/git</filename>
-        by default (or set to a custom value in the configuration),
-        <application>git</application> interprets the incoming path
-        (/project1.git) relative to that base directory so that the repository
-        in <filename class="directory">/srv/git/project1.git</filename> is
-        served.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-</sect1>
Index: general/prog/guile.xml
===================================================================
--- general/prog/guile.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,245 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 guile-download-http "&gnu-http;/guile/guile-&guile-version;.tar.xz">
-  <!ENTITY guile-download-ftp  " ">
-  <!ENTITY guile-md5sum        "258983e0156c2bc66539dcbcb96f2bd2">
-  <!ENTITY guile-size          "5.5 MB">
-  <!ENTITY guile-buildsize     "221 MB (add 4 MB for tests)">
-  <!ENTITY guile-time          "5.9 SBU (Using parallelism=4; add 0.3 SBU for tests)">
-]>
-
-<sect1 id="guile" xreflabel="Guile-&guile-version;">
-<?dbhtml filename="guile.html"?>
-
-
-  <title>Guile-&guile-version;</title>
-
-  <indexterm zone="guile">
-    <primary sortas="a-Guile">Guile</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Guile</title>
-
-    <para>
-      The <application>Guile</application> package contains the GNU Project's
-      extension language library. <application>Guile</application> also
-      contains a stand alone <application>Scheme</application> interpreter.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&guile-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&guile-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &guile-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &guile-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &guile-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &guile-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Guile Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gc"/> and
-      <xref linkend="libunistring"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="emacs"/> and
-      <xref linkend="gdb"/> (run-time only dependencies).
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Guile</title>
-
-    <para>
-      Install <application>Guile</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static \
-            --docdir=/usr/share/doc/guile-&guile-version; &amp;&amp;
-make      &amp;&amp;
-make html &amp;&amp;
-
-makeinfo --plaintext -o doc/r5rs/r5rs.txt doc/r5rs/r5rs.texi &amp;&amp;
-makeinfo --plaintext -o doc/ref/guile.txt doc/ref/guile.texi</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>./check-guile</command>.
-      On an i686 system, as many as 10 tests will fail in the
-      <filename>numbers.test</filename> test suite due to minor floating-point
-      rounding errors.
-    </para>
-    <!-- 10 of the numbers tests fail on i686. This should probably be looked
-         into at a later point in time. -renodr -->
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install      &amp;&amp;
-make install-html &amp;&amp;
-
-mkdir -p                       /usr/share/gdb/auto-load/usr/lib &amp;&amp;
-mv /usr/lib/libguile-*-gdb.scm /usr/share/gdb/auto-load/usr/lib &amp;&amp;
-mv /usr/share/doc/guile-&guile-version;/{guile.html,ref} &amp;&amp;
-mv /usr/share/doc/guile-&guile-version;/r5rs{.html,}     &amp;&amp;
-
-find examples -name "Makefile*" -delete         &amp;&amp;
-cp -vR examples   /usr/share/doc/guile-&guile-version;   &amp;&amp;
-
-for DIRNAME in r5rs ref; do
-  install -v -m644  doc/${DIRNAME}/*.txt \
-                    /usr/share/doc/guile-&guile-version;/${DIRNAME}
-done &amp;&amp;
-unset DIRNAME</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          guild, guile, guile-config, guile-snarf and guile-tools
-        </seg>
-        <seg>
-          libguile-3.0.so and guile-readline.so
-        </seg>
-        <seg>
-          /usr/include/guile,
-          /usr/lib/guile,
-          /usr/share/doc/guile-&guile-version; and
-          /usr/share/guile
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="guile-prog">
-        <term><command>guile</command></term>
-        <listitem>
-          <para>
-            is a stand-alone Scheme interpreter for
-            <application>Guile</application>
-          </para>
-          <indexterm zone="guile guile-prog">
-            <primary sortas="b-guile">guile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="guile-config">
-        <term><command>guile-config</command></term>
-        <listitem>
-          <para>
-            is a <application>Guile</application> script which provides the
-            information necessary to link your programs against the
-            <application>Guile</application> library, in much the same way
-            PkgConfig does
-          </para>
-          <indexterm zone="guile guile-config">
-            <primary sortas="b-guile-config">guile-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="guile-snarf">
-        <term><command>guile-snarf</command></term>
-        <listitem>
-          <para>
-            is a script to parse declarations in your
-            <application>C</application> code for
-            <application>Scheme</application> visible
-            <application>C</application> functions
-          </para>
-          <indexterm zone="guile guile-snarf">
-            <primary sortas="b-guile-snarf">guile-snarf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="guild">
-        <term><command>guild</command></term>
-        <listitem>
-          <para>
-            is a wrapper program installed along with <command>guile</command>,
-            which knows where a particular module is installed and calls it,
-            passing its arguments to the program
-          </para>
-          <indexterm zone="guile guild">
-            <primary sortas="b-guild">guild</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="guile-tools">
-        <term><command>guile-tools</command></term>
-        <listitem>
-          <para>
-            is a symlink to <command>guild</command>
-          </para>
-          <indexterm zone="guile guile-tools">
-            <primary sortas="b-guile-tools">guile-tools</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/prog/java.xml
===================================================================
--- general/prog/java.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,194 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
-
-<!-- Maintainer: before making the tarball, remove all .debuginfo files from
-    the directory: this saves more than 70 MB. -->
-  <!ENTITY anduin-download             "&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;">
-  <!ENTITY openjdk-download-binary-x86 "&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;/OpenJDK-&openjdk-version;+&openjdk-build;-i686-bin.tar.xz">
-  <!ENTITY openjdk-bin-md5sum-x86      "a08524784f41d0ccb80c1484b99bde3a">
-  <!ENTITY openjdk-bin-size-x86        "161 MB">
-  <!ENTITY openjdk-bin-buildsize-x86   "314 MB">
-
-<!-- Not uploaded to anduin, since this file is now available under GNU GPLv2
-     licence.-->
-<!-- Reuploaded to anduin due to the complexity of the download URL, per Bruce's
-     request. - Doug -->
-  <!ENTITY openjdk-download-binary-x64 "&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;/OpenJDK-&openjdk-version;+&openjdk-build;-x86_64-bin.tar.xz">
-  <!ENTITY openjdk-bin-md5sum-x64      "ff5cab3d4e6c571996911a6cd47023eb">
-  <!ENTITY openjdk-bin-size-x64        "169 MB">
-  <!ENTITY openjdk-bin-buildsize-x64   "343 MB">
-]>
-
-<sect1 id="java" xreflabel="Java-&openjdk-version;">
-  <?dbhtml filename="java.html"?>
-
-
-  <title>Java-&openjdk-version;</title>
-
-  <indexterm zone="java">
-    <primary sortas="a-java">JDK Binary</primary>
-  </indexterm>
-
-
-  <sect2>
-    <title>About Java</title>
-    <para>
-      Java is different from most of the packages in LFS and BLFS. It
-      is a programming language that works with files of bytecode to obtain
-      instructions and executes them in a Java Virtual Machine (JVM). An
-      introductory java program looks like:
-    </para>
-
-<screen><literal>public class HelloWorld
-{
-    public static void main(String[] args)
-    {
-        System.out.println("Hello, World");
-    }
-}</literal></screen>
-
-    <para>
-      This program is saved as <filename>HelloWorld.java</filename>. The
-      file name, <emphasis>HelloWorld</emphasis>, must match the class name.
-      It is then converted into byte code with
-      <command>javac HelloWorld.java</command>. The output file is
-      <filename>HelloWorld.class</filename>.  The program is executed with
-      <command>java HelloWorld</command>.  This creates a JVM and runs the
-      code.  The 'class' extension must not be specified.
-    </para>
-
-    <para>
-      Several class files can be combined into one file with the
-      <command>jar</command> command. This is similar to the standard
-      <command>tar</command> command. For instance, the command
-      <command>jar cf myjar.jar *.class</command> will combine all class files
-      in a directory into one jar file. These act as library files.
-    </para>
-
-    <para>
-      The JVM can search for and use classes in jar files automatically.
-      It uses the <envar>CLASSPATH</envar> environment variable to search for
-      jar files. This is a standard list of colon-separated directory names
-      similar to the <envar>PATH</envar> environment variable.
-    </para>
-
-  </sect2>
-
-  <sect2 id="java-bin" xreflabel="Java Binary" role="package">
-    <title>Binary JDK Information</title>
-
-    <para>
-      Creating a JVM from source requires a set of circular dependencies.
-      The first thing that's needed is a set of programs called a Java
-      Development Kit (JDK).  This set of programs includes
-      <command>java</command>, <command>javac</command>,
-      <command>jar</command>, and several others. It also includes several
-      base <emphasis>jar</emphasis> files.
-    </para>
-
-    <para>
-      To start, we set up a binary installation of the JDK created
-      by the BLFS editors.  It is installed in the <filename>/opt</filename>
-      directory to allow for multiple installations, including a source based
-      version.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Binary Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Binary download (x86): <ulink url="&openjdk-download-binary-x86;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &openjdk-bin-md5sum-x86;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size (binary): &openjdk-bin-size-x86;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &openjdk-bin-buildsize-x86;
-        </para>
-      </listitem>
-    </itemizedlist>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Binary download (x86_64): <ulink url="&openjdk-download-binary-x64;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &openjdk-bin-md5sum-x64;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size (binary): &openjdk-bin-size-x64;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &openjdk-bin-buildsize-x64;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Java Binary Runtime Dependencies</bridgehead>
-    <para role="required">
-      <xref role="runtime" linkend="alsa-lib"/>,
-      <xref role="runtime" linkend="cups"/>,
-      <xref role="runtime" linkend="giflib"/>, and
-      <xref role="runtime" linkend="xorg7-lib"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of the Java BinaryJDK </title>
-<!--
-    <note>
-      <para>
-        The tarball
-        <emphasis>openjdk-&openjdk-version;_linux-x64_bin.tar.gz</emphasis> will
-        untar to the <emphasis>jdk-&openjdk-version;</emphasis> directory.
-      </para>
-    </note>
--->
-    <para>
-      Begin by extracting the appropriate binary tarball for your
-      architecture and changing to the extracted directory. Install the binary
-      <application>OpenJDK</application> with the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -vdm755 /opt/OpenJDK-&openjdk-version;-bin &amp;&amp;
-mv -v * /opt/OpenJDK-&openjdk-version;-bin         &amp;&amp;
-chown -R root:root /opt/OpenJDK-&openjdk-version;-bin</userinput></screen>
-
-    <para>
-      The binary version is now installed. You may create a symlink to that
-      version by issuing, as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>ln -sfn OpenJDK-&openjdk-version;-bin /opt/jdk</userinput></screen>
-
-    <para>
-      You may now proceed to <xref linkend="ojdk-conf"/>, where the
-      instructions assume that the above link exists.
-    </para>
-
-  </sect2>
-
-</sect1>
Index: general/prog/jdk.xml
===================================================================
--- general/prog/jdk.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/prog/jdk.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,7 @@
+<sect1 id="jdk" xreflabel="jdk">
+<?dbhtml filename="jdk.html" dir="general"?>
+<title>jdk</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
Index: general/prog/llvm.xml
===================================================================
--- general/prog/llvm.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,1826 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 llvm-url "https://github.com/llvm/llvm-project/releases/download/llvmorg-&llvm-version;">
-
-  <!ENTITY llvm-download-http "&llvm-url;/llvm-&llvm-version;.src.tar.xz">
-  <!ENTITY llvm-download-ftp  " ">
-  <!ENTITY llvm-md5sum        "5d9201e7c9a494ce8325cf365b6529a2">
-  <!ENTITY llvm-size          "60 MB">
-  <!ENTITY llvm-buildsize     "4.2 GB (964 MB installed; add 20 GB for tests and 308 MB for documentation)">
-  <!ENTITY llvm-time          "13 SBU (Add 8 SBU for tests; both using parallelism=8)">
-
-  <!ENTITY clang-download-http "&llvm-url;/clang-&llvm-version;.src.tar.xz">
-  <!ENTITY clang-md5sum        "4b3713a71f1442097ba2e881d74b679f">
-  <!ENTITY clang-size          "22 MB">
-
-  <!ENTITY compiler-rt-download-http "&llvm-url;/compiler-rt-&llvm-version;.src.tar.xz">
-  <!ENTITY compiler-rt-md5sum        "616ffb64d92162f1e5fdc7016bb1012e">
-  <!ENTITY compiler-rt-size          "2.4 MB">
-
-  <!-- CMake modules and third party dependencies renamed and uploaded
-       onto anduin to avoid stupid file names.  -->
-
-  <!ENTITY cmake-llvm-download-http "&sources-anduin-http;/llvm/llvm-cmake-&llvm-maj-version;.src.tar.xz">
-  <!ENTITY cmake-llvm-md5sum         "bf2ad617d47ce40fe77c0e5c26b1fe43">
-  <!ENTITY cmake-llvm-size           "12 KB">
-
-  <!ENTITY llvm-3rdparty-download-http "&sources-anduin-http;/llvm/llvm-third-party-&llvm-maj-version;.src.tar.xz">
-  <!ENTITY llvm-3rdparty-md5sum        "5ebac19868c66cdac8b87077faefd38c">
-  <!ENTITY llvm-3rdparty-size          "396 KB">
-]>
-
-<sect1 id="llvm" xreflabel="LLVM-&llvm-version;">
-  <?dbhtml filename="llvm.html" ?>
-
-
-  <title>LLVM-&llvm-version;</title>
-
-  <indexterm zone="llvm">
-    <primary sortas="a-LLVM">LLVM</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to LLVM</title>
-
-    <para>
-      The <application>LLVM</application> package contains a collection of
-      modular and reusable compiler and toolchain technologies. The Low Level
-      Virtual Machine (LLVM) Core libraries provide a modern source and
-      target-independent optimizer, along with code generation support for many
-      popular CPUs (as well as some less common ones!). These libraries are
-      built around a well specified code representation known as the LLVM
-      intermediate representation ("LLVM IR").
-    </para>
-
-    <para>
-      <application>Clang</application> provides new C, C++, Objective C
-      and Objective C++ front-ends for <application>LLVM</application> and is
-      required by some desktop packages such as <application>firefox</application>
-      and for <application>rust</application> if that is built using the system
-      <application>LLVM</application>.
-    </para>
-
-    <para>
-      The <application>Compiler RT</application> package provides
-      runtime sanitizer and profiling libraries for developers who use
-      <application>Clang</application> and <application>LLVM</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&llvm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&llvm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &llvm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &llvm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &llvm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &llvm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <para>
-      <emphasis role="strong">Cmake modules for LLVM</emphasis>
-    </para>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download: <ulink url="&cmake-llvm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cmake-llvm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cmake-llvm-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para>
-      <emphasis role="strong">Third-party dependencies for LLVM build system</emphasis>
-    </para>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download: <ulink url="&llvm-3rdparty-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &llvm-3rdparty-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &llvm-3rdparty-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-
-    <bridgehead renderas="sect3">Recommended Download</bridgehead>
-    <para>
-      <emphasis role="strong">Clang</emphasis>
-    </para>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download: <ulink url="&clang-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &clang-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &clang-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Optional Download</bridgehead>
-    <para>
-      <emphasis role="strong">Compiler RT</emphasis>
-    </para>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download: <ulink url="&compiler-rt-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &compiler-rt-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &compiler-rt-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-    <bridgehead renderas="sect3">LLVM Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>,
-      <xref linkend="git"/>,
-      <xref linkend="graphviz"/>,
-      <xref linkend="libxml2"/>,
-      <xref linkend="psutil"/> (for tests),
-      <xref linkend="pygments"/>,
-      <xref linkend="rsync"/> (for tests),
-      <xref linkend="recommonmark"/> (for building documentation),
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>),
-      <xref linkend="valgrind"/>,
-      <xref linkend="PyYAML"/>, <!-- for yaml2obj -->
-      <xref linkend="zip"/>,
-      <ulink url="https://ocaml.org/">OCaml</ulink>,
-      and <ulink url="https://github.com/Z3Prover/z3">Z3</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of LLVM</title>
-
-    <para>
-      Two additional tarballs
-      <filename>llvm-cmake-&llvm-maj-version;.src.tar.xz</filename> and
-      <filename>llvm-third-party-&llvm-maj-version;.src.tar.xz</filename> are
-      needed by LLVM building system.  The upstream expects them extracted
-      at the same level as the
-      <filename>llvm-&llvm-version;.src.tar.xz</filename> tarball,
-      and the extracted directories renamed to
-      <filename class="directory">cmake</filename> and
-      <filename class="directory">third-party</filename>.  Extract them and
-      modify the build system to avoid creating ambiguously-named
-      directories outside the
-      <filename>llvm-&llvm-version;.src</filename> hierarchy:
-    </para>
-
-<screen><userinput>tar -xf ../llvm-cmake-&llvm-maj-version;.src.tar.xz                                   &amp;&amp;
-tar -xf ../llvm-third-party-&llvm-maj-version;.src.tar.xz                             &amp;&amp;
-sed '/LLVM_COMMON_CMAKE_UTILS/s@../cmake@llvm-cmake-&llvm-maj-version;.src@'          \
-    -i CMakeLists.txt                                                 &amp;&amp;
-sed '/LLVM_THIRD_PARTY_DIR/s@../third-party@llvm-third-party-&llvm-maj-version;.src@' \
-    -i cmake/modules/HandleLLVMOptions.cmake</userinput></screen>
-
-    <para>
-      Install <application>clang</application> into
-      the source tree by running the following commands:
-    </para>
-
-<screen><userinput>tar -xf ../clang-&llvm-version;.src.tar.xz -C tools &amp;&amp;
-mv tools/clang-&llvm-version;.src tools/clang</userinput></screen>
-
-    <para>
-      If you have downloaded <application>compiler-rt</application>,
-      install it into the source tree by running the following commands:
-    </para>
-
-<screen><userinput>tar -xf ../compiler-rt-&llvm-version;.src.tar.xz -C projects    &amp;&amp;
-mv projects/compiler-rt-&llvm-version;.src projects/compiler-rt</userinput></screen>
-
-    <para>
-     There are many Python scripts in this package which use
-     <command>/usr/bin/env python</command> to access the system Python
-     which on LFS is <xref linkend="python3"/>. Use the following command
-     to fix these scripts:
-    </para>
-
-<screen><userinput>grep -rl '#!.*python' | xargs sed -i '1s/python$/python3/'</userinput></screen>
-
-    <para>
-      Install <application>LLVM</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir -v build &amp;&amp;
-cd       build &amp;&amp;
-
-CC=gcc CXX=g++                              \
-cmake -DCMAKE_INSTALL_PREFIX=/usr           \
-      -DLLVM_ENABLE_FFI=ON                  \
-      -DCMAKE_BUILD_TYPE=Release            \
-      -DLLVM_BUILD_LLVM_DYLIB=ON            \
-      -DLLVM_LINK_LLVM_DYLIB=ON             \
-      -DLLVM_ENABLE_RTTI=ON                 \
-      -DLLVM_TARGETS_TO_BUILD="host;AMDGPU" \
-      -DLLVM_BINUTILS_INCDIR=/usr/include   \
-      -DLLVM_INCLUDE_BENCHMARKS=OFF         \
-      -DCLANG_DEFAULT_PIE_ON_LINUX=ON       \
-      -DCLANG_CONFIG_FILE_SYSTEM_DIR=/etc/clang \
-      -Wno-dev -G Ninja ..                  &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      If you have installed <xref linkend="recommonmark"/> and its
-      dependencies, you can generate the html documentation and manual
-      pages with the following commands:
-    </para>
-
-<screen remap="doc"><userinput>cmake -DLLVM_BUILD_DOCS=ON            \
-      -DLLVM_ENABLE_SPHINX=ON         \
-      -DSPHINX_WARNINGS_AS_ERRORS=OFF \
-      -Wno-dev -G Ninja ..            &amp;&amp;
-ninja docs-llvm-html  docs-llvm-man</userinput></screen>
-
-    <para>
-      The clang documentation can be built too:
-    </para>
-
-<screen remap="doc"><userinput>ninja docs-clang-html docs-clang-man</userinput></screen>
-
-    <!-- https://github.com/llvm/llvm-project/issues/39012 -->
-    <para>
-      If you wish to run the tests, remove a test case known to hang
-      indefinitely on some systems:
-    </para>
-
-    <screen remap='test'><userinput>rm -f ../projects/compiler-rt/test/tsan/getline_nohang.cpp</userinput></screen>
-
-    <!-- The excessive core dump made my system irresponsive.  -->
-    <para>
-      LLVM test suite can produce many core dump files.  They will occupy
-      a large amount of disk space, and the core dump process can
-      significantly slow down the testing.  To test the results with core
-      dump disabled, <phrase revision='systemd'>ensure
-      <xref linkend='systemd'/> and <xref linkend='shadow'/> have
-      been rebuilt with <xref linkend='linux-pam'/> support (if you are
-      interacting via a SSH or graphical session, also ensure the
-      <xref linkend='openssh'/> server or the desktop manager has been
-      built with <xref linkend='linux-pam'/>) and the current login session
-      is started after updating the
-      <filename>/etc/pam.d/system-session</filename> file to include
-      <filename class='libraryfile'>pam_systemd.so</filename>,
-      then </phrase>issue:
-    </para>
-
-    <screen remap="test" revision="sysv"><userinput>sh -c 'ulimit -c 0 &amp;&amp; ninja check-all'</userinput></screen>
-
-    <!-- From core(5): "RLIMIT_CORE will be ignored if the system is
-         configured to pipe core dumps to a program".  Here "the program"
-         is systemd-coredumpd.  So we need some fancy systemd setting.
-         -&ndash;user: Run it under per-user systemd manager, avoiding
-                       the necessity of root priviledge.
-         -&nash;pty: Run it in a pseudo-terminal, so we can monitor the
-                     process or interrupt it with Ctrl-C if we want.
-         -d: Run it with $PWD as the working directory.
-         -G: Delete the transient service unit even if the command fails,
-             to prevent "systemctl -&ndash;user status" from reporting
-             "degraded".
-         -p LimitCORE=0: Disable core dump.
-    -->
-
-<screen remap="test" revision="systemd"><userinput>systemctl   --user start dbus &amp;&amp;
-systemd-run --user --pty -d -G -p LimitCORE=0 ninja check-all</userinput></screen>
-
-    <para>
-      <!-- EDITORS - if you have more than 4 cores, use a cgroup to measure
-      the elapsed time for the tests.  Also, libstdc++.a and perhaps libstdc++fs.a
-      are used by a couple of the link-static tests. -->
-      If <option>-jN</option> (N replaced with a number) is passed to
-      <command>ninja</command>, the tests will be built with N logical
-      cores, but run using all available logical cores.
-      Run the test command in a cgroup (<phrase revision='systemd'>pass
-        the <option>-p AllowedCPUs=...</option> option to the
-        <command>systemd-run</command> command,
-      </phrase>
-      read <xref linkend='build-in-cgroup'/> for details) to limit the
-      number of logical cores for running the tests.
-      One test named <filename>Linux/clone_setns.cpp</filename> will fail
-      if <option>CONFIG_USER_NS</option> is not enabled in kernel
-      configuration.
-      <!-- 18.1.2: 71626 Passed, 27447 Unsupported, 339 Skipped,
-                   133 Expectedly Failed -->
-
-      <!-- To editors: it seems there is a more thorough test suite named
-           "test-suite-x.y.z.src.tar.xz" on the GitHub release download
-           page.  The usage of it is on
-           https://llvm.org/docs/TestSuiteGuide.html.  It looks like we've
-           never mentioned it in BLFS.
-
-           Let's let it go.  llvm is complex enough as it is.  Adding
-           the additional testsuite is IMO overkill.  - bdubbs -->
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>ninja install &amp;&amp;
-cp bin/FileCheck /usr/bin</userinput></screen>
-<!-- as of version 13.0.0, the install process seems to install the html
-     documentation and the manual pages. The llvm html documentation
-     is installed into /usr/share/doc/LLVM/llvm, while the clang html
-     documentation is installed into /usr/share/doc/LLVM/clang. So we have
-     just to move it. -->
-    <para>
-      If you have built the llvm documentation, it has been installed
-      by the above command, but it needs to be moved. As the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -v -d -m755 /usr/share/doc/llvm-&llvm-version;            &amp;&amp;
-mv -v /usr/share/doc/LLVM/llvm /usr/share/doc/llvm-&llvm-version; &amp;&amp;
-rmdir -v --ignore-fail-on-non-empty /usr/share/doc/LLVM</userinput></screen>
-
-    <para>
-      If you have built the clang documentation, it has been installed, but
-      needs to be moved too.  Again as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -v -d -m755 /usr/share/doc/llvm-&llvm-version;             &amp;&amp;
-mv -v /usr/share/doc/LLVM/clang /usr/share/doc/llvm-&llvm-version; &amp;&amp;
-rmdir -v --ignore-fail-on-non-empty /usr/share/doc/LLVM</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DLLVM_ENABLE_FFI=ON</parameter>: This switch allows
-      <application>LLVM</application> to use
-      <application>libffi</application>.
-    </para>
-
-    <para>
-      <parameter>-DLLVM_BUILD_LLVM_DYLIB=ON</parameter>: This switch builds
-      the libraries as static and links all of them into an unique shared one.
-      This is the recommended way of building a shared library.
-    </para>
-
-    <para>
-      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch enables
-      compiler optimizations in order to speed up the code and reduce its size.
-      It also disables some compile checks which are not necessary on a
-      production system.
-    </para>
-
-    <para>
-      <parameter>-DLLVM_TARGETS_TO_BUILD="host;AMDGPU"</parameter>: This
-      switch enables building for the same target as the host, and also for
-      the r600 AMD GPU used by the Mesa r600 and radeonsi drivers.
-      The default is
-      all of the targets. You can use a semicolon separated list. Valid targets
-      are: host, AArch64, AMDGPU, ARM, AVR, BPF, Hexagon, Lanai, LoongArch,
-      Mips, MSP430, NVPTX, PowerPC, RISCV, Sparc, SystemZ, SystemZ, VE,
-      WebAssembly, X86, XCore, or all.
-    </para>
-
-    <para>
-      <parameter>-DLLVM_LINK_LLVM_DYLIB=ON</parameter>: Used in conjunction with
-      <parameter>-DLLVM_BUILD_LLVM_DYLIB=ON</parameter>, this switch enables
-      linking the tools against the shared library instead of the static ones.
-      It slightly reduces their size and also ensures that llvm-config
-      will correctly use libLLVM-&llvm-maj-version;.so.
-    </para>
-
-    <para>
-      <parameter>-DLLVM_ENABLE_RTTI=ON</parameter>: This switch is used to
-      build LLVM with run-time type information. This is required for building
-      <xref linkend="mesa"/>.
-    </para>
-
-    <para>
-      <parameter>-DLLVM_BINUTILS_INCDIR=/usr/include</parameter>: This switch
-      is used to tell the build system the location of binutils headers,
-      which were installed in LFS.  This allows the building of
-      <filename class="libraryfile">LLVMgold.so</filename>, which is needed
-      for building programs with <command>clang</command> and Link Time
-      Optimization (LTO).
-    </para>
-
-    <para>
-      <parameter>-DLLVM_INCLUDE_BENCHMARKS=OFF</parameter>:
-      is used to disable generation build targets for the LLVM
-      benchmarks. This option requires additional code that
-      is not currently available.
-    </para>
-
-    <para>
-      <parameter>-DCLANG_DEFAULT_PIE_ON_LINUX=ON</parameter>: makes
-      <option>-fpie</option> option the default when compiling programs.
-      Together with the <xref linkend="gASLR"/> feature enabled in the kernel,
-      this defeats some kind of attacks based on known memory layouts.
-    </para>
-
-    <para>
-      <parameter>-DCLANG_CONFIG_FILE_SYSTEM_DIR=/etc/clang</parameter>:
-      makes <command>clang</command> and <command>clang++</command>
-      search <filename class='directory'>/etc/clang</filename> for
-      configuration files.
-    </para>
-
-    <para>
-      <option>-DBUILD_SHARED_LIBS=ON</option>: if used instead of
-      <parameter>-DLLVM_BUILD_LLVM_DYLIB=ON</parameter> and
-      <parameter>-DLLVM_LINK_LLVM_DYLIB=ON</parameter>, builds all the
-      <application>LLVM</application> libraries (about 60) as shared
-      libraries instead of static.
-    </para>
-
-    <para>
-      <option>-DLLVM_ENABLE_DOXYGEN</option>: Enables the generation of
-      browsable HTML documentation if you have installed <xref
-      linkend="doxygen"/>. You should run <command>make doxygen-html</command>
-      afterwards, and install the generated documentation manually.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring LLVM</title>
-
-    <sect3 id="llvm-config-info">
-      <title>Configuration Information</title>
-
-      <para>
-        If you've built Clang, as the &root; user create two configuration
-        files to make <xref linkend='gSSP'/> enabled by default for
-        <command>clang</command> and <command>clang++</command>, so
-        the default configuration of their SSP feature will be consistent
-        with <xref linkend='gcc'/>:
-      </para>
-
-<screen role='root'><userinput>mkdir -pv /etc/clang &amp;&amp;
-for i in clang clang++; do
-  echo -fstack-protector-strong &gt; /etc/clang/$i.cfg
-done</userinput></screen>
-    </sect3>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          amdgpu-arch,
-          analyze-build, bugpoint, c-index-test, clang, clang++ (symlinks to
-          clang-&llvm-maj-version;), clang-&llvm-maj-version;, clang-check, clang-cl,
-          clang-cpp (last two symlinks to clang), clang-extdef-mapping, clang-format,
-          clang-linker-wrapper,
-          clang-offload-bundler, clang-offload-packager,
-          clang-refactor, clang-rename, clang-repl, clang-scan-deps,
-          clang-tblgen,
-          diagtool, dsymutil, FileCheck, git-clang-format, hmaptool, intercept-build, llc, lli,
-          llvm-addr2line (symlink to llvm-symbolizer),
-          llvm-ar, llvm-as, llvm-bcanalyzer,
-          llvm-bitcode-strip (symlink to llvm-objcopy), llvm-cat,
-          llvm-cfi-verify, llvm-config, llvm-cov, llvm-c-test, llvm-cvtres,
-          llvm-cxxdump, llvm-cxxfilt, llvm-cxxmap, llvm-debuginfo-analyzer,
-          llvm-debuginfod, llvm-debuginfod-find,
-          llvm-diff, llvm-dis, llvm-dlltool (symlink to llvm-ar),
-          llvm-dwarfdump, llvm-dwarfutil,
-          llvm-dwp, llvm-exegesis, llvm-extract, llvm-gsymutil, llvm-ifs,
-          llvm-install-name-tool (symlink to llvm-objcopy), llvm-jitlink,
-          llvm-lib (symlink to llvm-ar), llvm-libtool-darwin, llvm-link,
-          llvm-lipo, llvm-lto, llvm-lto2, llvm-mc, llvm-mca, llvm-ml,
-          llvm-modextract, llvm-mt, llvm-nm, llvm-objcopy, llvm-objdump,
-          llvm-opt-report, llvm-otool (symlink to llv-objdump),
-          llvm-pdbutil, llvm-profdata, llvm-profgen,
-          llvm-ranlib (symlink to llvm-ar), llvm-rc,
-          llvm-readelf (symlink to llvm-readobj), llvm-readobj,
-          llvm-readtapi, llvm-reduce,
-          llvm-remarkutil,
-          llvm-rtdyld, llvm-sim, llvm-size, llvm-split, llvm-stress,
-          llvm-strings, llvm-strip (symlink to llvm-objcopy), llvm-symbolizer,
-          llvm-tblgen, llvm-tli-checker, llvm-undname, llvm-windres (symlink to
-          llvm-rc), llvm-xray, nvptx-arch, opt, sancov, sanstats, scan-build,
-          scan-build-py, scan-view, and verify-uselistorder
-        </seg>
-        <seg>
-          libLLVM.so,
-          libLLVM*.a (100 libraries),
-          libLTO.so,
-          libRemarks.so,
-          libclang.so,
-          libclang-cpp.so,
-          libclang*.a (42 libraries),
-          and LLVMgold.so
-        </seg>
-        <seg>
-          /usr/include/{clang,clang-c,llvm,llvm-c},
-          /usr/lib/{clang,cmake/{clang,llvm},libear,libscanbuild},
-          /usr/share/{clang,opt-viewer,scan-build,scan-view},
-          /usr/share/doc/llvm-&llvm-version;, and
-          /etc/clang
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="amdgpu-arch">
-        <term><command>amdgpu-arch</command></term>
-        <listitem>
-          <para>
-            lists AMD GPUs installed; at runtime it needs
-            <filename class='libraryfile'>libhsa-runtime64.so</filename>
-            which is not a part of BLFS
-          </para>
-          <indexterm zone="llvm amdgpu-arch">
-            <primary sortas="b-amdgpu-arch">amdgpu-arch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="analyze-build">
-        <term><command>analyze-build</command></term>
-        <listitem>
-          <para>
-            is a static analysis tool
-          </para>
-          <indexterm zone="llvm analyze-build">
-            <primary sortas="b-analyze-build">analyze-build</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bugpoint">
-        <term><command>bugpoint</command></term>
-        <listitem>
-          <para>
-            is the automatic test case reduction tool
-          </para>
-          <indexterm zone="llvm bugpoint">
-            <primary sortas="b-bugpoint">bugpoint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="c-index-test">
-        <term><command>c-index-test</command></term>
-        <listitem>
-          <para>
-            is used to test the libclang API and demonstrate its usage
-          </para>
-          <indexterm zone="llvm c-index-test">
-            <primary sortas="b-c-index-test">c-index-test</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="clang">
-        <term><command>clang</command></term>
-        <listitem>
-          <para>
-            is the <application>Clang</application> C, C++,
-            and Objective-C compiler
-          </para>
-          <indexterm zone="llvm clang">
-            <primary sortas="b-clang">clang</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="clang-check">
-        <term><command>clang-check</command></term>
-        <listitem>
-          <para>
-            is a tool to perform static code analysis and display Abstract
-            Syntax Trees (AST)
-          </para>
-          <indexterm zone="llvm clang-check">
-            <primary sortas="b-clang-check">clang-check</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="clang-extdef-mapping">
-        <term><command>clang-extdef-mapping</command></term>
-        <listitem>
-          <para>
-            is a tool to collect the USR name and location of external
-            definitions in a source file
-          </para>
-          <indexterm zone="llvm clang-extdef-mapping">
-            <primary sortas="b-clang-extdef-mapping">clang-extdef-mapping</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="clang-format">
-        <term><command>clang-format</command></term>
-        <listitem>
-          <para>
-            is a tool to format C/C++/Java/JavaScript/Objective-C/Protobuf
-            code
-          </para>
-          <indexterm zone="llvm clang-format">
-            <primary sortas="b-clang-format">clang-format</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="clang-linker-wrapper">
-        <term><command>clang-linker-wrapper</command></term>
-        <listitem>
-          <para>
-            is a wrapper utility over the host linker
-          </para>
-          <indexterm zone="llvm clang-linker-wrapper">
-            <primary sortas="b-clang-linker-wrapper">clang-linker-wrapper</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="clang-offload-bundler">
-        <term><command>clang-offload-bundler</command></term>
-        <listitem>
-          <para>
-            is a tool to bundle/unbundle OpenMP offloaded files associated with
-            a common source file
-          </para>
-          <indexterm zone="llvm clang-offload-bundler">
-            <primary sortas="b-clang-offload-bundler">clang-offload-bundler</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="clang-offload-packager">
-        <term><command>clang-offload-packager</command></term>
-        <listitem>
-          <para>
-            is a tool to bundle several object files into a single binary,
-            which can then be used to create a fatbinary containing offloading
-            code
-          </para>
-          <indexterm zone="llvm clang-offload-packager">
-            <primary sortas="b-clang-offload-packager">clang-offload-packager</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="clang-refactor">
-        <term><command>clang-refactor</command></term>
-        <listitem>
-          <para>
-            is a Clang-based refactoring tool for C, C++ and Objective-C
-          </para>
-          <indexterm zone="llvm clang-refactor">
-            <primary sortas="b-clang-refactor">clang-refactor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="clang-rename">
-        <term><command>clang-rename</command></term>
-        <listitem>
-          <para>
-            is a tool to rename symbols in C/C++ programs
-          </para>
-          <indexterm zone="llvm clang-rename">
-            <primary sortas="b-clang-rename">clang-rename</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="clang-scan-deps">
-        <term><command>clang-scan-deps</command></term>
-        <listitem>
-          <para>
-            is a tool to scan for dependencies in a source file
-          </para>
-          <indexterm zone="llvm clang-scan-deps">
-            <primary sortas="b-clang-scan-deps">clang-scan-deps</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="clang-tblgen">
-        <term><command>clang-tblgen</command></term>
-        <listitem>
-          <para>
-            is a program that translates compiler-related target
-            description (<filename class='extension'>.td</filename>) files
-            into C++ code and other output formats
-          </para>
-          <indexterm zone="llvm clang-tblgen">
-            <primary sortas="b-clang-tblgen">clang-tblgen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="diagtool">
-        <term><command>diagtool</command></term>
-        <listitem>
-          <para>
-            is a combination of tools for dealing with diagnostics in clang
-          </para>
-          <indexterm zone="llvm diagtool">
-            <primary sortas="b-diagtool">diagtool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="FileCheck">
-        <term><command>FileCheck</command></term>
-        <listitem>
-          <para>
-            is a tool that reads two files (one from standard input,
-            and one specified on the command line) and uses one to verify the other.
-          </para>
-          <indexterm zone="llvm FileCheck">
-            <primary sortas="b-FileCheck">FileCheck</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dsymutil">
-        <term><command>dsymutil</command></term>
-        <listitem>
-          <para>
-            is a tool used to manipulate archived DWARF debug symbol files,
-            compatible with the Darwin command <command>dsymutil</command>
-          </para>
-          <indexterm zone="llvm dsymutil">
-            <primary sortas="b-dsymutil">dsymutil</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="git-clang-format">
-        <term><command>git-clang-format</command></term>
-        <listitem>
-          <para>
-            runs clang-format on git generated patches (requires
-            <xref linkend="git"/>)
-          </para>
-          <indexterm zone="llvm git-clang-format">
-            <primary sortas="b-git-clang-format">git-clang-format</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hmaptool">
-        <term><command>hmaptool</command></term>
-        <listitem>
-          <para>
-            is a Python tool to dump and construct header maps
-          </para>
-          <indexterm zone="llvm hmaptool">
-            <primary sortas="b-hmaptool">hmaptool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="intercept-build">
-        <term><command>intercept-build</command></term>
-        <listitem>
-          <para>
-            generates a database of build commands for a project
-          </para>
-          <indexterm zone="llvm intercept-build">
-            <primary sortas="b-intercept-build">intercept-build</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llc">
-        <term><command>llc</command></term>
-        <listitem>
-          <para>
-            is the <application>LLVM</application> static compiler
-          </para>
-          <indexterm zone="llvm llc">
-            <primary sortas="b-llc">llc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lli">
-        <term><command>lli</command></term>
-        <listitem>
-          <para>
-            is used to directly execute programs from
-            <application>LLVM</application> bitcode
-          </para>
-          <indexterm zone="llvm lli">
-            <primary sortas="b-lli">lli</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-addr2line">
-        <term><command>llvm-addr2line</command></term>
-        <listitem>
-          <para>
-            is a tool used to convert addresses into file names and line
-            numbers
-          </para>
-          <indexterm zone="llvm llvm-addr2line">
-            <primary sortas="b-llvm-addr2line">llvm-addr2line</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-ar">
-        <term><command>llvm-ar</command></term>
-        <listitem>
-          <para>
-            is the <application>LLVM</application> archiver
-          </para>
-          <indexterm zone="llvm llvm-ar">
-            <primary sortas="b-llvm-ar">llvm-ar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-as">
-        <term><command>llvm-as</command></term>
-        <listitem>
-          <para>
-            is the <application>LLVM</application> assembler
-          </para>
-          <indexterm zone="llvm llvm-as">
-            <primary sortas="b-llvm-as">llvm-as</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-bcanalyzer">
-        <term><command>llvm-bcanalyzer</command></term>
-        <listitem>
-          <para>
-            is the <application>LLVM</application> bitcode analyzer
-          </para>
-          <indexterm zone="llvm llvm-bcanalyzer">
-            <primary sortas="b-llvm-bcanalyzer">llvm-bcanalyzer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-bitcode-strip">
-        <term><command>llvm-bitcode-strip</command></term>
-        <listitem>
-          <para>
-            strips LLVM bitcode from an object
-          </para>
-          <indexterm zone="llvm llvm-bitcode-strip">
-            <primary sortas="b-llvm-bitcode-strip">llvm-bitcode-strip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-cat">
-        <term><command>llvm-cat</command></term>
-        <listitem>
-          <para>
-            is a tool to concatenate llvm modules
-          </para>
-          <indexterm zone="llvm llvm-cat">
-            <primary sortas="b-llvm-cat">llvm-cat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-cfi-verify">
-        <term><command>llvm-cfi-verify</command></term>
-        <listitem>
-          <para>
-            identifies whether Control Flow Integrity protects all indirect
-            control flow instructions in the provided object file, DSO, or
-            binary
-          </para>
-          <indexterm zone="llvm llvm-cfi-verify">
-            <primary sortas="b-llvm-cfi-verify">llvm-cfi-verify</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-config">
-        <term><command>llvm-config</command></term>
-        <listitem>
-          <para>
-            Prints <application>LLVM</application> compilation options
-          </para>
-          <indexterm zone="llvm llvm-config">
-            <primary sortas="b-llvm-config">llvm-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-cov">
-        <term><command>llvm-cov</command></term>
-        <listitem>
-          <para>
-            is used to emit coverage information
-          </para>
-          <indexterm zone="llvm llvm-cov">
-            <primary sortas="b-llvm-cov">llvm-cov</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-c-test">
-        <term><command>llvm-c-test</command></term>
-        <listitem>
-          <para>
-            is a bytecode disassembler
-          </para>
-          <indexterm zone="llvm llvm-c-test">
-            <primary sortas="b-llvm-c-test">llvm-c-test</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-cvtres">
-        <term><command>llvm-cvtres</command></term>
-        <listitem>
-          <para>
-            is a tool to convert Microsoft resource files to COFF
-          </para>
-          <indexterm zone="llvm llvm-cvtres">
-            <primary sortas="b-llvm-cvtres">llvm-cvtres</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-cxxdump">
-        <term><command>llvm-cxxdump</command></term>
-        <listitem>
-          <para>
-            is used as a C++ ABI Data Dumper
-          </para>
-          <indexterm zone="llvm llvm-cxxdump">
-            <primary sortas="b-llvm-cxxdump">llvm-cxxdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-cxxfilt">
-        <term><command>llvm-cxxfilt</command></term>
-        <listitem>
-          <para>
-            is used to demangle C++ symbols in llvm code
-          </para>
-          <indexterm zone="llvm llvm-cxxfilt">
-            <primary sortas="b-llvm-cxxfilt">llvm-cxxfilt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-cxxmap">
-        <term><command>llvm-cxxmap</command></term>
-        <listitem>
-          <para>
-            is used to remap C++ mangled symbols
-          </para>
-          <indexterm zone="llvm llvm-cxxmap">
-            <primary sortas="b-llvm-cxxmap">llvm-cxxmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-debuginfo-analyzer">
-        <term><command>llvm-debuginfo-analyzer</command></term>
-        <listitem>
-          <para>
-            prints a logical representation of low-level debug information
-          </para>
-          <indexterm zone="llvm llvm-debuginfo-analyzer">
-            <primary sortas="b-llvm-debuginfo-analyzer">llvm-debuginfo-analyzer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-debuginfod">
-        <term><command>llvm-debuginfod</command></term>
-        <listitem>
-          <para>
-            is a service providing debug information over an HTTP API for
-            analyzing stripped binaries
-          </para>
-          <indexterm zone="llvm llvm-debuginfod">
-            <primary sortas="b-llvm-debuginfod">llvm-debuginfod</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-debuginfod-find">
-        <term><command>llvm-debuginfod-find</command></term>
-        <listitem>
-          <para>
-            is an interface to the <command>llvm-debuginfod</command> daemon
-            for finding debuginfod artifacts
-          </para>
-          <indexterm zone="llvm llvm-debuginfod-find">
-            <primary sortas="b-llvm-debuginfod-find">llvm-debuginfod-find</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-diff">
-        <term><command>llvm-diff</command></term>
-        <listitem>
-          <para>
-            is the <application>LLVM</application> structural
-            '<command>diff</command>'
-          </para>
-          <indexterm zone="llvm llvm-diff">
-            <primary sortas="b-llvm-diff">llvm-diff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-dis">
-        <term><command>llvm-dis</command></term>
-        <listitem>
-          <para>
-            is the <application>LLVM</application> disassembler
-          </para>
-          <indexterm zone="llvm llvm-dis">
-            <primary sortas="b-llvm-dis">llvm-dis</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-dwarfdump">
-        <term><command>llvm-dwarfdump</command></term>
-        <listitem>
-          <para>
-            prints the content of DWARF sections in object files
-          </para>
-          <indexterm zone="llvm llvm-dwarfdump">
-            <primary sortas="b-llvm-dwarfdump">llvm-dwarfdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-dwarfutil">
-        <term><command>llvm-dwarfutil</command></term>
-        <listitem>
-          <para>
-            is a tool to copy and manipulate debug info
-          </para>
-          <indexterm zone="llvm llvm-dwarfutil">
-            <primary sortas="b-llvm-dwarfutil">llvm-dwarfutil</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-dwp">
-        <term><command>llvm-dwp</command></term>
-        <listitem>
-          <para>
-            merges split DWARF files
-          </para>
-          <indexterm zone="llvm llvm-dwp">
-            <primary sortas="b-llvm-dwp">llvm-dwp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-elfabi">
-        <term><command>llvm-elfabi</command></term>
-        <listitem>
-          <para>
-            is used to read information about an ELF binary's ABI
-          </para>
-          <indexterm zone="llvm llvm-elfabi">
-            <primary sortas="b-llvm-elfabi">llvm-elfabi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-exegesis">
-        <term><command>llvm-exegesis</command></term>
-        <listitem>
-          <para>
-            is a benchmarking tool that uses information available in LLVM to
-            measure host machine instruction characteristics like latency or
-            port decomposition
-          </para>
-          <indexterm zone="llvm llvm-exegesis">
-            <primary sortas="b-llvm-exegesis">llvm-exegesis</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-extract">
-        <term><command>llvm-extract</command></term>
-        <listitem>
-          <para>
-            is used to extract a function from an
-            <application>LLVM</application> module
-          </para>
-          <indexterm zone="llvm llvm-extract">
-            <primary sortas="b-llvm-extract">llvm-extract</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-gsymutil">
-        <term><command>llvm-gsymutil</command></term>
-        <listitem>
-          <para>
-            is used to process GSYM Symbolication Format files which
-            convert memory addresses to function name and source file
-            line. These files are smaller than DWARF or Breakpad files
-          </para>
-          <indexterm zone="llvm llvm-gsymutil">
-            <primary sortas="b-llvm-gsymutil">llvm-gsymutil</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-ifs">
-        <term><command>llvm-ifs</command></term>
-        <listitem>
-          <para>
-            is used to merge interface stubs with object files
-          </para>
-          <indexterm zone="llvm llvm-ifs">
-            <primary sortas="b-llvm-ifs">llvm-ifs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-install-name-tool">
-        <term><command>llvm-install-name-tool</command></term>
-        <listitem>
-          <para>
-            is used to rewrite load commands into MachO binary format
-          </para>
-          <indexterm zone="llvm llvm-install-name-tool">
-            <primary sortas="b-llvm-install-name-tool">llvm-install-name-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-jitlink">
-        <term><command>llvm-jitlink</command></term>
-        <listitem>
-          <para>
-            is used to parse relocatable object files to make their contents
-            executable in a target process
-          </para>
-          <indexterm zone="llvm llvm-jitlink">
-            <primary sortas="b-llvm-jitlink">llvm-jitlink</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-libtool-darwin">
-        <term><command>llvm-libtool-darwin</command></term>
-        <listitem>
-          <para>
-            provides basic libtool functionality on Darwin-based systems.
-            This is mostly useful if you are generating binaries for macOS
-            systems
-          </para>
-          <indexterm zone="llvm llvm-libtool-darwin">
-            <primary sortas="b-llvm-libtool-darwin">llvm-libtool-darwin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-link">
-        <term><command>llvm-link</command></term>
-        <listitem>
-          <para>
-            is the <application>LLVM</application> linker
-          </para>
-          <indexterm zone="llvm llvm-link">
-            <primary sortas="b-llvm-link">llvm-link</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-lipo">
-        <term><command>llvm-lipo</command></term>
-        <listitem>
-          <para>
-            is used to create universal binaries from MachO files
-          </para>
-          <indexterm zone="llvm llvm-lipo">
-            <primary sortas="b-llvm-lipo">llvm-lipo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-lto">
-        <term><command>llvm-lto</command></term>
-        <listitem>
-          <para>
-            is the <application>LLVM</application> LTO (link time optimization)
-            linker
-          </para>
-          <indexterm zone="llvm llvm-lto">
-            <primary sortas="b-llvm-lto">llvm-lto</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-lto2">
-        <term><command>llvm-lto2</command></term>
-        <listitem>
-          <para>
-            is a test harness for the resolution based LTO interface
-          </para>
-          <indexterm zone="llvm llvm-lto2">
-            <primary sortas="b-llvm-lto2">llvm-lto2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-mc">
-        <term><command>llvm-mc</command></term>
-        <listitem>
-          <para>
-            is a standalone machine code assembler/disassembler
-          </para>
-          <indexterm zone="llvm llvm-mc">
-            <primary sortas="b-llvm-mc">llvm-mc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-mca">
-        <term><command>llvm-mca</command></term>
-        <listitem>
-          <para>
-            is a performance analysis tool to statically measure the
-            performance of machine code
-          </para>
-          <indexterm zone="llvm llvm-mca">
-            <primary sortas="b-llvm-mca">llvm-mca</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!--  <varlistentry id="llvm-mcmarkup">
-        <term><command>llvm-mcmarkup</command></term>
-        <listitem>
-          <para>
-            is a parser for machine code markup.
-          </para>
-          <indexterm zone="llvm llvm-mcmarkup">
-            <primary sortas="b-llvm-mcmarkup">llvm-mcmarkup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
-
-      <varlistentry id="llvm-ml">
-        <term><command>llvm-ml</command></term>
-        <listitem>
-          <para>
-            is a playground for machine code provided by LLVM
-          </para>
-          <indexterm zone="llvm llvm-ml">
-            <primary sortas="b-llvm-ml">llvm-ml</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-modextract">
-        <term><command>llvm-modextract</command></term>
-        <listitem>
-          <para>
-            is a tool to extract one module from multimodule bitcode files
-          </para>
-          <indexterm zone="llvm llvm-modextract">
-            <primary sortas="b-llvm-modextract">llvm-modextract</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-mt">
-        <term><command>llvm-mt</command></term>
-        <listitem>
-          <para>
-            is a tool to generate signed files and catalogs from a
-            side-by-side assembly manifest (used for Microsoft SDK)
-          </para>
-          <indexterm zone="llvm llvm-mt">
-            <primary sortas="b-llvm-mt">llvm-mt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-nm">
-        <term><command>llvm-nm</command></term>
-        <listitem>
-          <para>
-            is used to list <application>LLVM</application> bitcode
-            and object file's symbol table
-          </para>
-          <indexterm zone="llvm llvm-nm">
-            <primary sortas="b-llvm-nm">llvm-nm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-objcopy">
-        <term><command>llvm-objcopy</command></term>
-        <listitem>
-          <para>
-            is LLVM's version of an objcopy tool
-          </para>
-          <indexterm zone="llvm llvm-objcopy">
-            <primary sortas="b-llvm-objcopy">llvm-objcopy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-objdump">
-        <term><command>llvm-objdump</command></term>
-        <listitem>
-          <para>
-            is an <application>LLVM</application> object file dumper
-          </para>
-          <indexterm zone="llvm llvm-objdump">
-            <primary sortas="b-llvm-objdump">llvm-objdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-opt-report">
-        <term><command>llvm-opt-report</command></term>
-        <listitem>
-          <para>
-            is a tool to generate an optimization report from YAML optimization
-            record files
-          </para>
-          <indexterm zone="llvm llvm-opt-report">
-            <primary sortas="b-llvm-opt-report">llvm-opt-report</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-pdbutil">
-        <term><command>llvm-pdbutil</command></term>
-        <listitem>
-          <para>
-            is a PDB (Program Database) dumper. PDB is a Microsoft format
-          </para>
-          <indexterm zone="llvm llvm-pdbutil">
-            <primary sortas="b-llvm-pdbutil">llvm-pdbutil</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-profdata">
-        <term><command>llvm-profdata</command></term>
-        <listitem>
-          <para>
-            is a small tool to manipulate and print profile data files
-          </para>
-          <indexterm zone="llvm llvm-profdata">
-            <primary sortas="b-llvm-profdata">llvm-profdata</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-profgen">
-        <term><command>llvm-profgen</command></term>
-        <listitem>
-          <para>
-            generates LLVM SPGO profiling information
-          </para>
-          <indexterm zone="llvm llvm-profgen">
-            <primary sortas="b-llvm-profgen">llvm-profgen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-ranlib">
-        <term><command>llvm-ranlib</command></term>
-        <listitem>
-          <para>
-            is used to generate an index for a <application>LLVM</application>
-            archive
-          </para>
-          <indexterm zone="llvm llvm-ranlib">
-            <primary sortas="b-llvm-ranlib">llvm-ranlib</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-rc">
-        <term><command>llvm-rc</command></term>
-        <listitem>
-          <para>
-            is a platform-independent tool to compile resource scripts
-            into binary resource files
-          </para>
-          <indexterm zone="llvm llvm-rc">
-            <primary sortas="b-llvm-rc">llvm-rc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-readobj">
-        <term><command>llvm-readobj</command></term>
-        <listitem>
-          <para>
-            displays low-level format-specific information about object files
-          </para>
-          <indexterm zone="llvm llvm-readobj">
-            <primary sortas="b-llvm-readobj">llvm-readobj</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-readtapi">
-        <term><command>llvm-readtapi</command></term>
-        <listitem>
-          <para>
-            is the LLVM TAPI file reader and transformer
-          </para>
-          <indexterm zone="llvm llvm-readtapi">
-            <primary sortas="b-llvm-readtapi">llvm-readtapi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-reduce">
-        <term><command>llvm-reduce</command></term>
-        <listitem>
-          <para>
-            is used to automatically reduce testcases
-            when running a test suite
-          </para>
-          <indexterm zone="llvm llvm-reduce">
-            <primary sortas="b-llvm-reduce">llvm-reduce</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-remarkutil">
-        <term><command>llvm-remarkutil</command></term>
-        <listitem>
-          <para>
-            converts remark files between bitstream and YAML; or prints
-            function instruction count information in remark files
-          </para>
-          <indexterm zone="llvm llvm-remarkutil">
-            <primary sortas="b-llvm-remarkutil">llvm-remarkutil</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-rtdyld">
-        <term><command>llvm-rtdyld</command></term>
-        <listitem>
-          <para>
-            is the <application>LLVM</application> MC-JIT tool
-          </para>
-          <indexterm zone="llvm llvm-rtdyld">
-            <primary sortas="b-llvm-rtdyld">llvm-rtdyld</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-size">
-        <term><command>llvm-size</command></term>
-        <listitem>
-          <para>
-            is the <application>LLVM</application> object size dumper
-          </para>
-          <indexterm zone="llvm llvm-size">
-            <primary sortas="b-llvm-size">llvm-size</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-split">
-        <term><command>llvm-split</command></term>
-        <listitem>
-          <para>
-            is the <application>LLVM</application> module splitter
-          </para>
-          <indexterm zone="llvm llvm-split">
-            <primary sortas="b-llvm-split">llvm-split</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-stress">
-        <term><command>llvm-stress</command></term>
-        <listitem>
-          <para>
-            is used to generate random
-            <filename class="extension">.ll</filename> files
-          </para>
-          <indexterm zone="llvm llvm-stress">
-            <primary sortas="b-llvm-stress">llvm-stress</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-strings">
-        <term><command>llvm-strings</command></term>
-        <listitem>
-          <para>
-            print strings found in a binary (object file, executable, or
-            archive library)
-          </para>
-          <indexterm zone="llvm llvm-strings">
-            <primary sortas="b-llvm-strings">llvm-strings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-symbolizer">
-        <term><command>llvm-symbolizer</command></term>
-        <listitem>
-          <para>
-            converts addresses into source code locations
-          </para>
-          <indexterm zone="llvm llvm-symbolizer">
-            <primary sortas="b-llvm-symbolizer">llvm-symbolizer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-tblgen">
-        <term><command>llvm-tblgen</command></term>
-        <listitem>
-          <para>
-            is the <application>LLVM</application> Target Description
-            To C++ Code Generator
-          </para>
-          <indexterm zone="llvm llvm-tblgen">
-            <primary sortas="b-llvm-tblgen">llvm-tblgen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-tli-checker">
-        <term><command>llvm-tli-checker</command></term>
-        <listitem>
-          <para>
-            is the <application>LLVM</application> TargetLibraryInfo
-            versus SDK checker
-          </para>
-          <indexterm zone="llvm llvm-tli-checker">
-            <primary sortas="b-llvm-tli-checker">llvm-tli-checker</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-undname">
-        <term><command>llvm-undname</command></term>
-        <listitem>
-          <para>
-            is a tool to demangle names
-          </para>
-          <indexterm zone="llvm llvm-undname">
-            <primary sortas="b-llvm-undname">llvm-undname</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="llvm-xray">
-        <term><command>llvm-xray</command></term>
-        <listitem>
-          <para>
-            is an implementation of Google's XRay function call tracing system
-          </para>
-          <indexterm zone="llvm llvm-xray">
-            <primary sortas="b-llvm-xray">llvm-xray</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nvptx-arch">
-        <term><command>nvptx-arch</command></term>
-        <listitem>
-          <para>
-            lists NVIDIA GPUs installed; at runtime it needs
-            <filename class='libraryfile'>libcuda.so</filename>
-            which is not a part of BLFS
-          </para>
-          <indexterm zone="llvm nvptx-arch">
-            <primary sortas="b-nvptx-arch">nvptx-arch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="opt">
-        <term><command>opt</command></term>
-        <listitem>
-          <para>
-            is the <application>LLVM</application> optimizer
-          </para>
-          <indexterm zone="llvm opt">
-            <primary sortas="b-opt">opt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sancov">
-        <term><command>sancov</command></term>
-        <listitem>
-          <para>
-            is the sanitizer coverage processing tool
-          </para>
-          <indexterm zone="llvm sancov">
-            <primary sortas="b-sancov">sancov</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sanstats">
-        <term><command>sanstats</command></term>
-        <listitem>
-          <para>
-            is the sanitizer statistics processing tool
-          </para>
-          <indexterm zone="llvm sanstats">
-            <primary sortas="b-sanstats">sanstats</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="scan-build">
-        <term><command>scan-build</command></term>
-        <listitem>
-          <para>
-            is a <application>Perl</application> script that invokes the
-            <application>Clang</application> static analyzer
-          </para>
-          <indexterm zone="llvm scan-build">
-            <primary sortas="b-scan-build">scan-build</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="scan-build-py">
-        <term><command>scan-build-py</command></term>
-        <listitem>
-          <para>
-            is a <application>Python</application> script that invokes the
-            <application>Clang</application> static analyzer
-          </para>
-          <indexterm zone="llvm scan-build-py">
-            <primary sortas="b-scan-build-py">scan-build-py</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="scan-view">
-        <term><command>scan-view</command></term>
-        <listitem>
-          <para>
-            is a viewer for <application>Clang</application> static analyzer
-            results
-          </para>
-          <indexterm zone="llvm scan-view">
-            <primary sortas="b-scan-view">scan-view</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="verify-uselistorder">
-        <term><command>verify-uselistorder</command></term>
-        <listitem>
-          <para>
-            is the <application>LLVM</application> tool to verify use-list
-            order
-          </para>
-          <indexterm zone="llvm verify-uselistorder">
-            <primary sortas="b-verify-uselistorder">verify-uselistorder</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!-- Removed in 12.0.0
-      <varlistentry id="yaml2obj">
-        <term><command>yaml2obj</command></term>
-        <listitem>
-          <para>
-            takes a YAML representation of an object file and converts it
-            to a binary file
-          </para>
-          <indexterm zone="llvm yaml2obj">
-            <primary sortas="b-yaml2obj">yaml2obj</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-<!--
-      <varlistentry id="libllvm">
-        <term><filename class="libraryfile">libLLVM-&llvm-version;.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>LLVM</application> API functions.
-          </para>
-          <indexterm zone="llvm libllvm">
-            <primary sortas="c-libllvm">libLLVM-&llvm-version;.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libprofile_rt">
-        <term><filename class="libraryfile">libprofile_rt.so</filename></term>
-        <listitem>
-          <para>
-            is the C, C++ and Objective-C runtime library for
-            <application>Clang</application>.
-          </para>
-          <indexterm zone="llvm libprofile_rt">
-            <primary sortas="c-libprofile_rt">libprofile_rt.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/prog/lua.xml
===================================================================
--- general/prog/lua.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,276 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 lua-download-http "https://www.lua.org/ftp/lua-&lua-version;.tar.gz">
-  <!ENTITY lua-download-ftp  " ">
-  <!ENTITY lua-md5sum        "25a429319dff20dfbfb9956c2b5be911">
-  <!ENTITY lua-size          "356 KB">
-  <!ENTITY lua-buildsize     "3.8 MB (with Basic tests)">
-  <!ENTITY lua-time          "less than 0.1 SBU (with Basic tests)">
-
-  <!ENTITY lua-tests-download-http "https://www.lua.org/tests/lua-&lua-version;-tests.tar.gz">
-  <!ENTITY lua-tests-download-ftp  " ">
-  <!ENTITY lua-tests-md5sum        "e10a3da28b05d0e8d25ad08b7820c213">
-  <!ENTITY lua-tests-size          "134 KB">
-]>
-
-<sect1 id="lua" xreflabel="Lua-&lua-version;">
-  <?dbhtml filename="lua.html"?>
-
-
-  <title>Lua-&lua-version;</title>
-
-  <indexterm zone="lua">
-    <primary sortas="a-Lua">Lua</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Lua</title>
-
-    <para>
-      <application>Lua</application> is a powerful light-weight programming
-      language designed for extending applications. It is also frequently used
-      as a general-purpose, stand-alone language. <application>Lua</application>
-      is implemented as a small library of C functions, written in ANSI C, and
-      compiles unmodified in all known platforms. The implementation goals are
-      simplicity, efficiency, portability, and low embedding cost. The result is
-      a fast language engine with small footprint, making it ideal in embedded
-      systems too.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lua-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lua-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lua-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lua-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lua-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lua-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/lua-&lua-version;-shared_library-1.patch"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Optional Test Suite Download (HTTP): <ulink url="&lua-tests-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Optional Test Suite Download (FTP): <ulink url="&lua-tests-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Optional Test Suite Download MD5 sum: &lua-tests-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Optional Test Suite Download size: &lua-tests-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Lua</title>
-
-    <para>
-      Some packages check for the <application>pkg-config</application> file
-      for <application>Lua</application>, which is created with:
-    </para>
-
-<screen><userinput>cat &gt; lua.pc &lt;&lt; "EOF"
-<literal>V=5.4
-R=&lua-version;
-
-prefix=/usr
-INSTALL_BIN=${prefix}/bin
-INSTALL_INC=${prefix}/include
-INSTALL_LIB=${prefix}/lib
-INSTALL_MAN=${prefix}/share/man/man1
-INSTALL_LMOD=${prefix}/share/lua/${V}
-INSTALL_CMOD=${prefix}/lib/lua/${V}
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: Lua
-Description: An Extensible Extension Language
-Version: ${R}
-Requires:
-Libs: -L${libdir} -llua -lm -ldl
-Cflags: -I${includedir}</literal>
-EOF</userinput></screen>
-
-    <para>
-      Install <application>Lua</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../lua-&lua-version;-shared_library-1.patch &amp;&amp;
-make linux</userinput></screen>
-<!-- make MYCFLAGS="-DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1" linux
-     The MYCFLAGS="" part was brought into the patch since optimization had to
-     be turned off.
-     The LUA_ROOT change also has been merged into the patch.-->
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-      <quote>This will run the interpreter and print its version</quote>.
-      More comprehensive tests can be performed if you downloaded the "Test
-      suite" tarball. Those tests need to be executed after the package is
-      installed, thus we defer to the description below.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make INSTALL_TOP=/usr                \
-     INSTALL_DATA="cp -d"            \
-     INSTALL_MAN=/usr/share/man/man1 \
-     TO_LIB="liblua.so liblua.so.5.4 liblua.so.&lua-version;" \
-     install &amp;&amp;
-
-mkdir -pv                      /usr/share/doc/lua-&lua-version; &amp;&amp;
-cp -v doc/*.{html,css,gif,png} /usr/share/doc/lua-&lua-version; &amp;&amp;
-
-install -v -m644 -D lua.pc /usr/lib/pkgconfig/lua.pc</userinput></screen>
-
-    <para>
-      Here we describe only the "Basic tests". Untar the tarball and
-      change to the
-      <filename class="directory">lua-&lua-version;-tests</filename> directory,
-      then issue
-      <command>lua -e "_U=true" all.lua</command>. If the tests finish without
-      error, you will see a message containing the string "final OK".
-    </para>
-
-    <!-- The optimization problem fixed in the patch was identified by running
-         the test suite, and ultimately culminated in a SIGBUS error. -->
-  </sect2>
-
-  <!-- Brought into the patch, unneeded
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i ... src/luaconf.h</command>: This command changes the
-      <application>Lua</application> search path to match the install path.
-    </para>
-
-    <para>
-      <envar>MYCFLAGS="-DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1"</envar>: This
-      environment variable includes compatibility layers with Lua 5.1 and 5.2
-      in the build.
-    </para>
-
-  </sect2>
-  -->
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lua and luac
-        </seg>
-        <seg>
-          liblua.so
-        </seg>
-        <seg>
-          /usr/{lib,share}/lua and
-          /usr/share/doc/lua-&lua-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lua-prog">
-        <term><command>lua</command></term>
-        <listitem>
-          <para>
-            is the standalone Lua interpreter
-          </para>
-          <indexterm zone="lua lua-prog">
-            <primary sortas="b-lua">lua</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="luac">
-        <term><command>luac</command></term>
-        <listitem>
-          <para>
-            is the Lua compiler
-          </para>
-          <indexterm zone="lua luac">
-            <primary sortas="b-luac">luac</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="liblua">
-        <term><filename class="libraryfile">liblua.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Lua</application> API functions
-          </para>
-          <indexterm zone="lua liblua">
-            <primary sortas="c-liblua">liblua.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/prog/lua52.xml
===================================================================
--- general/prog/lua52.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,264 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 lua-download-http "https://www.lua.org/ftp/lua-&lua52-version;.tar.gz">
-  <!ENTITY lua-download-ftp  " ">
-  <!ENTITY lua-md5sum        "913fdb32207046b273fdb17aad70be13">
-  <!ENTITY lua-size          "248 KB">
-  <!ENTITY lua-buildsize     "3.6  MB">
-  <!ENTITY lua-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="lua52" xreflabel="Lua-&lua52-version;">
-  <?dbhtml filename="lua52.html"?>
-
-
-  <title>Lua-&lua52-version;</title>
-
-  <indexterm zone="lua52">
-    <primary sortas="a-Lua">Lua</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Lua 5.2</title>
-
-    <para>
-      <application>Lua</application> is a powerful light-weight programming
-      language designed for extending applications. It is also frequently used
-      as a general-purpose, stand-alone language. <application>Lua</application>
-      is implemented as a small library of C functions, written in ANSI C, and
-      compiles unmodified in all known platforms. The implementation goals are
-      simplicity, efficiency, portability, and low embedding cost. The result is
-      a fast language engine with small footprint, making it ideal in embedded
-      systems too.
-    </para>
-
-    <para>
-      This is an older version of <application>Lua</application> needed only
-      for compatibility with other programs such as <xref linkend='wireshark'/>
-      and <xref linkend="vlc"/>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lua-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lua-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lua-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lua-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lua-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lua-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/lua-&lua52-version;-shared_library-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Lua 5.2</title>
-
-    <para>
-      Some packages check for the <application>pkg-config</application> file
-      for <application>Lua</application>, which is created with:
-    </para>
-
-<screen><userinput>cat &gt; lua.pc &lt;&lt; "EOF"
-<literal>V=5.2
-R=&lua52-version;
-
-prefix=/usr
-INSTALL_BIN=${prefix}/bin
-INSTALL_INC=${prefix}/include/lua5.2
-INSTALL_LIB=${prefix}/lib
-INSTALL_MAN=${prefix}/share/man/man1
-INSTALL_LMOD=${prefix}/share/lua/${V}
-INSTALL_CMOD=${prefix}/lib/lua/${V}
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include/lua5.2
-
-Name: Lua
-Description: An Extensible Extension Language
-Version: ${R}
-Requires:
-Libs: -L${libdir} -llua5.2 -lm -ldl
-Cflags: -I${includedir}</literal>
-EOF</userinput></screen>
-
-    <para>
-      Install <application>Lua</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../lua-&lua52-version;-shared_library-1.patch &amp;&amp;
-
-sed -i '/#define LUA_ROOT/s:/usr/local/:/usr/:' src/luaconf.h &amp;&amp;
-
-sed -r -e '/^LUA_(SO|A|T)=/ s/lua/lua5.2/' \
-       -e '/^LUAC_T=/ s/luac/luac5.2/'     \
-       -i src/Makefile &amp;&amp;
-
-make MYCFLAGS="-fPIC" linux</userinput></screen>
-<!--
-    <para>
-      To test the results, issue: <command>make test</command>.
-      <quote>This will run the interpreter and print its version.</quote>.
-      More comprehensive tests can be performed if you downloaded the "Test
-      suite" tarball. Those tests need to be executed after the package is
-      installed, thus we defer to the description below.
-    </para>
--->
-    <para>
-      The installation of this package is complex, so we will use
-      the DESTDIR method of installation:
-    </para>
-
-<screen><userinput>make TO_BIN='lua5.2 luac5.2'                     \
-     TO_LIB="liblua5.2.so liblua5.2.so.5.2 liblua5.2.so.&lua52-version;" \
-     INSTALL_DATA="cp -d"                        \
-     INSTALL_TOP=$PWD/install/usr                \
-     INSTALL_INC=$PWD/install/usr/include/lua5.2 \
-     INSTALL_MAN=$PWD/install/usr/share/man/man1 \
-     install &amp;&amp;
-
-install -Dm644 lua.pc install/usr/lib/pkgconfig/lua52.pc &amp;&amp;
-
-mkdir -pv install/usr/share/doc/lua-&lua52-version; &amp;&amp;
-cp -v doc/*.{html,css,gif,png} install/usr/share/doc/lua-&lua52-version; &amp;&amp;
-
-ln -s liblua5.2.so install/usr/lib/liblua.so.5.2   &amp;&amp;
-ln -s liblua5.2.so install/usr/lib/liblua.so.&lua52-version; &amp;&amp;
-
-mv install/usr/share/man/man1/{lua.1,lua5.2.1} &amp;&amp;
-mv install/usr/share/man/man1/{luac.1,luac5.2.1}</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>chown -R root:root install  &amp;&amp;
-cp -a install/* /</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i ... src/luaconf.h</command>: This command changes the
-      <application>Lua</application> search path to match the install path.
-    </para>
-
-    <para>
-      <command>sed -i ... src/Makefile</command>: This command deconflicts
-      this installation with the latest version of lua.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lua5.2 and luac5.2
-        </seg>
-        <seg>
-          liblua5.2.so
-        </seg>
-        <seg>
-          /usr/include/lua5.2,
-          /usr/lib/lua/5.2,
-          /usr/share/doc/lua-&lua52-version;, and
-          /usr/share/lua/5.2
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lua52-prog">
-        <term><command>lua5.2</command></term>
-        <listitem>
-          <para>
-            is the standalone Lua version 5.2 interpreter
-          </para>
-          <indexterm zone="lua52 lua-prog">
-            <primary sortas="b-lua52">lua5.2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="luac52">
-        <term><command>luac5.2</command></term>
-        <listitem>
-          <para>
-            is the Lua version 5.2 compiler
-          </para>
-          <indexterm zone="lua52 luac52">
-            <primary sortas="b-luac52">luac5.2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="liblua52">
-        <term><filename class="libraryfile">liblua5.2.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Lua</application> version 5.2 API functions
-          </para>
-          <indexterm zone="lua52 liblua52">
-            <primary sortas="c-liblua52">liblua5.2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/prog/mercurial.xml
===================================================================
--- general/prog/mercurial.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,320 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 mercurial-download-http "https://www.mercurial-scm.org/release/mercurial-&mercurial-version;.tar.gz">
-  <!ENTITY mercurial-download-ftp  " ">
-  <!ENTITY mercurial-md5sum        "55a079ac42931797d87fabe45018f758">
-  <!ENTITY mercurial-size          "7.9 MB">
-  <!ENTITY mercurial-buildsize     "80 MB (with docs, add 1.6 GB for tests)">
-  <!ENTITY mercurial-time          "0.4 SBU (with docs; add 12 SBU for tests; both using parallelism=8)">
-]>
-
-<sect1 id="mercurial" xreflabel="Mercurial-&mercurial-version;">
-  <?dbhtml filename="mercurial.html"?>
-
-
-  <title>Mercurial-&mercurial-version;</title>
-
-  <indexterm zone="mercurial">
-    <primary sortas="a-mercurial">mercurial</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Mercurial</title>
-
-    <para>
-      <application>Mercurial</application> is a distributed source control
-      management tool similar to <application>Git</application> and
-      <application>Bazaar</application>. <application>Mercurial</application>
-      is written in <application>Python</application> and is used by projects
-      such as Mozilla for Firefox and Thunderbird.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&mercurial-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&mercurial-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &mercurial-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &mercurial-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &mercurial-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &mercurial-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Mercurial Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="docutils"/>
-        (required to build the documentation),
-      <xref linkend="git"/>,
-      <xref linkend="gpgme"/> (with Python bindings),
-      <xref role="runtime" linkend="openssh"/>
-        (runtime, to access ssh://... repositories),
-      <xref linkend="pygments"/>,
-      <xref linkend="rust"/> (see <filename>rust/README.rst</filename> and <filename>rust/rhg/README.md</filename>),
-      <xref linkend="subversion"/> (with Python bindings),
-      <ulink url="https://launchpad.net/bzr">Bazaar</ulink>,
-      <ulink url="https://www.nongnu.org/cvs/">CVS</ulink>,
-      <ulink url="https://pypi.python.org/pypi/pyflakes">pyflakes</ulink>,
-      <ulink url="https://www.pyopenssl.org/en/stable/">pyOpenSSL</ulink>, and
-      <ulink url="https://github.com/google/re2/">re2</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Mercurial</title>
-    <!-- Rust port is now part of the standard tests -->
-
-    <para>
-      Build <application>Mercurial</application> by issuing the following
-      command:
-    </para>
-
-<screen><userinput>make build</userinput></screen>
-
-    <para>
-      To build the documentation (requires <xref linkend="docutils"/>), issue:
-    </para>
-
-<screen remap="doc"><userinput>make doc</userinput></screen>
-<!--
-    The tests do not hang.  Better to just report what failed.
-    <para>
-      If you wish to run the tests, the rust tests must be removed as they are
-      currently broken due to syntax errors. To do this, issue:
-    </para>
-
-<screen><userinput>sed -i '138,142d' Makefile</userinput></screen>
--->
-    <para>
-      To run the test suite, issue:
-    </para>
-<screen remap="test"><userinput>TESTFLAGS="-j<replaceable>&lt;N&gt;</replaceable> --tmpdir tmp" make check</userinput></screen>
-<!-- The blacklists have to be checked every release of Mercurial, do a listing
-     of tests/blacklists, but do not include the README.
-     For 6.4.1 removing the -blacklist entries did not affect the test results
-     although blacklists/fsmonitor and blacklists/linux-vfat still exist. -->
-
-    <para>
-      where <replaceable>&lt;N&gt;</replaceable> is an integer between one
-      and the number of ( processor X threads ), inclusive. Tests may
-      fail because some error messages have changed in Python or
-      some deprecation warnings are printed that were not present when the
-      test was designed.  Two tests are known to fail: test-duplicateoptions.py
-      and test-profile.t.
-    </para>
-      <!--
-      # Ran 908 tests, 65 skipped, 4 failed.  real  10m37.422s -bdubbs  6 Sep 22.
-      # Ran 881 tests,102 skipped, 23 failed.                  -plabs  17 Nov 22.
-      # Ran 919 tests, 64 skipped, 23 failed. real  10m25.285s -bdubbs 10 Jan 23.
-      # Ran 893 tests,101 skipped,  9 failed. real  29m03.014s -bdubbs  5 Mar 23.
-      # Ran 938 tests, 64 skipped,  8 failed. real  32m13.014s -bdubbs 17 Apr 23.
-      # Ran 935 tests, 69 skipped,  8 failed. real  26m15.875s -bdubbs 10 Jun 23.
-      # Ran 940 tests, 64 skipped,  8 failed. real  omitted    -bdubbs 26 Jun 23.
-      # Ran 948 tests, 66 skipped, 0 failed. -pierre 12 Jul 23 (mercurial-6.5).
-      # Ran 950 tests, 65 skipped, 1 failed. -pierre 8  Nov 23 (mercurial-6.5.3).
-      # Ran 948 tests, 66 skipped, 0 failed. -renodr 22 Nov 23 (mercurial-6.6).
-      # Ran 946 tests, 71 skipped, 2 failed. -bdubbs 20 Mar 24 (mercurial-6.7).
-      -->
-    <para>
-      In order to
-      investigate any apparently failing tests, you may use the
-      <command>run-tests.py</command> script. To see the almost forty switches,
-      some of them very useful, issue <command>tests/run-tests.py
-      --help</command>.  Running the following commands, you will execute only
-      the tests that failed before:
-    </para>
-
-<screen remap="test"><userinput>pushd tests  &amp;&amp;
-  rm -rf tmp &amp;&amp;
-  ./run-tests.py --tmpdir tmp test-gpg.t
-popd</userinput></screen>
-
-    <para>
-      Normally, the previous failures will be reproducible. However, if
-      you add the switch <option>--debug</option> before
-      <option>--tmpdir</option>, and run the tests again, some failures may
-      disappear, which is a problem with the test suite. If this happens,
-      there will be no more of these failures even if you do not pass the
-      --debug switch again.
-    </para>
-
-    <para>
-      An interesting switch is <option>--time</option>, which will generate a
-      table of all the executed tests and their respective start, end, user,
-      system and real times once the tests are complete. Note that these
-      switches may be used with <command>make check</command> by including
-      them in the <envar>TESTFLAGS</envar> environment variable.
-    </para>
-
-    <para>
-      Install <application>Mercurial</application> by running the following
-      command (as <systemitem class="username">root</systemitem>):
-    </para>
-
-<screen role="root"><userinput>make PREFIX=/usr install-bin</userinput></screen>
-
-    <para>
-      If you built the documentation, install it by running the following
-      command (as <systemitem class="username">root</systemitem>):
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>make PREFIX=/usr install-doc</userinput></screen>
-
-    <para>
-      After installation, two very quick and simple tests should run
-      correctly. The first one needs some configuration:
-    </para>
-
-<screen><userinput>cat &gt;&gt; ~/.hgrc &lt;&lt; "EOF"
-<literal>[ui]
-username = <replaceable>&lt;user_name&gt; &lt;user@mail&gt;</replaceable></literal>
-EOF</userinput></screen>
-
-    <para>
-      where you must replace &lt;user_name&gt; and &lt;your@mail&gt; (mail
-      is optional and can be omitted). With the user identity defined, run
-      <command>hg debuginstall</command> and several lines will be displayed,
-      the last one reading "no problems detected". Another quick and simple
-      test is just <command>hg</command>, which should output basic commands
-      that can be used with <command>hg</command>.
-    </para>
-
-  </sect2>
-
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-      <para>
-        <command>2to3 -w doc/hgmanpage.py</command>: Since <application>
-        Python 3</application> is used with docutils, one file needs to be
-        converted in order to be compatible.
-      </para>
-
-   </sect2>
--->
-
-  <sect2 role="configuration">
-    <title>Configuring Mercurial</title>
-
-    <sect3 id="mercurial-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/mercurial/hgrc</filename> and
-        <filename>~/.hgrc</filename>
-      </para>
-
-      <indexterm zone="mercurial mercurial-config">
-        <primary sortas="e-etc-mercurial-hgrc">/etc/mercurial/hgrc</primary>
-      </indexterm>
-
-      <indexterm zone="mercurial mercurial-config">
-        <primary sortas="e-AA.hgrc">~/.hgrc</primary>
-      </indexterm>
-
-      <para>
-        The great majority of extensions are disabled by default. Run
-        <command>hg help extensions</command> if you need to enable any, e.g.
-        when investigating test failures. This will output a list of enabled
-        and disabled extensions, as well as more information such as how to
-        enable or disable extensions using configuration files.
-      </para>
-
-      <para>
-        If you have installed <xref linkend="make-ca"/> and want
-        <application>Mercurial</application> to use the certificates,
-        as the <systemitem class="username">root</systemitem> user, issue:
-      </para>
-
-<screen role="root"><userinput>install -v -d -m755 /etc/mercurial &amp;&amp;
-cat &gt; /etc/mercurial/hgrc &lt;&lt; "EOF"
-<literal>[web]
-cacerts = /etc/pki/tls/certs/ca-bundle.crt</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          hg
-        </seg>
-        <seg>
-          several internal modules under
-          /usr/lib/python&python3-majorver;/site-packages/mercurial
-        </seg>
-        <seg>
-          /etc/mercurial,
-          /usr/lib/python&python3-majorver;/site-packages/hgdemandimport,
-          /usr/lib/python&python3-majorver;/site-packages/hgext,
-          /usr/lib/python&python3-majorver;/site-packages/hgext3rd,
-          /usr/lib/python&python3-majorver;/site-packages/mercurial, and
-          /usr/lib/python&python3-majorver;/site-packages/mercurial-&mercurial-version;-py&python3-majorver;.egg-info
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="hg">
-        <term><command>hg</command></term>
-        <listitem>
-          <para>
-            is the mercurial version control system
-          </para>
-          <indexterm zone="mercurial hg">
-            <primary sortas="b-hg">hg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/prog/nasm.xml
===================================================================
--- general/prog/nasm.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,178 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 nasm-download-http "https://www.nasm.us/pub/nasm/releasebuilds/&nasm-version;/nasm-&nasm-version;.tar.xz">
-  <!ENTITY nasm-download-ftp  " ">
-  <!ENTITY nasm-md5sum        "2b8c72c52eee4f20085065e68ac83b55">
-  <!ENTITY nasm-size          "1008.1 KB">
-  <!ENTITY nasm-buildsize     "41 MB" >
-  <!ENTITY nasm-time          "0.2 SBU">
-]>
-
-<sect1 id="nasm" xreflabel="NASM-&nasm-version;">
-  <?dbhtml filename="nasm.html" ?>
-
-
-  <title>NASM-&nasm-version;</title>
-
-  <indexterm zone="nasm">
-    <primary sortas="a-NASM">NASM</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to NASM</title>
-
-    <para>
-      <application>NASM</application> (Netwide Assembler) is an 80x86
-      assembler designed for portability and modularity. It includes a
-      disassembler as well.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&nasm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&nasm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &nasm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &nasm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &nasm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &nasm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional documentation: <ulink
-          url="https://www.nasm.us/pub/nasm/releasebuilds/&nasm-version;/nasm-&nasm-version;-xdoc.tar.xz"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">NASM Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional (for generating documentation):</bridgehead>
-    <para role="optional">
-      <xref linkend="asciidoc"/> and
-      <xref linkend="xmlto"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of NASM</title>
-
-    <para>
-      If you downloaded the optional documentation, put it into the
-      source tree:
-    </para>
-
-<screen><userinput>tar -xf ../nasm-&nasm-version;-xdoc.tar.xz --strip-components=1</userinput></screen>
-
-    <para>
-      Install <application>NASM</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you downloaded the optional documentation, install it with the
-      following instructions as the <systemitem
-      class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -m755 -d         /usr/share/doc/nasm-&nasm-version;/html  &amp;&amp;
-cp -v doc/html/*.html    /usr/share/doc/nasm-&nasm-version;/html  &amp;&amp;
-cp -v doc/*.{txt,ps,pdf} /usr/share/doc/nasm-&nasm-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>nasm and ndisasm</seg>
-        <seg>None</seg>
-        <seg>/usr/share/doc/nasm-&nasm-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="nasm-prog">
-        <term><command>nasm</command></term>
-        <listitem>
-          <para>
-            is a portable 80x86 assembler
-          </para>
-          <indexterm zone="nasm nasm-prog">
-            <primary sortas="b-nasm">nasm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ndisasm">
-        <term><command>ndisasm</command></term>
-        <listitem>
-          <para>
-            is an 80x86 binary file disassembler
-          </para>
-          <indexterm zone="nasm ndisasm">
-            <primary sortas="b-ndisasm">ndisasm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/prog/ojdk-conf.xml
===================================================================
--- general/prog/ojdk-conf.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,135 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ojdk-conf" xreflabel="Configuring the Java environment">
-  <?dbhtml filename="ojdk-conf.html"?>
-
-
-  <title>Configuring the Java environment</title>
-
-  <sect2 id="java-profile">
-    <title>Setting up the environment</title>
-
-    <para>
-      After the package installation is complete, the next step is to make sure
-      that the system can properly find the files.  If you set up your login
-      scripts as recommended in <xref linkend='postlfs-config-profile'/>, update
-      the environment by creating the <filename>openjdk.sh</filename> script,
-      as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/openjdk.sh &lt;&lt; "EOF"
-<literal># Begin /etc/profile.d/openjdk.sh
-
-# Set JAVA_HOME directory
-JAVA_HOME=/opt/jdk
-
-# Adjust PATH
-pathappend $JAVA_HOME/bin
-
-# Auto Java CLASSPATH: Copy jar files to, or create symlinks in, the
-# /usr/share/java directory.
-
-AUTO_CLASSPATH_DIR=/usr/share/java
-
-pathprepend . CLASSPATH
-
-for dir in `find ${AUTO_CLASSPATH_DIR} -type d 2>/dev/null`; do
-    pathappend $dir CLASSPATH
-done
-
-for jar in `find ${AUTO_CLASSPATH_DIR} -name "*.jar" 2>/dev/null`; do
-    pathappend $jar CLASSPATH
-done
-
-export JAVA_HOME
-
-# By default, Java creates several files in a directory named
-# /tmp/hsperfdata_[username]. This directory contains files that are used for
-# performance monitoring and profiling, but aren't normally needed on a BLFS
-# system. This environment variable disables that feature.
-_JAVA_OPTIONS="-XX:-UsePerfData"
-
-export _JAVA_OPTIONS
-
-unset AUTO_CLASSPATH_DIR dir jar _JAVA_OPTIONS
-
-# End /etc/profile.d/openjdk.sh</literal>
-EOF</userinput></screen>
-
-    <para>
-      If <xref linkend="sudo"/> is installed, the super user should have
-      access to the above variables. Execute the following commands as the
-       <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cat &gt; /etc/sudoers.d/java &lt;&lt; "EOF"
-<literal>Defaults env_keep += JAVA_HOME
-Defaults env_keep += CLASSPATH
-Defaults env_keep += _JAVA_OPTIONS</literal>
-EOF</userinput></screen>
-
-    <para>
-      To use <command>mandb</command> to include the OpenJDK man pages
-      in its database, issue, as the <systemitem class="username">root
-      </systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/man_db.conf &lt;&lt; "EOF" &amp;&amp;
-<literal># Begin Java addition
-MANDATORY_MANPATH     /opt/jdk/man
-MANPATH_MAP           /opt/jdk/bin     /opt/jdk/man
-MANDB_MAP             /opt/jdk/man     /var/cache/man/jdk
-# End Java addition</literal>
-EOF
-
-mkdir -p /var/cache/man &amp;&amp;
-mandb -c /opt/jdk/man</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="ojdk-certs" xreflabel="installing the JVM Certificate Authority Certificates">
-
-    <title>Setting up the Certificate Authority Certificates for Java</title>
-
-    <para>
-      <application>OpenJDK</application> uses its own format for the
-      CA certificates. The Java security modules use
-      <envar>$JAVA_HOME</envar><filename>/lib/security/cacerts</filename> by
-      default. In order to keep all the certificates in one place, we use
-      <filename>/etc/ssl/java/cacerts</filename>. The instructions
-      on the <xref linkend="make-ca"/> page previously created the file
-      located in <filename class="directory">/etc/ssl/java</filename>.
-      Set up a symlink in the default location as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ln -sfv /etc/pki/tls/java/cacerts /opt/jdk/lib/security/cacerts</userinput></screen>
-
-    <para>
-      Use the following command to check if the <filename>cacerts</filename>
-      file has been successfully installed:
-    </para>
-
-<screen role="root"><userinput>/opt/jdk/bin/keytool -list -cacerts</userinput></screen>
-
-    <para>
-      At the prompt <computeroutput>Enter keystore password:</computeroutput>,
-      enter <userinput>changeit</userinput> (the default) or just press the
-      <quote>Enter</quote> key. If the <filename>cacerts</filename> file was
-      installed correctly, you will see a list of the certificates with
-      related information for each one. If not, you need to reinstall them.
-    </para>
-
-    <para>
-      If you later install a new JVM, you just have to create the symlink in
-      the default location to be able to use the cacerts.
-    </para>
-
-  </sect2>
-
-</sect1>
Index: general/prog/openjdk.xml
===================================================================
--- general/prog/openjdk.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,936 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 ojdk-tarball              "jdk-&openjdk-version;-ga.tar.gz">
-  <!ENTITY ojdk-repo                 "https://github.com/openjdk/jdk21u">
-  <!ENTITY ojdk-download             "&ojdk-repo;/archive/&ojdk-tarball;">
-
-  <!ENTITY anduin-download           "&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;">
-
-  <!ENTITY ojdk-md5sum               "6b714196cac31ebf31a0fc1a910ccb87">
-  <!ENTITY ojdk-size                 "107 MB">
-
-  <!ENTITY jtreg-version             "7.3.1+1">
-  <!ENTITY jtreg-download            "&anduin-download;/jtreg-&jtreg-version;.tar.gz">
-  <!ENTITY jtreg-md5sum              "0038551ecaf37d0cd99832217f79e56d">
-  <!ENTITY jtreg-size                "9.0 MB">
-
-  <!ENTITY ojdk-bdsize               "3.7 GB (add 557 MB for tests)">
-  <!ENTITY ojdk-time                 "5.2 SBU with 4 jobs (add 32 SBU for tests with 4 jobs)">
-]>
-
-<sect1 id="openjdk" xreflabel="OpenJDK-&openjdk-version;">
-  <?dbhtml filename="openjdk.html" ?>
-
-
-  <title>OpenJDK-&openjdk-version;</title>
-
-  <indexterm zone="openjdk">
-    <primary sortas="a-OpenJDK">OpenJDK</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to OpenJDK</title>
-
-    <para>
-      <application>OpenJDK</application> is an open-source implementation
-      of Oracle's Java Standard Edition platform.
-      <application>OpenJDK</application> is useful for developing
-      <application>Java</application> programs, and provides a complete
-      runtime environment to run <application>Java</application> programs.
-    </para>
-
-    &lfs121_checked;
-
-    <para>
-      OpenJDK is GPL'd code, with a special exception made for non-free
-      projects to use these classes in their proprietary products.
-      In similar fashion to the LGPL, which allows non-free programs to link
-      to libraries provided by free software, the
-      <ulink url="https://openjdk.org/legal/gplv2+ce.html">GNU
-      General Public License, version 2, with the Classpath Exception</ulink>
-      allows third party programs to use classes provided by free software
-      without the requirement that the third party software also be free. As
-      with the LGPL, any modifications made to the free software portions of a
-      third party application, must also be made freely available.
-    </para>
-
-    <note>
-      <para>
-        The <application>OpenJDK</application> source includes a very
-        thorough, open source test suite using the
-        <application>JTreg</application> test harness. The testing instructions
-        below allow testing the just built JDK for reasonable compatibility
-        with the proprietary Oracle JDK. However, in order for an independent
-        implementation to claim compatibility, it must pass a proprietary
-        <application>JCK/TCK</application> test suite. No claims of
-        compatibility, or even partial compatibility, may be made without passing
-        an approved test suite.
-      </para>
-
-      <para>
-        Oracle does provide free community access, on a case-by-case basis, to
-        a closed toolkit to ensure 100% compatibility with its proprietary JDK.
-        Neither the binary version provided on the <xref linkend="java"/> page
-        nor the JVM built with the instructions below have been tested against
-        the <ulink
-  url="https://openjdk.java.net/groups/conformance/JckAccess/jck-access.html">
-        TCK</ulink>. Any version that is built using the instructions given,
-        cannot claim to be compatible with the proprietary JDK, without the
-        user applying for, and completing the compatibility tests themselves.
-      </para>
-
-      <para>
-        With that in mind, the binaries produced using this build method are
-        regularly tested against the TCK by the members listed on the site
-        above. In addition to the community license above, an educational,
-        non-commercial license for the TCK can be obtained <ulink
-        url="https://www.oracle.com/java/scholarship-program.html">
-        here</ulink>.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&ojdk-download;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url=" "/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &ojdk-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download Size: &ojdk-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &ojdk-bdsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &ojdk-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-
-    <para>
-      <emphasis role="strong">Optional test harness</emphasis>
-    </para>
-
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          <ulink url="&jtreg-download;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &jtreg-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download Size: &jtreg-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect4">Required patch</bridgehead>
-
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          <ulink url="&patch-root;/openjdk-&openjdk-version;-make_4.3_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">OpenJDK Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required Dependencies</bridgehead>
-    <para role="required">
-      An existing binary (<xref linkend="java"/> or an earlier built
-      version of this package. The instructions below assume that
-      you are using <xref linkend="ojdk-conf"/>),
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="cpio"/>,
-      <xref linkend="cups"/>,
-      <xref linkend="unzip"/>,
-      <xref linkend="which"/>,
-      <xref linkend="xorg7-lib"/>, and
-      <xref linkend="zip"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="make-ca"/>,
-      <xref linkend="giflib"/>,
-      <xref linkend="harfbuzz"/>,
-      <xref linkend="lcms2"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libpng"/>, and
-      <xref linkend="wget"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="git"/>,
-      <xref linkend="graphviz"/>,
-      <xref linkend="mercurial"/>,
-<!-- not needed now, it seems
-      an X Window manager such as <xref linkend="twm"/> (for the tests), and
--->
-      <ulink url="https://ccache.dev/">ccache</ulink>,
-      <ulink url="https://pandoc.org/">pandoc</ulink>, and
-      <ulink url="https://zlib.net/pigz">pigz</ulink>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of OpenJDK</title>
-
-    <para>
-      If you have downloaded the optional test harness, unpack it now:
-    </para>
-
-<screen><userinput>tar -xf ../jtreg-&jtreg-version;.tar.gz</userinput></screen>
-<!--
-    <para>
-      Apply a patch to allow building with make-4.3:
-    </para>
-
-<screen><userinput>patch -p1 -i ../openjdk-&openjdk-version;-make_4.3_fix-1.patch</userinput></screen>
-
-    <para>
-      Fix an issue coming from a removed header in glibc-2.32:
-    </para>
-
-<screen><userinput>sed -i /sysctl/d \
-    src/jdk.incubator.jpackage/unix/native/libapplauncher/PosixPlatform.cpp</userinput></screen>
--->
-    <note>
-      <para>
-        Before proceeding, you should ensure that your environment
-        <envar>PATH</envar> variable contains the location of the Java
-        compiler used for bootstrapping <application>OpenJDK</application>.
-        This is the only requirement for the environment. Modern Java
-        installations do not need <envar>JAVA_HOME</envar> and
-        <envar>CLASSPATH</envar> is not used here. Furthermore, OpenJDK
-        developers recommend unsetting <envar>JAVA_HOME</envar>.
-      </para>
-
-      <para>
-        The build system does not allow the <option>-j</option> switch in
-        <envar>MAKEFLAGS</envar>. See the command explanation for
-        <option>--with-jobs=</option>
-        for more information on customizing parallelization.
-      </para>
-    </note>
-
-    <para>
-      Configure and build the package with the following commands:
-    </para>
-
-<screen><userinput>unset JAVA_HOME                             &amp;&amp;
-bash configure --enable-unlimited-crypto    \
-               --disable-warnings-as-errors \
-               --with-stdc++lib=dynamic     \
-               --with-giflib=system         \
-               --with-harfbuzz=system       \
-               --with-jtreg=$PWD/jtreg      \
-               --with-lcms=system           \
-               --with-libjpeg=system        \
-               --with-libpng=system         \
-               --with-zlib=system           \
-               --with-version-build="&openjdk-build;"    \
-               --with-version-pre=""        \
-               --with-version-opt=""        \
-               --with-cacerts-file=/etc/pki/tls/java/cacerts &amp;&amp;
-make images</userinput></screen>
-
-    <para>
-      To test the results, you will need to execute the jtreg program.
-      You can set the number of concurrent tests by adding the
-      <parameter>-conc:<replaceable>&lt;X&gt;</replaceable></parameter>
-      value in the below command (tests will run sequentially otherwise):
-    </para>
-
-<screen remap="test"><userinput>export JT_JAVA=$(echo $PWD/build/*/jdk) &amp;&amp;
-jtreg/bin/jtreg -jdk:$JT_JAVA -automatic -ignore:quiet -v1 \
-    test/jdk:tier1 test/langtools:tier1 &amp;&amp;
-unset JT_JAVA</userinput></screen>
-
-    <para>
-      For more control over the test suite, review the documentation
-      available in <filename>jtreg/doc/jtreg/usage.txt</filename>. To review
-      the results, see the files
-      <filename>JTreport/test_{jdk,langtools}/text/stats.txt</filename> and
-      <filename>JTreport/test_{jdk,langtools}/text/summary.txt</filename>.
-      You should expect to see around 60 failures and 10 errors.
-    </para>
-    <!--
-         14.0.1+7:
-         for x86_64: passed: 5,836; failed: 42; error: 50
-         17.0.2+8:
-         for x86_64: passed: 6,238; failed: 48; error: 13
-         for i686:   passed: 6,208; failed: 29; error: 6
-         18.0.1+10:
-         for x86_64: passed: 6,323; failed: 53; error: 14
-         for i686:   passed: 6,290; failed: 29; error: 11
-         18.0.1.1+2:
-         for x86_64: passed: 6,323; failed: 53; error: 14
-         for i686:   passed: 6,290; failed: 29; error: 11
-         18.0.2+8:
-         for x86_64: passed: 6,329; failed: 50; error: 14
-         for i686:   passed: 6,289; failed: 31; error: 13
-         19.0.1+10:
-         for x86_64: passed: 6,423; failed: 58; error: 15
-         for i686:   passed: 6,376; failed: 31; error: 12
-         19.0.2+7:
-         for x86_64: passed: 6,426; failed: 61; error: 14
-         for i686:   passed: 6,377; failed: 34; error: 11
-         20.0.1+9:
-         for x86_64: passed: 6,515; failed: 65; error: 13
-         for i686:   passed: 6,520; failed: 60; error: 13
-         20.0.2+9:
-         for x86_64: passed: 6,515; failed: 65; error: 14
-         for i686:   passed: 6,446; failed: 33; error: 12
-         21+35:
-         for x86_64: passed: 6,699; failed: 72; error: 13
-         for i686:   passed: 6,627; failed: 30; error: 10
-         21.0.1+12:
-         for x86_64: passed: 6,706; failed: 72; error: 14
-         for i686:   passed: 6,636; failed: 29; error: 11
-         21.0.2+13:
-         for x86_64: passed: 6,698; failed: 71; error: 13
-         for i686:   passed: 6,606; failed: 30; error: 34
-    -->
-
-    <para>
-      Install the package with the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -vdm755 /opt/jdk-&openjdk-version;+&openjdk-build;             &amp;&amp;
-cp -Rv build/*/images/jdk/* /opt/jdk-&openjdk-version;+&openjdk-build; &amp;&amp;
-chown -R root:root /opt/jdk-&openjdk-version;+&openjdk-build;          &amp;&amp;
-for s in 16 24 32 48; do
-  install -vDm644 src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png \
-                  /usr/share/icons/hicolor/${s}x${s}/apps/java.png
-done</userinput></screen>
-
-    <note>
-      <para>
-        If you only wish to install the Java Runtime Environment, you can
-        substitute <filename>build/*/images/jre</filename> in the above
-        <command>cp</command> command.
-      </para>
-    </note>
-
-    <para>
-      There are now two <application>OpenJDK</application> SDKs installed
-      in <filename class="directory">/opt</filename>. You should decide on
-      which one you would like to use as the default. Normally, you would opt
-      for the just installed <application>OpenJDK</application>. If so, do
-      the following as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>ln -v -nsf jdk-&openjdk-version;+&openjdk-build; /opt/jdk</userinput></screen>
-
-    <para>
-      If desired, you can create .desktop files to add entries
-      in the menu for <command>java</command>
-      and <command>jconsole</command>. The needed icons have already been
-      installed. As the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>mkdir -pv /usr/share/applications &amp;&amp;
-
-cat &gt; /usr/share/applications/openjdk-java.desktop &lt;&lt; "EOF" &amp;&amp;
-<literal>[Desktop Entry]
-Name=OpenJDK Java &openjdk-version; Runtime
-Comment=OpenJDK Java &openjdk-version; Runtime
-Exec=/opt/jdk/bin/java -jar
-Terminal=false
-Type=Application
-Icon=java
-MimeType=application/x-java-archive;application/java-archive;application/x-jar;
-NoDisplay=true</literal>
-EOF
-cat &gt; /usr/share/applications/openjdk-jconsole.desktop &lt;&lt; "EOF"
-<literal>[Desktop Entry]
-Name=OpenJDK Java &openjdk-version; Console
-Comment=OpenJDK Java &openjdk-version; Console
-Keywords=java;console;monitoring
-Exec=/opt/jdk/bin/jconsole
-Terminal=false
-Type=Application
-Icon=java
-Categories=Application;System;</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>bash configure...</command>: the top level
-      <filename>configure</filename> is a wrapper around the autotools one.
-      It is not executable and must be run through <command>bash</command>.
-    </para>
-<!-- Not needed in openjdk-15
-    <para>
-      <parameter>- -with-extra-cflags=-fcommon</parameter>: Allows building
-      with GCC 10.
-    </para>
--->
-    <para>
-      <parameter>--enable-unlimited-crypto</parameter>: Because of limitations
-      on the usage of cryptography in some countries, there is the possibility
-      to limit the size of encryption keys and the use of some algorithms in a
-      policy file. This switch allows to ship a policy file with no
-      restriction. It is the responsibility of the user to ensure proper
-      adherence to the law.
-    </para>
-
-    <para>
-      <parameter>--disable-warnings-as-errors</parameter>: This switch disables
-      use of <envar>-Werror</envar> in the build.
-    </para>
-
-    <para>
-      <parameter>--with-stdc++lib=dynamic</parameter>: This switch forces the
-      build system to link to <filename>libstdc++.so</filename> (dynamic)
-      instead of <filename>libstdc++.a</filename> (static).
-    </para>
-
-    <para>
-      <option>--with-jobs=<replaceable>&lt;X&gt;</replaceable></option>:
-      The <parameter>-j</parameter> passed to make does not work with make as
-      invoked here. By default, the build system will use the number of
-      CPUs - 1.
-    </para>
-
-    <para>
-      <parameter>--with-jtreg=$PWD/jtreg</parameter>: This switch tells
-      configure where to find jtreg. Omit if you have not downloaded the
-      optional test suite.
-    </para>
-
-    <para>
-      <parameter>--with-{giflib,harfbuzz,lcms,libjpeg,libpng,zlib}=system</parameter>:
-      These switches force the build system to use the system libraries instead
-      of the bundled versions.
-    </para>
-
-    <para>
-      <parameter>--with-version-build</parameter>: Currently, the build
-      system does not include the build number in the version string. It has
-      to be specified here.
-    </para>
-
-    <para>
-      <parameter>--with-version-pre</parameter>: This switch allows you to
-      prefix the version string with a custom string.
-    </para>
-
-    <para>
-      <parameter>--with-version-opt</parameter>: This switch allows you to add
-      an optional build description to the version string.
-    </para>
-
-    <para>
-      <parameter>--with-cacerts-file=/etc/pki/tls/java/cacerts</parameter>:
-      Specifies where to find a <filename>cacerts</filename> file,
-      <filename>/etc/pki/tls/java/</filename> on a BLFS system. Otherwise, an
-      empty one is created. You can use the
-      <command>/usr/sbin/make-ca --force</command> command to generate it, once
-      you have installed the Java binaries.
-    </para>
-
-    <para>
-      <option>--with-boot-jdk</option>: This switch provides the
-      location of the temporary <application>JDK</application>. It is normally
-      not needed if <command>java</command> is found in the <envar>PATH</envar>.
-    </para>
-<!-- Seems to have disappeared
-    <para>
-      <command>find ... -iname '*.diz' -delete</command>: This command
-      removes redundant files.
-    </para>
--->
-  </sect2>
-
-  <sect2 role="configuration"
-         id="openjdk-config"
-         xreflabel="Configuring OpenJDK">
-    <title>Configuring OpenJDK</title>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Normally, the Java environment has been configured after installing
-        the binary version, and can be used with the just built package as well.
-        Review <xref linkend="ojdk-conf"/> in case you want to modify
-        something.
-      </para>
-
-      <para>
-        To test if the man pages are correctly installed, issue
-        <command>source /etc/profile</command> and <command>man java</command>
-        to display the respective man page.
-      </para>
-
-    </sect3>
-
-    <sect3>
-      <title>
-        Setting up the JRE Certificate Authority Certificates (cacerts) file
-      </title>
-
-      <para>
-        If you have run the instructions on the <xref linkend="make-ca"/> page,
-        you only need to create a symlink in the default location for the
-        <filename>cacerts</filename> file. As user <systemitem
-        class="username">root</systemitem>:
-      </para>
-
-<screen role="root"><userinput>ln -sfv /etc/pki/tls/java/cacerts /opt/jdk/lib/security/cacerts</userinput></screen>
-
-      <para>
-        To check the installation, issue:
-      </para>
-
-<screen role="root"><userinput>cd /opt/jdk
-bin/keytool -list -cacerts</userinput></screen>
-
-    <para>
-      At the prompt <computeroutput>Enter keystore password:</computeroutput>,
-      enter <userinput>changeit</userinput> (the default) or just press the
-      <quote>Enter</quote> key. If the <filename>cacerts</filename> file was
-      installed correctly, you will see a list of the certificates with
-      related information for each one. If not, you need to reinstall them.
-    </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>jar, jarsigner, java, javac, javadoc, javap, jcmd,
-        jconsole, jdb, jdeprscan, jdeps, jfr, jhsdb, jimage, jinfo,
-        jlink, jmap, jmod, jpackage, jps, jrunscript, jshell, jstack,
-        jstat, jstatd, jwebserver, keytool, rmiregistry, and serialver</seg>
-        <seg>37 libraries in /opt/jdk-&openjdk-version;+&openjdk-build;/lib/</seg>
-        <seg>/opt/jdk-&openjdk-version;+&openjdk-build;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="jar">
-        <term><command>jar</command></term>
-        <listitem>
-          <para>
-            combines multiple files into a single jar archive
-          </para>
-          <indexterm zone="openjdk jar">
-            <primary sortas="b-jar">jar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jarsigner">
-        <term><command>jarsigner</command></term>
-        <listitem>
-          <para>
-            signs jar files and verifies the signatures and integrity
-            of a signed jar file
-          </para>
-          <indexterm zone="openjdk jarsigner">
-            <primary sortas="b-jarsigner">jarsigner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="java-prog">
-        <term><command>java</command></term>
-        <listitem>
-          <para>
-            launches a Java application by starting a Java runtime
-            environment, loading a specified class and invoking its main
-            method
-          </para>
-          <indexterm zone="openjdk java-prog">
-            <primary sortas="b-java-prog">java</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="javac">
-        <term><command>javac</command></term>
-        <listitem>
-          <para>
-            reads class and interface definitions, written in the
-            Java programming language, and compiles them into bytecode
-            class files
-          </para>
-          <indexterm zone="openjdk javac">
-            <primary sortas="b-javac">javac</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="javadoc">
-        <term><command>javadoc</command></term>
-        <listitem>
-          <para>
-            parses the declarations and documentation comments in a
-            set of Java source files and produces a corresponding set of
-            HTML pages describing the classes, interfaces, constructors,
-            methods, and fields
-          </para>
-          <indexterm zone="openjdk javadoc">
-            <primary sortas="b-javadoc">javadoc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="javap">
-        <term><command>javap</command></term>
-        <listitem>
-          <para>
-            disassembles a Java class file
-          </para>
-          <indexterm zone="openjdk javap">
-            <primary sortas="b-javap">javap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jcmd">
-        <term><command>jcmd</command></term>
-        <listitem>
-          <para>
-            is a utility to send diagnostic command requests to a running
-            Java Virtual Machine
-          </para>
-          <indexterm zone="openjdk jcmd">
-            <primary sortas="b-jcmd">jcmd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jconsole">
-        <term><command>jconsole</command></term>
-        <listitem>
-          <para>
-            is a graphical console tool to monitor and manage both
-            local and remote Java applications and virtual machines
-          </para>
-          <indexterm zone="openjdk jconsole">
-            <primary sortas="b-jconsole">jconsole</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jdb">
-        <term><command>jdb</command></term>
-        <listitem>
-          <para>
-            is a simple command-line debugger for Java classes
-          </para>
-          <indexterm zone="openjdk jdb">
-            <primary sortas="b-jdb">jdb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jdeprscan">
-        <term><command>jdeprscan</command></term>
-        <listitem>
-          <para>
-            scans class or jar files for uses of deprecated API elements
-          </para>
-          <indexterm zone="openjdk jdeprscan">
-            <primary sortas="b-jdeprscan">jdeprscan</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jdeps">
-        <term><command>jdeps</command></term>
-        <listitem>
-          <para>
-            shows the package-level or class-level dependencies of
-            Java class files
-          </para>
-          <indexterm zone="openjdk jdeps">
-            <primary sortas="b-jdeps">jdeps</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jfr">
-        <term><command>jfr</command></term>
-        <listitem>
-          <para>
-            is a tool for working with <quote>Flight Recorder</quote> files
-          </para>
-          <indexterm zone="openjdk jfr">
-            <primary sortas="b-jfr">jfr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jhsdb">
-        <term><command>jhsdb</command></term>
-        <listitem>
-          <para>
-            is a tool to analyze the content of a core dump from a
-            crashed Java Virtual Machine (JVM)
-          </para>
-          <indexterm zone="openjdk jhsdb">
-            <primary sortas="b-jhsdb">jhsdb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jimage">
-        <term><command>jimage</command></term>
-        <listitem>
-          <para>
-            is used to list, extract, verify, or get information about
-            modules in <emphasis>jimage</emphasis> format
-          </para>
-          <indexterm zone="openjdk jimage">
-            <primary sortas="b-jimage">jimage</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jinfo">
-        <term><command>jinfo</command></term>
-        <listitem>
-          <para>
-            prints Java configuration information for a given Java
-            process, core file, or a remote debug server
-          </para>
-          <indexterm zone="openjdk jinfo">
-            <primary sortas="b-jinfo">jinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jlink">
-        <term><command>jlink</command></term>
-        <listitem>
-          <para>
-            is used to assemble and optimize a set of modules and their
-            dependencies into a custom runtime image
-          </para>
-          <indexterm zone="openjdk jlink">
-            <primary sortas="b-jlink">jlink</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jmap">
-        <term><command>jmap</command></term>
-        <listitem>
-          <para>
-            prints shared object memory maps or heap memory details
-            of a given process, core file, or a remote debug server
-          </para>
-          <indexterm zone="openjdk jmap">
-            <primary sortas="b-jmap">jmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jmod">
-        <term><command>jmod</command></term>
-        <listitem>
-          <para>
-            creates JMOD files and lists the content of existing JMOD files
-          </para>
-          <indexterm zone="openjdk jmod">
-            <primary sortas="b-jmod">jmod</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jpackage">
-        <term><command>jpackage</command></term>
-        <listitem>
-          <para>
-            generates java application packages and images
-          </para>
-          <indexterm zone="openjdk jpackage">
-            <primary sortas="b-jpackage">jpackage</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jps">
-        <term><command>jps</command></term>
-        <listitem>
-          <para>
-            lists the instrumented JVMs on the target system
-          </para>
-          <indexterm zone="openjdk jps">
-            <primary sortas="b-jps">jps</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jrunscript">
-        <term><command>jrunscript</command></term>
-        <listitem>
-          <para>
-            is a command line script shell
-          </para>
-          <indexterm zone="openjdk jrunscript">
-            <primary sortas="b-jrunscript">jrunscript</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jshell">
-        <term><command>jshell</command></term>
-        <listitem>
-          <para>
-            is an interactive tool for learning the Java programming
-            language and prototyping Java code
-          </para>
-          <indexterm zone="openjdk jshell">
-            <primary sortas="b-jshell">jshell</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jstack">
-        <term><command>jstack</command></term>
-        <listitem>
-          <para>
-            prints Java stack traces of Java threads for a given
-            Java process, core file, or a remote debug server
-          </para>
-          <indexterm zone="openjdk jstack">
-            <primary sortas="b-jstack">jstack</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jstat">
-        <term><command>jstat</command></term>
-        <listitem>
-          <para>
-            displays performance statistics for an instrumented JVM
-          </para>
-          <indexterm zone="openjdk jstat">
-            <primary sortas="b-jstat">jstat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jstatd">
-        <term><command>jstatd</command></term>
-        <listitem>
-          <para>
-            is an RMI server application that monitors for the creation
-            and termination of instrumented JVMs
-          </para>
-          <indexterm zone="openjdk jstatd">
-            <primary sortas="b-jstatd">jstatd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jwebserver">
-        <term><command>jwebserver</command></term>
-        <listitem>
-          <para>
-            provides a minimal HTTP server, designed to be used for
-            prototyping, testing, and debugging
-          </para>
-          <indexterm zone="openjdk jwebserver">
-            <primary sortas="b-jwebserver">jwebserver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="keytool">
-        <term><command>keytool</command></term>
-        <listitem>
-          <para>
-            is a key and certificate management utility
-          </para>
-          <indexterm zone="openjdk keytool">
-            <primary sortas="b-keytool">keytool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rmiregistry">
-        <term><command>rmiregistry</command></term>
-        <listitem>
-          <para>
-            creates and starts a remote object registry on the specified
-            port on the current host
-          </para>
-          <indexterm zone="openjdk rmiregistry">
-            <primary sortas="b-rmiregistry">rmiregistry</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="serialver">
-        <term><command>serialver</command></term>
-        <listitem>
-          <para>
-            returns the serialVersionUID for one or more classes in a
-            form suitable for copying into an evolving class
-          </para>
-          <indexterm zone="openjdk serialver">
-            <primary sortas="b-serialver">serialver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/prog/patchelf.xml
===================================================================
--- general/prog/patchelf.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,129 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 patchelf-download-http "https://github.com/NixOS/patchelf/releases/download/&patchelf-version;/patchelf-&patchelf-version;.tar.gz">
-  <!ENTITY patchelf-download-ftp  " ">
-  <!ENTITY patchelf-md5sum        "b02099b0d63f06b3fe370f4edfc0c085">
-  <!ENTITY patchelf-size          "448 KB">
-  <!ENTITY patchelf-buildsize     "20 MB (with tests)">
-  <!ENTITY patchelf-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="patchelf" xreflabel="patchelf-&patchelf-version;">
-  <?dbhtml filename="patchelf.html"?>
-
-
-  <title>Patchelf-&patchelf-version;</title>
-
-  <indexterm zone="patchelf">
-    <primary sortas="a-patchelf">patchelf</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Patchelf</title>
-
-    <para>
-      The <application>patchelf</application> package contains a small
-      utility to modify the dynamic linker and RPATH of ELF executables.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&patchelf-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&patchelf-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &patchelf-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &patchelf-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &patchelf-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &patchelf-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Patchelf</title>
-
-    <para>
-      Install <application>patchelf</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --docdir=/usr/share/doc/patchelf-&patchelf-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-
-      <seglistitem>
-        <seg>
-          patchelf
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="patchelf-prog">
-        <term><command>patchelf</command></term>
-        <listitem>
-          <para>
-            is a simple utility for modifying existing ELF executables and
-            libraries; it can change the dynamic loader ("ELF interpreter")
-            of executables and change the RPATH of executables and
-            libraries.
-          </para>
-          <indexterm zone="patchelf patchelf-prog">
-            <primary sortas="b-patchelf">patchelf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: general/prog/perl-alternatives.xml
===================================================================
--- general/prog/perl-alternatives.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,86 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
-
-  <!-- it seems at least one entity is needed -->
-  <!ENTITY perl-alternatives-dummy      "42">
-]>
-  <!-- Begin perl alternatives -->
-  <sect2 id="perl-alternatives" xreflabel="CPAN automated install of perl modules">
-
-    <title>CPAN automated install of perl modules</title>
-
-    <indexterm zone="perl-alternatives">
-      <primary sortas="a-cpan-install-of-perl-modules">CPAN automated install of perl modules</primary>
-    </indexterm>
-
-    <sect3 role="installation" id="perl-auto-install"
-    xreflabel="automatic installation of perl modules">
-      <title> Automatic Installation of Perl Modules.</title>
-
-      <para>
-        There is an alternate way of installing the modules using the
-        <command>cpan</command> shell <command>install</command> command. The
-        command automatically downloads the latest source from the CPAN archive
-        for the module and any missing prerequisite modules listed by upstream.
-        Then for each module it extracts it, runs the compilation, the tests and
-        installs it.
-      </para>
-
-      <para>
-        You still need to install any non-perl dependencies before running
-        the automated installation method.  You may wish to clean out the
-        <filename class="directory">build/</filename> directory after
-        installing, to free up the space. If any post-install actions such
-        as creating a symlink are mentioned, you should also do those.
-      </para>
-
-      <para>
-        The first time you run <command>cpan</command>, you'll be prompted
-        to enter some information regarding download locations and methods. This
-        information is retained in files located in
-        <filename class='directory'>~/.cpan</filename>.
-      </para>
-
-      <para>
-        In particular, you may wish to configure it so that <xref linkend="sudo"/>
-        is used for the installs, allowing you to build and test as a regular user.
-        The following examples have not used that approach.
-      </para>
-
-      <para>
-        Start the
-        <command>cpan</command> shell by issuing '<command>cpan</command>' as the
-        <systemitem class="username">root</systemitem> user. Any module may now be
-        installed from the
-        <emphasis role='underlined'><prompt>cpan&gt;&nbsp;</prompt></emphasis>
-        prompt with the command:
-      </para>
-
-<screen role="root"><userinput>install <replaceable>&lt;Module::Name&gt;</replaceable></userinput></screen>
-
-      <para>
-        For additional commands and help, issue '<command>help</command>'
-        from the
-        <emphasis role='underlined'><prompt>cpan&gt;&nbsp;</prompt></emphasis>
-        prompt.
-      </para>
-
-      <para>
-        Alternatively, for scripted or non-interactive installations, use the
-        following syntax as the <systemitem class="username">root</systemitem>
-        user to install one or more modules:
-      </para>
-
-<screen role="root"><userinput>cpan -i <replaceable>&lt;Module1::Name&gt; &lt;Module2::Name&gt;</replaceable></userinput></screen>
-
-      <para>
-        Review the <filename>cpan.1</filename> man page for additional
-        parameters you can pass to <command>cpan</command> on the command line.
-      </para>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-core-modules.txt
===================================================================
--- general/prog/perl-core-modules.txt	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,110 +1,0 @@
-This is an attempt to make it easier to determine dependencies for perl modules
-by reading Makefile.PL or Build.PL and (sometimes) by reading the testscripts.
-
-It is a list of modules in core perl-5.24.0 which are deps for modules I have
-looked at.  Occasionally, a module might need a newer version than what is in
-the current perl release.  Usually, that only affects modules used by
-biblatex-biber.
-
-The '::' translates to '/' when looking at a log of what got installed,
-but some are slightly different (library, not pm ?) and some of the
-modules are in the Arch-OS (x86_64-linux-thread-multi) directory.
-
-If you see 'eval' in a Makefile.PL or in a test, it implies that the module
-may be optional.  There are one or two exceptions in Makefile.PLs where a
-module is only needed with certain versions of another module
-
-This list is in alphabetical order, with digits and '::' after letters,
-NOT ASCII order
-
-B
-B::Deparse
-base
-blib
-bytes
-Carp
-Compress::Raw::Bzip2
-Compress::Raw::Zlib
-Config
-constant
-CPAN::Meta
-CPAN::Meta::Prereqs
-CPAN::Meta::Requirements
-Cwd
-Data::Dumper
-Devel::Peek
-Dynaloader
-Encode
-Env
-Exporter
-ExtUtils::CBuilder
-ExtUtils::MakeMaker
-ExtUtils::MM_Unix
-Fcntl
-File::Basename
-File::Compare
-File::Copy
-File::Find
-File::Glob
-File::Path
-File::Spec
-File::Spec::Functions
-File::Temp
-File::Which
-FileHandle
-FindBin
-Getopt::Long
-Hash::Util
-if
-Importer
-integer
-IO::File
-IO::Handle
-IO::Select
-IO::Socket::IP
-IPC::Cmd
-IPC::Open2
-IPC::Open3
-JSON::PP
-lib
-List::Util
-Math::BigInt
-Module::Metadata
-open
-overload
-parent
-PerlIO
-Pod::Simple
-POSIX
-re
-Scalar::Util
-Storable
-strict
-Sub::Util
-Symbol
-Sys::Hostname
-Test
-Test::Builder
-Test::Builder::Module
-Test::Builder::Tester
-Test::Harness
-Test::More
-Test::Tester
-Text::Balanced
-Text::ParseWords
-Tie::Array
-Tie::Hash
-Time::HighRes
-Time::Local
-Unicode::Collate
-Unicode::Normalize
-utf8
-vars
-version
-warnings
-warnings::register
-XSLoader
-
-Any reference to inc:: in the Makefile.PL means that a module used
-during the build or install is shipped within the tarball.
-
Index: general/prog/perl-deps.xml
===================================================================
--- general/prog/perl-deps.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,849 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="perl-deps" xreflabel="Perl Module Dependencies">
-  <?dbhtml filename="perl-deps.html" ?>
-
-
-  <title>Perl Module Dependencies</title>
-
-  <indexterm zone="perl-deps">
-    <primary sortas="a-perl-module-dependencies">Perl Module Dependencies</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Perl Modules which are only required by other modules</title>
-
-    <para>
-      The modules on the previous page are referenced from other pages in BLFS,
-      but these modules are only in the book as dependencies of those modules.
-      If you use the CPAN install method, you do not need to read this page.
-   </para>
-
-    <para>
-      The BLFS editors pay much less attention to these modules, and the
-      versions will not be regularly reviewed. In all cases, only the required or
-      recommended dependencies are listed - there might be other modules which
-      allow more tests to be run, but omitting them will still allow the tests to
-      <literal>PASS</literal>.
-    </para>
-
-    <note>
-      <para>
-        The links on this page (to metacpan.org) should go to "known good"
-        versions, for which their dependencies are correct. If you wish to use a
-        later version, please check the Changes file at https://metacpan.org -
-        sometimes added dependencies are listed, other times not. Some of these
-        modules have very frequent updates, often bringing different dependencies.
-        <!-- FIXME - change or comment this when necessary -->
-        The linked metacpan.org versions below were known to work with the
-        module versions in BLFS when last reviewed.
-      </para>
-
-      <para>
-        However, if you notice that the Changes file for a newer version than is
-        in the current development book reports a fix for a security issue, please
-        report this to either the blfs-dev or the blfs-support list.
-      </para>
-
-      <para>
-        Similarly, if you discover that an updated module on the previous page
-        needs an extra dependency, please report this.
-      </para>
-    </note>
-
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          <xref linkend="perl-algorithm-diff"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-alien-build"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-alien-build-plugin-download-gitlab"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-alien-libxml2"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-b-cow"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-b-hooks-endofscope"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-business-isbn-data"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-capture-tiny"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-class-data-inheritable"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-class-inspector"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-class-singleton"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-class-tiny"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-clone"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-config-autoconf"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-cpan-meta-check"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-datetime"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-datetime-format-strptime"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-datetime-locale"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-datetime-timezone"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-devel-stacktrace"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-dist-checkconflicts"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-encode-locale"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-eval-closure"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-exception-class"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-exporter-tiny"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-extutils-libbuilder"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-ffi-checklib"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-file-chdir"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-file-copy-recursive"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-file-find-rule"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-file-listing"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-file-sharedir"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-file-sharedir-install"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-html-tagset"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-http-cookiejar"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-http-cookies"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-http-date"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-http-message"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-http-negotiate"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-io-html"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-ipc-system-simple"/>
-        </para>
-      </listitem>
-<!--  <listitem> moved to perl-modules, for install-tl_unx
-        <para>
-          <xref linkend="perl-libwww-perl"/>
-        </para>
-      </listitem>-->
-      <listitem>
-        <para>
-          <xref linkend="perl-list-moreutils-xs"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-list-someutils"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-list-someutils-xs"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-list-utilsby"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-lwp-mediatypes"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-mime-charset"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-module-implementation"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-module-runtime"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-mro-compat"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-namespace-autoclean"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-namespace-clean"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-net-http"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-net-ssleay"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-number-compare"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-package-stash"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-params-validate"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-params-validationcompiler"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-path-tiny"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-role-tiny"/>
-        </para>
-      </listitem>
-<!--  <listitem> in core modules of perl-5.36, with same version as cpan
-        <para>
-          <xref linkend="perl-scalar-list-utils"/>
-        </para>
-      </listitem>-->
-      <listitem>
-        <para>
-          <xref linkend="perl-scope-guard"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-specio"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-sub-exporter-progressive"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-sub-identify"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-sub-quote"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-sub-uplevel"/>
-        </para>
-      </listitem>
-<!--
-      <listitem>
-        <para>
-          <xref linkend="perl-super"/>
-        </para>
-      </listitem>
--->
-      <listitem>
-        <para>
-          <xref linkend="perl-term-table"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-test-deep"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-test-exception"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-test-fatal"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-test-file"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-test-file-sharedir"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-test-leaktrace"/>
-        </para>
-      </listitem>
-<!--
-      <listitem>
-        <para>
-          <xref linkend="perl-test-mockmodule"/>
-        </para>
-      </listitem>
--->
-      <listitem>
-        <para>
-          <xref linkend="perl-test-needs"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-test-requires"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-test-requiresinternet"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-test-utf8"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-test-warnings"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-test-without-module"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-test2-plugin-nowarnings"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-test2-suite"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-text-csv_xs"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-text-diff"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-text-glob"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-tie-cycle"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-timedate"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-try-tiny"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-variable-magic"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-www-robotrules"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-xml-libxml"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-xml-namespacesupport"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-xml-sax"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-xml-sax-base"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-algorithm-diff.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-alien-build.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-alien-build-plugin-download-gitlab.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-alien-libxml2.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-b-cow.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-b-hooks-endofscope.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-business-isbn-data.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-capture-tiny.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-class-data-inheritable.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-class-inspector.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-class-singleton.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-class-tiny.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-clone.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-config-autoconf.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-cpan-meta-check.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-datetime.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-datetime-format-strptime.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-datetime-locale.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-datetime-timezone.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-devel-stacktrace.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-dist-checkconflicts.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-encode-locale.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-eval-closure.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-exception-class.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-exporter-tiny.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-extutils-libbuilder.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-ffi-checklib.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-file-chdir.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-file-copy-recursive.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-file-find-rule.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-file-listing.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-file-sharedir.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-file-sharedir-install.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-html-tagset.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-http-cookiejar.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-http-cookies.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-http-date.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-http-message.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-http-negotiate.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-io-html.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-ipc-system-simple.xml"/>
-
-<!-- moved to perl-modules for install-tl_unx
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-libwww-perl.xml"/> -->
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-list-moreutils-xs.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-list-someutils.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-list-someutils-xs.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-list-utilsby.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-lwp-mediatypes.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-mime-charset.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-module-implementation.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-module-runtime.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-mro-compat.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-namespace-autoclean.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-namespace-clean.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-net-http.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-net-ssleay.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-number-compare.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-package-stash.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-params-validate.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-params-validationcompiler.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-path-tiny.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-role-tiny.xml"/>
-  <!-- in core modules of perl-5.36, with same version as cpan
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-scalar-list-utils.xml"/>-->
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-scope-guard.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-specio.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-sub-exporter-progressive.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-sub-identify.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-sub-quote.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-sub-uplevel.xml"/>
-
-<!-- Only used in Test::MockModule, which was archived since Archive::Zip no
-     longer uses it.
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-super.xml"/>
--->
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-term-table.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-test-deep.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-test-exception.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-test-fatal.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-test-file.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-test-file-sharedir.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-test-leaktrace.xml"/>
-
-<!-- Only referenced in Archive::Zip, and no longer used there.
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-test-mockmodule.xml"/>
--->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-test-needs.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-test-requires.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-test-requiresinternet.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-test-utf8.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-test-warnings.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-test-without-module.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-test2-plugin-nowarnings.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-test2-suite.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-text-csv_xs.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-text-diff.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-text-glob.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-tie-cycle.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-timedate.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-try-tiny.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-variable-magic.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-www-robotrules.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-xml-libxml.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-xml-namespacesupport.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-xml-sax.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-deps/perl-xml-sax-base.xml"/>
-
-</sect1>
Index: general/prog/perl-deps/perl-algorithm-diff.xml
===================================================================
--- general/prog/perl-deps/perl-algorithm-diff.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/R/RJ/RJBS//Algorithm-Diff-&Algorithm-Diff-version;.tar.gz">
-  <!ENTITY my-md5sum "2eaae910f5220261ee2bbdfc4a8df2c2">
-
-]>
-
-  <!-- Begin Algorithm::Diff -->
-  <sect2 id="perl-algorithm-diff" xreflabel="Algorithm-Diff-&Algorithm-Diff-version;">
-
-    <title>Algorithm::Diff-&Algorithm-Diff-version;</title>
-
-    <indexterm zone="perl-algorithm-diff">
-      <primary sortas="a-Algorithm-Diff">Algorithm::Diff</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Algorithm::Diff</title>
-
-      <para>
-        Algorithm::Diff computes 'intelligent' differences between two files or
-        lists.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Algorithm::Diff</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-alien-build-plugin-download-gitlab.xml
===================================================================
--- general/prog/perl-deps/perl-alien-build-plugin-download-gitlab.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,64 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/P/PL/PLICEASE/Alien-Build-Plugin-Download-GitLab-&Alien-Build-Plugin-Download-GitLab-version;.tar.gz">
-  <!ENTITY my-md5sum "ad1d815262ad7dd98b0a9b35ba2f05ef">
-
-]>
-
-  <!-- Begin Alien::Build -->
-  <sect2 id="perl-alien-build-plugin-download-gitlab" xreflabel="Alien-Build-Plugin-Download-GitLab-&Alien-Build-Plugin-Download-GitLab-version;">
-
-    <title>Alien::Build::Plugin::Download::GitLab-&Alien-Build-Plugin-Download-GitLab-version;</title>
-
-    <indexterm zone="perl-alien-build-plugin-download-gitlab">
-      <primary sortas="a-Alien-Build-Plugin-Download-GitLab">Alien::Build::Plugin::Download::GitLab</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Alien::Build::Plugin::Download::GitLab</title>
-
-      <para>
-        Alien::Build::Plugin::Download::GitLab allows Alien::Build to download
-        from GitLab (in practice, this does not download if the required library
-        is already installed on the system).
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Alien::Build::Plugin::Download::GitLab Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-alien-build"/> and
-        <xref linkend="perl-uri"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Alien::Build::Plugin::Download::GitLab</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-alien-build.xml
===================================================================
--- general/prog/perl-deps/perl-alien-build.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,71 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/P/PL/PLICEASE/Alien-Build-&Alien-Build-version;.tar.gz">
-  <!ENTITY my-md5sum "f60fe0bb8e96ad328e712675fd7f2d72">
-
-]>
-
-  <!-- Begin Alien::Build -->
-  <sect2 id="perl-alien-build" xreflabel="Alien-Build-&Alien-Build-version;">
-
-    <title>Alien::Build-&Alien-Build-version;</title>
-
-    <indexterm zone="perl-alien-build">
-      <primary sortas="a-Alien-Build">Alien::Build</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Alien::Build</title>
-
-      <para>
-        Alien::Build provides tools for building external (non-CPAN) dependencies
-        for CPAN.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Alien::Build Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-capture-tiny"/>,
-        <xref linkend="perl-file-which"/>,
-        <xref linkend="perl-ffi-checklib"/> and
-        <xref linkend="perl-file-chdir"/>
-      </para>
-
-      <!-- the direct test dependencies are also needed at runtime
-           when Alien-Build is used to build Alien-Libxml2
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-      </para>-->
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Alien::Build</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-alien-libxml2.xml
===================================================================
--- general/prog/perl-deps/perl-alien-libxml2.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,70 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/P/PL/PLICEASE/Alien-Libxml2-&Alien-Libxml2-version;.tar.gz">
-  <!ENTITY my-md5sum "54ef82ddf7641279a72f216e405f9a5e">
-
-]>
-
-  <!-- Begin Alien::Libxml2 -->
-  <sect2 id="perl-alien-libxml2" xreflabel="Alien-Libxml2-&Alien-Libxml2-version;">
-
-    <title>Alien::Libxml2-&Alien-Libxml2-version;</title>
-
-    <indexterm zone="perl-alien-libxml2">
-      <primary sortas="a-Alien-Libxml2">Alien::Libxml2</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Alien::Libxml2</title>
-
-      <para>
-        Alien::Libxml2 is designed to allow modules to install the C libxml2
-        library on your system. In BLFS, it uses <command>pkg-config</command>
-        to find how to link to the installed <xref linkend="libxml2"/>.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Alien::Libxml2 Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-alien-build-plugin-download-gitlab"/>,
-        <xref linkend="libxml2"/>,
-        <xref linkend="perl-path-tiny"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-test2-suite"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Alien::Libxml2</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-b-cow.xml
===================================================================
--- general/prog/perl-deps/perl-b-cow.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/A/AT/ATOOMIC/B-COW-&B-COW-version;.tar.gz">
-  <!ENTITY my-md5sum "7afc46f19e6f906e2ba5769b21fca5ff">
-
-]>
-
-  <!-- Begin B::COW -->
-  <sect2 id="perl-b-cow" xreflabel="B-COW-&B-COW-version;">
-
-    <title>B::COW-&B-COW-version;</title>
-
-    <indexterm zone="perl-b-cow">
-      <primary sortas="a-B-COW">B::COW</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to B::COW</title>
-
-      <para>
-        B::COW provides additional helpers for the B core module to check
-        Copy On Write.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of B::COW</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-b-hooks-endofscope.xml
===================================================================
--- general/prog/perl-deps/perl-b-hooks-endofscope.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/E/ET/ETHER/B-Hooks-EndOfScope-&B-Hooks-EndOfScope-version;.tar.gz">
-  <!ENTITY my-md5sum "d738ba65539d4acd601d47cc3e2cbb3a">
-
-]>
-
-  <!-- Begin B::Hooks::EndOfScope -->
-  <sect2 id="perl-b-hooks-endofscope" xreflabel="B-Hooks-EndOfScope-&B-Hooks-EndOfScope-version;">
-
-    <title>B::Hooks::EndOfScope-&B-Hooks-EndOfScope-version;</title>
-
-    <indexterm zone="perl-b-hooks-endofscope">
-      <primary sortas="a-B-Hooks-EndOfScope">B::Hooks::EndOfScope</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to B::Hooks::EndOfScope</title>
-
-      <para>
-        B::Hooks::EndOfScope allows you to execute code when perl finished
-        compiling the surrounding scope.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">B::Hooks::EndOfScope Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-module-implementation"/>,
-        <xref linkend="perl-sub-exporter-progressive"/> and
-        <xref linkend="perl-variable-magic"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-try-tiny"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of B::Hooks::EndOfScope</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-business-isbn-data.xml
===================================================================
--- general/prog/perl-deps/perl-business-isbn-data.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,53 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/B/BD/BDFOY/Business-ISBN-Data-&Business-ISBN-Data-version;.tar.gz">
-  <!ENTITY my-md5sum "9eecef0abe410be4c41a74adafdca230">
-]>
-
-  <!-- Begin Business-ISBN-Data -->
-  <sect2 id="perl-business-isbn-data" xreflabel="Business-ISBN-Data-&Business-ISBN-Data-version;">
-
-    <title>Business::ISBN::Data-&Business-ISBN-Data-version;</title>
-
-    <indexterm zone="perl-business-isbn-data">
-      <primary sortas="a-Business-ISBN-Data">Business-ISBN-Data</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Business-ISBN-Data</title>
-
-      <para>
-        Business-ISBN-Data is a data pack for Business::ISBN.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Business-ISBN-Data</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-capture-tiny.xml
===================================================================
--- general/prog/perl-deps/perl-capture-tiny.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/D/DA/DAGOLDEN/Capture-Tiny-&Capture-Tiny-version;.tar.gz">
-  <!ENTITY my-md5sum "f5d24083ad270f8326dd659dd83eeb54">
-
-]>
-
-  <!-- Begin Capture::Tiny -->
-  <sect2 id="perl-capture-tiny" xreflabel="Capture-Tiny-&Capture-Tiny-version;">
-
-    <title>Capture::Tiny-&Capture-Tiny-version;</title>
-
-    <indexterm zone="perl-capture-tiny">
-      <primary sortas="a-Capture-Tiny">Capture::Tiny</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Capture::Tiny</title>
-
-      <para>
-        The Capture::Tiny module captures STDOUT and STDERR from Perl, XS
-        (eXternal Subroutine, i.e. written in C or C++) or external programs.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Capture::Tiny</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-class-data-inheritable.xml
===================================================================
--- general/prog/perl-deps/perl-class-data-inheritable.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/R/RS/RSHERER/Class-Data-Inheritable-&Class-Data-Inheritable-version;.tar.gz">
-  <!ENTITY my-md5sum "bd25ecd6e5d528fbc3783edf1b8facef">
-
-]>
-
-  <!-- Begin Class::Data::Inheritable -->
-  <sect2 id="perl-class-data-inheritable" xreflabel="Class-Data-Inheritable-&Class-Data-Inheritable-version;">
-
-    <title>Class::Data::Inheritable-&Class-Data-Inheritable-version;</title>
-
-    <indexterm zone="perl-class-data-inheritable">
-      <primary sortas="a-Class-Data-Inheritable">Class::Data::Inheritable</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Class::Data::Inheritable</title>
-
-      <para>
-        Class::Data::Inheritable is for creating accessor/mutators to class data.
-        That is, if you want to store something about your class as a whole
-        (instead of about a single object).
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Class::Data::Inheritable</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-class-inspector.xml
===================================================================
--- general/prog/perl-deps/perl-class-inspector.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/P/PL/PLICEASE/Class-Inspector-&Class-Inspector-version;.tar.gz">
-  <!ENTITY my-md5sum "084c3aeec023639d21ecbaf7d4460b21">
-
-]>
-
-  <!-- Begin Class::Inspector -->
-  <sect2 id="perl-class-inspector" xreflabel="Class-Inspector-&Class-Inspector-version;">
-
-    <title>Class::Inspector-&Class-Inspector-version;</title>
-
-    <indexterm zone="perl-class-inspector">
-      <primary sortas="a-Class-Inspector">Class::Inspector</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Class::Inspector</title>
-
-      <para>
-        Class::Inspector allows you to get information about a loaded class.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Class::Inspector</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-class-singleton.xml
===================================================================
--- general/prog/perl-deps/perl-class-singleton.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/S/SH/SHAY/Class-Singleton-&Class-Singleton-version;.tar.gz">
-  <!ENTITY my-md5sum "d9c84a7b8d1c490c38e88ed1f9faae47">
-
-]>
-
-  <!-- Begin Class::Singleton -->
-  <sect2 id="perl-class-singleton" xreflabel="Class-Singleton-&Class-Singleton-version;">
-
-    <title>Class::Singleton-&Class-Singleton-version;</title>
-
-    <indexterm zone="perl-class-singleton">
-      <primary sortas="a-Class-Singleton">Class::Singleton</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Class::Singleton</title>
-
-      <para>
-        A Singleton describes an object class that can have only one instance in
-        any system, such as a print spooler. This module implements a Singleton
-        class from which other classes can be derived.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Class::Singleton</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-class-tiny.xml
===================================================================
--- general/prog/perl-deps/perl-class-tiny.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
-<!-- FIXME This does not seem to be needed -->
-  <!ENTITY my-download-http "&metacpan_authors;/D/DA/DAGOLDEN/Class-Tiny-&Class-Tiny-version;.tar.gz">
-  <!ENTITY my-md5sum "e3ccfae5f64d443e7e1110be964d7202">
-
-]>
-
-  <!-- Begin Class:Tiny -->
-  <sect2 id="perl-class-tiny" xreflabel="Class-Tiny-&Class-Tiny-version;">
-
-    <title>Class:Tiny-&Class-Tiny-version;</title>
-
-    <indexterm zone="perl-class-tiny">
-      <primary sortas="a-Class-Tiny">Class:Tiny</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Class:Tiny</title>
-
-      <para>
-        Class:Tiny offers a minimalist class construction kit.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Class:Tiny</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-clone.xml
===================================================================
--- general/prog/perl-deps/perl-clone.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,65 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
-
- <!-- but for modules which are only dependencies of other modules, put them in
-   general/pprog/perl-deps with a link to &metacpan_authors; that includes the /id part -->
-  <!ENTITY my-download-http "&metacpan_authors;/G/GA/GARU/Clone-&Clone-version;.tar.gz">
- <!-- only one of the above choices -->
-  <!ENTITY my-md5sum "cafa8984a2c2e005e54b27dd1e3f0afe">
-
-]>
-
-  <!-- Begin Clone -->
-  <sect2 id="perl-clone" xreflabel="Clone-&Clone-version;">
-
-    <title>Clone-&Clone-version;</title>
-
-    <indexterm zone="perl-clone">
-      <primary sortas="a-Clone">Clone</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Clone</title>
-
-      <para>
-        Clone recursively copies perl datatypes.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Clone Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-b-cow"/>
-
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Clone</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-config-autoconf.xml
===================================================================
--- general/prog/perl-deps/perl-config-autoconf.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/A/AM/AMBS/Config-AutoConf-&Config-AutoConf-version;.tar.gz">
-  <!ENTITY my-md5sum "71664b2864232e265179ac29298e0916">
-
-]>
-
-  <!-- Begin Config::AutoConf -->
-  <sect2 id="perl-config-autoconf" xreflabel="Config-AutoConf-&Config-AutoConf-version;">
-
-    <title>Config::AutoConf-&Config-AutoConf-version;</title>
-
-    <indexterm zone="perl-config-autoconf">
-      <primary sortas="a-Config-AutoConf">Config::AutoConf</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Config::AutoConf</title>
-
-      <para>
-        The Config::AutoConf module implements some of the AutoConf macros
-        (detecting a command, detecting a library, etc.) in pure perl.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Config::AutoConf Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-capture-tiny"/>,
-        <xref linkend="perl-file-slurper"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Config::AutoConf</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-cpan-meta-check.xml
===================================================================
--- general/prog/perl-deps/perl-cpan-meta-check.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/L/LE/LEONT/CPAN-Meta-Check-&CPAN-Meta-Check-version;.tar.gz">
-  <!ENTITY my-md5sum "d1c2190e8bc1c176b9ee9cba3ac403ad">
-
-]>
-
-  <!-- Begin CPAN::Meta::Check -->
-  <sect2 id="perl-cpan-meta-check" xreflabel="CPAN-Meta-Check-&CPAN-Meta-Check-version;">
-
-    <title>CPAN::Meta::Check-&CPAN-Meta-Check-version;</title>
-
-    <indexterm zone="perl-cpan-meta-check">
-      <primary sortas="a-CPAN-Meta-Check">CPAN::Meta::Check</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to CPAN::Meta::Check</title>
-
-      <para>
-        CPAN::Meta::Check verifies if requirements described in a CPAN::Meta
-        object are present.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of CPAN::Meta::Check</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-datetime-format-strptime.xml
===================================================================
--- general/prog/perl-deps/perl-datetime-format-strptime.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,67 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/D/DR/DROLSKY/DateTime-Format-Strptime-&DateTime-Format-Strptime-version;.tar.gz">
-  <!ENTITY my-md5sum "441cfec62b0b8a1b4c05cbe5ef73fbf4">
-
-]>
-
-  <!-- Begin DateTime::Format::Strptime -->
-  <sect2 id="perl-datetime-format-strptime" xreflabel="DateTime-Format-Strptime-&DateTime-Format-Strptime-version;">
-
-    <title>DateTime::Format::Strptime-&DateTime-Format-Strptime-version;</title>
-
-    <indexterm zone="perl-datetime-format-strptime">
-      <primary sortas="a-DateTime-Format-Strptime">DateTime::Format::Strptime</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to DateTime::Format::Strptime</title>
-
-      <para>
-        DateTime::Format::Strptime implements most of <ulink role='man'
-        url='&man;strptime.3'>strptime(3)</ulink>, i.e. it takes a string
-        and a pattern and returns a DateTime object.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">DateTime::Format::Strptime Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-datetime"/>
-        <!-- This pulls in perl-datetime-locale, perl-datetime-timezone,
-             perl-params-validationcompiler, perl-specio and perl-try-tiny -->
-      </para>
-      <!-- the changes claim it needs FindBin for testing,
-           but it is fine without that and does not seem to reference it -->
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of DateTime::Format::Strptime</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-datetime-locale.xml
===================================================================
--- general/prog/perl-deps/perl-datetime-locale.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,74 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/D/DR/DROLSKY/DateTime-Locale-&DateTime-Locale-version;.tar.gz">
-  <!ENTITY my-md5sum "cf78f7fe66326ccc447e718a20b6361c">
-
-]>
-
-  <!-- Begin DateTime::Locale -->
-  <sect2 id="perl-datetime-locale" xreflabel="DateTime-Locale-&DateTime-Locale-version;">
-
-    <title>DateTime::Locale-&DateTime-Locale-version;</title>
-
-    <indexterm zone="perl-datetime-locale">
-      <primary sortas="a-DateTime-Locale">DateTime::Locale</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to DateTime::Locale</title>
-
-      <para>
-        DateTime::Locale provides localization support for <xref
-        linkend="perl-datetime"/>.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">DateTime::Locale Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-dist-checkconflicts"/>,
-        <xref linkend="perl-file-sharedir"/>,
-        <!-- perl-file-sharedir pulls in perl-file-sharedir-install -->
-        <xref linkend="perl-namespace-autoclean"/> and
-        <xref linkend="perl-params-validationcompiler"/>
-        <!-- perl-params-validationcompiler pulls in perl-specio -->
-      </para>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-cpan-meta-check"/>,
-        <xref linkend="perl-ipc-system-simple"/> and
-        <xref linkend="perl-test-file-sharedir"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of DateTime::Locale</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-datetime-timezone.xml
===================================================================
--- general/prog/perl-deps/perl-datetime-timezone.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,78 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/D/DR/DROLSKY/DateTime-TimeZone-&DateTime-TimeZone-version;.tar.gz">
-  <!ENTITY my-md5sum "e11bb3a07c4f3d156f7dc356816f3962">
-
-]>
-
-  <!-- Begin DateTime::TimeZone -->
-  <sect2 id="perl-datetime-timezone" xreflabel="DateTime-TimeZone-&DateTime-TimeZone-version;">
-
-    <title>DateTime::TimeZone-&DateTime-TimeZone-version;</title>
-
-    <indexterm zone="perl-datetime-timezone">
-      <primary sortas="a-DateTime-TimeZone">DateTime::TimeZone</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to DateTime::TimeZone</title>
-
-      <para>
-        This class is the base class for all time zone objects. A time zone is
-        represented internally as a set of observances, each of which describes
-        the offset from GMT for a given time period.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">DateTime::TimeZone Dependencies</bridgehead>
-
-      <!-- the Changes file suggeests it needs File-Slurp-Tiny but it is fine
-           without it and does not seem to reference it. -->
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-class-singleton"/>,
-        <xref linkend="perl-module-runtime"/>, and
-        <xref linkend="perl-params-validationcompiler"/>, also
-        <!-- perl-params-validationcompiler pulls in perl-specio -->
-        <!-- perl-specio pulls in perl-try-tiny -->
-      </para>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        Both <xref linkend="perl-test-fatal"/> and
-        <xref linkend="perl-test-requires"/>,
-        but only if a copy of <xref role="nodep" linkend="perl-datetime"/>
-        (for which this is a dependency) has already been installed
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of DateTime::TimeZone</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-datetime.xml
===================================================================
--- general/prog/perl-deps/perl-datetime.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,74 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/D/DR/DROLSKY/DateTime-&DateTime-version;.tar.gz">
-  <!ENTITY my-md5sum "6f60018500f8f20c5fd3d34495eae1eb">
-
-]>
-
-  <!-- Begin DateTime -->
-  <sect2 id="perl-datetime" xreflabel="DateTime-&DateTime-version;">
-
-    <title>DateTime-&DateTime-version;</title>
-
-    <indexterm zone="perl-datetime">
-      <primary sortas="a-DateTime">DateTime</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to DateTime</title>
-
-      <para>
-        DateTime is a date and time object for perl.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">DateTime Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-datetime-locale"/>,
-        <!-- perl-datetime-locale pulls in perl-namespace-autoclean -->
-        <xref linkend="perl-datetime-timezone"/>
-        <!-- perl-params-validation-compiler is pulled in by both
-             perl-datetime-locale and perl-datetime-timezone -->
-        <!-- perl-params-validationcompiler pulls in perl-specio -->
-      </para>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-cpan-meta-check"/>,
-        <xref linkend="perl-test-fatal"/>,
-        <xref linkend="perl-test-warnings"/> and
-        <xref linkend="perl-test-without-module"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of DateTime</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-devel-stacktrace.xml
===================================================================
--- general/prog/perl-deps/perl-devel-stacktrace.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/D/DR/DROLSKY/Devel-StackTrace-&Devel-StackTrace-version;.tar.gz">
-  <!ENTITY my-md5sum "b8ca19bb4c76e98a04373618db9c7c3c">
-
-]>
-
-  <!-- Begin Devel::StackTrace -->
-  <sect2 id="perl-devel-stacktrace" xreflabel="Devel-StackTrace-&Devel-StackTrace-version;">
-
-    <title>Devel::StackTrace-&Devel-StackTrace-version;</title>
-
-    <indexterm zone="perl-devel-stacktrace">
-      <primary sortas="a-Devel-StackTrace">Devel::StackTrace</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Devel::StackTrace</title>
-
-      <para>
-        Devel::StackTrace provides an object representing a stack trace.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Devel::StackTrace</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-dist-checkconflicts.xml
===================================================================
--- general/prog/perl-deps/perl-dist-checkconflicts.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,67 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/D/DO/DOY/Dist-CheckConflicts-&Dist-CheckConflicts-version;.tar.gz">
-  <!ENTITY my-md5sum "c8725a92b9169708b0f63036812070f2">
-
-]>
-
-  <!-- Begin Dist::CheckConflicts -->
-  <sect2 id="perl-dist-checkconflicts" xreflabel="Dist-CheckConflicts-&Dist-CheckConflicts-version;">
-
-    <title>Dist::CheckConflicts-&Dist-CheckConflicts-version;</title>
-
-    <indexterm zone="perl-dist-checkconflicts">
-      <primary sortas="a-Dist-CheckConflicts">Dist::CheckConflicts</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Dist::CheckConflicts</title>
-
-      <para>
-        Dist::CheckConflicts declares version conflicts for a distribution,
-        to support post-install updates of dependent distributions.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Dist::CheckConflicts Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-module-runtime"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-test-fatal"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Dist::CheckConflicts</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-encode-locale.xml
===================================================================
--- general/prog/perl-deps/perl-encode-locale.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/G/GA/GAAS/Encode-Locale-&Encode-Locale-version;.tar.gz">
-  <!ENTITY my-md5sum "fcfdb8e4ee34bcf62aed429b4a23db27">
-
-]>
-
-  <!-- Begin Encode::Locale -->
-  <sect2 id="perl-encode-locale" xreflabel="Encode-Locale-&Encode-Locale-version;">
-
-    <title>Encode::Locale-&Encode-Locale-version;</title>
-
-    <indexterm zone="perl-encode-locale">
-      <primary sortas="a-Encode-Locale">Encode::Locale</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Encode::Locale</title>
-
-      <para>
-        Encode::Locale determines the locale encoding.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Encode::Locale</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-eval-closure.xml
===================================================================
--- general/prog/perl-deps/perl-eval-closure.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/D/DO/DOY/Eval-Closure-&Eval-Closure-version;.tar.gz">
-  <!ENTITY my-md5sum "ceeb1fc579ac9af981fa6b600538c285">
-
-]>
-
-  <!-- Begin Eval::Closure -->
-  <sect2 id="perl-eval-closure" xreflabel="Eval-Closure-&Eval-Closure-version;">
-
-    <title>Eval::Closure-&Eval-Closure-version;</title>
-
-    <indexterm zone="perl-eval-closure">
-      <primary sortas="a-Eval-Closure">Eval::Closure</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Eval::Closure</title>
-
-      <para>
-        Eval::Closure safely and cleanly creates closures via string eval.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Eval::Closure Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-test-fatal"/>,
-        <xref linkend="perl-test-requires"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Eval::Closure</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-exception-class.xml
===================================================================
--- general/prog/perl-deps/perl-exception-class.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/D/DR/DROLSKY/Exception-Class-&Exception-Class-version;.tar.gz">
-  <!ENTITY my-md5sum "1e564d20b374a99fdf660ba3f36b0098">
-
-]>
-
-  <!-- Begin Exception::Class -->
-  <sect2 id="perl-exception-class" xreflabel="Exception-Class-&Exception-Class-version;">
-
-    <title>Exception::Class-&Exception-Class-version;</title>
-
-    <indexterm zone="perl-exception-class">
-      <primary sortas="a-Exception-Class">Exception::Class</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Exception::Class</title>
-
-      <para>
-        Exception::Class allows you to declare real exception classes in <application>Perl</application>.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Exception::Class Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-class-data-inheritable"/>,
-        <xref linkend="perl-devel-stacktrace"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Exception::Class</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-exporter-tiny.xml
===================================================================
--- general/prog/perl-deps/perl-exporter-tiny.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/T/TO/TOBYINK/Exporter-Tiny-&Exporter-Tiny-version;.tar.gz">
-  <!ENTITY my-md5sum "0545ee8f4edcb9dc5a87b21ed25edd74">
-
-]>
-
-  <!-- Begin Exporter::Tiny -->
-  <sect2 id="perl-exporter-tiny" xreflabel="Exporter-Tiny-&Exporter-Tiny-version;">
-
-    <title>Exporter::Tiny-&Exporter-Tiny-version;</title>
-
-    <indexterm zone="perl-exporter-tiny">
-      <primary sortas="a-Exporter-Tiny">Exporter::Tiny</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Exporter::Tiny</title>
-
-      <para>
-        Exporter::Tiny is an exporter with the features of Sub::Exporter but
-        only core dependencies.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Exporter::Tiny</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-extutils-libbuilder.xml
===================================================================
--- general/prog/perl-deps/perl-extutils-libbuilder.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/A/AM/AMBS/ExtUtils-LibBuilder-&ExtUtils-LibBuilder-version;.tar.gz">
-  <!ENTITY my-md5sum "8ffe9e9a3c2f916f40dc4f6aed237d33">
-
-]>
-
-  <!-- Begin ExtUtils::LibBuilder -->
-  <sect2 id="perl-extutils-libbuilder" xreflabel="ExtUtils-LibBuilder-&ExtUtils-LibBuilder-version;">
-
-    <title>ExtUtils::LibBuilder-&ExtUtils-LibBuilder-version;</title>
-
-    <indexterm zone="perl-extutils-libbuilder">
-      <primary sortas="a-ExtUtils-LibBuilder">ExtUtils::LibBuilder</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to ExtUtils::LibBuilder</title>
-
-      <para>
-        ExtUtils::LibBuilder is a tool to build C libraries.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">ExtUtils::LibBuilder Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-module-build"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of ExtUtils::LibBuilder</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-build-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-ffi-checklib.xml
===================================================================
--- general/prog/perl-deps/perl-ffi-checklib.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,66 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/P/PL/PLICEASE/FFI-CheckLib-&FFI-CheckLib-version;.tar.gz">
-  <!ENTITY my-md5sum "ffc8e61bb686dd631bed3ddf102af41c">
-
-]>
-
-  <!-- Begin FFI::CheckLib -->
-  <sect2 id="perl-ffi-checklib" xreflabel="FFI-CheckLib-&FFI-CheckLib-version;">
-
-    <title>FFI::CheckLib-&FFI-CheckLib-version;</title>
-
-    <indexterm zone="perl-ffi-checklib">
-      <primary sortas="a-FFI-CheckLib">FFI::CheckLib</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to FFI::CheckLib</title>
-
-      <para>
-        FFI::CheckLib checks whether a particular dynamic library is available
-        for FFI (Foreign Function Interface) to use.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">FFI::CheckLib Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-capture-tiny"/>,
-        <xref linkend="perl-file-which"/>,
-        <xref linkend="perl-path-tiny"/>,
-        <xref linkend="perl-test2-suite"/>
-
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of FFI::CheckLib</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-file-chdir.xml
===================================================================
--- general/prog/perl-deps/perl-file-chdir.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/D/DA/DAGOLDEN/File-chdir-&File-chdir-version;.tar.gz">
-  <!ENTITY my-md5sum "932090f6c5f602301ae66c259de23ebb">
-
-]>
-
-  <!-- Begin File::chdir -->
-  <sect2 id="perl-file-chdir" xreflabel="File-chdir-&File-chdir-version;">
-
-    <title>File::chdir-&File-chdir-version;</title>
-
-    <indexterm zone="perl-file-chdir">
-      <primary sortas="a-File-chdir">File::chdir</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to File::chdir</title>
-
-      <para>
-        File::chdir provides a more sensible way to change directories.
-      </para>
-
-      <para>
-        Perl's chdir() has the unfortunate problem of being very, very, very
-        global. If any part of your program calls chdir() or if any library you
-        use calls chdir(), it changes the current working directory for the
-        *whole* program. File::chdir gives you an alternative, $CWD and @CWD.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of File::chdir</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-file-copy-recursive.xml
===================================================================
--- general/prog/perl-deps/perl-file-copy-recursive.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,67 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/D/DM/DMUEY/File-Copy-Recursive-&File-Copy-Recursive-version;.tar.gz">
-  <!ENTITY my-md5sum "e5eee1a3f8ae3aebbac063ea54870e54">
-
-]>
-
-  <!-- Begin File::Copy::Recursive -->
-  <sect2 id="perl-file-copy-recursive" xreflabel="File-Copy-Recursive-&File-Copy-Recursive-version;">
-
-    <title>File::Copy::Recursive-&File-Copy-Recursive-version;</title>
-
-    <indexterm zone="perl-file-copy-recursive">
-      <primary sortas="a-File-Copy-Recursive">File::Copy::Recursive</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to File::Copy::Recursive</title>
-
-      <para>
-        This module copies and moves directories recursively (or single files),
-        to an optional depth and attempts to preserve each file or directory's
-        mode.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">File::Copy::Recursive Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-path-tiny"/>,
-        <xref linkend="perl-test-deep"/>,
-        <xref linkend="perl-test-fatal"/>,
-        <xref linkend="perl-test-file"/> and
-        <xref linkend="perl-test-warnings"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of File::Copy::Recursive</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-file-find-rule.xml
===================================================================
--- general/prog/perl-deps/perl-file-find-rule.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,97 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/R/RC/RCLAMP/File-Find-Rule-&File-Find-Rule-version;.tar.gz">
-  <!ENTITY my-md5sum "a7aa9ad4d8ee87b2a77b8e3722768712">
-
-]>
-
-  <!-- Begin File::Find::Rule -->
-  <sect2 id="perl-file-find-rule" xreflabel="File-Find-Rule-&File-Find-Rule-version;">
-
-    <title>File::Find::Rule-&File-Find-Rule-version;</title>
-
-    <indexterm zone="perl-file-find-rule">
-      <primary sortas="a-File-Find-Rule">File::Find::Rule</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to File::Find::Rule</title>
-
-      <para>
-        File::Find::Rule is a friendlier interface to File::Find. It allows you
-        to build rules which specify the desired files and directories.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">File::Find::Rule Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-number-compare"/>,
-        <xref linkend="perl-text-glob"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of File::Find::Rule</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-
-        <seglistitem>
-          <seg>
-            findrule
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="findrule-prog">
-          <term><command>findrule</command></term>
-          <listitem>
-            <para>
-              is a command line wrapper to File::Find::Rule
-            </para>
-            <indexterm zone="perl-file-find-rule findrule-prog">
-              <primary sortas="b-findrule">findrule</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-file-listing.xml
===================================================================
--- general/prog/perl-deps/perl-file-listing.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/P/PL/PLICEASE/File-Listing-&File-Listing-version;.tar.gz">
-  <!ENTITY my-md5sum "d4fc8b0c86633d1fa5bf75323720eadc">
-
-]>
-
-  <!-- Begin File::Listing -->
-  <sect2 id="perl-file-listing" xreflabel="File-Listing-&File-Listing-version;">
-
-    <title>File::Listing-&File-Listing-version;</title>
-
-    <indexterm zone="perl-file-listing">
-      <primary sortas="a-File-Listing">File::Listing</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to File::Listing</title>
-
-      <para>
-        File::Listing parses a directory listing.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">File::Listing Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-http-date"/>,
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of File::Listing</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-file-sharedir-install.xml
===================================================================
--- general/prog/perl-deps/perl-file-sharedir-install.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/E/ET/ETHER/File-ShareDir-Install-&File-ShareDir-Install-version;.tar.gz">
-  <!ENTITY my-md5sum "bac4d924f3d863b00648ab56ec0dcbdc">
-
-]>
-
-  <!-- Begin File::ShareDir::Install -->
-  <sect2 id="perl-file-sharedir-install" xreflabel="File-ShareDir-Install-&File-ShareDir-Install-version;">
-
-    <title>File::ShareDir::Install-&File-ShareDir-Install-version;</title>
-
-    <indexterm zone="perl-file-sharedir-install">
-      <primary sortas="a-File-ShareDir-Install">File::ShareDir::Install</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to File::ShareDir::Install</title>
-
-      <para>
-        File::ShareDir::Install allows you to install read-only data files from
-        a distribution.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of File::ShareDir::Install</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-file-sharedir.xml
===================================================================
--- general/prog/perl-deps/perl-file-sharedir.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/R/RE/REHSACK/File-ShareDir-&File-ShareDir-version;.tar.gz">
-  <!ENTITY my-md5sum "0084f730f4e3d4d89703d92b3ea82f54">
-
-]>
-
-  <!-- Begin File::ShareDir -->
-  <sect2 id="perl-file-sharedir" xreflabel="File-ShareDir-&File-ShareDir-version;">
-
-    <title>File::ShareDir-&File-ShareDir-version;</title>
-
-    <indexterm zone="perl-file-sharedir">
-      <primary sortas="a-File-ShareDir">File::ShareDir</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to File::ShareDir</title>
-
-      <para>
-        File::ShareDir allows you to access data files which have been
-        installed by File::ShareDir::Install.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">File::ShareDir Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-class-inspector"/>,
-        <xref linkend="perl-file-sharedir-install"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of File::ShareDir</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-html-tagset.xml
===================================================================
--- general/prog/perl-deps/perl-html-tagset.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/P/PE/PETDANCE/HTML-Tagset-&HTML-Tagset-version;.tar.gz">
-  <!ENTITY my-md5sum "f8db8974f5e7fe7df2a58263a7b00552">
-
-]>
-
-  <!-- Begin HTML::Tagset -->
-  <sect2 id="perl-html-tagset" xreflabel="HTML-Tagset-&HTML-Tagset-version;">
-
-    <title>HTML::Tagset-&HTML-Tagset-version;</title>
-
-    <indexterm zone="perl-html-tagset">
-      <primary sortas="a-HTML-Tagset">HTML::Tagset</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to HTML::Tagset</title>
-
-      <para>
-        HTML::Tagset provides several data tables useful in parsing HTML.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of HTML::Tagset</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-http-cookiejar.xml
===================================================================
--- general/prog/perl-deps/perl-http-cookiejar.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/D/DA/DAGOLDEN/HTTP-CookieJar-&HTTP-CookieJar-version;.tar.gz">
-  <!ENTITY my-md5sum "a1d891ce0046f1a2c19e2c617d624d0d">
-
-]>
-
-  <!-- Begin HTTP::CookieJar -->
-  <sect2 id="perl-http-cookiejar" xreflabel="HTTP-CookieJar-&HTTP-CookieJar-version;">
-
-    <title>HTTP::CookieJar-&HTTP-CookieJar-version;</title>
-
-    <indexterm zone="perl-http-cookiejar">
-      <primary sortas="a-HTTP-CookieJar">HTTP::CookieJar</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to HTTP::CookieJar</title>
-
-      <para>
-        HTTP::CookieJar provides a minimalist HTTP user agent cookie jar.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">HTTP::CookieJar Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-http-date"/>
-        <!-- perl-http-date pulls in perl-timedate -->
-      </para>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-test-deep"/>,
-        <xref linkend="perl-test-requires"/>,
-        <xref linkend="perl-uri"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of HTTP::CookieJar</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-http-cookies.xml
===================================================================
--- general/prog/perl-deps/perl-http-cookies.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,65 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/O/OA/OALDERS/HTTP-Cookies-&HTTP-Cookies-version;.tar.gz">
-  <!ENTITY my-md5sum "80017e7e56bdc8ba16dea75789748829">
-
-]>
-
-  <!-- Begin HTTP::Cookies -->
-  <sect2 id="perl-http-cookies" xreflabel="HTTP-Cookies-&HTTP-Cookies-version;">
-
-    <title>HTTP::Cookies-&HTTP-Cookies-version;</title>
-
-    <indexterm zone="perl-http-cookies">
-      <primary sortas="a-HTTP-Cookies">HTTP::Cookies</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to HTTP::Cookies</title>
-
-      <para>
-        HTTP::Cookies provides a class for objects that represent a "cookie jar"
-        -- that is, a database of all the HTTP cookies that a given
-        LWP::UserAgent (from <xref linkend="perl-libwww-perl"/>) object
-        knows about.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">HTTP::Cookies Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-http-message"/>
-        <!-- perl-http-message pulls in perl-http-date and perl-uri -->
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of HTTP::Cookies</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-http-date.xml
===================================================================
--- general/prog/perl-deps/perl-http-date.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,65 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/O/OA/OALDERS/HTTP-Date-&HTTP-Date-version;.tar.gz">
-  <!ENTITY my-md5sum "60462359bfeb1e6d14602508cfd07885">
-
-]>
-
-  <!-- Begin HTTP::Date -->
-  <sect2 id="perl-http-date" xreflabel="HTTP-Date-&HTTP-Date-version;">
-
-    <title>HTTP::Date-&HTTP-Date-version;</title>
-
-    <indexterm zone="perl-http-date">
-      <primary sortas="a-HTTP-Date">HTTP::Date</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to HTTP::Date</title>
-
-      <para>
-        HTTP::Date provides functions to deal with the date formats used by the
-        HTTP protocol and also with some other date formats.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">HTTP::Date Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended</bridgehead>
-      <para role="recommended">
-        <!-- Time::Zone is part of TimeDate -->
-        <xref linkend="perl-timedate"/> (to allow it to recognize zones other
-        than GMT and numeric)
-
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of HTTP::Date</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-http-message.xml
===================================================================
--- general/prog/perl-deps/perl-http-message.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,72 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/O/OA/OALDERS/HTTP-Message-&HTTP-Message-version;.tar.gz">
-  <!ENTITY my-md5sum "86c386bcc85a63c8908e6ae9967b34ee">
-
-]>
-
-  <!-- Begin HTTP::Message -->
-  <sect2 id="perl-http-message" xreflabel="HTTP-Message-&HTTP-Message-version;">
-
-    <title>HTTP::Message-&HTTP-Message-version;</title>
-
-    <indexterm zone="perl-http-message">
-      <primary sortas="a-HTTP-Message">HTTP::Message</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to HTTP::Message</title>
-
-      <para>
-        HTTP::Message provides a base class for HTTP style message objects.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">HTTP::Message Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-clone"/>,
-        <xref linkend="perl-encode-locale"/>,
-        <xref linkend="perl-http-date"/>,
-        <xref linkend="perl-io-html"/>,
-        <xref linkend="perl-lwp-mediatypes"/>, and
-        <xref linkend="perl-uri"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-test-needs"/> and
-        <xref linkend="perl-try-tiny"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of HTTP::Message</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-http-negotiate.xml
===================================================================
--- general/prog/perl-deps/perl-http-negotiate.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/G/GA/GAAS/HTTP-Negotiate-&HTTP-Negotiate-version;.tar.gz">
-  <!ENTITY my-md5sum "1236195250e264d7436e7bb02031671b">
-
-]>
-
-  <!-- Begin HTTP::Negotiate -->
-  <sect2 id="perl-http-negotiate" xreflabel="HTTP-Negotiate-&HTTP-Negotiate-version;">
-
-    <title>HTTP::Negotiate-&HTTP-Negotiate-version;</title>
-
-    <indexterm zone="perl-http-negotiate">
-      <primary sortas="a-HTTP-Negotiate">HTTP::Negotiate</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to HTTP::Negotiate</title>
-
-      <para>
-        HTTP::Negotiate provides a complete implementation of the HTTP content
-        negotiation algorithm.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">HTTP::Negotiate Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <!-- The required HTTP~::Headers is part of HTTP::Message -->
-        <xref linkend="perl-http-message"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of HTTP::Negotiate</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-io-html.xml
===================================================================
--- general/prog/perl-deps/perl-io-html.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/C/CJ/CJM/IO-HTML-&IO-HTML-version;.tar.gz">
-  <!ENTITY my-md5sum "04bbe363686fd19bfb4cc0ed775e3d03">
-
-]>
-
-  <!-- Begin IO::HTML -->
-  <sect2 id="perl-io-html" xreflabel="IO-HTML-&IO-HTML-version;">
-
-    <title>IO::HTML-&IO-HTML-version;</title>
-
-    <indexterm zone="perl-io-html">
-      <primary sortas="a-IO-HTML">IO::HTML</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to IO::HTML</title>
-
-      <para>
-        IO::HTML opens an HTML file with automatic character set detection.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of IO::HTML</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-ipc-system-simple.xml
===================================================================
--- general/prog/perl-deps/perl-ipc-system-simple.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/J/JK/JKEENAN/IPC-System-Simple-&IPC-System-Simple-version;.tar.gz">
-  <!ENTITY my-md5sum "e68341fd958fd013b3521d909904f675">
-
-]>
-
-  <!-- Begin IPC::System::Simple -->
-  <sect2 id="perl-ipc-system-simple" xreflabel="IPC-System-Simple-&IPC-System-Simple-version;">
-
-    <title>IPC::System::Simple-&IPC-System-Simple-version;</title>
-
-    <indexterm zone="perl-ipc-system-simple">
-      <primary sortas="a-IPC-System-Simple">IPC::System::Simple</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to IPC::System::Simple</title>
-
-      <para>
-        IPC::System::Simple takes the hard work out of calling external commands
-        and producing detailed diagnostics.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of IPC::System::Simple</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-list-moreutils-xs.xml
===================================================================
--- general/prog/perl-deps/perl-list-moreutils-xs.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/R/RE/REHSACK/List-MoreUtils-XS-&List-MoreUtils-XS-version;.tar.gz">
-  <!ENTITY my-md5sum "e77113e55b046906aecfb4ddb4f0c662">
-
-]>
-
-  <!-- Begin List::MoreUtils::XS -->
-  <sect2 id="perl-list-moreutils-xs" xreflabel="List-MoreUtils-XS-&List-MoreUtils-XS-version;">
-
-    <title>List::MoreUtils::XS-&List-MoreUtils-XS-version;</title>
-
-    <indexterm zone="perl-list-moreutils-xs">
-      <primary sortas="a-List-MoreUtils-XS">List::MoreUtils::XS</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to List::MoreUtils::XS</title>
-
-      <para>
-        List::MoreUtils::XS is a compiled backend for List::MoreUtils
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of List::MoreUtils::XS</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-list-someutils-xs.xml
===================================================================
--- general/prog/perl-deps/perl-list-someutils-xs.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/D/DR/DROLSKY/List-SomeUtils-XS-&List-SomeUtils-XS-version;.tar.gz">
-  <!ENTITY my-md5sum "396eabe83a75fcb8d7542d95812469d1">
-
-]>
-
-  <!-- Begin List::SomeUtils::XS -->
-  <sect2 id="perl-list-someutils-xs" xreflabel="List-SomeUtils-XS-&List-SomeUtils-XS-version;">
-
-    <title>List::SomeUtils::XS-&List-SomeUtils-XS-version;</title>
-
-    <indexterm zone="perl-list-someutils-xs">
-      <primary sortas="a-List-SomeUtils-XS">List::SomeUtils::XS</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to List::SomeUtils::XS</title>
-
-      <para>
-        List::SomeUtils::XS is a (faster) XS (eXternal Subroutine)
-        implementation for List::SomeUtils.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">List::SomeUtils::XS Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-test-leaktrace"/>,
-        <xref linkend="perl-test-warnings"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of List::SomeUtils::XS</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-list-someutils.xml
===================================================================
--- general/prog/perl-deps/perl-list-someutils.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/D/DR/DROLSKY/List-SomeUtils-&List-SomeUtils-version;.tar.gz">
-  <!ENTITY my-md5sum "333b4adb2907deff2be8da5899881453">
-
-]>
-
-  <!-- Begin List::SomeUtils -->
-  <sect2 id="perl-list-someutils" xreflabel="List-SomeUtils-&List-SomeUtils-version;">
-
-    <title>List::SomeUtils-&List-SomeUtils-version;</title>
-
-    <indexterm zone="perl-list-someutils">
-      <primary sortas="a-List-SomeUtils">List::SomeUtils</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to List::SomeUtils</title>
-
-      <para>
-        List::SomeUtils provides the stuff missing in List::Util.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">List::SomeUtils Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-module-implementation"/>,
-        <xref linkend="perl-list-someutils-xs"/>
-        <!-- perl-test-leaktrace is pulled in by perl-list-someutils-xs -->
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of List::SomeUtils</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-list-utilsby.xml
===================================================================
--- general/prog/perl-deps/perl-list-utilsby.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/P/PE/PEVANS/List-UtilsBy-&List-UtilsBy-version;.tar.gz">
-  <!ENTITY my-md5sum "54a8c7092bc02f29ea6c5ae215eea385">
-
-]>
-
-  <!-- Begin List::UtilsBy -->
-  <sect2 id="perl-list-utilsby" xreflabel="List-UtilsBy-&List-UtilsBy-version;">
-
-    <title>List::UtilsBy-&List-UtilsBy-version;</title>
-
-    <indexterm zone="perl-list-utilsby">
-      <primary sortas="a-List-UtilsBy">List::UtilsBy</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to List::UtilsBy</title>
-
-      <para>
-        List::UtilsBy provides a number of higher-order list utility functions.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of List::UtilsBy</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-lwp-mediatypes.xml
===================================================================
--- general/prog/perl-deps/perl-lwp-mediatypes.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/O/OA/OALDERS/LWP-MediaTypes-&LWP-MediaTypes-version;.tar.gz">
-  <!ENTITY my-md5sum "84b799a90c0d2ce52897a7cb4c0478d0">
-
-]>
-
-  <!-- Begin LWP::MediaTypes -->
-  <sect2 id="perl-lwp-mediatypes" xreflabel="LWP-MediaTypes-&LWP-MediaTypes-version;">
-
-    <title>LWP::MediaTypes-&LWP-MediaTypes-version;</title>
-
-    <indexterm zone="perl-lwp-mediatypes">
-      <primary sortas="a-LWP-MediaTypes">LWP::MediaTypes</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to LWP::MediaTypes</title>
-
-      <para>
-        LWP::MediaTypes guesses the media type (i.e. the MIME Type) for a file
-        or URL.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">LWP::MediaTypes Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-test-fatal"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of LWP::MediaTypes</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-mime-charset.xml
===================================================================
--- general/prog/perl-deps/perl-mime-charset.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,88 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/N/NE/NEZUMI/MIME-Charset-&MIME-Charset-version;.tar.gz">
-  <!ENTITY my-md5sum "b1932cfc806c8deb1b4a20d6afbfa8ac">
-
-]>
-
-  <!-- Begin MIME::Charset -->
-  <sect2 id="perl-mime-charset" xreflabel="MIME-Charset-&MIME-Charset-version;">
-
-    <title>MIME::Charset-&MIME-Charset-version;</title>
-
-    <indexterm zone="perl-mime-charset">
-      <primary sortas="a-MIME-Charset">MIME::Charset</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to MIME::Charset</title>
-
-      <para>
-        MIME::Charset provides information about character sets used for MIME
-        messages o nthe internet, such as their encodings.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">MIME::Charset Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-encode-eucjpascii"/>,
-        <xref linkend="perl-encode-hanextra"/> and
-        <xref linkend="perl-encode-jis2k"/> (because all are required
-        by <xref role="nodep" linkend="biber"/>)
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of MIME::Charset</title>
-
-      <para>
-        This module uses a variant of the standard build and installation
-        instructions:
-
-<screen><userinput>yes '' | perl Makefile.PL &amp;&amp;
-make             &amp;&amp;
-make test</userinput></screen>
-
-        Now, as the <systemitem class="username">root</systemitem> user:
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    </para>
-
-    </sect3>
-
-    <sect3 role="commands">
-      <title>Command Explanations</title>
-
-      <para>
-        <command>yes |</command>: Perl will ask if you wish to install
-        a further module for handling legacy Japanese encodings, and another
-        which it would use for translating documentation to Japanese. The
-        default option is 'n', using 'yes' allows you to script the build.
-      </para>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-module-implementation.xml
===================================================================
--- general/prog/perl-deps/perl-module-implementation.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,70 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/D/DR/DROLSKY/Module-Implementation-&Module-Implementation-version;.tar.gz">
-  <!ENTITY my-md5sum "52e3fe0ca6b1eff0488d59b7aacc0667">
-
-]>
-
-  <!-- Begin Module::Implementation -->
-  <sect2 id="perl-module-implementation" xreflabel="Module-Implementation-&Module-Implementation-version;">
-
-    <title>Module::Implementation-&Module-Implementation-version;</title>
-
-    <indexterm zone="perl-module-implementation">
-      <primary sortas="a-Module-Implementation">Module::Implementation</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Module::Implementation</title>
-
-      <para>
-        Module::Implementation loads one of several alternate underlying
-        implementations of a module (e.g. eXternal Subroutine or pure Perl, or
-        an implementation for a given OS).
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Module::Implementation Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-module-runtime"/>,
-        <xref linkend="perl-try-tiny"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-test-fatal"/>,
-        <xref linkend="perl-test-requires"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Module::Implementation</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-module-runtime.xml
===================================================================
--- general/prog/perl-deps/perl-module-runtime.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,60 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/Z/ZE/ZEFRAM/Module-Runtime-&Module-Runtime-version;.tar.gz">
-  <!ENTITY my-md5sum "d3d47222fa2e3dfcb4526f6cc8437b20">
-
-]>
-
-  <!-- Begin Module::Runtime -->
-  <sect2 id="perl-module-runtime" xreflabel="Module-Runtime-&Module-Runtime-version;">
-
-    <title>Module::Runtime-&Module-Runtime-version;</title>
-
-    <indexterm zone="perl-module-runtime">
-      <primary sortas="a-Module-Runtime">Module::Runtime</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Module::Runtime</title>
-
-      <para>
-        Module::Runtime provides functions to deal with runtime handling of
-        <application>Perl</application> modules.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Module::Runtime</title>
-
-      <para>
-        Although Module::Build is still listed as a prerequisite, it is
-        no-longer necessary on systems with a working <command>make</command>.
-      </para>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-mro-compat.xml
===================================================================
--- general/prog/perl-deps/perl-mro-compat.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/H/HA/HAARG/MRO-Compat-&MRO-Compat-version;.tar.gz">
-  <!ENTITY my-md5sum "f644dafe901214cedfa7ed8b43b56df1">
-
-]>
-
-  <!-- Begin MRO::Compat -->
-  <sect2 id="perl-mro-compat" xreflabel="MRO-Compat-&MRO-Compat-version;">
-
-    <title>MRO::Compat-&MRO-Compat-version;</title>
-
-    <indexterm zone="perl-mro-compat">
-      <primary sortas="a-MRO-Compat">MRO::Compat</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to MRO::Compat</title>
-
-      <para>
-        The "mro" namespace provides several utilities for dealing with method
-        resolution order and method caching in general in Perl 5.9.5 and higher.
-        This module provides those interfaces for earlier versions of Perl.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of MRO::Compat</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-namespace-autoclean.xml
===================================================================
--- general/prog/perl-deps/perl-namespace-autoclean.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,73 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/E/ET/ETHER/namespace-autoclean-&namespace-autoclean-version;.tar.gz">
-  <!ENTITY my-md5sum "39b38c776cd1f0ee03cc70781a2f2798">
-
-]>
-
-  <!-- Begin namespace::autoclean -->
-  <sect2 id="perl-namespace-autoclean" xreflabel="namespace-autoclean-&namespace-autoclean-version;">
-
-    <title>namespace::autoclean-&namespace-autoclean-version;</title>
-
-    <indexterm zone="perl-namespace-autoclean">
-      <primary sortas="a-namespace-autoclean">namespace::autoclean</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to namespace::autoclean</title>
-
-      <para>
-        This module is very similar to namespace::clean, except it will clean
-        all imported functions, no matter if you imported them before or after
-        you used the pragma. It will also not touch anything that looks like a
-        method.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">namespace::autoclean Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-namespace-clean"/>,
-        <!-- namespace-clean pulls in b-hooks-endofscope which this requires -->
-        <xref linkend="perl-sub-identify"/>
-
-      </para>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-test-needs"/>
-
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of namespace::autoclean</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-namespace-clean.xml
===================================================================
--- general/prog/perl-deps/perl-namespace-clean.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,64 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/R/RI/RIBASUSHI/namespace-clean-&namespace-clean-version;.tar.gz">
-  <!ENTITY my-md5sum "cba97f39ef7e594bd8489b4fdcddb662">
-
-]>
-
-  <!-- Begin namespace::clean -->
-  <sect2 id="perl-namespace-clean" xreflabel="namespace-clean-&namespace-clean-version;">
-
-    <title>namespace::clean-&namespace-clean-version;</title>
-
-    <indexterm zone="perl-namespace-clean">
-      <primary sortas="a-namespace-clean">namespace::clean</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to namespace::clean</title>
-
-      <para>
-        This package allows you to keep imports and functions out of your
-        namespace.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">namespace::clean Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-b-hooks-endofscope"/>,
-        <!-- This package pulls in b-hooks-endofscope for namespace-autoclean -->
-        <xref linkend="perl-package-stash"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of namespace::clean</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-net-http.xml
===================================================================
--- general/prog/perl-deps/perl-net-http.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/O/OA/OALDERS/Net-HTTP-&Net-HTTP-version;.tar.gz">
-  <!ENTITY my-md5sum "1682735ddd1c059864ca5c1bbf15ab95">
-
-]>
-
-  <!-- Begin Net::HTTP -->
-  <sect2 id="perl-net-http" xreflabel="Net-HTTP-&Net-HTTP-version;">
-
-    <title>Net::HTTP-&Net-HTTP-version;</title>
-
-    <indexterm zone="perl-net-http">
-      <primary sortas="a-Net-HTTP">Net::HTTP</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Net::HTTP</title>
-
-      <para>
-        The Net::HTTP class is a low level HTTP client. An instance of the class
-        represents a connection to an HTTP server.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Net::HTTP Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-uri"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Net::HTTP</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-net-ssleay.xml
===================================================================
--- general/prog/perl-deps/perl-net-ssleay.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,94 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/C/CH/CHRISN/Net-SSLeay-&Net-SSLeay-version;.tar.gz">
-  <!ENTITY my-md5sum "1b22c764e5a094c6261e37a4b1f148ce">
-
-]>
-
-  <!-- Begin Net::SSLeay -->
-  <sect2 id="perl-net-ssleay" xreflabel="Net-SSLeay-&Net-SSLeay-version;">
-
-    <title>Net::SSLeay-&Net-SSLeay-version;</title>
-
-    <indexterm zone="perl-net-ssleay">
-      <primary sortas="a-Net-SSLeay">Net::SSLeay</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Net::SSLeay</title>
-
-      <para>
-        Net::SSLeay is a Perl extension for using OpenSSL.
-      </para>
-
-      <!--
-      <bridgehead renderas="sect4">Additional Download</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Required patch (for openssl-1.1.1):
-            <ulink url="&patch-root;/Net-SSLeay-&Net-SSLeay-version;-openssl_1.1.1-1.patch"/>
-          </para>
-        </listitem>
-      </itemizedlist>-->
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Net::SSLeay</title>
-
-      <note>
-        <para>
-          If enabling the external tests, one test in t/external/15_altnames.t
-          may fail. <!-- https://rt.cpan.org/Public/Bug/Display.html?id=12954 -->
-        </para>
-      </note>
-
-      <para>
-        This module uses a variant of the standard build and installation
-        instructions:
-
-<screen><userinput>yes '' | perl Makefile.PL &amp;&amp;
-make             &amp;&amp;
-make test</userinput></screen>
-
-        Now, as the <systemitem class="username">root</systemitem> user:
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-      </para>
-
-    </sect3>
-
-    <sect3 role="commands">
-      <title>Command Explanations</title>
-
-      <para>
-        <command>yes ''</command>: Perl will ask if you wish to run external
-        tests, which will fail if you do not have network connectivity. The
-        default is 'n', specifying this allows you to script the build.
-      </para>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-number-compare.xml
===================================================================
--- general/prog/perl-deps/perl-number-compare.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/R/RC/RCLAMP/Number-Compare-&Number-Compare-version;.tar.gz">
-  <!ENTITY my-md5sum "ded4085a8fc96328742785574ca65208">
-
-]>
-
-  <!-- Begin Number::Compare -->
-  <sect2 id="perl-number-compare" xreflabel="Number-Compare-&Number-Compare-version;">
-
-    <title>Number::Compare-&Number-Compare-version;</title>
-
-    <indexterm zone="perl-number-compare">
-      <primary sortas="a-Number-Compare">Number::Compare</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Number::Compare</title>
-
-      <para>
-        Number::Compare compiles a simple comparison to an anonymous subroutine,
-        which you can call with a value to be tested against. It understands IEC
-        standard magnitudes (k, ki, m, mi, g, gi).
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Number::Compare</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-package-stash.xml
===================================================================
--- general/prog/perl-deps/perl-package-stash.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,73 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/E/ET/ETHER/Package-Stash-&Package-Stash-version;.tar.gz">
-  <!ENTITY my-md5sum "7a2922941cc2aad6a52642e4fb13d07b">
-
-]>
-
-  <!-- Begin Package::Stash -->
-  <sect2 id="perl-package-stash" xreflabel="Package-Stash-&Package-Stash-version;">
-
-    <title>Package::Stash-&Package-Stash-version;</title>
-
-    <indexterm zone="perl-package-stash">
-      <primary sortas="a-Package-Stash">Package::Stash</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Package::Stash</title>
-
-      <para>
-        Manipulating stashes (Perl's symbol tables) is occasionally necessary,
-        but incredibly messy, and easy to get wrong. This module hides all of
-        that behind a simple API.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Package::Stash Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-dist-checkconflicts"/>,
-        <xref linkend="perl-module-implementation"/>
-      </para>
-      <!-- Note: requirements include Package::Stash::XS but it is ok without that
-           and happily skips the test which would use that. -->
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-cpan-meta-check"/>,
-        <xref linkend="perl-test-fatal"/>,
-        <xref linkend="perl-test-needs"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Package::Stash</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-params-validate.xml
===================================================================
--- general/prog/perl-deps/perl-params-validate.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/D/DR/DROLSKY/Params-Validate-&Params-Validate-version;.tar.gz">
-  <!ENTITY my-md5sum "ef5f57387c2c9032b59fb23023cf5b25">
-
-]>
-
-  <!-- Begin Params::Validate -->
-  <sect2 id="perl-params-validate" xreflabel="Params-Validate-&Params-Validate-version;">
-
-    <title>Params::Validate-&Params-Validate-version;</title>
-
-    <indexterm zone="perl-params-validate">
-      <primary sortas="a-Params-Validate">Params::Validate</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Params::Validate</title>
-
-      <para>
-        Params::Validate allows you to validate method or function call
-        parameters to an arbitrary level of specificity.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Params::Validate Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-module-build"/>,
-        <xref linkend="perl-module-implementation"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-test-fatal"/>,
-        <xref linkend="perl-test-requires"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Params::Validate</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-build-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-params-validationcompiler.xml
===================================================================
--- general/prog/perl-deps/perl-params-validationcompiler.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,71 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/D/DR/DROLSKY/Params-ValidationCompiler-&Params-ValidationCompiler-version;.tar.gz">
-  <!ENTITY my-md5sum "15528055f3f53c8cfebbee1f928dec07">
-
-]>
-
-  <!-- Begin Params::ValidationCompiler -->
-  <sect2 id="perl-params-validationcompiler" xreflabel="Params-ValidationCompiler-&Params-ValidationCompiler-version;">
-
-    <title>Params::ValidationCompiler-&Params-ValidationCompiler-version;</title>
-
-    <indexterm zone="perl-params-validationcompiler">
-      <primary sortas="a-Params-ValidationCompiler">Params::ValidationCompiler</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Params::ValidationCompiler</title>
-
-      <para>
-        Params::ValidationCompiler builds an optimized subroutine parameter
-        validator.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Params::ValidationCompiler Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <!-- eval-closure is pulled in by specio -->
-        <xref linkend="perl-exception-class"/>,
-        <xref linkend="perl-specio"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-test-without-module"/>,
-        <xref linkend="perl-test2-plugin-nowarnings"/>
-        <!-- test2-suite provides Test2::Vo and is pulled in by test2-plugin-nowarnings -->
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Params::ValidationCompiler</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-path-tiny.xml
===================================================================
--- general/prog/perl-deps/perl-path-tiny.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/D/DA/DAGOLDEN/Path-Tiny-&Path-Tiny-version;.tar.gz">
-  <!ENTITY my-md5sum "7b2fc4f5edfd29b88d2cc3b96830e7d1">
-
-]>
-
-  <!-- Begin Path::Tiny -->
-  <sect2 id="perl-path-tiny" xreflabel="Path-Tiny-&Path-Tiny-version;">
-
-    <title>Path::Tiny-&Path-Tiny-version;</title>
-
-    <indexterm zone="perl-path-tiny">
-      <primary sortas="a-Path-Tiny">Path::Tiny</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Path::Tiny</title>
-
-      <para>
-        Path::Tiny provides a small fast utility for working with file paths.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Path::Tiny</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-role-tiny.xml
===================================================================
--- general/prog/perl-deps/perl-role-tiny.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/H/HA/HAARG/Role-Tiny-&Role-Tiny-version;.tar.gz">
-  <!ENTITY my-md5sum "9ee45591befa3d0b1094ac75d282b6ba">
-
-]>
-
-  <!-- Begin Role::Tiny -->
-  <sect2 id="perl-role-tiny" xreflabel="Role-Tiny-&Role-Tiny-version;">
-
-    <title>Role::Tiny-&Role-Tiny-version;</title>
-
-    <indexterm zone="perl-role-tiny">
-      <primary sortas="a-Role-Tiny">Role::Tiny</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Role::Tiny</title>
-
-      <para>
-        Role::Tiny is a minimalist role composition tool.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Role::Tiny</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-scope-guard.xml
===================================================================
--- general/prog/perl-deps/perl-scope-guard.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/C/CH/CHOCOLATE/Scope-Guard-&Scope-Guard-version;.tar.gz">
-  <!ENTITY my-md5sum "be57b915d23ddac7677ef2ad9e52b92a">
-
-]>
-
-  <!-- Begin Scope::Guard -->
-  <sect2 id="perl-scope-guard" xreflabel="Scope-Guard-&Scope-Guard-version;">
-
-    <title>Scope::Guard-&Scope-Guard-version;</title>
-
-    <indexterm zone="perl-scope-guard">
-      <primary sortas="a-Scope-Guard">Scope::Guard</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Scope::Guard</title>
-
-      <para>
-        Scope::Guard provides a convenient way to perform cleanup or other forms
-        of resource management at the end of a scope.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Scope::Guard</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-specio.xml
===================================================================
--- general/prog/perl-deps/perl-specio.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,85 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/D/DR/DROLSKY/Specio-&Specio-version;.tar.gz">
-  <!ENTITY my-md5sum "96cf1ae4e2e205986e03672071116b16">
-
-]>
-
-  <!-- Begin Specio -->
-  <sect2 id="perl-specio" xreflabel="Specio-&Specio-version;">
-
-    <title>Specio-&Specio-version;</title>
-
-    <indexterm zone="perl-specio">
-      <primary sortas="a-Specio">Specio</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Specio</title>
-
-      <para>
-        Specio provides classes for representing type constraints and coercion,
-        along with syntax sugar for declaring them.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Specio Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-devel-stacktrace"/>,
-        <xref linkend="perl-eval-closure"/>,
-        <xref linkend="perl-module-runtime"/>,
-        <xref linkend="perl-role-tiny"/>,
-        <xref linkend="perl-sub-quote"/> and
-        <xref linkend="perl-try-tiny"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <!-- This claims to need XString, and will use it for memory
-         efficiency if present, but runs fine without it. It also
-         shows Ref-Util in 'Runtime Recommends' but the only reference
-         to that seems to be in the prereqs. -->
-        <xref linkend="perl-mro-compat"/>,
-        <xref linkend="perl-test-fatal"/> and
-        <xref linkend="perl-test-needs"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <!-- this adds little, but it gets pulled in anyway for DateTime,
-             of which Specio is a dependency -->
-        <xref linkend="perl-namespace-autoclean"/> (for the test suite)
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Specio</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-sub-exporter-progressive.xml
===================================================================
--- general/prog/perl-deps/perl-sub-exporter-progressive.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/F/FR/FREW/Sub-Exporter-Progressive-&Sub-Exporter-Progressive-version;.tar.gz">
-  <!ENTITY my-md5sum "72cf6acdd2a0a8b105821a4db98e4ebe">
-
-]>
-
-  <!-- Begin Sub::Exporter::Progressive -->
-  <sect2 id="perl-sub-exporter-progressive" xreflabel="Sub-Exporter-Progressive-&Sub-Exporter-Progressive-version;">
-
-    <title>Sub::Exporter::Progressive-&Sub-Exporter-Progressive-version;</title>
-
-    <indexterm zone="perl-sub-exporter-progressive">
-      <primary sortas="a-Sub-Exporter-Progressive">Sub::Exporter::Progressive</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Sub::Exporter::Progressive</title>
-
-      <para>
-        Sub::Exporter::Progressive is a wrapper for Sub::Exporter.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Sub::Exporter::Progressive</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-sub-identify.xml
===================================================================
--- general/prog/perl-deps/perl-sub-identify.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/R/RG/RGARCIA/Sub-Identify-&Sub-Identify-version;.tar.gz">
-  <!ENTITY my-md5sum "014f19e72698b6a2cbcb54adc9691825">
-
-]>
-
-  <!-- Begin Sub::Identify -->
-  <sect2 id="perl-sub-identify" xreflabel="Sub-Identify-&Sub-Identify-version;">
-
-    <title>Sub::Identify-&Sub-Identify-version;</title>
-
-    <indexterm zone="perl-sub-identify">
-      <primary sortas="a-Sub-Identify">Sub::Identify</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Sub::Identify</title>
-
-      <para>
-        Sub::Identify allows you to retrieve the real name of code references.
-        It is encouraged to migrate to Sub::Util (a core module) when possible.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Sub::Identify</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-sub-quote.xml
===================================================================
--- general/prog/perl-deps/perl-sub-quote.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/H/HA/HAARG/Sub-Quote-&Sub-Quote-version;.tar.gz">
-  <!ENTITY my-md5sum "f19c60039ba87f69f7f9357fc0a03e07">
-
-]>
-
-  <!-- Begin Sub::Quote -->
-  <sect2 id="perl-sub-quote" xreflabel="Sub-Quote-&Sub-Quote-version;">
-
-    <title>Sub::Quote-&Sub-Quote-version;</title>
-
-    <indexterm zone="perl-sub-quote">
-      <primary sortas="a-Sub-Quote">Sub::Quote</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Sub::Quote</title>
-
-      <para>
-        Sub::Quote provides ways to generate subroutines from strings.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Sub::Quote</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-sub-uplevel.xml
===================================================================
--- general/prog/perl-deps/perl-sub-uplevel.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/D/DA/DAGOLDEN/Sub-Uplevel-&Sub-Uplevel-version;.tar.gz">
-  <!ENTITY my-md5sum "6c6a174861fd160e8d5871a86df00baf">
-
-]>
-
-  <!-- Begin Sub::Uplevel -->
-  <sect2 id="perl-sub-uplevel" xreflabel="Sub-Uplevel-&Sub-Uplevel-version;">
-
-    <title>Sub::Uplevel-&Sub-Uplevel-version;</title>
-
-    <indexterm zone="perl-sub-uplevel">
-      <primary sortas="a-Sub-Uplevel">Sub::Uplevel</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Sub::Uplevel</title>
-
-      <para>
-        Sub::Uplevel allows you to fool a caller that it is running in a
-        higher stack frame.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Sub::Uplevel</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-term-table.xml
===================================================================
--- general/prog/perl-deps/perl-term-table.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/E/EX/EXODIST/Term-Table-&Term-Table-version;.tar.gz">
-  <!ENTITY my-md5sum "7022839afa343ce81c92645acb21c22d">
-
-]>
-
-  <!-- Begin Term::Table -->
-  <sect2 id="perl-term-table" xreflabel="Term-Table-&Term-Table-version;">
-
-    <title>Term::Table-&Term-Table-version;</title>
-
-    <indexterm zone="perl-term-table">
-      <primary sortas="a-Term-Table">Term::Table</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Term::Table</title>
-
-      <para>
-        Term::Table formats a header and rows into a table. This is used by some
-        failing tests to provide diagnostics about what has gone wrong.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Term::Table</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-test-deep.xml
===================================================================
--- general/prog/perl-deps/perl-test-deep.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/R/RJ/RJBS/Test-Deep-&Test-Deep-version;.tar.gz">
-  <!ENTITY my-md5sum "fcff296434cd92538ae9de9d1744705f">
-
-]>
-
-  <!-- Begin Test::Deep -->
-  <sect2 id="perl-test-deep" xreflabel="Test-Deep-&Test-Deep-version;">
-
-    <title>Test::Deep-&Test-Deep-version;</title>
-
-    <indexterm zone="perl-test-deep">
-      <primary sortas="a-Test-Deep">Test::Deep</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Test::Deep</title>
-
-      <para>
-        Test::Deep gives you very flexible ways to check that the result you got
-        is the result you were expecting.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Test::Deep</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-test-exception.xml
===================================================================
--- general/prog/perl-deps/perl-test-exception.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/E/EX/EXODIST/Test-Exception-&Test-Exception-version;.tar.gz">
-  <!ENTITY my-md5sum "572d355026fb0b87fc2b8c64b83cada0">
-
-]>
-
-  <!-- Begin Test::Exception -->
-  <sect2 id="perl-test-exception" xreflabel="Test-Exception-&Test-Exception-version;">
-
-    <title>Test::Exception-&Test-Exception-version;</title>
-
-    <indexterm zone="perl-test-exception">
-      <primary sortas="a-Test-Exception">Test::Exception</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Test::Exception</title>
-
-      <para>
-        Test::Exception provides convenience methods for testing exception
-        based code.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Test::Exception Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-sub-uplevel"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Test::Exception</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-test-fatal.xml
===================================================================
--- general/prog/perl-deps/perl-test-fatal.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/R/RJ/RJBS/Test-Fatal-&Test-Fatal-version;.tar.gz">
-  <!ENTITY my-md5sum "2f160c31e1848536e3b82112d573bb76">
-
-]>
-
-  <!-- Begin Test::Fatal -->
-  <sect2 id="perl-test-fatal" xreflabel="Test-Fatal-&Test-Fatal-version;">
-
-    <title>Test::Fatal-&Test-Fatal-version;</title>
-
-    <indexterm zone="perl-test-fatal">
-      <primary sortas="a-Test-Fatal">Test::Fatal</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Test::Fatal</title>
-
-      <para>
-        The Test::Fatal module provides simple helpers for testing code which
-        throws exceptions.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Test::Fatal Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-try-tiny"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-
-      <title>Installation of Test::Fatal</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-test-file-sharedir.xml
===================================================================
--- general/prog/perl-deps/perl-test-file-sharedir.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,75 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/K/KE/KENTNL/Test-File-ShareDir-&Test-File-ShareDir-version;.tar.gz">
-  <!ENTITY my-md5sum "ec31466aa44c1cd56c6cb51d7ec3a5de">
-
-]>
-
-  <!-- Begin Test::File::ShareDir -->
-  <sect2 id="perl-test-file-sharedir" xreflabel="Test-File-ShareDir-&Test-File-ShareDir-version;">
-
-    <title>Test::File::ShareDir-&Test-File-ShareDir-version;</title>
-
-    <indexterm zone="perl-test-file-sharedir">
-      <primary sortas="a-Test-File-ShareDir">Test::File::ShareDir</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Test::File::ShareDir</title>
-
-      <para>
-        Test::File::ShareDir is some low level plumbing to enable a distribution
-        to perform tests while consuming its own share directories in a manner
-        similar to how they will be once installed. This allows <xref
-        linkend="perl-file-sharedir"/> to see the latest version of content
-        instead of whatever is installed on the target system where you are
-        testing.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Test::File::ShareDir Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-class-tiny"/>,
-        <xref linkend="perl-file-copy-recursive"/>,
-        <xref linkend="perl-file-sharedir"/>,
-        <xref linkend="perl-path-tiny"/> and
-        <xref linkend="perl-scope-guard"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-test-fatal"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Test::File::ShareDir</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-test-file.xml
===================================================================
--- general/prog/perl-deps/perl-test-file.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/B/BD/BDFOY/Test-File-&Test-File-version;.tar.gz">
-  <!ENTITY my-md5sum "dccb988191187261ce3a2a10af939625">
-
-]>
-
-  <!-- Begin Test::File -->
-  <sect2 id="perl-test-file" xreflabel="Test-File-&Test-File-version;">
-
-    <title>Test::File-&Test-File-version;</title>
-
-    <indexterm zone="perl-test-file">
-      <primary sortas="a-Test-File">Test::File</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Test::File</title>
-
-      <para>
-        Test::File provides a collection of test utilities for file attributes.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Test::File Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-test-utf8"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Test::File</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-test-leaktrace.xml
===================================================================
--- general/prog/perl-deps/perl-test-leaktrace.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/L/LE/LEEJO/Test-LeakTrace-&Test-LeakTrace-version;.tar.gz">
-  <!ENTITY my-md5sum "afdb2cc6be0807cb635fb601a004d522">
-
-]>
-
-  <!-- Begin Test::LeakTrace -->
-  <sect2 id="perl-test-leaktrace" xreflabel="Test-LeakTrace-&Test-LeakTrace-version;">
-
-    <title>Test::LeakTrace-&Test-LeakTrace-version;</title>
-
-    <indexterm zone="perl-test-leaktrace">
-      <primary sortas="a-Test-LeakTrace">Test::LeakTrace</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Test::LeakTrace</title>
-
-      <para>
-        Test::LeakTrace traces memory leaks.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Test::LeakTrace</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-test-needs.xml
===================================================================
--- general/prog/perl-deps/perl-test-needs.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/H/HA/HAARG/Test-Needs-&Test-Needs-version;.tar.gz">
-  <!ENTITY my-md5sum "2b3d10946001561297624e7668f09c26">
-
-]>
-
-  <!-- Begin Test::Needs -->
-  <sect2 id="perl-test-needs" xreflabel="Test-Needs-&Test-Needs-version;">
-
-    <title>Test::Needs-&Test-Needs-version;</title>
-
-    <indexterm zone="perl-test-needs">
-      <primary sortas="a-Test-Needs">Test::Needs</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Test::Needs</title>
-
-      <para>
-        Test::Needs skips tests if a requested module is not present.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Test::Needs</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-test-requires.xml
===================================================================
--- general/prog/perl-deps/perl-test-requires.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/T/TO/TOKUHIROM/Test-Requires-&Test-Requires-version;.tar.gz">
-  <!ENTITY my-md5sum "999d6c4e46ea7baae7a5113292e02ed8">
-
-]>
-
-  <!-- Begin Test::Requires -->
-  <sect2 id="perl-test-requires" xreflabel="Test-Requires-&Test-Requires-version;">
-
-    <title>Test::Requires-&Test-Requires-version;</title>
-
-    <indexterm zone="perl-test-requires">
-      <primary sortas="a-Test-Requires">Test::Requires</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Test::Requires</title>
-
-      <para>
-        The Test::Requires module checks if another (optional) module
-        can be loaded, and if not it skips all the current tests.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Test::Requires</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-test-requiresinternet.xml
===================================================================
--- general/prog/perl-deps/perl-test-requiresinternet.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/M/MA/MALLEN/Test-RequiresInternet-&Test-RequiresInternet-version;.tar.gz">
-  <!ENTITY my-md5sum "0ba9f1cff4cf90ed2618c2eddfd525d8">
-
-]>
-
-  <!-- Begin Test::RequiresInternet -->
-  <sect2 id="perl-test-requiresinternet" xreflabel="Test-RequiresInternet-&Test-RequiresInternet-version;">
-
-    <title>Test::RequiresInternet-&Test-RequiresInternet-version;</title>
-
-    <indexterm zone="perl-test-requiresinternet">
-      <primary sortas="a-Test-RequiresInternet">Test::RequiresInternet</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Test::RequiresInternet</title>
-
-      <para>
-        Test::RequiresInternet is intended to easily test network connectivity
-        before functional tests begin to non-local Internet resources.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Test::RequiresInternet</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-test-utf8.xml
===================================================================
--- general/prog/perl-deps/perl-test-utf8.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/M/MA/MARKF/Test-utf8-&Test-utf8-version;.tar.gz">
-  <!ENTITY my-md5sum "71d187539c76ac1ed9a0242ff208796d">
-
-]>
-
-  <!-- Begin Test::utf8 -->
-  <sect2 id="perl-test-utf8" xreflabel="Test-utf8-&Test-utf8-version;">
-
-    <title>Test::utf8-&Test-utf8-version;</title>
-
-    <indexterm zone="perl-test-utf8">
-      <primary sortas="a-Test-utf8">Test::utf8</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Test::utf8</title>
-
-      <para>
-        Test::utf8 is a collection of tests useful for dealing with utf8 strings
-        in <application>Perl</application>.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Test::utf8</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-test-warnings.xml
===================================================================
--- general/prog/perl-deps/perl-test-warnings.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/E/ET/ETHER/Test-Warnings-&Test-Warnings-version;.tar.gz">
-  <!ENTITY my-md5sum "a936461688611bd85258c09e4bf6de68">
-
-]>
-
-  <!-- Begin Test::Warnings -->
-  <sect2 id="perl-test-warnings" xreflabel="Test-Warnings-&Test-Warnings-version;">
-
-    <title>Test::Warnings-&Test-Warnings-version;</title>
-
-    <indexterm zone="perl-test-warnings">
-      <primary sortas="a-Test-Warnings">Test::Warnings</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Test::Warnings</title>
-
-      <para>
-        Test::Warnings tests for warnings and the lack of them.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Test::Warnings</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-test-without-module.xml
===================================================================
--- general/prog/perl-deps/perl-test-without-module.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/C/CO/CORION/Test-Without-Module-&Test-Without-Module-version;.tar.gz">
-  <!ENTITY my-md5sum "d6fdc73b60d197a8098fd41a81c92630">
-
-]>
-
-  <!-- Begin Test::Without::Module -->
-  <sect2 id="perl-test-without-module" xreflabel="Test-Without-Module-&Test-Without-Module-version;">
-
-    <title>Test::Without::Module-&Test-Without-Module-version;</title>
-
-    <indexterm zone="perl-test-without-module">
-      <primary sortas="a-Test-Without-Module">Test::Without::Module</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Test::Without::Module</title>
-
-      <para>
-        This module allows you to deliberately hide modules from a program even
-        though they are installed. This is mostly useful for testing modules
-        that have a fallback when a certain dependency module is not installed.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Test::Without::Module</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-test2-plugin-nowarnings.xml
===================================================================
--- general/prog/perl-deps/perl-test2-plugin-nowarnings.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,67 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/D/DR/DROLSKY/Test2-Plugin-NoWarnings-&Test2-Plugin-NoWarnings-version;.tar.gz">
-  <!ENTITY my-md5sum "efcddec6cda66260ae14206e28f7feeb">
-
-]>
-
-  <!-- Begin Test2::Plugin::NoWarnings -->
-  <sect2 id="perl-test2-plugin-nowarnings" xreflabel="Test2-Plugin-NoWarnings-&Test2-Plugin-NoWarnings-version;">
-
-    <title>Test2::Plugin::NoWarnings-&Test2-Plugin-NoWarnings-version;</title>
-
-    <indexterm zone="perl-test2-plugin-nowarnings">
-      <primary sortas="a-Test2-Plugin-NoWarnings">Test2::Plugin::NoWarnings</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Test2::Plugin::NoWarnings</title>
-
-      <para>
-        Test2::Plugin::NoWarnings causes tests to fail if there are any warnings
-        while they run.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Test2::Plugin::NoWarnings Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-test2-suite"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-ipc-run3"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Test2::Plugin::NoWarnings</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-test2-suite.xml
===================================================================
--- general/prog/perl-deps/perl-test2-suite.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/E/EX/EXODIST/Test2-Suite-&Test2-Suite-version;.tar.gz">
-  <!ENTITY my-md5sum "b5958ed274ab778fe5681f0c520d05f7">
-
-]>
-
-  <!-- Begin Test2::Suite -->
-  <sect2 id="perl-test2-suite" xreflabel="Test2-Suite-&Test2-Suite-version;">
-
-    <title>Test2::Suite-&Test2-Suite-version;</title>
-
-    <indexterm zone="perl-test2-suite">
-      <primary sortas="a-Test2-Suite">Test2::Suite</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Test2::Suite</title>
-
-      <para>
-        Test2::Suite is a distribution with a rich set of tools built upon the
-        Test2 framework.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Test2::Suite Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-term-table"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Test2::Suite</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-text-csv_xs.xml
===================================================================
--- general/prog/perl-deps/perl-text-csv_xs.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
-
- <!-- .tgz -->
-  <!ENTITY my-download-http "&metacpan_authors;/H/HM/HMBRAND/Text-CSV_XS-&Text-CSV_XS-version;.tgz">
-  <!ENTITY my-md5sum "d6af5f1aec99e5a5392ae3175de9a7ae">
-
-]>
-
-  <!-- Begin Text::CSV_XS -->
-  <sect2 id="perl-text-csv_xs" xreflabel="Text-CSV_XS-&Text-CSV_XS-version;">
-
-    <title>Text::CSV_XS-&Text-CSV_XS-version;</title>
-
-    <indexterm zone="perl-text-csv_xs">
-      <primary sortas="a-Text-CSV_XS">Text::CSV_XS</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Text::CSV_XS</title>
-
-      <para>
-        Text::CSV_XS provides facilities for the composition and decomposition
-        of comma-separated values.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Text::CSV_XS</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-text-diff.xml
===================================================================
--- general/prog/perl-deps/perl-text-diff.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/N/NE/NEILB/Text-Diff-&Text-Diff-version;.tar.gz">
-  <!ENTITY my-md5sum "edf57b6189f7651a6be454062a4e6d9c">
-
-]>
-
-  <!-- Begin Text::Diff -->
-  <sect2 id="perl-text-diff" xreflabel="Text-Diff-&Text-Diff-version;">
-
-    <title>Text::Diff-&Text-Diff-version;</title>
-
-    <indexterm zone="perl-text-diff">
-      <primary sortas="a-Text-Diff">Text::Diff</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Text::Diff</title>
-
-      <para>
-        Text::Diff performs diffs on files and record sets.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Text::Diff Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-algorithm-diff"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Text::Diff</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-text-glob.xml
===================================================================
--- general/prog/perl-deps/perl-text-glob.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/R/RC/RCLAMP/Text-Glob-&Text-Glob-version;.tar.gz">
-  <!ENTITY my-md5sum "d001559c504a2625dd117bd1558f07f7">
-
-]>
-
-  <!-- Begin Text::Glob -->
-  <sect2 id="perl-text-glob" xreflabel="Text-Glob-&Text-Glob-version;">
-
-    <title>Text::Glob-&Text-Glob-version;</title>
-
-    <indexterm zone="perl-text-glob">
-      <primary sortas="a-Text-Glob">Text::Glob</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Text::Glob</title>
-
-      <para>
-        Text::Glob implements <ulink role='man'
-        url='&man;glob.3'>glob(3)</ulink> style matching that can be used to
-        match against text, rather than fetching names from a filesystem.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Text::Glob</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-tie-cycle.xml
===================================================================
--- general/prog/perl-deps/perl-tie-cycle.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/B/BD/BDFOY/Tie-Cycle-&Tie-Cycle-version;.tar.gz">
-  <!ENTITY my-md5sum "2c99b09532d80599f4b041f3ecae7af8">
-
-]>
-
-  <!-- Begin Tie::Cycle -->
-  <sect2 id="perl-tie-cycle" xreflabel="Tie-Cycle-&Tie-Cycle-version;">
-
-    <title>Tie::Cycle-&Tie-Cycle-version;</title>
-
-    <indexterm zone="perl-tie-cycle">
-      <primary sortas="a-Tie-Cycle">Tie::Cycle</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Tie::Cycle</title>
-
-      <para>
-        You use Tie::Cycle to go through a list over and over again. Once you
-        get to the end of the list, you go back to the beginning. You don't have
-        to worry about any of this since the magic of tie does that for you.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Tie::Cycle</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-timedate.xml
===================================================================
--- general/prog/perl-deps/perl-timedate.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/A/AT/ATOOMIC/TimeDate-&TimeDate-version;.tar.gz">
-  <!ENTITY my-md5sum "5e5afe22c8d417417283d1f7f4572a57">
-
-]>
-
-  <!-- Begin TimeDate -->
-  <sect2 id="perl-timedate" xreflabel="TimeDate-&TimeDate-version;">
-
-    <title>TimeDate-&TimeDate-version;</title>
-
-    <indexterm zone="perl-timedate">
-      <primary sortas="a-TimeDate">TimeDate</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to TimeDate</title>
-
-      <para>
-        TimeDate provides miscellaneous timezone manipulation routines.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of TimeDate</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-try-tiny.xml
===================================================================
--- general/prog/perl-deps/perl-try-tiny.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,64 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/E/ET/ETHER/Try-Tiny-&Try-Tiny-version;.tar.gz">
-  <!ENTITY my-md5sum "993a29ee8a03c9bd9c2f7c53d1082a03">
-
-]>
-
-  <!-- Begin Try::Tiny -->
-  <sect2 id="perl-try-tiny" xreflabel="Try-Tiny-&Try-Tiny-version;">
-
-    <title>Try::Tiny-&Try-Tiny-version;</title>
-
-    <indexterm zone="perl-try-tiny">
-      <primary sortas="a-Try-Tiny">Try::Tiny</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Try::Tiny</title>
-
-      <para>
-        Try::Tiny provides <command>try</command> and <command>catch</command>
-        to expect and handle exceptional conditions, avoiding quirks in
-        <application>Perl</application> and common mistakes.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Try::Tiny Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (can be used by the test suite)</bridgehead>
-      <para role="optional">
-        <!-- runs one more test if this is present -->
-        <xref linkend="perl-capture-tiny"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Try::Tiny</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-variable-magic.xml
===================================================================
--- general/prog/perl-deps/perl-variable-magic.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/V/VP/VPIT/Variable-Magic-&Variable-Magic-version;.tar.gz">
-  <!ENTITY my-md5sum "957d53fc6614deb593aa6d7cf96d713a">
-
-]>
-
-  <!-- Begin Variable::Magic -->
-  <sect2 id="perl-variable-magic" xreflabel="Variable-Magic-&Variable-Magic-version;">
-
-    <title>Variable::Magic-&Variable-Magic-version;</title>
-
-    <indexterm zone="perl-variable-magic">
-      <primary sortas="a-Variable-Magic">Variable::Magic</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Variable::Magic</title>
-
-      <para>
-        Magic is Perl's way of enhancing variables. With this module, you can
-        add your own magic to any variable.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Variable::Magic</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-www-robotrules.xml
===================================================================
--- general/prog/perl-deps/perl-www-robotrules.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,64 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/G/GA/GAAS/WWW-RobotRules-&WWW-RobotRules-version;.tar.gz">
-  <!ENTITY my-md5sum "b7186e8b8b3701e70c22abf430742403">
-
-]>
-
-  <!-- Begin WWW::RobotRules -->
-  <sect2 id="perl-www-robotrules" xreflabel="WWW-RobotRules-&WWW-RobotRules-version;">
-
-    <title>WWW::RobotRules-&WWW-RobotRules-version;</title>
-
-    <indexterm zone="perl-www-robotrules">
-      <primary sortas="a-WWW-RobotRules">WWW::RobotRules</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to WWW::RobotRules</title>
-
-      <para>
-        WWW::RobotRules parses <filename>robots.txt</filename> files,
-        creating a WWW::RobotRules object with methods to check if access
-        to a given URL is prohibited.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">WWW::RobotRules Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required (runtime)</bridgehead>
-      <para role="required">
-        <!-- LWP~::Simple comes from libwww-perl -->
-        <xref role="runtime" linkend="perl-libwww-perl"/> (install this
-        module first and install that later)
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of WWW::RobotRules</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-xml-libxml.xml
===================================================================
--- general/prog/perl-deps/perl-xml-libxml.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/S/SH/SHLOMIF/XML-LibXML-&XML-LibXML-version;.tar.gz">
-  <!ENTITY my-md5sum "d2bad7f395716a6f57abde538d47008c">
-]>
-
-  <!-- Begin XML::LibXML -->
-  <sect2 id="perl-xml-libxml" xreflabel="XML-LibXML-&XML-LibXML-version;">
-
-    <title>XML::LibXML-&XML-LibXML-version;</title>
-
-    <indexterm zone="perl-xml-libxml">
-      <primary sortas="a-XML-LibXML">XML::LibXML</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to XML::LibXML</title>
-
-      <para>
-        XML::LibXML is a perl binding for <xref linkend="libxml2"/>.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">XML::LibXML Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-alien-libxml2"/>,
-        <xref linkend="perl-xml-sax"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of XML::LibXML</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-xml-namespacesupport.xml
===================================================================
--- general/prog/perl-deps/perl-xml-namespacesupport.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/P/PE/PERIGRIN/XML-NamespaceSupport-&XML-NamespaceSupport-version;.tar.gz">
-  <!ENTITY my-md5sum "a8916c6d095bcf073e1108af02e78c97">
-
-]>
-
-  <!-- Begin XML::NamespaceSupport -->
-  <sect2 id="perl-xml-namespacesupport" xreflabel="XML-NamespaceSupport-&XML-NamespaceSupport-version;">
-
-    <title>XML::NamespaceSupport-&XML-NamespaceSupport-version;</title>
-
-    <indexterm zone="perl-xml-namespacesupport">
-      <primary sortas="a-XML-NamespaceSupport">XML::NamespaceSupport</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to XML::NamespaceSupport</title>
-
-      <para>
-        XML::NamespaceSupport offers a simple way to process namespaced XML names
-        from within any application that may need them.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of XML::NamespaceSupport</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-xml-sax-base.xml
===================================================================
--- general/prog/perl-deps/perl-xml-sax-base.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/G/GR/GRANTM/XML-SAX-Base-&XML-SAX-Base-version;.tar.gz">
-  <!ENTITY my-md5sum "ec347a14065dd7aec7d9fb181b2d7946">
-
-]>
-
-  <!-- Begin XML::SAX::Base -->
-  <sect2 id="perl-xml-sax-base" xreflabel="XML-SAX-Base-&XML-SAX-Base-version;">
-
-    <title>XML::SAX::Base-&XML-SAX-Base-version;</title>
-
-    <indexterm zone="perl-xml-sax-base">
-      <primary sortas="a-XML-SAX-Base">XML::SAX::Base</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to XML::SAX::Base</title>
-
-      <para>
-        This module has a very simple task - to be a base class for PerlSAX
-        drivers and filters.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of XML::SAX-Base</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-deps/perl-xml-sax.xml
===================================================================
--- general/prog/perl-deps/perl-xml-sax.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,91 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/G/GR/GRANTM/XML-SAX-&XML-SAX-version;.tar.gz">
-  <!ENTITY my-md5sum "b62e3754523695c7f5bbcafa3676a38d">
-
-]>
-
-  <!-- Begin XML::SAX -->
-  <sect2 id="perl-xml-sax" xreflabel="XML-SAX-&XML-SAX-version;">
-
-    <title>XML::SAX-&XML-SAX-version;</title>
-
-    <indexterm zone="perl-xml-sax">
-      <primary sortas="a-XML-SAX">XML::SAX</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to XML::SAX</title>
-
-      <para>
-        XML::SAX is a SAX parser access API for Perl. It includes classes and
-        APIs required for implementing SAX drivers, along with a factory class
-        for returning any SAX parser installed on the user's system.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">XML::SAX Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="libxml2"/>,
-        <xref linkend="perl-xml-namespacesupport"/> and
-        <xref linkend="perl-xml-sax-base"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of XML::SAX</title>
-
-        <!-- claimed to not support parallel building, but all it does is
-         copy a few files, works with -j4 although running parallel builds
-         on modules is usually not beneficial : Ken -->
-
-      <para>
-        This module uses a variant of the standard build and installation
-         instructions:
-
-<screen><userinput>yes | perl Makefile.PL &amp;&amp;
-make             &amp;&amp;
-make test</userinput></screen>
-
-        Now, as the <systemitem class="username">root</systemitem> user:
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-      </para>
-
-    </sect3>
-
-    <sect3 role="commands">
-      <title>Command Explanations</title>
-
-      <para>
-        <command>yes</command>: Perl will ask if you want it to alter
-        ParserDetails.ini and then wait for a response. The default is
-        'y'. Using 'yes' allows you to script this.
-      </para>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules.xml
===================================================================
--- general/prog/perl-modules.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,511 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="perl-modules" xreflabel="Perl Modules">
-  <?dbhtml filename="perl-modules.html" ?>
-
-
-  <title>Perl Modules</title>
-
-  <indexterm zone="perl-modules">
-    <primary sortas="a-perl-Modules">Perl Modules</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Perl Modules</title>
-
- <!-- note for editors:
-      When testing the dependencies for a new/updated module, it is possible
-      to build the dependencies in a directory, then do DESTDIR installs.
-      For packages using Module::Build, supply \-\-destdir= (lower case!)
-      AFTER the command.  Repeat as necessary.  At any one time, ALL deps for
-      the module being tested need to be in the same DESTDIR - it may be
-      convenient to copy the contents, e.g.
- cp -av MODULEA/usr/lib/perl5/site_perl/5.xx.y/* BATCH1/usr/lib/perl5/site_perl/5.xx.y/
-
-      And then to use these deps (plus what is already installed),
-      export PERL5LIB=/ab/path/to/BATCH1/usr/lib/perl5/site_perl/5.xx.y
-
-      Please be aware that not all non-core prerequisite deps are necessarily
-      needed.  If 'use Foo::Bar' appears in one of the main files in lib/ or blib/
-      it is assumed to be needed.  But if it only gets used in tests (t/) then
-      please try without it to see if the tests can still pass. -->
-
-    <para>
-      The <application>Perl</application> module packages (also referred to as
-      Distributions, because each can contain multiple modules) add useful
-      objects to the <application>Perl</application> language. The packages
-      listed on this page are required or recommended for other packages in
-      the book. If they have dependent modules, those are either on this page
-      or else on the next page (<xref linkend="perl-deps"/>).
-   </para>
-
-    <para>
-      In many cases, only the required or recommended dependencies are listed -
-      there might be other modules which allow more tests to be run, but
-      omitting them will still allow the tests to <literal>PASS</literal>.
-    </para>
-
-    <para>
-      For a few modules, the BLFS editors have determined that other modules
-      still listed as prerequisites are not required, and omitted them.
-    </para>
-
-    <para>
-      Where an alphabetically-earlier dependency of the same module pulls in a
-      dependency, it is not mentioned for the later dependencies of the same
-      module. You should build the listed dependencies in order.
-    </para>
-
-    <para>
-      It is generally worth running the tests for perl modules, they often
-      can show problems such as missing dependencies which are required to
-      use the module.  Here, the editors have attempted to separate those
-      dependencies which are only required for running test suites, but they
-      will not be mentioned for a module where one of its dependencies uses
-      that module for its own test suite.  That is to say, if you intend to
-      run the test suites, please run them for each dependency of the module.
-    </para>
-
-    <para>
-      It is possible to automatically install the current versions of a module
-      and <emphasis>all</emphasis> missing or too-old dependencies
-      <emphasis>recommended by upstream</emphasis> using CPAN. See
-      <xref linkend="perl-alternatives"/> at the end of this page.
-    </para>
-
-    <para>
-      Most of these modules only install files below <filename
-      class="directory">/usr/lib/perl5/site_perl/5.xx.y</filename> and those will
-      not be documented. One or two install programs (mostly, perl scripts), or
-      a library, into <filename class="directory">/usr/bin/</filename> or
-      <filename class="directory">/usr/lib/</filename> and these
-      <emphasis>are</emphasis> documented.
-    </para>
-
-    <para condition="html" role="usernotes">
-      Editor Notes: <ulink url="&blfs-wiki;/perl-modules"/>
-    </para>
-
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          <xref linkend="perl-archive-zip"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-autovivification"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-business-isbn"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-business-ismn"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-business-issn"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-class-accessor"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-data-compare"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-data-dump"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-data-uniqid"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-datetime-calendar-julian"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-datetime-format-builder"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-encode-eucjpascii"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-encode-hanextra"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-encode-jis2k"/>
-        </para>
-      </listitem>
-      <!--<listitem>
-        <para>
-          <xref linkend="perl-error"/>
-        </para>
-      </listitem>-->
-      <listitem>
-        <para>
-          <xref linkend="perl-file-fcntllock"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-file-slurper"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-file-which"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-html-parser"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-http-daemon"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-io-socket-ssl"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-io-string"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-ipc-run3"/>
-        </para>
-      </listitem>
-<!--
-      <listitem>
-        <para>
-          <xref linkend="perl-json"/>
-        </para>
-      </listitem>
--->
-      <listitem>
-        <para>
-          <xref linkend="perl-libwww-perl"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-lingua-translit"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-list-allutils"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-list-moreutils"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-log-log4perl"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-lwp-protocol-https"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-module-build"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-net-dns"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-parse-recdescent"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-parse-yapp"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-perlio-utf8_strict"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-regexp-common"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-sgmlspm"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-sort-key"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-test-command"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-test-differences"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-text-bibtex"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-text-csv"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-text-roman"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-unicode-collate"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-unicode-linebreak"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-uri"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-xml-libxml-simple"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-xml-libxslt"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-xml-simple"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="perl-xml-writer"/>
-        </para>
-      </listitem>
-      <!-- alternative cpan installation stays at the end -->
-      <listitem>
-        <para>
-          <xref linkend="perl-alternatives"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-  </sect2>
-
-  <!-- and keep these in the same order as above -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-archive-zip.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-autovivification.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-business-isbn.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-business-ismn.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-business-issn.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-class-accessor.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-data-compare.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-data-dump.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-data-uniqid.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-datetime-calendar-julian.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-datetime-format-builder.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-encode-eucjpascii.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-encode-hanextra.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-encode-jis2k.xml"/>
-<!--
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-error.xml"/>
--->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-file-fcntllock.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-file-slurper.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-file-which.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-html-parser.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-http-daemon.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-io-socket-ssl.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-io-string.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-ipc-run3.xml"/>
-<!--
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-json.xml"/>
--->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-lingua-translit.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-libwww-perl.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-list-allutils.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-list-moreutils.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-log-log4perl.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-lwp-protocol-https.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-module-build.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-net-dns.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-parse-recdescent.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-parse-yapp.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-perlio-utf8_strict.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-regexp-common.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-sgmlspm.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-sort-key.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-test-command.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-test-differences.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-text-bibtex.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-text-csv.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-text-roman.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-unicode-collate.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-unicode-linebreak.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-uri.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-xml-libxml-simple.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-xml-libxslt.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-xml-simple.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-modules/perl-xml-writer.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="perl-alternatives.xml"/>
-
-</sect1>
Index: general/prog/perl-modules/perl-archive-zip.xml
===================================================================
--- general/prog/perl-modules/perl-archive-zip.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,103 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/P/PH/PHRED/Archive-Zip-&Archive-Zip-version;.tar.gz">
-  <!ENTITY my-md5sum "a33993309322164867c99e04a4000ee3">
-]>
-
-  <!-- Begin Archive::Zip -->
-  <sect2 id="perl-archive-zip" xreflabel="Archive-Zip-&Archive-Zip-version;">
-
-    <title>Archive::Zip-&Archive-Zip-version;</title>
-
-    <indexterm zone="perl-archive-zip">
-      <primary sortas="a-Archive-Zip">Archive::Zip</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Archive::Zip</title>
-
-      <para>
-        The Archive::Zip module allows a Perl program to create, manipulate,
-        read, and write Zip archive files.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Archive::Zip Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended (for the test suite)</bridgehead>
-      <para role="required">
-        <xref linkend="unzip"/> (with its patch)
-      </para>
-
-<!-- Removed in 1.68, see the Changes file
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <xref linkend="perl-test-mockmodule"/>
-      </para>
--->
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Archive::Zip</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-
-        <seglistitem>
-          <seg>
-            crc32
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="crc32-prog">
-          <term><command>crc32</command></term>
-          <listitem>
-            <para>
-              computes and prints to stdout the CRC-32 values of the given
-              files
-            </para>
-            <indexterm zone="perl-archive-zip crc32-prog">
-              <primary sortas="b-crc32">crc32</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-autovivification.xml
===================================================================
--- general/prog/perl-modules/perl-autovivification.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,57 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/V/VP/VPIT/autovivification-&autovivification-version;.tar.gz">
-  <!ENTITY my-md5sum "8dec994e1e7d368e055f21a5777385a0">
-
-]>
-
-  <!-- Begin Autovivification -->
-  <sect2 id="perl-autovivification" xreflabel="autovivification-&autovivification-version;">
-
-    <title>autovivification-&autovivification-version;</title>
-
-    <indexterm zone="perl-autovivification">
-      <primary sortas="a-autovivification">autovivification</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to the autovivification module</title>
-
-      <para>
-        This module allows you disable autovivification (the automatic creation
-        and population of new arrays and hashes whenever undefined variables are
-        dereferenced), and optionally throw a warning or an error when it would
-        have occurred.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of autovivification</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-business-isbn.xml
===================================================================
--- general/prog/perl-modules/perl-business-isbn.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/B/BR/BRIANDFOY/Business-ISBN-&Business-ISBN-version;.tar.gz">
-  <!ENTITY my-md5sum "e906867846f4d1fa57366aa519da5846">
-]>
-
-  <!-- Begin Business::ISBN -->
-  <sect2 id="perl-business-isbn" xreflabel="Business-ISBN-&Business-ISBN-version;">
-
-    <title>Business::ISBN-&Business-ISBN-version;</title>
-
-    <indexterm zone="perl-business-isbn">
-      <primary sortas="a-Business-ISBN">Business::ISBN</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Business::ISBN</title>
-
-      <para>
-        The Business::ISBN module provides functions for working with
-        International Standard Book Numbers.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Business::ISBN Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-business-isbn-data"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Business::ISBN</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-business-ismn.xml
===================================================================
--- general/prog/perl-modules/perl-business-ismn.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/B/BR/BRIANDFOY/Business-ISMN-&Business-ISMN-version;.tar.gz">
-  <!ENTITY my-md5sum "dbc9023703262ee29d1b9e9a8294106c">
-]>
-
-  <!-- Begin Business::ISMN -->
-  <sect2 id="perl-business-ismn" xreflabel="Business-ISMN-&Business-ISMN-version;">
-
-    <title>Business::ISMN-&Business-ISMN-version;</title>
-
-    <indexterm zone="perl-business-ismn">
-      <primary sortas="a-Business-ISMN">Business::ISMN</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Business::ISMN</title>
-
-      <para>
-        The Business::ISMN module is for work with International Standard Music
-        Numbers.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Business::ISMN Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-tie-cycle"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Business::ISMN</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-business-issn.xml
===================================================================
--- general/prog/perl-modules/perl-business-issn.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/B/BD/BDFOY/Business-ISSN-&Business-ISSN-version;.tar.gz">
-  <!ENTITY my-md5sum "f46bf5585d6c3aa9fb32127edb13151a">
-
-]>
-
-  <!-- Begin Business::ISSN -->
-  <sect2 id="perl-business-issn" xreflabel="Business-ISSN-&Business-ISSN-version;">
-
-    <title>Business::ISSN-&Business-ISSN-version;</title>
-
-    <indexterm zone="perl-business-issn">
-      <primary sortas="a-Business-ISSN">Business::ISSN</primary>
-    </indexterm>
-
-
-    <sect3 role="package">
-      <title>Introduction to Business::ISSN</title>
-
-      <para>
-        The Business::ISSN module is for work with International Standard
-        Serial Numbers.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Business::ISSN</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-class-accessor.xml
===================================================================
--- general/prog/perl-modules/perl-class-accessor.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/K/KA/KASEI/Class-Accessor-&Class-Accessor-version;.tar.gz">
-  <!ENTITY my-md5sum "1f1e5990f87cad7659b292fed7dc0407">
-
-]>
-
-  <!-- Begin Class::Accessor -->
-  <sect2 id="perl-class-accessor" xreflabel="Class-Accessor-&Class-Accessor-version;">
-
-    <title>Class::Accessor-&Class-Accessor-version;</title>
-
-    <indexterm zone="perl-class-accessor">
-      <primary sortas="a-Class-Accessor">Class::Accessor</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Class::Accessor</title>
-
-      <para>
-        Class::Accessor generates accessors/mutators for your class.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Class::Accessor</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-data-compare.xml
===================================================================
--- general/prog/perl-modules/perl-data-compare.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/D/DC/DCANTRELL/Data-Compare-&Data-Compare-version;.tar.gz">
-  <!ENTITY my-md5sum "ce9cb42ba6af634f5ab51f13f37e2ddb">
-]>
-
-  <!-- Begin Data::Compare -->
-  <sect2 id="perl-data-compare" xreflabel="Data-Compare-&Data-Compare-version;">
-
-    <title>Data::Compare-&Data-Compare-version;</title>
-
-    <indexterm zone="perl-data-compare">
-      <primary sortas="a-Data-Compare">Data::Compare</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Data::Compare</title>
-
-      <para>
-        The Data::Compare module compares two <application>perl</application>
-        data structures.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Data::Compare Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-clone"/>,
-        <xref linkend="perl-file-find-rule"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Data::Compare</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-data-dump.xml
===================================================================
--- general/prog/perl-modules/perl-data-dump.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/G/GA/GARU/Data-Dump-&Data-Dump-version;.tar.gz">
-  <!ENTITY my-md5sum "9bd7131ef0441e1e0e001bf85e9fae31">
-
-]>
-
-  <!-- Begin Data::Dump -->
-  <sect2 id="perl-data-dump" xreflabel="Data-Dump-&Data-Dump-version;">
-
-    <title>Data::Dump-&Data-Dump-version;</title>
-
-    <indexterm zone="perl-data-dump">
-      <primary sortas="a-Data-Dump">Data::Dump</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Data::Dump</title>
-
-      <para>
-        Data::Dump provides pretty printing of data structures.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Data::Dump</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-data-uniqid.xml
===================================================================
--- general/prog/perl-modules/perl-data-uniqid.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,59 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/M/MW/MWX/Data-Uniqid-&Data-Uniqid-version;.tar.gz">
-  <!ENTITY my-md5sum "6bab3b5da09fedfdf60ce2629a7367db">
-
-]>
-
-  <!-- Begin Data::Uniqid -->
-  <sect2 id="perl-data-uniqid" xreflabel="Data-Uniqid-&Data-Uniqid-version;">
-
-    <title>Data::Uniqid-&Data-Uniqid-version;</title>
-
-    <indexterm zone="perl-data-uniqid">
-      <primary sortas="a-Data-Uniqid">Data::Uniqid</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Data::Uniqid</title>
-
-      <para>
-        Data::Uniqid provides three simple routines for generating unique IDs.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Data::Uniqid</title>
-
-      <para>
-        Although the final test fails and reports an Error, the test suite
-        returns a status of 0. The error can safely be ignored.
-      </para>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-datetime-calendar-julian.xml
===================================================================
--- general/prog/perl-modules/perl-datetime-calendar-julian.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/W/WY/WYANT/DateTime-Calendar-Julian-&DateTime-Calendar-Julian-version;.tar.gz">
-  <!ENTITY my-md5sum "abd775d1d82f0f45d4fd6214cf7bbed8">
-
-]>
-
-  <!-- Begin DateTime::Calendar::Julian -->
-  <sect2 id="perl-datetime-calendar-julian" xreflabel="DateTime-Calendar-Julian-&DateTime-Calendar-Julian-version;">
-
-    <title>DateTime::Calendar::Julian-&DateTime-Calendar-Julian-version;</title>
-
-    <indexterm zone="perl-datetime-calendar-julian">
-      <primary sortas="a-DateTime-Calendar-Julian">DateTime::Calendar::Julian</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to DateTime::Calendar::Julian</title>
-
-      <para>
-        DateTime::Calendar::Julian implements the Julian Calendar.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">DateTime::Calendar::Julian Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-datetime"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of DateTime::Calendar::Julian</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-datetime-format-builder.xml
===================================================================
--- general/prog/perl-modules/perl-datetime-format-builder.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/D/DR/DROLSKY/DateTime-Format-Builder-&DateTime-Format-Builder-version;.tar.gz">
-  <!ENTITY my-md5sum "aa41917ca9ad69b3898728ce9c2fb477">
-
-]>
-
-  <!-- Begin DateTime::Format::Builder -->
-  <sect2 id="perl-datetime-format-builder" xreflabel="DateTime-Format-Builder-&DateTime-Format-Builder-version;">
-
-    <title>DateTime::Format::Builder-&DateTime-Format-Builder-version;</title>
-
-    <indexterm zone="perl-datetime-format-builder">
-      <primary sortas="a-DateTime-Format-Builder">DateTime::Format::Builder</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to DateTime::Format::Builder</title>
-
-      <para>
-        DateTime::Format::Builder created DateTime parser classes and objects.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">DateTime::Format::Builder Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-datetime-format-strptime"/> and
-        <!-- perl-datetime-format-strptime fulls in perl-datetime -->
-        <xref linkend="perl-params-validate"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of DateTime::Format::Builder</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-encode-eucjpascii.xml
===================================================================
--- general/prog/perl-modules/perl-encode-eucjpascii.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/N/NE/NEZUMI/Encode-EUCJPASCII-&Encode-EUCJPASCII-version;.tar.gz">
-  <!ENTITY my-md5sum "5daa65f55b7c2050bb0713d9e95f239d">
-
-]>
-
-  <!-- Begin Encode::EUCJPASCII -->
-  <sect2 id="perl-encode-eucjpascii" xreflabel="Encode-EUCJPASCII-&Encode-EUCJPASCII-version;">
-
-    <title>Encode::EUCJPASCII-&Encode-EUCJPASCII-version;</title>
-
-    <indexterm zone="perl-encode-eucjpascii">
-      <primary sortas="a-Encode-EUCJPASCII">Encode::EUCJPASCII</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Encode::EUCJPASCII</title>
-
-      <para>
-        Encode::EUCJPASCII provides an eucJP-open (Extended Unix Code, Japanese)
-        mapping.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Encode::EUCJPASCII</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-encode-hanextra.xml
===================================================================
--- general/prog/perl-modules/perl-encode-hanextra.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,58 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/A/AU/AUDREYT/Encode-HanExtra-&Encode-HanExtra-version;.tar.gz">
-  <!ENTITY my-md5sum "e1d3bc32c1c8ee304235a06fbcd5d5a4">
-
-  <!ENTITY Encode-HanExtra-download-http "&perl_authors;/id/A/AU/AUDREYT/Encode-HanExtra-&Encode-HanExtra-version;.tar.gz">
-  <!ENTITY Encode-HanExtra-md5sum "e1d3bc32c1c8ee304235a06fbcd5d5a4">
-]>
-
-  <!-- Begin Encode::HanExtra -->
-  <sect2 id="perl-encode-hanextra" xreflabel="Encode-HanExtra-&Encode-HanExtra-version;">
-
-    <title>Encode::HanExtra-&Encode-HanExtra-version;</title>
-
-    <indexterm zone="perl-encode-hanextra">
-      <primary sortas="a-Encode-HanExtra">Encode::HanExtra</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Encode::HanExtra</title>
-
-      <para>
-        The Encode::HanExtra module provides extra sets of Chinese Encodings
-        which are not included in the core Encode module because of size
-        issues.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Encode::HanExtra</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-unsafe-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-encode-jis2k.xml
===================================================================
--- general/prog/perl-modules/perl-encode-jis2k.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/D/DA/DANKOGAI/Encode-JIS2K-&Encode-JIS2K-version;.tar.gz">
-  <!ENTITY my-md5sum "06acd9e878d41ffc354258e265db2875">
-
-]>
-
-  <!-- Begin Encode::JIS2K -->
-  <sect2 id="perl-encode-jis2k" xreflabel="Encode-JIS2K-&Encode-JIS2K-version;">
-
-    <title>Encode::JIS2K-&Encode-JIS2K-version;</title>
-
-    <indexterm zone="perl-encode-jis2k">
-      <primary sortas="a-Encode-JIS2K">Encode::JIS2K</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Encode::JIS2K</title>
-
-      <para>
-        The Encode::JIS2K module provides JIS X 0212 (aka JIS 2000) Encodings.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Encode::JIS2K</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-file-fcntllock.xml
===================================================================
--- general/prog/perl-modules/perl-file-fcntllock.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,67 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/J/JT/JTT/File-FcntlLock-0.22.tar.gz">
-  <!ENTITY my-md5sum "579698d735d864ee403674f1175f789d">
-]>
-
-  <!-- Begin File::FcntlLock -->
-  <sect2 id="perl-file-fcntllock" xreflabel="File-FcntlLock-&File-FcntlLock-version;">
-
-    <title>File::FcntlLock-&File-FcntlLock-version;</title>
-
-    <indexterm zone="perl-file-fcntllock">
-      <primary sortas="a-File-FcntlLock">File::FcntlLock</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to File::FcntlLock</title>
-
-      <para>
-        File::FcntlLock is a module to do file locking in an object oriented
-        fashion using the <ulink role='man'
-        url='&man;fcntl.2'>fcntl(2)</ulink> system call. This allows locks
-        on parts of a file as well as on the whole file and overcomes some
-        known problems with
-        <ulink role='man' url='&man;flock.2'>flock(2)</ulink>, on which
-        which Perl's <function>flock()</function> function is based per
-        default.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-<!-- None that I can find.  bdubbs 11-17-23
-      <bridgehead renderas="sect4">File::FcntlLock Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-test-warnings"/>
-      </para>
--->
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of File::FcntlLock</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-file-slurper.xml
===================================================================
--- general/prog/perl-modules/perl-file-slurper.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/L/LE/LEONT/File-Slurper-&File-Slurper-version;.tar.gz">
-  <!ENTITY my-md5sum "d43bc5f069035eff3b6b7c418b4cedc4">
-
-]>
-
-  <!-- Begin File::Slurper -->
-  <sect2 id="perl-file-slurper" xreflabel="File-Slurper-&File-Slurper-version;">
-
-    <title>File::Slurper-&File-Slurper-version;</title>
-
-    <indexterm zone="perl-file-slurper">
-      <primary sortas="a-File-Slurper">File::Slurper</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to File::Slurper</title>
-
-      <para>
-        File::Slurper is a simple, sane and efficient module to slurp a file.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">File::Slurper Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-test-warnings"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of File::Slurper</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-file-which.xml
===================================================================
--- general/prog/perl-modules/perl-file-which.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/P/PL/PLICEASE/File-Which-&File-Which-version;.tar.gz">
-  <!ENTITY my-md5sum "d5c9154262b93398f0750ec364207639">
-
-]>
-
-  <!-- Begin File::Which -->
-  <sect2 id="perl-file-which" xreflabel="File-Which-&File-Which-version;">
-
-    <title>File::Which-&File-Which-version;</title>
-
-    <indexterm zone="perl-file-which">
-      <primary sortas="a-File-Which">File::Which</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to File::Which</title>
-
-      <para>
-        File::Which provides a portable implementation of the
-        &apos;which&apos; utility.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of File::Which</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-html-parser.xml
===================================================================
--- general/prog/perl-modules/perl-html-parser.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,64 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/O/OA/OALDERS/HTML-Parser-&HTML-Parser-version;.tar.gz">
-  <!ENTITY my-md5sum "b9f5dd3b14632f7a60541a2b61389c06">
-]>
-
-  <!-- Begin HTML::Parser -->
-  <sect2 id="perl-html-parser" xreflabel="HTML-Parser-&HTML-Parser-version;">
-
-    <title>HTML::Parser-&HTML-Parser-version;</title>
-
-    <indexterm zone="perl-html-parser">
-      <primary sortas="a-HTML-Parser">HTML::Parser</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to HTML::Parser</title>
-
-      <para>
-        The HTML::Parser distribution is a collection of modules that parse and
-        extract information from HTML documents.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">HTML::Parser Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-html-tagset"/>
-        <xref linkend="perl-http-message"/> (stritly speaking, not required
-        for building, but its module HTTP::Headers is required for tests and
-        a run-time requirement for HTML::HeadParser from this distribution).
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of HTML::Parser</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-http-daemon.xml
===================================================================
--- general/prog/perl-modules/perl-http-daemon.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,76 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/O/OA/OALDERS/HTTP-Daemon-&HTTP-Daemon-version;.tar.gz">
-  <!ENTITY my-md5sum "51425462790165aeafc2819a7359706f">
-]>
-
-  <!-- Begin HTTP::Daemon -->
-  <sect2 id="perl-http-daemon" xreflabel="HTTP-Daemon-&HTTP-Daemon-version;">
-
-    <title>HTTP::Daemon-&HTTP-Daemon-version;</title>
-
-    <indexterm zone="perl-http-daemon">
-      <primary sortas="a-HTTP-Daemon">HTTP::Daemon</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to HTTP::Daemon</title>
-
-      <para>
-        Instances of the HTTP::Daemon class are HTTP/1.1 servers that listen on
-        a socket for incoming requests. The HTTP::Daemon is a subclass of
-        IO::Socket::INET, so you can perform socket operations directly on it too.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">HTTP::Daemon Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-http-message"/>
-        <!-- the listed deps are HTTP::Request, HTTP::Response, HTTP::Status
-         which are all submodules from perl-http-message, and also
-         HTTP::Date (perl-http-date) and LWP::MediaTypes (perl-lwp-mediatypes)
-         which are dependencies of perl-http-message, as well as URI (perl-uri)
-         in a test - that too is a dependency of perl-http-message. It claims
-         to want Module::Build::Tiny but that is only for the old ./Build.PL -->
-      </para>
-
-      <note>
-        <para>
-          Makefile.PL and running the tests will complain that Module::Build::Tiny
-          is missing, but that is only needed for <filename>Build.PL</filename>
-          which is used if the system lacks a C compiler.
-        </para>
-      </note>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of HTTP::Daemon</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-io-socket-ssl.xml
===================================================================
--- general/prog/perl-modules/perl-io-socket-ssl.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,92 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/S/SU/SULLR/IO-Socket-SSL-&IO-Socket-SSL-version;.tar.gz">
-  <!ENTITY my-md5sum "7a13ba92cdbad523f1a489c03b151569">
-
-  <!ENTITY IO-Socket-SSL-download-http "&perl_authors;/id/S/SU/SULLR/IO-Socket-SSL-&IO-Socket-SSL-version;.tar.gz">
-]>
-
-  <!-- Begin IO::Socket::SSL -->
-  <sect2 id="perl-io-socket-ssl" xreflabel="IO-Socket-SSL-&IO-Socket-SSL-version;">
-
-    <title>IO::Socket::SSL-&IO-Socket-SSL-version;</title>
-
-    <indexterm zone="perl-io-socket-ssl">
-      <primary sortas="a-IO-Socket-SSL">IO::Socket::SSL</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to IO::Socket::SSL</title>
-
-      <para>
-        IO::Socket::SSL makes using SSL/TLS much easier by wrapping the necessary
-        functionality into the familiar IO::Socket interface and providing secure
-        defaults whenever possible.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">IO::Socket::SSL Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="make-ca"/> and
-        <xref linkend="perl-net-ssleay"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-uri"/> (to access international domain names)
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of IO::Socket::SSL</title>
-
-      <para>
-        This module uses a variant of the standard build and installation
-        instructions:
-
-<screen><userinput>yes | perl Makefile.PL &amp;&amp;
-make             &amp;&amp;
-make test</userinput></screen>
-
-        Now, as the <systemitem class="username">root</systemitem> user:
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-      </para>
-
-    </sect3>
-
-    <sect3 role="commands">
-      <title>Command Explanations</title>
-
-      <para>
-        <command>yes</command>: Perl will ask if you wish to run external
-        tests, which will 'fail soft' if there are network problems. The
-        default is 'y', this allows you to script the build.
-      </para>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-io-string.xml
===================================================================
--- general/prog/perl-modules/perl-io-string.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/G/GA/GAAS/IO-String-&IO-String-version;.tar.gz">
-  <!ENTITY my-md5sum "250e5424f290299fc3d6b5d1e9da3835">
-
-  <!ENTITY IO-String-download-http "&perl_authors;/id/S/SU/SULLR/IO-String-&IO-String-version;.tar.gz">
-]>
-
-  <!-- Begin IO::String -->
-  <sect2 id="perl-io-string" xreflabel="IO-String-&IO-String-version;">
-
-    <title>IO::String-&IO-String-version;</title>
-
-    <indexterm zone="perl-io-string">
-      <primary sortas="a-IO-String">IO::String</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to IO::String</title>
-
-      <para>
-        IO::String - Emulate file interface for in-core strings.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of IO::String</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-ipc-run3.xml
===================================================================
--- general/prog/perl-modules/perl-ipc-run3.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/R/RJ/RJBS/IPC-Run3-&IPC-Run3-version;.tar.gz">
-  <!ENTITY my-md5sum "569393ca56dfb78dedd79e93c0439159">
-
-]>
-
-  <!-- Begin IPC::Run3 -->
-  <sect2 id="perl-ipc-run3" xreflabel="IPC-Run3-&IPC-Run3-version;">
-
-    <title>IPC::Run3-&IPC-Run3-version;</title>
-
-    <indexterm zone="perl-ipc-run3">
-      <primary sortas="a-IPC-Run3">IPC::Run3</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to IPC::Run3</title>
-
-      <para>
-        IPC::Run3 is used to run a subprocess with input/output redirection.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of IPC::Run3</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-libwww-perl.xml
===================================================================
--- general/prog/perl-modules/perl-libwww-perl.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,166 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/O/OA/OALDERS/libwww-perl-&libwww-perl-version;.tar.gz">
-  <!ENTITY my-md5sum "e70e2f41a97b8d97608569d10b75b931">
-]>
-
-  <!-- Begin libwww-perl -->
-  <sect2 id="perl-libwww-perl" xreflabel="libwww-perl-&libwww-perl-version;">
-
-    <title>LWP (libwww-perl-&libwww-perl-version;)</title>
-
-    <indexterm zone="perl-libwww-perl">
-      <primary sortas="a-libwww-perl">libwww-perl</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to LWP - The World-wide Web library for
-      <application>Perl</application></title>
-
-      <para>
-        The libwww-perl collection is a set of Perl modules which provides a
-        simple and consistent application programming interface (API) to the
-        World-Wide Web. The main focus of the library is to provide classes and
-        functions that allow you to write WWW clients. The library also contains
-        modules that are of more general use and even classes that help you
-        implement simple HTTP servers.
-      </para>
-
-      <!-- For CPAN, this may be pulled in with 'cpan -i Bundle::LWP'   or just LWP-->
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">libwww-perl Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-file-listing"/>,
-        <xref linkend="perl-http-cookiejar"/>,
-        <xref linkend="perl-http-cookies"/>,
-        <xref linkend="perl-http-daemon"/>,
-        <!-- perl-http-daemon pulls in perl-http-message
-          for HTTP::Request, HTTP::Response, HTTP::Status -->
-        <!-- perl-http-message pulls in perl-encode-locale,
-          perl-http-date, perl-lwp-mediatypes and perl-uri -->
-        <xref linkend="perl-http-negotiate"/>,
-        <xref linkend="perl-html-parser"/>,
-        <xref linkend="perl-net-http"/>,
-        <xref linkend="perl-try-tiny"/> and
-        <xref linkend="perl-www-robotrules"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-test-fatal"/>,
-        <xref linkend="perl-test-needs"/> and
-        <xref linkend="perl-test-requiresinternet"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of libwww-perl</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-      <para>
-        After installing this package, if you want HTTPS protocol support
-        install <xref linkend="perl-lwp-protocol-https"/>.
-      </para>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-
-        <seglistitem>
-          <seg>
-            lwp-download, lwp-dump, lwp-mirror, lwp-request
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="lwp-download-prog">
-          <term><command>lwp-download</command></term>
-          <listitem>
-            <para>
-              is a script to fetch a large file from the web
-            </para>
-            <!-- the -prog is for while (old) and new- perl module pages
-             are both in the book, without it the link to the package is
-             correct, but the link to the prog goes to the progs in old
-             perl-modules.xml -->
-            <indexterm zone="perl-libwww-perl lwp-download-prog">
-              <primary sortas="b-lwp-download">lwp-download</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="lwp-dump-prog">
-          <term><command>lwp-dump</command></term>
-          <listitem>
-            <para>
-              is used to see what headers and content is returned for a URL
-            </para>
-            <indexterm zone="perl-libwww-perl lwp-dump-prog">
-              <primary sortas="b-lwp-dump">lwp-dump</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="lwp-mirror-prog">
-          <term><command>lwp-mirror</command></term>
-          <listitem>
-            <para>
-              is a simple mirror utility
-            </para>
-            <indexterm zone="perl-libwww-perl lwp-mirror-prog">
-              <primary sortas="b-lwp-mirror">lwp-mirror</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="lwp-request-prog">
-          <term><command>lwp-request</command></term>
-          <listitem>
-            <para>
-              is a simple command line user agent
-            </para>
-            <indexterm zone="perl-libwww-perl lwp-request-prog">
-              <primary sortas="b-lwp-request">lwp-request</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-lingua-translit.xml
===================================================================
--- general/prog/perl-modules/perl-lingua-translit.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,90 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/A/AL/ALINKE/Lingua-Translit-&Lingua-Translit-version;.tar.gz">
-  <!ENTITY my-md5sum "605a82f06b05fef4fc18bf069b1be511">
-
-]>
-
-  <!-- Begin Lingua::Translit -->
-  <sect2 id="perl-lingua-translit" xreflabel="Lingua-Translit-&Lingua-Translit-version;">
-
-    <title>Lingua::Translit-&Lingua-Translit-version;</title>
-
-    <indexterm zone="perl-lingua-translit">
-      <primary sortas="a-Lingua-Translit">Lingua::Translit</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Lingua::Translit</title>
-
-      <para>
-        Lingua::Translit and its <command>translit</command> program
-        transliterate text between writing systems.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Lingua::Translit</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-
-        <seglistitem>
-          <seg>
-            translit
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="translit-prog">
-          <term><command>translit</command></term>
-          <listitem>
-            <para>
-              transliterates text between writing systems using various
-              standards
-            </para>
-            <indexterm zone="perl-lingua-translit translit-prog">
-              <primary sortas="b-translit">translit</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-list-allutils.xml
===================================================================
--- general/prog/perl-modules/perl-list-allutils.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,64 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/D/DR/DROLSKY/List-AllUtils-&List-AllUtils-version;.tar.gz">
-  <!ENTITY my-md5sum "86469b1f6819ba181a8471eb932965f2">
-
-]>
-
-  <!-- Begin List::AllUtils -->
-  <sect2 id="perl-list-allutils" xreflabel="List-AllUtils-&List-AllUtils-version;">
-
-    <title>List::AllUtils-&List-AllUtils-version;</title>
-
-    <indexterm zone="perl-list-allutils">
-      <primary sortas="a-List-AllUtils">List::AllUtils</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to List::AllUtils</title>
-
-      <para>
-        The List::Allutils module combines List::Util and List::MoreUtils in one
-        bite-sized package.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">List::AllUtils Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-list-someutils"/>,
-        <xref linkend="perl-list-utilsby"/>
-<!-- core module        <xref linkend="perl-scalar-list-utils"/>-->
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of List::AllUtils</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-list-moreutils.xml
===================================================================
--- general/prog/perl-modules/perl-list-moreutils.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/R/RE/REHSACK/List-MoreUtils-&List-MoreUtils-version;.tar.gz">
-  <!ENTITY my-md5sum "daccd6310021231b827dcc943ff1c6b7">
-
-]>
-
-  <!-- Begin List::MoreUtils -->
-  <sect2 id="perl-list-moreutils" xreflabel="List-MoreUtils-&List-MoreUtils-version;">
-
-    <title>List::MoreUtils-&List-MoreUtils-version;</title>
-
-    <indexterm zone="perl-list-moreutils">
-      <primary sortas="a-List-MoreUtils">List::MoreUtils</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to List::MoreUtils</title>
-
-      <para>
-        List::MoreUtils provides the stuff missing in List::Util.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">List::MoreUtils Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-exporter-tiny"/> and
-        <xref linkend="perl-list-moreutils-xs"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of List::MoreUtils</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-log-log4perl.xml
===================================================================
--- general/prog/perl-modules/perl-log-log4perl.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,88 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/E/ET/ETJ/Log-Log4perl-&Log-Log4perl-version;.tar.gz">
-  <!ENTITY my-md5sum "acbe29cbaf03f4478a13579a275b0011">
-]>
-
-  <!-- Begin Log::Log4perl -->
-  <sect2 id="perl-log-log4perl" xreflabel="Log-Log4perl-&Log-Log4perl-version;">
-
-    <title>Log::Log4perl-&Log-Log4perl-version;</title>
-
-    <indexterm zone="perl-log-log4perl">
-      <primary sortas="a-Log-Log4perl">Log::Log4perl</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Log::Log4perl</title>
-
-      <para>
-        Log::Log4perl provides a Log4j implementation for
-        <application>perl</application>.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Log::Log4perl</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-
-        <seglistitem>
-          <seg>
-            l4p-templ
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="l4p-templ-prog">
-          <term><command>l4p-templ</command></term>
-          <listitem>
-            <para>
-              prints out the text of a template Log4perl configuration for
-              starting a new Log4perl configuration file
-            </para>
-            <indexterm zone="perl-log-log4perl l4p-templ-prog">
-              <primary sortas="b-l4p-templ">l4p-templ</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-lwp-protocol-https.xml
===================================================================
--- general/prog/perl-modules/perl-lwp-protocol-https.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,91 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/O/OA/OALDERS/LWP-Protocol-https-&LWP-Protocol-https-version;.tar.gz">
-  <!ENTITY my-md5sum "65401e3e34be653c9e3b31f798ed5454">
-
-]>
-
-  <!-- Begin LWP::Protocol::https -->
-  <sect2 id="perl-lwp-protocol-https" xreflabel="LWP-Protocol-https-&LWP-Protocol-https-version;">
-
-    <title>LWP::Protocol::https-&LWP-Protocol-https-version;</title>
-
-    <indexterm zone="perl-lwp-protocol-https">
-      <primary sortas="a-LWP-Protocol-https">LWP::Protocol::https</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to LWP::Protocol::https</title>
-
-      <para>
-        LWP::Protocol::https provides https support for LWP::UserAgent (i.e.
-        <xref linkend="perl-libwww-perl"/>). Once the module is installed
-        LWP is able to access sites using HTTP over SSL/TLS.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-<!--
-      <bridgehead renderas="sect4">Additional Download</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Required patch:
-            <ulink url="&patch-root;/LWP-Protocol-https-&LWP-Protocol-https-version;-system_certs-2.patch"/>
-          </para>
-        </listitem>
-      </itemizedlist>
--->
-
-      <bridgehead renderas="sect4">LWP::Protocol::https Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-io-socket-ssl"/>,
-        <!-- perl-io-socket-ssl pulls in perl-net-ssleay -->
-        <xref linkend="perl-libwww-perl"/> and
-        <!-- perl-libwww-perl pulls in perl-net-https -->
-        <xref linkend="make-ca"/> with
-        <literal>/etc/pki/tls/certs/ca-bundle.crt</literal>.
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of LWP::Protocol::https</title>
-
-<!-- Applied upstream in 6.11
-      <para>
-        First, apply a patch to use the system certificates (using the CPAN
-        automated install will instead use <ulink
-        url="https://metacpan.org/pod/Mozilla::CA">Mozilla::CA</ulink> which
-        is usually not up to date and does not use local certificates).
-      </para>
-
-<screen><userinput>patch -Np1 -i ../LWP-Protocol-https-&LWP-Protocol-https-version;-system_certs-2.patch</userinput></screen>
--->
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-module-build.xml
===================================================================
--- general/prog/perl-modules/perl-module-build.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,101 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&metacpan_authors;/L/LE/LEONT/Module-Build-&Module-Build-version;.tar.gz">
-  <!ENTITY my-md5sum "0032d0c0bc36a3b68ef41c947829d5e3">
-
-]>
-
-  <!-- Begin Module::Build -->
-  <sect2 id="perl-module-build" xreflabel="Module-Build-&Module-Build-version;">
-
-    <title>Module::Build-&Module-Build-version;</title>
-
-    <indexterm zone="perl-module-build">
-      <primary sortas="a-Module-Build">Module::Build</primary>
-    </indexterm>
-
-
-    <sect3 role="package">
-      <title>Introduction to Module::Build</title>
-
-      <para>
-        Module::Build allows perl modules to be built without a
-        <command>make</command> command being present.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    <!-- Dependencies: It warns that the optional fetature inc_bundling_support
-        is disabled because inc::latest is not installed : that is experimental
-        (originally part of Module::Build itself) and is not useful except for
-        people who create CPAN distributions. -->
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Module::Build</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-      <para>
-        Note that this module can also be built using
-        <filename>Build.PL</filename>
-      </para>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-
-        <seglistitem>
-          <seg>
-            config_data
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="config-data-prog">
-          <term><command>config_data</command></term>
-          <listitem>
-            <para>
-              is used to query or change the configuration of perl modules
-            </para>
-            <indexterm zone="perl-module-build config-data-prog">
-              <primary sortas="b-config-data">config_data</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-net-dns.xml
===================================================================
--- general/prog/perl-modules/perl-net-dns.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/N/NL/NLNETLABS/Net-DNS-&Net-DNS-version;.tar.gz">
-  <!ENTITY my-md5sum "e4694815daeeb6f7ac80e0a1fec6839b">
-]>
-
-  <!-- Begin Net::DNS -->
-  <sect2 id="perl-net-dns" xreflabel="Net-DNS-&Net-DNS-version;">
-
-    <title>Net::DNS-&Net-DNS-version;</title>
-
-    <indexterm zone="perl-net-dns">
-      <primary sortas="a-Net-DNS">Net::DNS</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Net::DNS</title>
-
-      <para>
-        Net::DNS is a DNS resolver implemented in <application>Perl</application>.
-        It can be used to perform nearly any type of DNS query from a
-        <application>Perl</application> script.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Net::DNS</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-parse-recdescent.xml
===================================================================
--- general/prog/perl-modules/perl-parse-recdescent.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/J/JT/JTBRAUN/Parse-RecDescent-&Parse-RecDescent-version;.tar.gz">
-  <!ENTITY my-md5sum "7a36d45d62a9b68603edcdbd276006cc">
-
-]>
-
-  <!-- Begin Parse::RecDescent -->
-  <sect2 id="perl-parse-recdescent" xreflabel="Parse-RecDescent-&Parse-RecDescent-version;">
-
-    <title>Parse::RecDescent-&Parse-RecDescent-version;</title>
-
-    <indexterm zone="perl-parse-recdescent">
-      <primary sortas="a-Parse-RecDescent">Parse::RecDescent</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Parse::RecDescent</title>
-
-      <para>
-        Parse::RecDescent incrementally generates top-down recursive-descent text
-        parsers from simple yacc-like grammar specifications.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Parse::RecDescent</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-parse-yapp.xml
===================================================================
--- general/prog/perl-modules/perl-parse-yapp.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,91 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/W/WB/WBRASWELL/Parse-Yapp-&Parse-Yapp-version;.tar.gz">
-  <!ENTITY my-md5sum "69584d5b0f0304bb2a23cffcd982c5de">
-
-  <!ENTITY Parse-Yapp-download-http "&perl_authors;/id/W/WB/WBRASWELL/Parse-Yapp-&Parse-Yapp-version;.tar.gz">
-  <!ENTITY Parse-Yapp-md5sum "69584d5b0f0304bb2a23cffcd982c5de">
-]>
-
-  <!-- Begin Parse::Yapp -->
-  <sect2 id="perl-parse-yapp" xreflabel="Parse-Yapp-&Parse-Yapp-version;">
-
-    <title>Parse::Yapp-&Parse-Yapp-version;</title>
-
-    <indexterm zone="perl-parse-yapp">
-      <primary sortas="a-Parse-Yapp">Parse::Yapp</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Parse::Yapp</title>
-
-      <para>
-        Parse::Yapp is a Perl extension for generating and using LALR parsers.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Parse::Yapp</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-
-        <seglistitem>
-          <seg>
-            yapp
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="yapp-prog">
-          <term><command>yapp</command></term>
-          <listitem>
-            <para>
-              is a frontend to the Parse::Yapp module, which lets you create
-              a Perl OO parser from an input grammar file
-            </para>
-            <indexterm zone="perl-parse-yapp yapp-prog">
-              <primary sortas="b-yapp">yapp</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-perlio-utf8_strict.xml
===================================================================
--- general/prog/perl-modules/perl-perlio-utf8_strict.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/L/LE/LEONT/PerlIO-utf8_strict-&PerlIO-utf8_strict-version;.tar.gz">
-  <!ENTITY my-md5sum "d90ca967f66e05ad9221c79060868346">
-]>
-
-  <!-- Begin PerlIO::utf8_strict -->
-  <sect2 id="perl-perlio-utf8_strict" xreflabel="PerlIO-utf8_strict-&PerlIO-utf8_strict-version;">
-
-    <title>PerlIO::utf8_strict-&PerlIO-utf8_strict-version;</title>
-
-    <indexterm zone="perl-perlio-utf8_strict">
-      <primary sortas="a-PerlIO-utf8_strict">PerlIO::utf8_strict</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to PerlIO::utf8_strict</title>
-
-      <para>
-        PerlIO::utf8_strict provides a fast and correct UTF-8 PerlIO layer.
-        Unlike Perl's default :utf8 layer it checks the input for correctness.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">PerlIO::utf8_strict Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-test-exception"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of PerlIO::utf8_strict</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-regexp-common.xml
===================================================================
--- general/prog/perl-modules/perl-regexp-common.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/A/AB/ABIGAIL/Regexp-Common-&Regexp-Common-version;.tar.gz">
-  <!ENTITY my-md5sum "b1bb40759b84154990f36a160160fb94">
-
-]>
-
-  <!-- Begin Regexp::Common -->
-  <sect2 id="perl-regexp-common" xreflabel="Regexp-Common-&Regexp-Common-version;">
-
-    <title>Regexp::Common-&Regexp-Common-version;</title>
-
-    <indexterm zone="perl-regexp-common">
-      <primary sortas="a-Regexp-Common">Regexp::Common</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Regexp::Common</title>
-
-      <para>
-        Regexp::Common provides commonly requested regular expressions.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Regexp::Common</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-sgmlspm.xml
===================================================================
--- general/prog/perl-modules/perl-sgmlspm.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,118 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/R/RA/RAAB/SGMLSpm-&SGMLSpm-version;.tar.gz">
-  <!ENTITY my-md5sum "746c74ae969992cedb1a2879b4168090">
-
-]>
-
-  <!-- Begin SGMLSpm -->
-  <sect2 id="perl-sgmlspm" xreflabel="SGMLSpm-&SGMLSpm-version;">
-
-    <title>SGMLSpm-&SGMLSpm-version;</title>
-
-    <indexterm zone="perl-sgmlspm">
-      <primary sortas="a-SGMLSpm">SGMLSpm</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to SGMLSpm</title>
-
-      <para>
-        The SGMLSpm module is a <application>Perl</application> library
-        used for parsing the output from James Clark's SGMLS and NSGMLS
-        parsers.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of SGMLSpm</title>
-
-      <para>
-        Before beginning the build, issue
-        the following command to prevent an error:
-      </para>
-
-<screen><userinput>chmod -v 644 MYMETA.yml</userinput></screen>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-      <para>
-        After the package has been installed, run the following command
-        as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>ln -sv sgmlspl.pl /usr/bin/sgmlspl</userinput></screen>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-
-        <seglistitem>
-          <seg>
-            sgmlspl.pl, sgmlspl
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="sgmlspl.pl">
-          <term><command>sgmlspl.pl</command></term>
-          <listitem>
-            <para>
-              is an SGML processor
-            </para>
-            <indexterm zone="perl-sgmlspm sgmlspl.pl">
-              <primary sortas="b-sgmlspl.pl">sgmlspl.pl</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="sgmlspl-prog">
-          <term><command>sgmlspl</command></term>
-          <listitem>
-            <para>
-              is a symbolic link used during the install of
-              <xref linkend="docbook-utils"/>
-            </para>
-            <indexterm zone="perl-sgmlspm sgmlspl-prog">
-              <primary sortas="b-sgmlspl">sgmlspl</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-sort-key.xml
===================================================================
--- general/prog/perl-modules/perl-sort-key.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/S/SA/SALVA/Sort-Key-&Sort-Key-version;.tar.gz">
-  <!ENTITY my-md5sum "a37ab0da0cfdc26e57b4c79e39f6d98f">
-
-]>
-
-  <!-- Begin Sort::Key -->
-  <sect2 id="perl-sort-key" xreflabel="Sort-Key-&Sort-Key-version;">
-
-    <title>Sort::Key-&Sort-Key-version;</title>
-
-    <indexterm zone="perl-sort-key">
-      <primary sortas="a-Sort-Key">Sort::Key</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Sort::Key</title>
-
-      <para>
-        Sort::Key provides a set of functions to sort lists of values by some
-        calculated key value.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Sort::Key</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-test-command.xml
===================================================================
--- general/prog/perl-modules/perl-test-command.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/D/DA/DANBOO/Test-Command-&Test-Command-version;.tar.gz">
-  <!ENTITY my-md5sum "9ab83c4695961dbe92cd86efe08f0634">
-
-]>
-
-  <!-- Begin Test::Command -->
-  <sect2 id="perl-test-command" xreflabel="Test-Command-&Test-Command-version;">
-
-    <title>Test::Command-&Test-Command-version;</title>
-
-    <indexterm zone="perl-test-command">
-      <primary sortas="a-Test-Command">Test::Command</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Test::Command</title>
-
-      <para>
-        Test::Command tests the exit status, STDOUT, or STDERR, of an external
-        command.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Test::Command</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-test-differences.xml
===================================================================
--- general/prog/perl-modules/perl-test-differences.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,66 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/D/DC/DCANTRELL/Test-Differences-&Test-Differences-version;.tar.gz">
-  <!ENTITY my-md5sum "23a54d5ada6ffe0850f42cd768b4b3c1">
-]>
-
-  <!-- Begin Test::Differences -->
-  <sect2 id="perl-test-differences" xreflabel="Test-Differences-&Test-Differences-version;">
-
-    <title>Test::Differences-&Test-Differences-version;</title>
-
-    <indexterm zone="perl-test-differences">
-      <primary sortas="a-Test-Differences">Test::Differences</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Test::Differences</title>
-
-      <para>
-        Test::Differences tests strings and data structures and shows the
-        differences if they do not match.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Test::Differences Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-text-diff"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-capture-tiny"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Test::Differences</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-text-bibtex.xml
===================================================================
--- general/prog/perl-modules/perl-text-bibtex.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,139 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/A/AM/AMBS/Text-BibTeX-&Text-BibTeX-version;.tar.gz">
-  <!ENTITY my-md5sum "67fa6d9c03c659627d9fd58bb380c1fe">
-]>
-
-  <!-- Begin Text::BibTeX -->
-  <sect2 id="perl-text-bibtex" xreflabel="Text-BibTeX-&Text-BibTeX-version;">
-
-    <title>Text::BibTeX-&Text-BibTeX-version;</title>
-
-    <indexterm zone="perl-text-bibtex">
-      <primary sortas="a-Text-BibTeX">Text::BibTeX</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Text::BibTeX</title>
-
-      <para>
-        Text::BibTeX provides an interface to read and parse
-        <application>BibTeX</application> files.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Text::BibTeX Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-config-autoconf"/>,
-        <xref linkend="perl-extutils-libbuilder"/>
-        <!-- perl-module-build is pulled in by perl-extutils-libbuilder -->
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Text::BibTeX</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-build-install.xml"/>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-
-        <seglistitem>
-          <seg>
-            biblex, libparse, dumpnames
-          </seg>
-          <seg>
-            libtparse.so
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="biblex-prog">
-          <term><command>biblex</command></term>
-          <listitem>
-            <para>
-              performs lexical analysis on a BibTeX file
-            </para>
-            <indexterm zone="perl-text-bibtex biblex-prog">
-              <primary sortas="b-biblex">biblex</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="bibparse-prog">
-          <term><command>bibparse</command></term>
-          <listitem>
-            <para>
-              parses a series of BibTeX files with command line options to
-              control the string post-processing behavior
-            </para>
-            <indexterm zone="perl-text-bibtex bibparse-prog">
-              <primary sortas="b-bibparse">bibparse</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="dumpnames-prog">
-          <term><command>dumpnames</command></term>
-          <listitem>
-            <para>
-              parses a BibTeX file, splitting 'author' and 'editor' fields
-              into lists of names, and then dumps everything to stdout
-            </para>
-            <indexterm zone="perl-text-bibtex dumpnames-prog">
-              <primary sortas="b-dumpnames">dumpnames</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="libbtparse-lib">
-          <term><filename class="libraryfile">libbtparse.so</filename></term>
-          <listitem>
-            <para>
-              is a library for parsing and processing BibTeX data files
-            </para>
-            <indexterm zone="perl-text-bibtex libbtparse-lib">
-              <primary sortas="c-libbtparse">libbtparse.so</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-text-csv.xml
===================================================================
--- general/prog/perl-modules/perl-text-csv.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,64 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/I/IS/ISHIGAKI/Text-CSV-&Text-CSV-version;.tar.gz">
-  <!ENTITY my-md5sum "500b1cd1349e2186877c39aa404230dc">
-
-]>
-
-  <!-- Begin Text::CSV -->
-  <sect2 id="perl-text-csv" xreflabel="Text-CSV-&Text-CSV-version;">
-
-    <title>Text::CSV-&Text-CSV-version;</title>
-
-    <indexterm zone="perl-text-csv">
-      <primary sortas="a-Text-CSV">Text::CSV</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Text::CSV</title>
-
-      <para>
-        Text::CSV is a comma-separated values manipulator, using XS
-        (eXternal Subroutine - for subroutines written in C or C++)
-        or pure perl.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Text::CSV Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-text-csv_xs"/>
-          (required by <xref role="nodep" linkend="biber"/>)
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Text::CSV</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-text-roman.xml
===================================================================
--- general/prog/perl-modules/perl-text-roman.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/S/SY/SYP/Text-Roman-&Text-Roman-version;.tar.gz">
-  <!ENTITY my-md5sum "1f6b09c0cc1f4425b565ff787a39fd83">
-
-]>
-
-  <!-- Begin Text::Roman -->
-  <sect2 id="perl-text-roman" xreflabel="Text-Roman-&Text-Roman-version;">
-
-    <title>Text::Roman-&Text-Roman-version;</title>
-
-    <indexterm zone="perl-text-roman">
-      <primary sortas="a-Text-Roman">Text::Roman</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Text::Roman</title>
-
-      <para>
-        Text::Roman allows conversion between Roman and Arabic algorisms (number
-        systems, e.g. MCMXLV and 1945).
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Text::Roman</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-unicode-collate.xml
===================================================================
--- general/prog/perl-modules/perl-unicode-collate.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/S/SA/SADAHIRO/Unicode-Collate-&Unicode-Collate-version;.tar.gz">
-  <!ENTITY my-md5sum "ee4d960d057c5e5b02ebb49d0286db8f">
-]>
-
-  <!-- Begin Unicode::Collate -->
-  <sect2 id="perl-unicode-collate" xreflabel="Unicode-Collate-&Unicode-Collate-version;">
-
-    <title>Unicode::Collate-&Unicode-Collate-version;</title>
-
-    <indexterm zone="perl-unicode-collate">
-      <primary sortas="a-Unicode-Collate">Unicode::Collate</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Unicode::Collate</title>
-
-      <para>
-        Unicode::Collate provides a Unicode collation algorithm.
-      </para>
-
-      <note>
-        <para>
-          This is a core module. If you are using
-          <application>perl-5.28.0</application> or later, its version is good
-          enough for <xref linkend="biber"/> and you do not need to reinstall
-          this module.
-        </para>
-      </note>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Unicode::Collate</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-unicode-linebreak.xml
===================================================================
--- general/prog/perl-modules/perl-unicode-linebreak.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/N/NE/NEZUMI/Unicode-LineBreak-&Unicode-LineBreak-version;.tar.gz">
-  <!ENTITY my-md5sum "003d6da7a13700e069afed9238c864b9">
-
-]>
-
-  <!-- Begin Unicode::LineBreak -->
-  <sect2 id="perl-unicode-linebreak" xreflabel="Unicode-LineBreak-&Unicode-LineBreak-version;">
-
-    <title>Unicode::LineBreak-&Unicode-LineBreak-version;</title>
-
-    <indexterm zone="perl-unicode-linebreak">
-      <primary sortas="a-Unicode-LineBreak">Unicode::LineBreak</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Unicode::LineBreak</title>
-
-      <para>
-        Unicode::LineBreak provides a UAX #14 Unicode Line Breaking Algorithm.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Unicode::LineBreak Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-mime-charset"/>, also
-        <xref linkend="wget"/> (to download two files from unicode.org in the
-        test suite)
-      </para>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="recommended">
-        <ulink url="https://linux.thai.net/projects/libthai/">libthai</ulink>
-        (to break Thai words into segments)
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Unicode::LineBreak</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-uri.xml
===================================================================
--- general/prog/perl-modules/perl-uri.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,75 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/O/OA/OALDERS/URI-&URI-version;.tar.gz">
-  <!ENTITY my-md5sum "82aaecd8861f31444338231801ba01ca">
-]>
-
-  <!-- Begin URI -->
-  <sect2 id="perl-uri" xreflabel="URI-&URI-version;">
-
-    <title>URI-&URI-version;</title>
-
-    <indexterm zone="perl-uri">
-      <primary sortas="a-URI">URI</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to URI</title>
-
-      <para>
-        This module implements the URI class. Objects of this class represent
-        "Uniform Resource Identifier references" as specified in RFC 2396 (and
-        updated by RFC 2732). A Uniform Resource Identifier is a compact string
-        of characters that identifies an abstract or physical resource. A
-        Uniform Resource Identifier can be further classified as either a
-        Uniform Resource Locator (URL) or a Uniform Resource Name (URN). The
-        distinction between URL and URN does not matter to the URI class
-        interface. A "URI-reference" is a URI that may have additional
-        information attached in the form of a fragment identifier.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">URI Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended (required for the test suite)</bridgehead>
-      <para role="recommended">
-        <xref linkend="perl-test-fatal"/>,
-        <xref linkend="perl-test-needs"/>, and
-        <xref linkend="perl-test-warnings"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <xref linkend="perl-business-isbn"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of URI</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-xml-libxml-simple.xml
===================================================================
--- general/prog/perl-modules/perl-xml-libxml-simple.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/M/MA/MARKOV/XML-LibXML-Simple-&XML-LibXML-Simple-version;.tar.gz">
-  <!ENTITY my-md5sum "faad5ed26cd83998f6514be199c56c38">
-
-]>
-
-  <!-- Begin XML::LibXML::Simple -->
-  <sect2 id="perl-xml-libxml-simple" xreflabel="XML-LibXML-Simple-&XML-LibXML-Simple-version;">
-
-    <title>XML::LibXML::Simple-&XML-LibXML-Simple-version;</title>
-
-    <indexterm zone="perl-xml-libxml-simple">
-      <primary sortas="a-XML-LibXML-Simple">XML::LibXML::Simple</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to XML::LibXML::Simple</title>
-
-      <para>
-        The XML::LibXML::Simple module is a rewrite of XML::Simple to use the
-        XML::LibXML parser for XML structures, instead of the plain
-        <application>Perl</application> or SAX parsers.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">XML::LibXML::Simple Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="perl-xml-libxml"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of XML::LibXML::Simple</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-xml-libxslt.xml
===================================================================
--- general/prog/perl-modules/perl-xml-libxslt.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/S/SH/SHLOMIF/XML-LibXSLT-&XML-LibXSLT-version;.tar.gz">
-  <!ENTITY my-md5sum "b47ac3a69b58fa43386c4f39be5d7bd5">
-
-]>
-
-  <!-- Begin XML-LibXSLT -->
-  <sect2 id="perl-xml-libxslt" xreflabel="XML-LibXSLT-&XML-LibXSLT-version;">
-
-    <title>XML::LibXSLT-&XML-LibXSLT-version;</title>
-
-    <indexterm zone="perl-xml-libxslt">
-      <primary sortas="a-XML-LibXSLT">XML-LibXSLT</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to XML::LibXSLT</title>
-
-      <para>
-        XML-LibXSLT provides an interface to <xref linkend="libxslt"/>
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">XML::LibXSLT Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="libxslt"/>,
-        <xref linkend="perl-xml-libxml"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of XML::LibXSLT</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-xml-simple.xml
===================================================================
--- general/prog/perl-modules/perl-xml-simple.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/G/GR/GRANTM/XML-Simple-&XML-Simple-version;.tar.gz">
-  <!ENTITY my-md5sum "bb841dce889a26c89a1c2739970e9fbc">
-
-]>
-
-  <!-- Begin XML::Simple -->
-  <sect2 id="perl-xml-simple" xreflabel="XML-Simple-&XML-Simple-version;">
-
-    <title>XML::Simple-&XML-Simple-version;</title>
-
-    <indexterm zone="perl-xml-simple">
-      <primary sortas="a-XML-Simple">XML::Simple</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to XML::Simple</title>
-
-      <para>
-        XML::Simple provides an easy API to read and write XML (especially config
-        files). It is deprecated and its use is discouraged.
-         <!-- per https://metacpan.org/pod/XML::Simple :-
-        The use of this module in new code is strongly discouraged. (explanations
-        are given there) -->
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">XML::Simple Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <xref linkend="perl-xml-sax"/> (for an alternative parser which
-        will be used if available, otherwise <application>XML::Parser</application>
-        which was installed in LFS will be used),
-        <!-- perl-xml-sax pulls in perl-xml-namespacesupport and
-             perl-xml-sax-base -->
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of XML::Simple</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/perl-modules/perl-xml-writer.xml
===================================================================
--- general/prog/perl-modules/perl-xml-writer.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 my-download-http "&perl_authors;/id/J/JO/JOSEPHW/XML-Writer-&XML-Writer-version;.tar.gz">
-  <!ENTITY my-md5sum "2457214360cefda445742a608dd6195e">
-
-]>
-
-  <!-- Begin XML::Writer -->
-  <sect2 id="perl-xml-writer" xreflabel="XML-Writer-&XML-Writer-version;">
-
-    <title>XML::Writer-&XML-Writer-version;</title>
-
-    <indexterm zone="perl-xml-writer">
-      <primary sortas="a-XML-Writer">XML::Writer</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to XML::Writer</title>
-
-      <para>
-        XML::Writer provides a <application>Perl</application> extension for
-        writing XML documents.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of XML::Writer</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/php.xml
===================================================================
--- general/prog/php.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,780 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY php-download-http "https://www.php.net/distributions/php-&php-version;.tar.xz">
-  <!ENTITY php-download-ftp  " ">
-  <!ENTITY php-md5sum        "0b8809e3bbb7f00b90f775d28846197d">
-  <!ENTITY php-size          "12 MB">
-  <!ENTITY php-buildsize     "526 MB (with documentation and tests)">
-  <!ENTITY php-time          "1.9 SBU (with parallelism=4; add 1.8 SBU for tests)">
-  <!-- Tests were run for 8.0.1 at -j4, had two timeouts as well.
-       Results were otherwise normal though, so I'm unsure of what caused the
-       increase in time. -renodr
-       No timeout for 8.0.2. Tests run at -j4 too. -pierre
-       No timeouts on 8.0.3 for me this time. -renodr
-       No timeouts on 8.0.5 -bdubbs
-       No timeouts, one failure on 8.0.9 -bdubbs
-       No timeouts on 8.0.10 - thomas
-       No timeouts on 8.0.11 - thomas
-
-TEST RESULT SUMMARY 8.1.0
-
-Exts skipped    :   36
-Exts tested     :   36
-
-Number of tests : 17060             12551
-Tests skipped   : 4509 ( 26.4%)
-Tests warned    :    2 (  0.0%) (  0.0%)
-Tests failed    :    4 (  0.0%) (  0.0%)
-Expected fail   :   28 (  0.2%) (  0.2%)
-Tests passed    : 12517 ( 73.4%) ( 99.7%)
-
-Time taken      :  165 seconds
-
-Stats for tests changed slightly for 8.1.1, but not significantly.
-Stats for tests changed slightly for 8.1.2, but not significantly.
-  Tests failed    :    1
-For 8.1.4, ran tests at -j4. One test still fails.
-For 8.1.5, ran tests at -j4. One test still fails.
-
-Running tests at -j4 does nothing.  The jobs cound is not passed to the
-actual routine running the tests.
-
-For 8.1.7:
-Number of tests : 17250             12714
-Tests skipped   : 4536 ( 26.3%)
-Tests warned    :    2 (  0.0%) (  0.0%)
-Tests failed    :    1 (  0.0%) (  0.0%)
-Expected fail   :   27 (  0.2%) (  0.2%)
-Tests passed    : 12684 ( 73.5%) ( 99.8%)
-
-Time taken      :  162 seconds
-
-The warnings are really XFAIL.  The FAIL is ext/phar/tests/bug69958.phpt.
-It appears to be mission a test file.
-
-For 8.1.10:
-Number of tests : 17315             12768
-Tests skipped   : 4547 ( 26.3%) - - - - - - - -
-Tests warned    :    2 (  0.0%) (  0.0%)
-Tests failed    :    5 (  0.0%) (  0.0%)
-Expected fail   :   27 (  0.2%) (  0.2%)
-Tests passed    : 12734 ( 73.5%) ( 99.7%)
-
-Time taken      :  162 seconds
-
-For 8.2.0:
-Number of tests : 17768             13167
-Tests skipped   : 4601 ( 25.9%) - - - - - - - -
-Tests warned    :    3 (  0.0%) (  0.0%)
-Tests failed    :    1 (  0.0%) (  0.0%)
-Expected fail   :   25 (  0.1%) (  0.2%)
-Tests passed    : 13138 ( 73.9%) ( 99.8%)
-
-Time taken      :  166 seconds
-
-For 8.3.0:
-Number of tests : 18682             13904
-Tests skipped   :  4778 ( 25.6%) - - - - - - - -
-Tests warned    :     1 (  0.0%) (  0.0%)
-Tests failed    :     8 (  0.0%) (  0.1%)
-Expected fail   :     9 (  0.0%) (  0.1%)
-Tests passed    : 13886 ( 74.3%) ( 99.9%)
-
-Time taken      :   183 seconds
-
-For 8.3.1: [rahul] (Ryzen 7 1700)
-
-Number of tests : 18706             13767
-Tests skipped   :  4939 ( 26.4%) 
-Tests warned    :     0 (  0.0%) (  0.0%)
-Tests failed    :     1 (  0.0%) (  0.0%)
-Expected fail   :     9 (  0.0%) (  0.1%)
-Tests passed    : 13757 ( 73.5%) ( 99.9%)
-
-Time taken      :   301 seconds
-
-For 8.3.6: [bdubbs] (AMD 3900)
-
-Number of tests : 18777             13968
-Tests skipped   :  4809 ( 25.6%) 
-Tests warned    :     1 (  0.0%) (  0.0%)
-Tests failed    :     2 (  0.0%) (  0.0%)
-Expected fail   :     9 (  0.0%) (  0.1%)
-Tests passed    : 13956 ( 74.3%) ( 99.9%)
-
-Time taken      :   189 seconds
-
--->
-
-]>
-
-<sect1 id="php" xreflabel="PHP-&php-version;">
-  <?dbhtml filename="php.html"?>
-
-
-  <title>PHP-&php-version;</title>
-
-  <indexterm zone="php">
-    <primary sortas="a-PHP">PHP</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to PHP</title>
-
-    <para>
-      <application>PHP</application> is the PHP Hypertext Preprocessor.
-      Primarily used in dynamic web sites, it allows for programming code to be
-      directly embedded into the HTML markup.  It is also useful as a
-      general purpose scripting language.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&php-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&php-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &php-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &php-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &php-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &php-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional pre-built documentation (single file html): <ulink
-          url="https://www.php.net/distributions/manual/php_manual_en.html.gz"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Optional pre-built documentation (chunked html): <ulink
-          url="https://www.php.net/distributions/manual/php_manual_en.tar.gz"/>.
-          Note that the documentation can be found in languages other than
-          English at <ulink url="https://www.php.net/download-docs.php"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">PHP Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="apache"/> and
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional System Utilities and Libraries</bridgehead>
-    <para role="optional">
-      <xref linkend="aspell"/>,
-      <xref linkend="enchant"/>,
-      <xref linkend="libxslt"/>,
-      an <xref linkend="server-mail"/> (that provides a
-      <command>sendmail</command> command),
-      <xref linkend="pcre2"/>,
-      <ulink url="https://wiki.ubuntu.com/AppArmor">AppArmor</ulink>,
-      <ulink url="https://dmalloc.com/">Dmalloc</ulink>,
-      <ulink url="http://www.net-snmp.org/">Net-SNMP</ulink>,
-      <ulink url="https://github.com/kkos/oniguruma">oniguruma</ulink>,
-      <ulink url="http://www.ossp.org/pkg/lib/mm/">OSSP mm</ulink>,
-      <ulink url="https://re2c.org/">re2c</ulink>, and
-      <ulink url="https://xmlrpc-epi.sourceforge.net/main.php?t=php_about">XMLRPC-EPI</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional Graphics Utilities and Libraries</bridgehead>
-    <para role="optional">
-      <xref linkend="freetype2"/>,
-      <xref linkend="libexif"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libtiff"/>,
-      <xref linkend="libwebp"/>,
-      <xref linkend="x-window-system"/>,
-      <!--<ulink url="http://www.fastio.com/">ClibPDF</ulink>, - site asks for username/password-->
-      <ulink url="https://opensource.adobe.com/dc-acrobat-sdk-docs/acrobatsdk/">FDF Toolkit</ulink>,
-      <ulink url="https://github.com/libgd/libgd">GD</ulink>, and
-      <ulink url="https://www.t1lib.org/">t1lib</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional Web Utilities</bridgehead>
-    <para role="optional">
-      <xref linkend="curl"/>,
-      <xref linkend="tidy-html5"/>,
-      <ulink url="https://sourceforge.net/projects/caudium/">Caudium</ulink>,
-      <ulink url="https://www.hyperwave.com/en/">Hyperwave</ulink>,
-      <ulink url="https://download.roxen.com/6.1/">Roxen WebServer</ulink>, and
-      <ulink url="https://github.com/Bilal-S/WDDX.net">WDDX</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional Data Management Utilities and Libraries</bridgehead>
-    <para role="optional">
-      <xref linkend="libiodbc"/>,
-      <xref linkend="lmdb"/>,
-      <xref linkend="mariadb"/> or <ulink url="https://www.mysql.com/">MySQL</ulink>,
-      <xref linkend="openldap"/>,
-      <xref linkend="postgresql"/>,
-      <xref linkend="sqlite"/>,
-      <xref linkend="unixodbc"/>,
-      &berkeley-db;
-      <ulink url="https://www.softwareag.com/en_corporate/platform/adabas-natural.html">Adabas</ulink>,
-      <ulink url="https://raima.com/product-overview/">Birdstep</ulink>,
-      <ulink url="https://cr.yp.to/cdb.html">cdb</ulink>,
-      <ulink url="https://www.dbmaker.com/">DBMaker</ulink>,
-      <ulink url="http://www.empress.com/">Empress</ulink>,
-      <ulink url="http://www.frontbase.com/cgi-bin/WebObjects/FBWebSite">FrontBase</ulink>,
-      <ulink url="https://www.ibm.com/analytics/us/en/db2/">IBM DB2</ulink>,
-      <ulink url="https://hughestech.com.au/products/msql/">Mini SQL</ulink>,
-      <ulink url="https://www.monetra.com/">Monetra</ulink>, and
-      <ulink url="https://sourceforge.net/projects/qdbm">QDBM</ulink>
-    </para>
-
-    <para>
-      <application>PHP</application> also provides support for many
-      commercial database tools such as <application>Oracle</application>,
-      <application>SAP</application> and
-      <application>ODBC Router</application>.
-    </para>
-
-    <bridgehead renderas="sect4">Optional Security/Encryption Utilities and Libraries</bridgehead>
-    <para role="optional">
-      <xref linkend="cyrus-sasl"/>,
-      <xref linkend="mitkrb"/>,
-      <ulink url="https://mcrypt.sourceforge.net/">libmcrypt</ulink>, and
-      <ulink url="https://mhash.sourceforge.net/">mhash</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      Editor Notes: <ulink url="&blfs-wiki;/php"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of PHP</title>
-
-    <para>
-      You can use <application>PHP</application> for server-side
-      scripting, command-line scripting or client-side GUI applications. This
-      book provides instructions for setting up <application>PHP</application>
-      for server-side scripting as it is the most common form.
-    </para>
-
-    <note>
-      <para>
-        <application>PHP</application> has many more
-        <command>configure</command> options that will enable support for
-        various things. You can use <command>./configure --help</command> to
-        see a full list of the available options. Also, use of the
-        <ulink url="https://www.php.net/">PHP web site</ulink>
-        is highly recommended, as their online docs are very good. An example
-        of a <command>configure</command> command that utilizes many of the
-        most common dependencies can be found at <ulink
-        url="&sources-anduin-http;/files/php_configure.txt"/>.
-      </para>
-
-      <para>
-        If, for whatever reason, you don't have <xref linkend="libxml2"/>
-        installed, you need to add <option>--disable-libxml</option> to the
-        <command>configure</command> command in the instructions below. Note
-        that this will prevent the <command>pear</command> command from being
-        built.
-      </para>
-    </note>
-
-    <para>
-      Install <application>PHP</application> by running the following commands:
-    </para>
-
-<screen revision="sysv"><userinput>./configure --prefix=/usr                \
-            --sysconfdir=/etc            \
-            --localstatedir=/var         \
-            --datadir=/usr/share/php     \
-            --mandir=/usr/share/man      \
-            --without-pear               \
-            --enable-fpm                 \
-            --with-fpm-user=apache       \
-            --with-fpm-group=apache      \
-            --with-config-file-path=/etc \
-            --with-zlib                  \
-            --enable-bcmath              \
-            --with-bz2                   \
-            --enable-calendar            \
-            --enable-dba=shared          \
-            --with-gdbm                  \
-            --with-gmp                   \
-            --enable-ftp                 \
-            --with-gettext               \
-            --enable-mbstring            \
-            --disable-mbregex            \
-            --with-readline              &amp;&amp;
-make</userinput></screen>
-
-<screen revision="systemd"><userinput>./configure --prefix=/usr                \
-            --sysconfdir=/etc            \
-            --localstatedir=/var         \
-            --datadir=/usr/share/php     \
-            --mandir=/usr/share/man      \
-            --enable-fpm                 \
-            --without-pear               \
-            --with-fpm-user=apache       \
-            --with-fpm-group=apache      \
-            --with-fpm-systemd           \
-            --with-config-file-path=/etc \
-            --with-zlib                  \
-            --enable-bcmath              \
-            --with-bz2                   \
-            --enable-calendar            \
-            --enable-dba=shared          \
-            --with-gdbm                  \
-            --with-gmp                   \
-            --enable-ftp                 \
-            --with-gettext               \
-            --enable-mbstring            \
-            --disable-mbregex            \
-            --with-readline              &amp;&amp;
-make</userinput></screen>
-    <para>
-      To test the results, issue: <command>make test</command>. Several
-      tests (out of over 18000) may fail, in which case you are asked
-      whether you want to send the report to the PHP developers. If you
-      want to automate the test, you may prefix the command with
-      <command>yes "n" | </command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<!-- dev note: make INSTALL_ROOT=<DESTDIR> install -->
-
-<screen role="root"><userinput>make install                                     &amp;&amp;
-install -v -m644 php.ini-production /etc/php.ini &amp;&amp;
-
-install -v -m755 -d /usr/share/doc/php-&php-version; &amp;&amp;
-install -v -m644    CODING_STANDARDS* EXTENSIONS NEWS README* UPGRADING* \
-                    /usr/share/doc/php-&php-version;</userinput></screen>
-
-    <para>
-      The default configuration files for the fastCGI process manager are
-      installed only if they do not already exist on the system. If this is
-      the first installation, they should be renamed, as the
-      <systemitem class='username'>root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>if [ -f /etc/php-fpm.conf.default ]; then
-  mv -v /etc/php-fpm.conf{.default,} &amp;&amp;
-  mv -v /etc/php-fpm.d/www.conf{.default,}
-fi</userinput></screen>
-
-    <para>
-      The pre-built HTML documentation is packaged in two forms: a tarball
-      containing many individual files, useful for quick loading into your
-      browser, and one large individual file, which is useful for using the
-      search utility of your browser. If you downloaded either, or both, of the
-      documentation files, issue the following commands as the
-      <systemitem class='username'>root</systemitem> user to install them (note
-      these instructions assume English docs, modify the tarball names below if
-      necessary).
-    </para>
-
-    <para>
-      For the <quote>Single HTML</quote> file:
-    </para>
-
-<screen role="root"><userinput>install -v -m644 ../php_manual_en.html.gz \
-    /usr/share/doc/php-&php-version; &amp;&amp;
-gunzip -v /usr/share/doc/php-&php-version;/php_manual_en.html.gz</userinput></screen>
-
-    <para>
-      For the <quote>Many HTML files</quote> tarball:
-    </para>
-
-<screen role="root"><userinput>tar -xvf ../php_manual_en.tar.gz \
-    -C /usr/share/doc/php-&php-version; --no-same-owner</userinput></screen>
-
-    <para>
-      The bundled pear is not installed because of a bug which might
-      pollute the filesystem with several hidden files and directories.
-      If pear is needed, execute the following commands to install it:
-    </para>
-
-<screen role="nodump"><userinput>wget https://pear.php.net/go-pear.phar
-php ./go-pear.phar</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-      <para>
-        <parameter>--datadir=/usr/share/php</parameter>: This works
-        around a bug in the build machinery, which installs some data to a
-        wrong location.
-      </para>
-
-      <para>
-        <parameter>--enable-fpm</parameter>: This parameter allows
-        building the fastCGI Process Manager.
-      </para>
-
-      <para revision="systemd">
-        <parameter>--with-fpm-systemd</parameter>: This parameter allows
-        the FastCGI Process Manager to integrate with systemd.
-      </para>
-
-      <para>
-        <parameter>--without-pear</parameter>: This switch disables
-        installation of bundled pear software.
-      </para>
-
-      <para>
-        <parameter>--with-config-file-path=/etc</parameter>: This parameter
-        makes <application>PHP</application> look for the
-        <filename>php.ini</filename> configuration file in
-        <filename class='directory'>/etc</filename>.
-      </para>
-
-      <para>
-        <parameter>--with-zlib</parameter>: This parameter adds
-        support for <application>Zlib</application> compression.
-      </para>
-
-      <para>
-        <parameter>--enable-bcmath</parameter>: Enables
-        <command>bc</command> style precision math functions.
-      </para>
-
-      <para>
-        <parameter>--with-bz2</parameter>: Adds support for
-        <application>Bzip2</application> compression functions.
-      </para>
-
-      <para>
-        <parameter>--enable-calendar</parameter>: This parameter
-        provides support for calendar conversion.
-      </para>
-
-      <para>
-        <parameter>--enable-dba=shared</parameter>: This parameter enables
-        support for database (dbm-style) abstraction layer functions.
-      </para>
-
-      <para>
-        <parameter>--enable-ftp</parameter>: This parameter
-        enables FTP functions.
-      </para>
-
-      <para>
-        <parameter>--with-gettext</parameter>: Enables functions
-        that use <application>Gettext</application> text translation.
-      </para>
-
-      <para>
-        <parameter>--enable-mbstring</parameter>: This parameter
-        enables multibyte string support.
-      </para>
-
-<!--
-      <para>
-        <parameter>- -disable-mbstring</parameter>: This parameter
-        disables multibyte string regular expression support.  It
-        requires the external
-        <ulink url="https://github.com/kkos/oniguruma">oniguruma</ulink>
-        library.
-      </para>
--->
-      <para>
-        <parameter>--with-readline</parameter>: This parameter
-        enables command line <application>Readline</application> support.
-      </para>
-
-      <para>
-        <option>--disable-libxml</option>: This option
-        allows building PHP without <application>libxml2</application>
-        installed.
-      </para>
-
-      <para>
-        <option>--with-apxs2</option>: Instead of building the fastCGI process
-        manager, it is possible to build an <application>apache</application>
-        module.  This has some performance penalty for heavy loaded servers,
-        but may be easier to set up. This switch is incompatible with the
-        <parameter>--enable-fpm</parameter> and
-        <parameter>--with-fpm-...</parameter> switches.
-      </para>
-
-      <para>
-        <option>--with-mysqli=shared</option>: This option includes MySQLi
-        support.
-      </para>
-
-      <para>
-        <option>--with-mysql-sock=/run/mysqld/mysqld.sock</option>: Location of
-        the MySQL unix socket pointer.
-      </para>
-
-      <para>
-        <option>--with-pdo-mysql=shared</option>: This option includes PDO:
-        MySQL support.
-      </para>
-
-      <para>
-        <option>--with-tidy=shared</option>: This option includes tidy library
-        support.
-      </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring PHP</title>
-
-    <sect3 id="php-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/php.ini</filename>,
-        <filename>/etc/pear.conf</filename>,
-        <filename>/etc/php-fpm.conf</filename>, and
-        <filename>/etc/php-fpm.d/www.conf</filename>
-      </para>
-
-      <indexterm zone="php php-config">
-        <primary sortas="e-etc-php.ini">/etc/php.ini</primary>
-      </indexterm>
-
-      <indexterm zone="php php-config">
-        <primary sortas="e-etc-pear.conf">/etc/pear.conf</primary>
-      </indexterm>
-
-      <indexterm zone="php php-config">
-        <primary sortas="e-etc-php-fpm.d-www.conf">
-        /etc/php-fpm.d/www.conf</primary>
-      </indexterm>
-
-      <indexterm zone="php php-config">
-        <primary sortas="e-etc-php-fpm.conf">/etc/php-fpm.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        The file used as the default <filename>/etc/php.ini</filename>
-        configuration file is recommended by the <application>PHP</application>
-        development team. This file modifies the default behavior of
-        <application>PHP</application>.  If no <filename>/etc/php.ini</filename>
-        is used, all configuration settings fall to the defaults. You should
-        review the comments in this file and ensure the changes are acceptable
-        in your particular environment.
-      </para>
-
-      <para>
-       The fastCGI process manager uses the configuration file
-       <filename>/etc/php-fpm.conf</filename>. The default file shipped with
-       PHP includes all the <filename>/etc/php-fpm.d/*.conf</filename> in turn.
-       There is a shipped <filename>/etc/php-fpm.d/www.conf</filename> file,
-       that contains the parameters related to the interaction with the Apache
-       Web server.
-      </para>
-
-      <para>
-        You may have noticed the following from the output of the
-        <command>make install</command> command:
-     </para>
-
-<screen><computeroutput>You may want to add: /usr/lib/php to your php.ini include_path</computeroutput></screen>
-
-      <para>
-        If desired, add the entry using the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>sed -i 's@php/includes"@&amp;\ninclude_path = ".:/usr/lib/php"@' \
-    /etc/php.ini</userinput></screen>
-
-      <para>
-        To enable fastCGI support in the <application>Apache</application>
-        web server, two LoadModule directives must be added to the
-        <filename>httpd.conf</filename> file. They are commented out, so just
-        issue the following command as
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>sed -i -e '/proxy_module/s/^#//'      \
-       -e '/proxy_fcgi_module/s/^#//' \
-       /etc/httpd/httpd.conf</userinput></screen>
-
-      <para>
-        Those modules accept various <command>ProxyPass</command>
-        directives. One possibility is (as the
-        <systemitem class="username">root</systemitem> user):
-      </para>
-
-<screen role="root"><userinput>echo \
-'ProxyPassMatch ^/(.*\.php)$ fcgi://127.0.0.1:9000/srv/www/$1' >> \
-/etc/httpd/httpd.conf</userinput></screen>
-
-      <para>
-        Additionally, it may be useful to add an entry for
-        <filename>index.php</filename> to the DirectoryIndex directive of the
-        <filename>httpd.conf</filename> file. Lastly, adding a line to set up the
-        <filename class='extension'>.phps</filename> extension to show
-        highlighted <application>PHP</application> source may be
-        desirable:
-      </para>
-
-<screen><literal>AddType application/x-httpd-php-source .phps</literal></screen>
-
-      <para>
-        You'll need to restart the <application>Apache</application> web server
-        after making any modifications to the <filename>httpd.conf</filename>
-        file.
-      </para>
-
-    </sect3>
-
-    <sect3  id="php-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para revision="sysv">
-        To automatically start the <command>php-fpm</command> daemon when the
-        system is rebooted, install the
-        <filename>/etc/rc.d/init.d/php</filename> bootscript from the
-        <xref linkend="bootscripts"/> package as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-      <para revision="systemd">
-        To start the <command>php-fpm</command> daemon at boot,
-        install the systemd unit from the <xref linkend="systemd-units"/>
-        package by running the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-
-      <indexterm zone="php php-init">
-        <primary sortas="f-php">php</primary>
-      </indexterm>
-
-<screen role="root" revision="sysv"><userinput>make install-php</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>make install-php-fpm</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg><!-- not built anymore pear, peardev, pecl,-->
-        phar (symlink), phar.phar, php,
-        php-cgi, php-config, php-fpm, phpdbg, and phpize</seg>
-
-        <seg>dba.so and opcache.so in
-        /usr/lib/php/extensions/no-debug-non-zts-20220829</seg>
-
-        <seg>/etc/php-fpm.d, /usr/{include,lib,share}/php, and
-        /usr/share/doc/php-&php-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="php-prog">
-        <term><command>php</command></term>
-        <listitem>
-          <para>
-            is a command line interface that enables you to parse and
-            execute PHP code
-          </para>
-          <indexterm zone="php php-prog">
-            <primary sortas="b-php">php</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pear">
-        <term><command>pear</command></term>
-        <listitem>
-          <para>
-            is the PHP Extension and Application Repository (PEAR) package
-            manager. This isn't installed by default
-          </para>
-          <indexterm zone="php pear">
-            <primary sortas="b-pear">pear</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="php-fpm">
-        <term><command>php-fpm</command></term>
-        <listitem>
-          <para>
-            is the fastCGI process manager for PHP
-          </para>
-          <indexterm zone="php php-fpm">
-            <primary sortas="b-php-fpm">php-fpm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="phpdbg">
-        <term><command>phpdbg</command></term>
-        <listitem>
-          <para>
-            is the interactive PHP debugger
-          </para>
-          <indexterm zone="php phpdbg">
-            <primary sortas="b-phpdbg">phpdbg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/prog/prog.xml
===================================================================
--- general/prog/prog.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ general/prog/prog.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,75 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
+<chapter id="general-prog">
+<?dbhtml filename="prog.html" dir="general"?>
+<title>Programming</title>
 
-<chapter id="general-prog">
-  <?dbhtml filename="prog.html" ?>
-
-  <title>Programming</title>
-
-  <para>
-    A base LFS system can be used as a development
-    platform, however the base system only includes language support for
-    <application>C</application>, <application>C++</application>,
-    <application>Perl</application>, and <application>Python</application>.
-    This chapter provides instructions to build many popular programming
-    environments to greatly expand your system's development capabilities.
-  </para>
-
-  <!--xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="autoconf213.xml"/-->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bazaar.xml"/> -->
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cbindgen.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clisp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cmake.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dejagnu.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="doxygen.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dtc.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expect.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcc.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcc-ada.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gdb.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="git.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gitserver.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="guile.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="librep.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="llvm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lua.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lua52.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mercurial.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nasm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="patchelf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="perl-modules.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="perl-deps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="php.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python3.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python311.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python-modules.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python-dependencies.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ruby.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rust.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="scons.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="slang.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="subversion.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="svnserver.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="swig.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysprof.xml"/>-->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tcl.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="unifdef.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vala.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="valgrind.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="yasm.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="other-tools.xml"/>-->
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dummy-java.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="java.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openjdk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ojdk-conf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apache-ant.xml"/>
+&python;
+&jdk;
 
 </chapter>
Index: general/prog/python-dependencies.xml
===================================================================
--- general/prog/python-dependencies.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,337 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="python-dependencies" xreflabel="Python Dependencies">
-  <?dbhtml filename="python-dependencies.html" ?>
-
-  <sect1info>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Python Dependencies</title>
-
-  <indexterm zone="python-dependencies">
-    <primary sortas="a-Python-Dependencies">Python Dependencies</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Python Dependencies</title>
-
-    <para>
-      Python modules listed in <xref linkend="python-modules"/> have
-      dependencies that are not referenced by other packages in BLFS.
-      These dependencies are listed here. They will not get updated on
-      regular basis, unless a more recent version is needed.
-    </para>
-
-    <important>
-      <para>
-        In BLFS, we normally build and install Python 3 modules with
-        <command>pip3</command>.  Please take care that the
-        <command>pip3 install</command> commands in the book should be
-        run as &root; unless it's for a Python virtual environment.  Running
-        <command>pip3 install</command> as a non-&root; user may seem to
-        work fine, but it will cause the installed module to be inaccessible by
-        other users.
-      </para>
-      <para>
-        <command>pip3 install</command> will not reinstall an already
-        installed module by default.  For using the
-        <command>pip3 install</command> command to upgrade a module (for
-        example, from meson-0.61.3 to meson-0.62.0), insert
-        <parameter>--upgrade</parameter> into the command line.  If it's really
-        necessary to downgrade a module or reinstall the same version for
-        some reason, insert <parameter>--force-reinstall</parameter> into
-        the command line.
-      </para>
-    </important>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          <xref linkend="alabaster"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="attrs"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="babel"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="certifi"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="chardet"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="charset-normalizer"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="commonmark"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="editables"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="hatchling"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="hatch-vcs"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="idna"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="imagesize"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="iniconfig"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="markdown"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="meson_python"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="msgpack"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pathspec"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pluggy"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="py"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pyproject-metadata"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pytz"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="setuptools_scm"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="smartypants"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="snowballstemmer"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="sc-applehelp"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="sc-devhelp"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="sc-htmlhelp"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="sc-jquery"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="sc-jsmath"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="sc-qthelp"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="sc-serializinghtml"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="typing_extensions"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="typogrify"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="urllib3"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="webencodings"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/alabaster.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/attrs.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/Babel.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/certifi.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/chardet.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/charset-normalizer.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/commonmark.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/editables.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/hatchling.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/hatch-vcs.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/idna.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/imagesize.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/iniconfig.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/markdown.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/meson_python.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/msgpack.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/pathspec.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/pluggy.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/py.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/pyproject-metadata.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/pytz.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/setuptools_scm.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/smartypants.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/snowballstemmer.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/sphinxcontrib-applehelp.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/sphinxcontrib-devhelp.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/sphinxcontrib-htmlhelp.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/sphinxcontrib-jquery.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/sphinxcontrib-jsmath.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/sphinxcontrib-qthelp.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/sphinxcontrib-serializinghtml.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/typing_extensions.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/typogrify.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/urllib3.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/webencodings.xml"/>
-
-</sect1>
Index: general/prog/python-dependencies/Babel.xml
===================================================================
--- general/prog/python-dependencies/Babel.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,160 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 babel-download-http "https://files.pythonhosted.org/packages/source/B/Babel/Babel-&babel-version;.tar.gz">
-  <!ENTITY babel-download-ftp  " ">
-  <!ENTITY babel-md5sum        "&babel-md5sum;">
-  <!ENTITY babel-size          "8.9 MB">
-  <!ENTITY babel-buildsize     "103 MB (add 30 MB for tests)">
-  <!ENTITY babel-time          "less than 0.1 SBU (0.1 SBU for tests)">
-]>
-
-  <sect2 id="babel" xreflabel="Babel-&babel-version;">
-
-    <title>Babel-&babel-version;</title>
-
-    <indexterm zone="babel">
-      <primary sortas="a-Babel">Babel</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Babel Module</title>
-
-      <para>
-        The <application>Babel</application> package is an integrated
-        collection of utilities that assist in internationalizing and
-        localizing Python applications, with an emphasis on web-based
-        applications.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&babel-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&babel-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &babel-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &babel-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &babel-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &babel-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Babel Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="pytz"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>,
-        <xref linkend="python3"/> (with the sqlite module),
-        <ulink url="https://pypi.org/project/freezegun/">freezegun</ulink>==0.3.12, and
-        <ulink url="https://pypi.org/project/pytest-cov/">pytest-cov</ulink>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Babel</title>
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; Babel</userinput></screen>
-
-    <para>
-      Assuming <xref linkend="pytest"/> is installed, but the other optional
-      dependencies are not, the installation can be tested with the following
-      commands:
-    </para>
-
-<screen remap="test"><userinput>python3 -m venv --system-site-packages testenv &amp;&amp;
-source testenv/bin/activate                    &amp;&amp;
-pip3 install pytest-cov freezegun==0.3.12      &amp;&amp;
-python3 /usr/bin/pytest<!-- no && because of the error -->
-deactivate</userinput></screen>
-<!--
-    <para>
-      One test involving zh_TW locale is known to fail.
-    </para>
-    -->
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            pybabel
-          </seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/babel and
-            /usr/lib/python&python3-majorver;/site-packages/Babel-&babel-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect5">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="pybabel">
-          <term><command>pybabel</command></term>
-          <listitem>
-            <para>
-              is a command-line interface for working with message
-              catalogs
-            </para>
-            <indexterm zone="babel pybabel">
-              <primary sortas="b-pybabel">pybabel</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-dependencies/alabaster.xml
===================================================================
--- general/prog/python-dependencies/alabaster.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,112 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 alabaster-download-http "https://files.pythonhosted.org/packages/source/a/alabaster/alabaster-&alabaster-version;.tar.gz">
-  <!ENTITY alabaster-download-ftp  " ">
-  <!ENTITY alabaster-md5sum        "&alabaster-md5sum;">
-  <!ENTITY alabaster-size          "11 KB">
-  <!ENTITY alabaster-buildsize     "360 KB">
-  <!ENTITY alabaster-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="alabaster" xreflabel="alabaster-&alabaster-version;">
-
-    <title>Alabaster-&alabaster-version;</title>
-
-    <indexterm zone="alabaster">
-      <primary sortas="a-alabaster">alabaster</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Alabaster Module</title>
-
-      <para>
-        The <application>Alabaster</application> package is a theme for
-        the <application>sphinx</application> documentation system. Although
-        developed separately, it is the default theme for sphinx.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&alabaster-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&alabaster-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &alabaster-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &alabaster-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &alabaster-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &alabaster-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Alabaster</title>
-
-    <para>Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; alabaster</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/alabaster and
-            /usr/lib/python&python3-majorver;/site-packages/alabaster-&alabaster-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-dependencies/attrs.xml
===================================================================
--- general/prog/python-dependencies/attrs.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,131 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 attrs-download-http "https://files.pythonhosted.org/packages/source/a/attrs/attrs-&attrs-version;.tar.gz">
-  <!ENTITY attrs-download-ftp  " ">
-  <!ENTITY attrs-md5sum        "eff16b3bbd0d9b72e118cca83a19d380">
-  <!ENTITY attrs-size          "211 KB">
-  <!ENTITY attrs-buildsize     "2 MB (add 53 MB for tests)">
-  <!ENTITY attrs-time          "less than 0.1 SBU (0.2 SBU for tests)">
-]>
-
-  <sect2 id="attrs" xreflabel="attrs-&attrs-version;">
-
-    <title>Attrs-&attrs-version;</title>
-
-    <indexterm zone="attrs">
-      <primary sortas="a-attrs">attrs</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Attrs Module</title>
-
-      <para>
-        The <application>Attrs</application> package is a theme for
-        the <application>sphinx</application> documentation system. Although
-        developed separately, it is the default theme for sphinx.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&attrs-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&attrs-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &attrs-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &attrs-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &attrs-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &attrs-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>,
-        <ulink url="https://pypi.org/project/coverage/">coverage[toml]</ulink>,
-        <ulink url="https://pypi.org/project/hypothesis/">hypothesis</ulink>,
-        <ulink url="https://pypi.org/project/Pympler/">Pympler</ulink>,
-        <ulink url="https://pypi.org/project/mypy/">mypy</ulink>,
-        <ulink url="https://pypi.org/project/pytest-mypy-plugins/">pytest-mypy-plugins</ulink>,
-        <ulink url="https://pypi.org/project/zope.interface/">zope.interface</ulink>, and
-        <ulink url="https://pypi.org/project/cloudpickle/">cloudpickle</ulink>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Attrs</title>
-
-    <para>Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; attrs</userinput></screen>
-
-    <para>
-      To test the installation, run:
-    </para>
-
-<screen remap="test"><userinput>python3 -m venv --system-site-packages testenv &amp;&amp;
-source testenv/bin/activate                    &amp;&amp;
-pip3 install attrs[tests]                      &amp;&amp;
-python3 /usr/bin/pytest                        &amp;&amp;
-deactivate</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/attr,
-            /usr/lib/python&python3-majorver;/site-packages/attrs, and
-            /usr/lib/python&python3-majorver;/site-packages/attrs-&attrs-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-dependencies/certifi.xml
===================================================================
--- general/prog/python-dependencies/certifi.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,109 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 certifi-download-http "https://files.pythonhosted.org/packages/source/c/certifi/certifi-&certifi-version;.tar.gz">
-  <!ENTITY certifi-download-ftp  " ">
-  <!ENTITY certifi-md5sum        "&certifi-md5sum;">
-  <!ENTITY certifi-size          "164 KB">
-  <!ENTITY certifi-buildsize     "844 KB">
-  <!ENTITY certifi-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="certifi" xreflabel="certifi-&certifi-version;">
-
-    <title>certifi-&certifi-version;</title>
-
-    <indexterm zone="certifi">
-      <primary sortas="a-certifi">certifi</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Certifi Module</title>
-
-      <para>
-        The <application>certifi</application> module provides Mozilla’s 
-        carefully curated collection of Root Certificates for validating 
-        the trustworthiness of SSL certificates while verifying the 
-        identity of TLS hosts. 
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&certifi-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&certifi-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &certifi-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &certifi-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &certifi-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &certifi-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of certifi</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; certifi</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/certifi and
-            /usr/lib/python&python3-majorver;/site-packages/certifi-&certifi-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-dependencies/chardet.xml
===================================================================
--- general/prog/python-dependencies/chardet.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,136 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 chardet-download-http "https://files.pythonhosted.org/packages/source/c/chardet/chardet-&chardet-version;.tar.gz">
-  <!ENTITY chardet-download-ftp  " ">
-  <!ENTITY chardet-md5sum        "&chardet-md5sum;">
-  <!ENTITY chardet-size          "2 MB">
-  <!ENTITY chardet-buildsize     "13 MB (add 1.1 MB for tests)">
-  <!ENTITY chardet-time          "less than 0.1 SBU (0.3 SBU for tests)">
-]>
-
-  <sect2 id="chardet" xreflabel="chardet-&chardet-version;">
-
-    <title>Chardet-&chardet-version;</title>
-
-    <indexterm zone="chardet">
-      <primary sortas="a-chardet">chardet</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to chardet Module</title>
-
-      <para>
-        <application>Chardet</application> is a universal character
-        encoding detector.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&chardet-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&chardet-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &chardet-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &chardet-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &chardet-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &chardet-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Chardet Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Chardet</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; chardet</userinput></screen>
-
-    <para>
-      To test the installation issue <command>pytest</command>.
-    </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>chardetect</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/chardet and
-            /usr/lib/python&python3-majorver;/site-packages/chardet-&chardet-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect5">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="chardetect">
-          <term><command>chardetect</command></term>
-          <listitem>
-            <para>
-              is a Universal Character Encoding Detector
-            </para>
-            <indexterm zone="chardet chardetect">
-              <primary sortas="b-chardetect">chardetect</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-    </sect3>
-
-  </sect2>
Index: general/prog/python-dependencies/charset-normalizer.xml
===================================================================
--- general/prog/python-dependencies/charset-normalizer.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 charset-normalizer-download-http "https://files.pythonhosted.org/packages/source/c/charset-normalizer/charset-normalizer-&charset-normalizer-version;.tar.gz">
-  <!ENTITY charset-normalizer-download-ftp  " ">
-  <!ENTITY charset-normalizer-md5sum        "&charset-normalizer-md5sum;">
-  <!ENTITY charset-normalizer-size          "91 KB">
-  <!ENTITY charset-normalizer-buildsize     "1.1 MB (add 27 MB for tests)">
-  <!ENTITY charset-normalizer-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <sect2 id="charset-normalizer" xreflabel="charset-normalizer-&charset-normalizer-version;">
-
-    <title>Charset-normalizer-&charset-normalizer-version;</title>
-
-    <indexterm zone="charset-normalizer">
-      <primary sortas="a-charset-normalizer">charset-normalizer</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to charset-normalizer Module</title>
-
-      <para>
-        The <application>charset-normalizer</application> library helps
-        reading text from an unknown character encoding.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&charset-normalizer-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&charset-normalizer-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &charset-normalizer-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &charset-normalizer-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &charset-normalizer-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &charset-normalizer-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Charset-normalizer Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>,
-        <xref linkend="python3"/> (rebuilt after installing
-          <xref role="nodep" linkend="sqlite"/>), and
-        <ulink url="https://pypi.org/project/pytest-cov/">pytest-cov</ulink>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Charset-normalizer</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; charset-normalizer</userinput></screen>
-
-    <para>
-      Assuming <xref linkend="pytest"/> is installed, but the other optional
-      dependencies are not, the installation can be tested with the following
-      commands:
-    </para>
-
-<screen remap="test"><userinput>python3 -m venv --system-site-packages testenv &amp;&amp;
-source testenv/bin/activate                    &amp;&amp;
-pip3 install pytest-cov                        &amp;&amp;
-python3 /usr/bin/pytest<!-- no && because of a possible error -->
-deactivate</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>normalizer</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/charset_normalizer and
-            /usr/lib/python&python3-majorver;/site-packages/charset_normalizer-&charset-normalizer-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect5">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="normalizer">
-          <term><command>normalizer</command></term>
-          <listitem>
-            <para>
-              is a Universal Charset Detector (discovers originating encoding
-              and normalizes text to unicode)
-            </para>
-            <indexterm zone="charset-normalizer normalizer">
-              <primary sortas="b-normalizer">normalizer</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-    </sect3>
-
-  </sect2>
Index: general/prog/python-dependencies/commonmark.xml
===================================================================
--- general/prog/python-dependencies/commonmark.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 commonmark-download-http "https://files.pythonhosted.org/packages/source/c/commonmark/commonmark-&commonmark-version;.tar.gz">
-  <!ENTITY commonmark-download-ftp  " ">
-  <!ENTITY commonmark-md5sum        "&commonmark-md5sum;">
-  <!ENTITY commonmark-size          "94 KB">
-  <!ENTITY commonmark-buildsize     "1.3 MB (add 30 MB for tests)">
-  <!ENTITY commonmark-time          "less than 0.1 SBU (0.1 SBU for tests)">
-]>
-
-  <sect2 id="commonmark" xreflabel="commonmark-&commonmark-version;">
-
-    <title>Commonmark-&commonmark-version;</title>
-
-    <indexterm zone="commonmark">
-      <primary sortas="a-commonmark">commonmark</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Commonmark Module</title>
-
-      <para>
-        <application>Commonmark</application> Python parser for the CommonMark
-        Markdown specification.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&commonmark-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&commonmark-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &commonmark-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &commonmark-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &commonmark-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &commonmark-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Commonmark Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>,
-        <ulink url="https://pypi.org/project/flake8/">flake8</ulink>, and
-        <ulink url="https://pypi.org/project/hypothesis/">hypothesis</ulink>
-      </para>
-
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Commonmark</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; commonmark</userinput></screen>
-
-    <para>
-      Assuming <xref linkend="pytest"/> is installed and the other optional
-      dependency is not, the installation can be tested with:
-    </para>
-
-<screen remap="test"><userinput>python3 -m venv --system-site-packages testenv &amp;&amp;
-source testenv/bin/activate                    &amp;&amp;
-pip3 install hypothesis                        &amp;&amp;
-python3 /usr/bin/pytest commonmark/tests/unit_tests.py<!-- no && because of a possible error -->
-python3 commonmark/tests/run_spec_tests.py
-deactivate</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>cmark</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/commonmark and
-            /usr/lib/python&python3-majorver;/site-packages/commonmark-&commonmark-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="cmark">
-          <term><command>cmark</command></term>
-          <listitem>
-            <para>
-              processes Markdown according to the CommonMark specification
-            </para>
-            <indexterm zone="commonmark cmark">
-              <primary sortas="b-cmark">cmark</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-dependencies/editables.xml
===================================================================
--- general/prog/python-dependencies/editables.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,111 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 editables-download-http "https://files.pythonhosted.org/packages/source/e/editables/editables-&editables-version;.tar.gz">
-  <!ENTITY editables-download-ftp  " ">
-  <!ENTITY editables-md5sum        "&editables-md5sum;">
-  <!ENTITY editables-size          "4.6 KB">
-  <!ENTITY editables-buildsize     "180 KB">
-  <!ENTITY editables-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="editables" xreflabel="editables-&editables-version;">
-
-    <title>Editables-&editables-version;</title>
-
-    <indexterm zone="editables">
-      <primary sortas="a-editables">editables</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Editables Module</title>
-
-      <para>
-        <application>Editables</application> is python library for creating
-        <quote>editable wheels</quote>.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&editables-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&editables-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &editables-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &editables-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &editables-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &editables-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Editables</title>
-
-    <para>Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; editables</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/editables and
-            /usr/lib/python&python3-majorver;/site-packages/editables-&editables-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-dependencies/hatch-vcs.xml
===================================================================
--- general/prog/python-dependencies/hatch-vcs.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,126 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 hatch-vcs-download-http "https://files.pythonhosted.org/packages/source/h/hatch-vcs/hatch_vcs-&hatch-vcs-version;.tar.gz">
-  <!ENTITY hatch-vcs-download-ftp  " ">
-  <!ENTITY hatch-vcs-md5sum        "&hatch-vcs-md5sum;">
-  <!ENTITY hatch-vcs-size          "9.9 KB">
-  <!ENTITY hatch-vcs-buildsize     "436 KB (with tests)">
-  <!ENTITY hatch-vcs-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <sect2 id="hatch-vcs" xreflabel="hatch_vcs-&hatch-vcs-version;">
-
-    <title>Hatch_vcs-&hatch-vcs-version;</title>
-
-    <indexterm zone="hatch-vcs">
-      <primary sortas="a-hatch_vcs">hatch_vcs</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Hatch-vcs Module</title>
-
-      <para>
-        <application>Hatch_vcs</application> is a Hatch plugin for versioning
-        with several <xref linkend="gVCS"/>.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&hatch-vcs-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&hatch-vcs-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &hatch-vcs-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &hatch-vcs-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &hatch-vcs-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &hatch-vcs-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Hatch_vcs Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="hatchling"/> and
-        <xref linkend="setuptools_scm"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Hatch_vcs</title>
-
-      <para>Build the module: </para>
-
-&build-wheel;
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; hatch_vcs</userinput></screen>
-
-      <para>
-        To test the installation, issue <command>pytest</command>. One test,
-        <application>tests/test_build.py::test_write</application>, is known
-        to fail.
-      </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/hatch_vcs and
-            /usr/lib/python&python3-majorver;/site-packages/hatch_vcs-&hatch-vcs-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-dependencies/hatchling.xml
===================================================================
--- general/prog/python-dependencies/hatchling.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,144 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 hatchling-download-http "https://files.pythonhosted.org/packages/source/h/hatchling/hatchling-&hatchling-version;.tar.gz">
-  <!ENTITY hatchling-download-ftp  " ">
-  <!ENTITY hatchling-md5sum        "&hatchling-md5sum;">
-  <!ENTITY hatchling-size          "60 KB">
-  <!ENTITY hatchling-buildsize     "2.3 MB">
-  <!ENTITY hatchling-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="hatchling" xreflabel="hatchling-&hatchling-version;">
-
-    <title>Hatchling-&hatchling-version;</title>
-
-    <indexterm zone="hatchling">
-      <primary sortas="a-hatchling">hatchling</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Hatchling Module</title>
-
-      <para>
-        <application>Hatchling</application> is an extensible, standards
-        compliant build backend for python modules.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&hatchling-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&hatchling-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &hatchling-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &hatchling-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &hatchling-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &hatchling-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Hatchling Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="editables"/>,
-        <xref linkend="packaging"/>,
-        <xref linkend="pathspec"/>, and
-        <xref linkend="pluggy"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Hatchling</title>
-
-    <para>Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      This package does not come with a working test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; hatchling</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>hatchling</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/hatchling and
-            /usr/lib/python&python3-majorver;/site-packages/hatchling-&hatchling-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-      <!-- If the program or library name conflicts with (is the same as) the
-      package name, add -prog or -lib to the varlistentry entity id
-      and the 2nd entry of the indexterm zone entity -->
-
-        <varlistentry id="hatchling-prog">
-          <term><command>hatchling</command></term>
-          <listitem>
-            <para>
-              is a python module builder
-            </para>
-            <indexterm zone="hatchling hatchling-prog">
-              <primary sortas="b-hatchling">hatchling</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-dependencies/idna.xml
===================================================================
--- general/prog/python-dependencies/idna.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,119 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 idna-download-http "https://files.pythonhosted.org/packages/source/i/idna/idna-&idna-version;.tar.gz">
-  <!ENTITY idna-download-ftp  " ">
-  <!ENTITY idna-md5sum        "&idna-md5sum;">
-  <!ENTITY idna-size          "179 KB">
-  <!ENTITY idna-buildsize     "2.1 MB (with test)">
-  <!ENTITY idna-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <sect2 id="idna" xreflabel="idna-&idna-version;">
-
-    <title>Idna-&idna-version;</title>
-
-    <indexterm zone="idna">
-      <primary sortas="a-idna">idna</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Idna Module</title>
-
-      <para>
-        The <application>Idna</application> module provides support
-        for the Internationalized Domain Names in Applications (IDNA) protocol
-        as specified in RFC 5891.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&idna-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&idna-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &idna-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &idna-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &idna-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &idna-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Idna Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Idna</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; idna</userinput></screen>
-
-    <para>
-      To test the installation, run <command>pytest</command>.
-    </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/idna and
-            /usr/lib/python&python3-majorver;/site-packages/idna-&idna-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-dependencies/imagesize.xml
===================================================================
--- general/prog/python-dependencies/imagesize.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,121 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 imagesize-download-http "https://files.pythonhosted.org/packages/source/i/imagesize/imagesize-&imagesize-version;.tar.gz">
-  <!ENTITY imagesize-download-ftp  " ">
-  <!ENTITY imagesize-md5sum        "&imagesize-md5sum;">
-  <!ENTITY imagesize-size          "1.2 MB">
-  <!ENTITY imagesize-buildsize     "1.8 MB (with tests)">
-  <!ENTITY imagesize-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <sect2 id="imagesize" xreflabel="imagesize-&imagesize-version;">
-
-    <title>Imagesize-&imagesize-version;</title>
-
-    <indexterm zone="imagesize">
-      <primary sortas="a-imagesize">imagesize</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Imagesize Module</title>
-
-      <para>
-        The <application>imagesize</application> package analyzes image file
-        headers and returns the image size and DPI. It works with
-        JPEG/JPEG 2000/PNG/GIF/TIFF/SVG/Netpbm/WebP formats.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&imagesize-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&imagesize-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &imagesize-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &imagesize-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &imagesize-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &imagesize-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Imagesize Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/> and
-        <xref linkend="requests"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Imagesize</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; imagesize</userinput></screen>
-
-    <para>
-      The tests for this package are known to be broken.
-      To test the installation anyway, run <command>pytest</command>.
-    </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/imagesize and
-            /usr/lib/python&python3-majorver;/site-packages/imagesize-&imagesize-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-dependencies/iniconfig.xml
===================================================================
--- general/prog/python-dependencies/iniconfig.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,123 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 iniconfig-download-http "https://files.pythonhosted.org/packages/source/i/iniconfig/iniconfig-&iniconfig-version;.tar.gz">
-  <!ENTITY iniconfig-download-ftp  " ">
-  <!ENTITY iniconfig-md5sum        "&iniconfig-md5sum;">
-  <!ENTITY iniconfig-size          "4.5 KB">
-  <!ENTITY iniconfig-buildsize     "168 KB">
-  <!ENTITY iniconfig-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="iniconfig" xreflabel="iniconfig-&iniconfig-version;">
-
-    <title>Iniconfig-&iniconfig-version;</title>
-
-    <indexterm zone="iniconfig">
-      <primary sortas="a-iniconfig">iniconfig</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Iniconfig Module</title>
-
-      <para>
-        <application>Iniconfig</application> is a small and simple
-        INI-file parser module.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&iniconfig-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&iniconfig-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &iniconfig-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &iniconfig-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &iniconfig-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &iniconfig-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Iniconfig Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="hatch-vcs"/>
-      </para>
-      <!-- No test in 2.0.0
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>
-      </para>
-      -->
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Iniconfig</title>
-
-    <para>Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; iniconfig</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/iniconfig and
-            /usr/lib/python&python3-majorver;/site-packages/iniconfig-&iniconfig-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-dependencies/markdown.xml
===================================================================
--- general/prog/python-dependencies/markdown.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 markdown-download-http "https://files.pythonhosted.org/packages/source/M/Markdown/Markdown-&markdown-version;.tar.gz">
-  <!ENTITY markdown-download-ftp  " ">
-  <!ENTITY markdown-md5sum        "&markdown-md5sum;">
-  <!ENTITY markdown-size          "315 KB">
-  <!ENTITY markdown-buildsize     "4.1 MB (add 27 MB for tests)">
-  <!ENTITY markdown-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <sect2 id="markdown" xreflabel="Markdown-&markdown-version;">
-
-    <title>Markdown-&markdown-version;</title>
-
-    <indexterm zone="markdown">
-      <primary sortas="a-Markdown">Markdown</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Markdown Module</title>
-
-      <para>
-        <application>Markdown</application> is a Python parser for
-        John Gruber's Markdown specification.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&markdown-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&markdown-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &markdown-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &markdown-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &markdown-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &markdown-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Markdown Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>,
-        <xref linkend="PyYAML"/>, and
-        <ulink url="https://pypi.org/project/coverage/">coverage</ulink>
-      </para>
-
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Markdown</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; Markdown</userinput></screen>
-
-    <para>
-      Assuming <xref linkend="pytest"/> and <xref linkend="PyYAML"/> are
-      installed and the other optional dependency is not, the installation
-      can be tested with:
-    </para>
-
-<screen remap="test"><userinput>python3 -m venv --system-site-packages testenv &amp;&amp;
-source testenv/bin/activate                    &amp;&amp;
-pip3 install coverage                          &amp;&amp;
-python3 /usr/bin/pytest --ignore=tests/test_syntax/extensions/test_md_in_html.py<!-- no && because of a possible error -->
-deactivate</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>markdown_py</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/markdown and
-            /usr/lib/python&python3-majorver;/site-packages/Markdown-&markdown-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="markdown_py">
-          <term><command>markdown_py</command></term>
-          <listitem>
-            <para>
-              converts markdown files to (x)html
-            </para>
-            <indexterm zone="markdown markdown_py">
-              <primary sortas="b-markdown_py">markdown_py</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-dependencies/meson_python.xml
===================================================================
--- general/prog/python-dependencies/meson_python.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,122 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 meson_python-download-http "https://files.pythonhosted.org/packages/source/m/meson_python/meson_python-&meson_python-version;.tar.gz">
-  <!ENTITY meson_python-download-ftp  " ">
-  <!ENTITY meson_python-md5sum        "&meson_python-md5sum;">
-  <!ENTITY meson_python-size          "80 KB">
-  <!ENTITY meson_python-buildsize     "1.3 MB">
-  <!ENTITY meson_python-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="meson_python" xreflabel="meson_python-&meson_python-version;">
-
-    <title>Meson_python-&meson_python-version;</title>
-
-    <indexterm zone="meson_python">
-      <primary sortas="a-meson_python">meson_python</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Meson_python Module</title>
-
-      <para>
-        The <application>Meson_python</application> module contains
-        a Python build backend (PEP 517) for Meson projects.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&meson_python-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&meson_python-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &meson_python-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &meson_python-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &meson_python-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &meson_python-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Meson_python Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="pyproject-metadata"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended (Runtime)</bridgehead>
-      <para role="runtime">
-        <xref linkend="patchelf"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Meson_python</title>
-
-    <para>Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; meson_python</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/meson_python and
-            /usr/lib/python&python3-majorver;/site-packages/meson_python-&meson_python-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-dependencies/msgpack.xml
===================================================================
--- general/prog/python-dependencies/msgpack.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,126 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 msgpack-download-http "https://files.pythonhosted.org/packages/source/m/msgpack/msgpack-&msgpack-version;.tar.gz">
-  <!ENTITY msgpack-download-ftp  " ">
-  <!ENTITY msgpack-md5sum        "&msgpack-md5sum;">
-  <!ENTITY msgpack-size          "126 KB">
-  <!ENTITY msgpack-buildsize     "1.9 MB (add 0.3 MB for tests)">
-  <!ENTITY msgpack-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="msgpack" xreflabel="msgpack-&msgpack-version;">
-
-    <title>Msgpack-&msgpack-version;</title>
-
-    <indexterm zone="msgpack">
-      <primary sortas="a-msgpack">msgpack</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Msgpack Module</title>
-
-      <para>
-        <application>Msgpack</application> is an efficient binary
-        serialization format. It lets you exchange data among multiple
-        languages like JSON. But it's faster and smaller. This package
-        provides CPython bindings for reading and writing Msgpack data.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&msgpack-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&msgpack-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &msgpack-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &msgpack-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &msgpack-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &msgpack-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Msgpack Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="cython"/> and
-        <xref linkend="setuptools_scm"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Msgpack</title>
-
-      <para> Build the module: </para>
-
-&build-wheel;
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; msgpack</userinput></screen>
-
-      <para>
-        To test the installation issue <command>pytest</command>.
-      </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/msgpack-&msgpack-version;.dist-info and
-            /usr/lib/python&python3-majorver;/site-packages/msgpack
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-dependencies/pathspec.xml
===================================================================
--- general/prog/python-dependencies/pathspec.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,118 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 pathspec-download-http "https://files.pythonhosted.org/packages/source/p/pathspec/pathspec-&pathspec-version;.tar.gz">
-  <!ENTITY pathspec-download-ftp  " ">
-  <!ENTITY pathspec-md5sum        "&pathspec-md5sum;">
-  <!ENTITY pathspec-size          "45 KB">
-  <!ENTITY pathspec-buildsize     "912 KB (with tests)">
-  <!ENTITY pathspec-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <sect2 id="pathspec" xreflabel="pathspec-&pathspec-version;">
-
-    <title>Pathspec-&pathspec-version;</title>
-
-    <indexterm zone="pathspec">
-      <primary sortas="a-pathspec">pathspec</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Pathspec Module</title>
-
-      <para>
-        <application>Pathspec</application> is a utility library for pattern
-        matching of file paths.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pathspec-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pathspec-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pathspec-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pathspec-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pathspec-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pathspec-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Pathspec Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Pathspec</title>
-
-    <para>Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; pathspec</userinput></screen>
-
-    <para>
-      To test the installation, issue <command>pytest</command>.
-    </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/pathspec and
-            /usr/lib/python&python3-majorver;/site-packages/pathspec-&pathspec-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-dependencies/pluggy.xml
===================================================================
--- general/prog/python-dependencies/pluggy.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,136 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 pluggy-download-http "https://files.pythonhosted.org/packages/source/p/pluggy/pluggy-&pluggy-version;.tar.gz">
-  <!ENTITY pluggy-download-ftp  " ">
-  <!ENTITY pluggy-md5sum        "&pluggy-md5sum;">
-  <!ENTITY pluggy-size          "68 KB">
-  <!ENTITY pluggy-buildsize     "588 KB (add 18 MB for tests)">
-  <!ENTITY pluggy-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <sect2 id="pluggy" xreflabel="pluggy-&pluggy-version;">
-
-    <title>Pluggy-&pluggy-version;</title>
-
-    <indexterm zone="pluggy">
-      <primary sortas="a-pluggy">pluggy</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Pluggy Module</title>
-
-      <para>
-        The <application>Pluggy</application> package gives users the ability
-        to extend or modify the behaviour of a host program by installing a
-        plugin for that program. The plugin code will run as part of normal
-        program execution, changing or enhancing certain aspects of it. In
-        essence, <application>pluggy</application> enables function hooking
-        so a user can build <quote>pluggable</quote> systems.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pluggy-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pluggy-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pluggy-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pluggy-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pluggy-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pluggy-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Pluggy Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended</bridgehead>
-      <para role="recommended">
-        <xref linkend="setuptools_scm"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/> and
-        <ulink url="https://pypi.org/project/pytest-benchmark/">pytest-benchmark</ulink>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Pluggy</title>
-
-    <para>Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; pluggy</userinput></screen>
-
-    <para>
-      Assuming <xref linkend="pytest"/> is installed, but the other optional
-      dependencies are not, the installation can be tested with the following
-      commands:
-    </para>
-
-<screen remap="test"><userinput>python3 -m venv --system-site-packages testenv &amp;&amp;
-source testenv/bin/activate                    &amp;&amp;
-pip3 install pytest-benchmark                  &amp;&amp;
-python3 /usr/bin/pytest<!-- no && in case there is an error -->
-deactivate</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/pluggy and
-            /usr/lib/python&python3-majorver;/site-packages/pluggy-&pluggy-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-dependencies/py.xml
===================================================================
--- general/prog/python-dependencies/py.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,122 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 py-download-http "https://files.pythonhosted.org/packages/source/p/py/py-&py-version;.tar.gz">
-  <!ENTITY py-download-ftp  " ">
-  <!ENTITY py-md5sum        "&py-md5sum;">
-  <!ENTITY py-size          "203 KB">
-  <!ENTITY py-buildsize     "2.8 MB">
-  <!ENTITY py-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="py" xreflabel="py-&py-version;">
-
-    <title>Py-&py-version;</title>
-
-    <indexterm zone="py">
-      <primary sortas="a-py">py</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Py Module</title>
-
-      <para>
-        The <application>Py</application> library is a Python development
-        support library used in <application>Pytest</application>. It is
-        deprecated and should be removed at some point in time, but part of
-        it is still used in <application>Pytest</application>.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&py-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&py-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &py-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &py-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &py-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &py-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Py Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended</bridgehead>
-      <para role="recommended">
-        <xref linkend="setuptools_scm"/>
-      </para>
-
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Py</title>
-
-    <para>Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; py</userinput></screen>
-
-    <para>
-      Due to the deprecation of this package, the test suite is not maintained
-      and cannot be run.
-    </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/py and
-            /usr/lib/python&python3-majorver;/site-packages/py-&py-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-dependencies/pyproject-metadata.xml
===================================================================
--- general/prog/python-dependencies/pyproject-metadata.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,119 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 pyproject-metadata-download-http "https://files.pythonhosted.org/packages/source/p/pyproject-metadata/pyproject-metadata-&pyproject-metadata-version;.tar.gz">
-  <!ENTITY pyproject-metadata-download-ftp  " ">
-  <!ENTITY pyproject-metadata-md5sum        "&pyproject-metadata-md5sum;">
-  <!ENTITY pyproject-metadata-size          "8 KB">
-  <!ENTITY pyproject-metadata-buildsize     "124 KB">
-  <!ENTITY pyproject-metadata-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="pyproject-metadata" xreflabel="pyproject-metadata-&pyproject-metadata-version;">
-
-    <title>Pyproject-Metadata-&pyproject-metadata-version;</title>
-
-    <indexterm zone="pyproject-metadata">
-      <primary sortas="a-pyproject-metadata">pyproject-metadata</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Pyproject-Metadata Module</title>
-
-      <para>
-        The <application>Pyproject-Metadata</application> module contains
-        a data class for PEP 621 metadata with support for
-        <quote>core metadata</quote> (PEP 643) generation.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pyproject-metadata-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pyproject-metadata-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pyproject-metadata-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pyproject-metadata-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pyproject-metadata-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pyproject-metadata-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Pyproject-Metadata Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="packaging"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Pyproject-Metadata</title>
-
-    <para>Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; pyproject-metadata</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/pyproject_metadata and
-            /usr/lib/python&python3-majorver;/site-packages/pyproject_metadata-&pyproject-metadata-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-dependencies/pytz.xml
===================================================================
--- general/prog/python-dependencies/pytz.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,122 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 pytz-download-http "https://files.pythonhosted.org/packages/source/p/pytz/pytz-&pytz-version;.tar.gz">
-  <!ENTITY pytz-download-ftp  " ">
-  <!ENTITY pytz-md5sum        "&pytz-md5sum;">
-  <!ENTITY pytz-size          "312 KB">
-  <!ENTITY pytz-buildsize     "6.1 MB (with tests)">
-  <!ENTITY pytz-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <sect2 id="pytz" xreflabel="pytz-&pytz-version;">
-
-    <title>Pytz-&pytz-version;</title>
-
-    <indexterm zone="pytz">
-      <primary sortas="a-pytz">pytz</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Pytz Module</title>
-
-      <para>
-        The <application>Pytz</application> library brings the IANA tz database
-        into Python. It allows accurate and cross-platform timezone
-        calculations.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pytz-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pytz-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pytz-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pytz-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pytz-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pytz-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Pytz dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Pytz</title>
-
-      <para>
-        Build the module:
-      </para>
-
-&build-wheel;
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; pytz</userinput></screen>
-
-      <para>
-        To test the installation, run <command>pytest</command>. A few warnings
-        are issued.
-      </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/pytz and
-            /usr/lib/python&python3-majorver;/site-packages/pytz-&pytz-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-dependencies/setuptools_scm.xml
===================================================================
--- general/prog/python-dependencies/setuptools_scm.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,129 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../../general.ent">
-  %general-entities;
-
-  <!ENTITY setuptools_scm-download-http "https://files.pythonhosted.org/packages/source/s/setuptools_scm/setuptools_scm-&setuptools_scm-version;.tar.gz">
-  <!ENTITY setuptools_scm-download-ftp  " ">
-  <!ENTITY setuptools_scm-md5sum        "&setuptools_scm-md5sum;">
-  <!ENTITY setuptools_scm-size          "70 KB">
-  <!ENTITY setuptools_scm-buildsize     "1.6 MB (with tests)">
-  <!ENTITY setuptools_scm-time          "less than 0.1 SBU (add 0.4 SBU for tests)">
-]>
-
-  <sect2 id="setuptools_scm" xreflabel="setuptools_scm-&setuptools_scm-version;">
-
-    <title>Setuptools_scm-&setuptools_scm-version;</title>
-
-    <indexterm zone="setuptools_scm">
-      <primary sortas="a-setuptools_scm">setuptools_scm</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Setuptools_scm Module</title>
-
-      <para>
-        The <application>Setuptools_scm</application> package is used to
-        extract Python package versions from git or hg metadata instead
-        of declaring them.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&setuptools_scm-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&setuptools_scm-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &setuptools_scm-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &setuptools_scm-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &setuptools_scm-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &setuptools_scm-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Setuptools_scm Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="packaging"/> and
-        <xref linkend="typing_extensions"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="git"/>,
-        <xref linkend="mercurial"/>, and
-        <xref linkend="pytest"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Setuptools_scm</title>
-
-    <para>Build the module: </para>
-
-&build-wheel; 
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; setuptools_scm</userinput></screen>
-
-    <para>
-      The installation can be tested with <command>pytest</command>. A few
-      tests may fail if your <application>git</application> configuration
-      is not the one expected by the test suite.
-    </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/setuptools_scm and
-            /usr/lib/python&python3-majorver;/site-packages/setuptools_scm-&setuptools_scm-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-dependencies/smartypants.xml
===================================================================
--- general/prog/python-dependencies/smartypants.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,146 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 smartypants-download-http "https://github.com/leohemsted/smartypants.py/archive/v&smartypants-version;/smartypants-&smartypants-version;.tar.gz">
-  <!ENTITY smartypants-download-ftp  " ">
-  <!ENTITY smartypants-md5sum        "27957540f4718e892039b2ed208c78f3">
-  <!ENTITY smartypants-size          "24 KB">
-  <!ENTITY smartypants-buildsize     "344 KB">
-  <!ENTITY smartypants-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="smartypants" xreflabel="smartypants-&smartypants-version;">
-
-    <title>Smartypants-&smartypants-version;</title>
-
-    <indexterm zone="smartypants">
-      <primary sortas="a-smartypants">smartypants</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Smartypants Module</title>
-
-      <para>
-        <application>Smartypants</application> translates plain ASCII
-        punctuation characters into <quote>smart</quote> typographic
-        punctuation HTML entities.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&smartypants-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&smartypants-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &smartypants-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &smartypants-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &smartypants-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &smartypants-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-      <!-- The test suite seems to be broken
-      <bridgehead renderas="sect4">Smartypants Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>
-      </para>
-      -->
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Smartypants</title>
-
-      <note>
-        <para>
-          The tarball extracts into the
-          <filename class='directory'>smartypants.py-&smartypants-version;</filename>
-          directory.
-        </para>
-      </note>
-
-    <para>Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      This package does not come with a working test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; smartypants</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>smartypants</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/smartypants-&smartypants-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="smartypants-prog">
-          <term><command>smartypants</command></term>
-          <listitem>
-            <para>
-              translates ASCII punctuation to HTML punctuation.
-            </para>
-            <indexterm zone="smartypants smartypants-prog">
-              <primary sortas="b-smartypants-prog">smartypants</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-dependencies/snowballstemmer.xml
===================================================================
--- general/prog/python-dependencies/snowballstemmer.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,120 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 snowballstemmer-download-http "https://files.pythonhosted.org/packages/source/s/snowballstemmer/snowballstemmer-&snowballstemmer-version;.tar.gz">
-  <!ENTITY snowballstemmer-download-ftp  " ">
-  <!ENTITY snowballstemmer-md5sum        "&snowballstemmer-md5sum;">
-  <!ENTITY snowballstemmer-size          "85 KB">
-  <!ENTITY snowballstemmer-buildsize     "3.8 MB">
-  <!ENTITY snowballstemmer-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="snowballstemmer" xreflabel="snowballstemmer-&snowballstemmer-version;">
-
-    <title>Snowballstemmer-&snowballstemmer-version;</title>
-
-    <indexterm zone="snowballstemmer">
-      <primary sortas="a-snowballstemmer">snowballstemmer</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Snowballstemmer Module</title>
-
-      <para>
-        The <application>Snowballstemmer</application> package is a small
-        string processing language for creating stemming algorithms for use
-        in Information Retrieval, plus a collection of stemming algorithms
-        implemented using it. Stemming maps different forms of the same word
-        to a common <quote>stem</quote> &mdash; for example, the English
-        stemmer maps <emphasis>connection</emphasis>,
-        <emphasis>connections</emphasis>, <emphasis>connective</emphasis>,
-        <emphasis>connected</emphasis>, and <emphasis>connecting</emphasis>
-        to <emphasis>connect</emphasis>. Running a search for
-        <emphasis>connected</emphasis> would also find documents which only
-        have the other forms.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&snowballstemmer-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&snowballstemmer-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &snowballstemmer-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &snowballstemmer-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &snowballstemmer-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &snowballstemmer-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Snowballstemmer</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; snowballstemmer</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/snowballstemmer and
-            /usr/lib/python&python3-majorver;/site-packages/snowballstemmer-&snowballstemmer-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-dependencies/sphinxcontrib-applehelp.xml
===================================================================
--- general/prog/python-dependencies/sphinxcontrib-applehelp.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,121 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 sc-applehelp-download-http "https://files.pythonhosted.org/packages/source/s/sphinxcontrib-applehelp/sphinxcontrib-applehelp-&sc-applehelp-version;.tar.gz">
-  <!ENTITY sc-applehelp-download-ftp  " ">
-  <!ENTITY sc-applehelp-md5sum        "&sc-applehelp-md5sum;">
-  <!ENTITY sc-applehelp-size          "28 KB">
-  <!ENTITY sc-applehelp-buildsize     "2.0 MB (with tests)">
-  <!ENTITY sc-applehelp-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <sect2 id="sc-applehelp" xreflabel="sphinxcontrib-applehelp-&sc-applehelp-version;">
-
-    <title>Sphinxcontrib-applehelp-&sc-applehelp-version;</title>
-
-    <indexterm zone="sc-applehelp">
-      <primary sortas="a-sphinxcontrib-applehelp">sphinxcontrib-applehelp</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Sphinxcontrib-applehelp Module</title>
-
-      <para>
-        The <application>Sphinxcontrib-applehelp</application> package is a
-        <application>Sphinx</application> extension which outputs Apple
-        help books.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&sc-applehelp-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&sc-applehelp-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &sc-applehelp-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &sc-applehelp-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &sc-applehelp-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &sc-applehelp-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Sphinxcontrib-applehelp Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/> and
-        <xref linkend="sphinx"/> (circular dependency)
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Sphinxcontrib-applehelp</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; sphinxcontrib-applehelp</userinput></screen>
-
-      <para>
-        To test the installation, run <command>pytest</command>. Several
-        warnings may be issued, due to the use of deprecated functions.
-      </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib and
-            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib_applehelp-&sc-applehelp-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-dependencies/sphinxcontrib-devhelp.xml
===================================================================
--- general/prog/python-dependencies/sphinxcontrib-devhelp.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,121 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 sc-devhelp-download-http "https://files.pythonhosted.org/packages/source/s/sphinxcontrib-devhelp/sphinxcontrib-devhelp-&sc-devhelp-version;.tar.gz">
-  <!ENTITY sc-devhelp-download-ftp  " ">
-  <!ENTITY sc-devhelp-md5sum        "&sc-devhelp-md5sum;">
-  <!ENTITY sc-devhelp-size          "17 KB">
-  <!ENTITY sc-devhelp-buildsize     "2.7 MB (with tests)">
-  <!ENTITY sc-devhelp-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <sect2 id="sc-devhelp" xreflabel="sphinxcontrib-devhelp-&sc-devhelp-version;">
-
-    <title>Sphinxcontrib-devhelp-&sc-devhelp-version;</title>
-
-    <indexterm zone="sc-devhelp">
-      <primary sortas="a-sphinxcontrib-devhelp">sphinxcontrib-devhelp</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Sphinxcontrib-devhelp Module</title>
-
-      <para>
-        The <application>Sphinxcontrib-devhelp</application> package is a
-        <application>Sphinx</application> extension which outputs
-        <ulink url="https://wiki.gnome.org/Apps/Devhelp">Devhelp</ulink>
-        documents.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&sc-devhelp-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&sc-devhelp-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &sc-devhelp-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &sc-devhelp-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &sc-devhelp-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &sc-devhelp-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Sphinxcontrib-devhelp Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/> and
-        <xref linkend="sphinx"/> (circular dependency)
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Sphinxcontrib-devhelp</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; sphinxcontrib-devhelp</userinput></screen>
-
-      <para>
-        To test the installation, run <command>pytest</command>.
-      </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib and
-            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib_devhelp-&sc-devhelp-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-dependencies/sphinxcontrib-htmlhelp.xml
===================================================================
--- general/prog/python-dependencies/sphinxcontrib-htmlhelp.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,123 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 sc-htmlhelp-download-http "https://files.pythonhosted.org/packages/source/s/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-&sc-htmlhelp-version;.tar.gz">
-  <!ENTITY sc-htmlhelp-download-ftp  " ">
-  <!ENTITY sc-htmlhelp-md5sum        "&sc-htmlhelp-md5sum;">
-  <!ENTITY sc-htmlhelp-size          "28 KB">
-  <!ENTITY sc-htmlhelp-buildsize     "3.2 MB (add 26 MB for tests)">
-  <!ENTITY sc-htmlhelp-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <sect2 id="sc-htmlhelp" xreflabel="sphinxcontrib-htmlhelp-&sc-htmlhelp-version;">
-
-    <title>Sphinxcontrib-htmlhelp-&sc-htmlhelp-version;</title>
-
-    <indexterm zone="sc-htmlhelp">
-      <primary sortas="a-sphinxcontrib-htmlhelp">sphinxcontrib-htmlhelp</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Sphinxcontrib-htmlhelp Module</title>
-
-      <para>
-        The <application>Sphinxcontrib-htmlhelp</application> package is a
-        <application>Sphinx</application> extension which renders HTML
-        help files.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&sc-htmlhelp-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&sc-htmlhelp-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &sc-htmlhelp-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &sc-htmlhelp-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &sc-htmlhelp-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &sc-htmlhelp-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Sphinxcontrib-htmlhelp Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>,
-        <xref linkend="sphinx"/> (circular dependency), and
-        <xref linkend="html5lib"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Sphinxcontrib-htmlhelp</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; sphinxcontrib-htmlhelp</userinput></screen>
-
-    <para>
-      If the optional dependencies are installed, the package can be tested with:
-    </para>
-
-<screen remap="test"><userinput>pytest</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib and
-            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib_htmlhelp-&sc-htmlhelp-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-dependencies/sphinxcontrib-jquery.xml
===================================================================
--- general/prog/python-dependencies/sphinxcontrib-jquery.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,124 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 sc-jquery-download-http "https://files.pythonhosted.org/packages/source/s/sphinxcontrib-jquery/sphinxcontrib-jquery-&sc-jquery-version;.tar.gz">
-  <!ENTITY sc-jquery-download-ftp  " ">
-  <!ENTITY sc-jquery-md5sum        "&sc-jquery-md5sum;">
-  <!ENTITY sc-jquery-size          "120 KB">
-  <!ENTITY sc-jquery-buildsize     "552 KB">
-  <!ENTITY sc-jquery-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="sc-jquery" xreflabel="sphinxcontrib-jquery-&sc-jquery-version;">
-
-    <title>Sphinxcontrib-jquery-&sc-jquery-version;</title>
-
-    <indexterm zone="sc-jquery">
-      <primary sortas="a-sphinxcontrib-jquery">sphinxcontrib-jquery</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Sphinxcontrib-jquery Module</title>
-
-      <para>
-        The <application>Sphinxcontrib-jquery</application> package is a
-        <application>Sphinx</application> extension which includes jQuery
-        on newer Sphinx releases.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&sc-jquery-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&sc-jquery-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &sc-jquery-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &sc-jquery-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &sc-jquery-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &sc-jquery-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Sphinxcontrib-jquery Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="sphinx"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Sphinxcontrib-jquery</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      This package does not come with a testsuite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; sphinxcontrib-jquery</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib and
-            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib_jquery-&sc-jquery-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-dependencies/sphinxcontrib-jsmath.xml
===================================================================
--- general/prog/python-dependencies/sphinxcontrib-jsmath.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,129 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 sc-jsmath-download-http "https://files.pythonhosted.org/packages/source/s/sphinxcontrib-jsmath/sphinxcontrib-jsmath-&sc-jsmath-version;.tar.gz">
-  <!ENTITY sc-jsmath-download-ftp  " ">
-  <!ENTITY sc-jsmath-md5sum        "&sc-jsmath-md5sum;">
-  <!ENTITY sc-jsmath-size          "5.7 KB">
-  <!ENTITY sc-jsmath-buildsize     "324 KB (with tests)">
-  <!ENTITY sc-jsmath-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <sect2 id="sc-jsmath" xreflabel="sphinxcontrib-jsmath-&sc-jsmath-version;">
-
-    <title>Sphinxcontrib-jsmath-&sc-jsmath-version;</title>
-
-    <indexterm zone="sc-jsmath">
-      <primary sortas="a-sphinxcontrib-jsmath">sphinxcontrib-jsmath</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Sphinxcontrib-jsmath Module</title>
-
-      <para>
-        The <application>Sphinxcontrib-jsmath</application> package is a
-        <application>Sphinx</application> extension which renders display
-        math in HTML via JavaScript.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&sc-jsmath-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&sc-jsmath-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &sc-jsmath-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &sc-jsmath-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &sc-jsmath-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &sc-jsmath-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Sphinxcontrib-jsmath Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/> and
-        <xref linkend="sphinx"/> (circular dependency)
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Sphinxcontrib-jsmath</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; sphinxcontrib-jsmath</userinput></screen>
-
-    <para>
-      The installation can be tested with the following commands:
-    </para>
-
-<screen remap="test"><userinput>sed -i 's/text()/read_&amp;/' tests/test_jsmath.py &amp;&amp;
-pytest</userinput></screen>
-
-    <para>
-      the <command>sed ...</command> command is needed because of a change
-      in <application>Sphinx</application> API for versions greater than
-      5.0.
-    </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib and
-            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib_jsmath-&sc-jsmath-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-dependencies/sphinxcontrib-qthelp.xml
===================================================================
--- general/prog/python-dependencies/sphinxcontrib-qthelp.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,129 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 sc-qthelp-download-http "https://files.pythonhosted.org/packages/source/s/sphinxcontrib-qthelp/sphinxcontrib-qthelp-&sc-qthelp-version;.tar.gz">
-  <!ENTITY sc-qthelp-download-ftp  " ">
-  <!ENTITY sc-qthelp-md5sum        "&sc-qthelp-md5sum;">
-  <!ENTITY sc-qthelp-size          "21 KB">
-  <!ENTITY sc-qthelp-buildsize     "2.8 MB (with tests)">
-  <!ENTITY sc-qthelp-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <sect2 id="sc-qthelp" xreflabel="sphinxcontrib-qthelp-&sc-qthelp-version;">
-
-    <title>Sphinxcontrib-qthelp-&sc-qthelp-version;</title>
-
-    <indexterm zone="sc-qthelp">
-      <primary sortas="a-sphinxcontrib-qthelp">sphinxcontrib-qthelp</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Sphinxcontrib-qthelp Module</title>
-
-      <para>
-        The <application>Sphinxcontrib-qthelp</application> package is a
-        <application>Sphinx</application> extension which outputs QtHelp
-        documents.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&sc-qthelp-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&sc-qthelp-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &sc-qthelp-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &sc-qthelp-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &sc-qthelp-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &sc-qthelp-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Sphinxcontrib-qthelp Dependencies</bridgehead>
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/> and
-        <xref linkend="sphinx"/> (circular dependency)
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Sphinxcontrib-qthelp</title>
-
-    <para> Build the module: </para>
-
-&build-wheel; 
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; sphinxcontrib-qthelp</userinput></screen>
-
-    <para>
-      The installation can be tested with the following commands:
-    </para>
-
-<screen remap="test"><userinput>sed -i 's/text()/read_&amp;/' tests/test_qthelp.py &amp;&amp;
-pytest</userinput></screen>
-
-    <para>
-      The <command>sed ...</command> command is needed because of a change
-      in <application>Sphinx</application> API for versions greater than
-      5.0.
-    </para>
-
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib and
-            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib_qthelp-&sc-qthelp-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-dependencies/sphinxcontrib-serializinghtml.xml
===================================================================
--- general/prog/python-dependencies/sphinxcontrib-serializinghtml.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,127 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 sc-serializinghtml-download-http "https://files.pythonhosted.org/packages/source/s/sphinxcontrib_serializinghtml/sphinxcontrib_serializinghtml-&sc-serializinghtml-version;.tar.gz">
-  <!ENTITY sc-serializinghtml-download-ftp  " ">
-  <!ENTITY sc-serializinghtml-md5sum        "&sc-serializinghtml-md5sum;">
-  <!ENTITY sc-serializinghtml-size          "15 KB">
-  <!ENTITY sc-serializinghtml-buildsize     "2.0 MB (with tests)">
-  <!ENTITY sc-serializinghtml-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <sect2 id="sc-serializinghtml" xreflabel="sphinxcontrib-serializinghtml-&sc-serializinghtml-version;">
-
-    <title>Sphinxcontrib-serializinghtml-&sc-serializinghtml-version;</title>
-
-    <indexterm zone="sc-serializinghtml">
-      <primary sortas="a-sphinxcontrib-serializinghtml">sphinxcontrib-serializinghtml</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Sphinxcontrib-serializinghtml Module</title>
-
-      <para>
-        The <application>Sphinxcontrib-serializinghtml</application> package is a
-        <application>Sphinx</application> extension which outputs
-        <quote>serialized</quote> HTML files (json and pickle).
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&sc-serializinghtml-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&sc-serializinghtml-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &sc-serializinghtml-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &sc-serializinghtml-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &sc-serializinghtml-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &sc-serializinghtml-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Sphinxcontrib-serializinghtml Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/> and
-        <xref linkend="sphinx"/> (circular dependency)
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Sphinxcontrib-serializinghtml</title>
-
-      <para>
-        First remove a spurious circular dependency:
-      </para>
-
-<screen><userinput>sed /^dependencies/,+2d -i pyproject.toml</userinput></screen>
-
-      <para> Build the module: </para>
-
-&build-wheel;
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; sphinxcontrib-serializinghtml</userinput></screen>
-
-      <para>
-        To test the installation, first install <xref linkend="sphinx"/>, then
-        run <command>pytest</command>.
-      </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib and
-            /usr/lib/python&python3-majorver;/site-packages/sphinxcontrib_serializinghtml-&sc-serializinghtml-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-dependencies/typing_extensions.xml
===================================================================
--- general/prog/python-dependencies/typing_extensions.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,111 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 typing_extensions-download-http "https://files.pythonhosted.org/packages/source/t/typing_extensions/typing_extensions-&typing_extensions-version;.tar.gz">
-  <!ENTITY typing_extensions-download-ftp  " ">
-  <!ENTITY typing_extensions-md5sum        "&typing_extensions-md5sum;">
-  <!ENTITY typing_extensions-size          "47 KB">
-  <!ENTITY typing_extensions-buildsize     "528 KB">
-  <!ENTITY typing_extensions-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="typing_extensions" xreflabel="typing_extensions-&typing_extensions-version;">
-
-    <title>Typing_extensions-&typing_extensions-version;</title>
-
-    <indexterm zone="typing_extensions">
-      <primary sortas="a-typing_extensions">typing_extensions</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Typing_extensions Module</title>
-
-      <para>
-        The <application>Typing_extensions</application> module allows
-        using new type system features not yet defined on the Python
-        version in use on the system.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&typing_extensions-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&typing_extensions-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &typing_extensions-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &typing_extensions-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &typing_extensions-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &typing_extensions-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Typing_extensions</title>
-
-    <para>Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; typing_extensions</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/typing_extensions-&typing_extensions-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-dependencies/typogrify.xml
===================================================================
--- general/prog/python-dependencies/typogrify.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,118 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 typogrify-download-http "https://files.pythonhosted.org/packages/source/t/typogrify/typogrify-&typogrify-version;.tar.gz">
-  <!ENTITY typogrify-download-ftp  " ">
-  <!ENTITY typogrify-md5sum        "&typogrify-md5sum;">
-  <!ENTITY typogrify-size          "13 KB">
-  <!ENTITY typogrify-buildsize     "404 KB">
-  <!ENTITY typogrify-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="typogrify" xreflabel="typogrify-&typogrify-version;">
-
-    <title>Typogrify-&typogrify-version;</title>
-
-    <indexterm zone="typogrify">
-      <primary sortas="a-typogrify">typogrify</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Typogrify Module</title>
-
-      <para>
-        <application>Typogrify</application> provides filters to enhance
-        web typography, including support for Django and Jinja templates.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&typogrify-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&typogrify-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &typogrify-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &typogrify-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &typogrify-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &typogrify-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Typogrify Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="smartypants"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Typogrify</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      This package does not come with a testsuite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; typogrify</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/typogrify and
-            /usr/lib/python&python3-majorver;/site-packages/typogrify-&typogrify-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-dependencies/urllib3.xml
===================================================================
--- general/prog/python-dependencies/urllib3.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,162 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 urllib3-download-http "https://files.pythonhosted.org/packages/source/u/urllib3/urllib3-&urllib3-version;.tar.gz">
-  <!ENTITY urllib3-download-ftp  " ">
-  <!ENTITY urllib3-md5sum        "&urllib3-md5sum;">
-  <!ENTITY urllib3-size          "272 KB">
-  <!ENTITY urllib3-buildsize     "3.2 MB (add 49 MB for tests)">
-  <!ENTITY urllib3-time          "less than 0.1 SBU (1.6 SBU for tests)">
-]>
-
-  <sect2 id="urllib3" xreflabel="urllib3-&urllib3-version;">
-
-    <title>Urllib3-&urllib3-version;</title>
-
-    <indexterm zone="urllib3">
-      <primary sortas="a-urllib3">urllib3</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Urllib3 Module</title>
-
-      <para>
-        The <application>Urllib3</application> module is a powerful,
-        user-friendly HTTP client for Python. It brings many critical
-        features that are missing from the Python standard libraries.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&urllib3-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&urllib3-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &urllib3-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &urllib3-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &urllib3-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &urllib3-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Urllib3 Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="hatchling"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional (for tests)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>,
-        <ulink url="https://pypi.org/project/mock/">mock</ulink>,
-        <ulink url="https://pypi.org/project/PySocks/">PySocks</ulink>,
-       <!-- <ulink url="https://pypi.org/project/pytest-freezegun/">pytest-freezegun</ulink>,-->
-        <ulink url="https://pypi.org/project/pytest-timeout/">pytest-timeout</ulink>,
-        <ulink url="https://pypi.org/project/python-dateutil/">python-dateutil</ulink>,
-        <ulink url="https://pypi.org/project/tornado/">tornado</ulink>, and
-        <ulink url="https://pypi.org/project/trustme/">trustme</ulink>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Urllib3</title>
-
-    <para> If you want to run the tests, remove some that may hang: </para>
-
-<screen><userinput>rm -v test/test_retry.py \
-      test/contrib/test_pyopenssl.py \
-      test/contrib/test_securetransport.py \
-      test/with_dummyserver/test_socketlevel.py</userinput></screen>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; urllib3</userinput></screen>
-
-    <note>
-      <para>
-        Running the tests may result in the procedure below hanging and are
-        not recommended.
-      </para>
-    </note>
-
-    <para>
-      Assuming <xref linkend="pytest"/> is installed, but the other optional
-      dependencies are not, the installation can be tested with the following
-      commands:
-    </para>
-
-<screen remap="test"><userinput>python3 -m venv --system-site-packages testenv &amp;&amp;
-source testenv/bin/activate                    &amp;&amp;
-pip3 install trustme         \
-             tornado         \
-             python-dateutil \
-             mock            \
-             pysocks         \
-             pytest-timeout  &amp;&amp;
-python3 /usr/bin/pytest<!-- no && because of a possible error -->
-deactivate</userinput></screen>
-
-    <para>
-      A few errors are known to occur.
-    </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/urllib3 and
-            /usr/lib/python&python3-majorver;/site-packages/urllib3-&urllib3-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-dependencies/webencodings.xml
===================================================================
--- general/prog/python-dependencies/webencodings.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,108 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 webencodings-download-http "https://files.pythonhosted.org/packages/source/w/webencodings/webencodings-&webencodings-version;.tar.gz">
-  <!ENTITY webencodings-download-ftp  " ">
-  <!ENTITY webencodings-md5sum        "&webencodings-md5sum;">
-  <!ENTITY webencodings-size          "12 KB">
-  <!ENTITY webencodings-buildsize     "164 KB">
-  <!ENTITY webencodings-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="webencodings" xreflabel="webencodings-&webencodings-version;">
-
-    <title>webencodings-&webencodings-version;</title>
-
-    <indexterm zone="webencodings">
-      <primary sortas="a-webencodings">webencodings</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Webencodings Module</title>
-
-      <para>
-        The <application>webencodings</application> module is a Python 
-        implementation of the 
-        <ulink url="https://encoding.spec.whatwg.org/">WHATWG Encoding standard</ulink>.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&webencodings-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&webencodings-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &webencodings-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &webencodings-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &webencodings-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &webencodings-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of webencodings</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; webencodings</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/webencodings and
-            /usr/lib/python&python3-majorver;/site-packages/webencodings-&webencodings-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-modules.xml
===================================================================
--- general/prog/python-modules.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,370 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="python-modules" xreflabel="Python Modules">
-  <?dbhtml filename="python-modules.html" ?>
-
-
-  <title>Python Modules</title>
-
-  <indexterm zone="python-modules">
-    <primary sortas="a-Python-Modules">Python Modules</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Python Modules</title>
-
-    <para>
-      The <application>Python</application> module packages add useful objects
-      to the <application>Python</application> language. Modules utilized by
-      packages throughout BLFS are listed here, along with their dependencies.
-    </para>
-
-    <note>
-      <para>
-        If you want to run tests, several of the following modules depend on
-        the <option>sqlite3</option> core python module that has not been
-        built in LFS. It is therefore recommended to rebuild Python after
-        installing the recommended dependency listed in
-        <xref linkend="python3"/>.
-      </para>
-    </note>
-
-    <important>
-      <para>
-        In BLFS, we normally build and install Python 3 modules with
-        <command>pip3</command>.  Please take care that the
-        <command>pip3 install</command> commands in the book should be
-        run as &root; unless it's for a Python virtual environment.  Running
-        <command>pip3 install</command> as a non-&root; user may seem to
-        work fine, but it will cause the installed module to be inaccessible by
-        other users.
-      </para>
-      <para>
-        <command>pip3 install</command> will not reinstall an already
-        installed module by default.  For using the
-        <command>pip3 install</command> command to upgrade a module (for
-        example, from meson-0.61.3 to meson-0.62.0), insert
-        <parameter>--upgrade</parameter> into the command line.  If it's really
-        necessary to downgrade a module or reinstall the same version for
-        some reason, insert <parameter>--force-reinstall</parameter> into
-        the command line.
-      </para>
-    </important>
-
-    <itemizedlist spacing="compact">
-<!--
-      <listitem>
-        <para>
-          <xref linkend="pythonhosted"/>
-        </para>
-      </listitem>
--->
-      <listitem>
-        <para>
-          <xref linkend="asciidoc"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="cachecontrol"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="cssselect"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="cython"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="python-dbusmock"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="dbus-python"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="docutils"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="doxypypy"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="doxyqml"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="gi-docgen"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="html5lib"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="lxml"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="Mako"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="numpy"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="packaging"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="psutil"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="py3c"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pyatspi2"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pycairo2"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pycairo"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pygdbmi"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pygments"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pygobject2"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pygobject3"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pygtk"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pyparsing"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pyserial"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pytest"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="pyxdg"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="PyYAML"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="recommonmark"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="requests"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="sentry-sdk"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="scour"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="six"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="sphinx"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="sphinx_rtd_theme"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-  </sect2>
-
-<!--
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dependencies/pythonhosted.xml"/>
--->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/asciidoc.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/cssselect.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/cachecontrol.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/cython.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/python-dbusmock.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/dbus-python.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/docutils.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/doxypypy.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/doxyqml.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/gi-docgen.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/html5lib.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/lxml.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/mako.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/numpy.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/packaging.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/psutil.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/py3c.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/pyatspi2.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/pycairo2.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/pycairo.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/pygdbmi.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/pygments.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/pygobject2.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/pygobject3.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/pygtk.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/pyparsing.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/pyserial.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/pytest.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/pyxdg.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/pyyaml.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/recommonmark.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/requests.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/scour.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/sentry-sdk.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/six.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/sphinx.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-modules/sphinx_rtd_theme.xml"/>
-
-</sect1>
Index: general/prog/python-modules/asciidoc.xml
===================================================================
--- general/prog/python-modules/asciidoc.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,172 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 asciidoc-download-http "https://files.pythonhosted.org/packages/source/a/asciidoc/asciidoc-&asciidoc-version;.tar.gz">
-  <!ENTITY asciidoc-download-ftp  " ">
-  <!ENTITY asciidoc-md5sum        "&asciidoc-md5sum;">
-  <!ENTITY asciidoc-size          "212 KB">
-  <!ENTITY asciidoc-buildsize     "4.3 MB">
-  <!ENTITY asciidoc-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="asciidoc" xreflabel="asciidoc-&asciidoc-version;">
-
-    <title>Asciidoc-&asciidoc-version;</title>
-
-    <indexterm zone="asciidoc">
-      <primary sortas="a-asciidoc">asciidoc</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Asciidoc Module</title>
-
-      <para>
-        The <application>Asciidoc</application> package is a text document
-        format for writing notes, documentation, articles, books, ebooks,
-        slideshows, web pages, man pages and blogs. AsciiDoc files can be
-        translated to many formats including HTML, PDF, EPUB, and man page.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&asciidoc-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&asciidoc-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &asciidoc-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &asciidoc-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &asciidoc-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &asciidoc-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Asciidoc Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (runtime)</bridgehead>
-      <para role="optional">
-        <xref linkend="docbook-xsl"/>,
-        <xref linkend="fop"/>,
-        <xref linkend="libxslt"/>,
-        <xref linkend="lynx"/>,
-        <ulink url="https://sourceforge.net/projects/dblatex/">dblatex</ulink>, and
-        <ulink url="&w3m-url;">W3m</ulink>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Asciidoc</title>
-
-      <!-- https://github.com/asciidoc-py/asciidoc-py/pull/267 -->
-      <para>
-        Fix an issue causing thousands of lines of
-        <quote><computeroutput>invalid escape sequence</computeroutput></quote>
-        warnings outputted when generating the documentation of some
-        packages with Asciidoc and Python 3.12 or later:
-      </para>
-
-<screen><userinput>sed '/self.separator =/s/"/r"/' -i asciidoc/asciidoc.py</userinput></screen>
-
-      <para>
-        Build the module:
-      </para>
-
-&build-wheel;
-
-      <para>
-        This package does not come with a test suite.
-      </para>
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; asciidoc</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            a2x and
-            asciidoc
-          </seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/asciidoc and
-            /usr/lib/python&python3-majorver;/site-packages/asciidoc-&asciidoc-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect5">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="a2x">
-          <term><command>a2x</command></term>
-          <listitem>
-            <para>
-              is a toolchain manager for AsciiDoc
-              (converts Asciidoc text files to other file formats)
-            </para>
-            <indexterm zone="asciidoc a2x">
-              <primary sortas="b-a2x">a2x</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="asciidoc-prog">
-          <term><command>asciidoc</command></term>
-          <listitem>
-            <para>
-              converts an AsciiDoc text file to HTML or DocBook
-            </para>
-            <indexterm zone="asciidoc asciidoc-prog">
-              <primary sortas="b-asciidoc-prog">asciidoc</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-modules/cachecontrol.xml
===================================================================
--- general/prog/python-modules/cachecontrol.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,153 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 cachecontrol-download-http "https://github.com/psf/cachecontrol/archive/v&cachecontrol-version;/cachecontrol-&cachecontrol-version;.tar.gz">
-  <!ENTITY cachecontrol-download-ftp  " ">
-  <!ENTITY cachecontrol-md5sum        "&cachecontrol-md5sum;">
-  <!ENTITY cachecontrol-size          "44 KB">
-  <!ENTITY cachecontrol-buildsize     "344 KB">
-  <!ENTITY cachecontrol-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="cachecontrol" xreflabel="CacheControl-&cachecontrol-version;">
-
-    <title>CacheControl-&cachecontrol-version;</title>
-
-    <indexterm zone="cachecontrol">
-      <primary sortas="a-cachecontrol">cachecontrol</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to CacheControl Module</title>
-
-      <para>
-        <application>CacheControl</application> is a port of the caching
-        algorithms in httplib2 for use with requests session object. It was
-        written because httplib2's better support for caching is often
-        mitigated by its lack of thread safety. The same is true of requests
-        in terms of caching.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&cachecontrol-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&cachecontrol-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &cachecontrol-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &cachecontrol-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &cachecontrol-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &cachecontrol-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">CacheControl Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="msgpack"/> and
-        <xref linkend="requests"/>
-      </para>
-
-      <!-- commented in case fixed in newer version
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pluggy"/>,
-        <xref linkend="pytests"/>
-      </para> -->
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of CacheControl</title>
-
-      <para> Build the module: </para>
-
-&build-wheel;
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; cachecontrol</userinput></screen>
-
-      <para>
-        <!-- tests run with plain 'pytest', but 0 items are selected,
-             resulting in non-zero status -->
-        This module does not have a working test suite.
-      </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            doesitcache
-          </seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/CacheControl-&cachecontrol-version;.dist-info and
-            /usr/lib/python&python3-majorver;/site-packages/cachecontrol
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect5">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="doesitcache">
-          <term><command>doesitcache</command></term>
-          <listitem>
-            <para>
-              is an undocumented command line script.
-              <!-- debian patch this out as undocumented and unnecessary -->
-            </para>
-            <indexterm zone="cachecontrol">
-              <primary sortas="b-cachecontrol">doesitcache</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-modules/cssselect.xml
===================================================================
--- general/prog/python-modules/cssselect.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,123 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 cssselect-download-http "https://files.pythonhosted.org/packages/source/c/cssselect/cssselect-&cssselect-version;.tar.gz">
-  <!ENTITY cssselect-download-ftp  " ">
-  <!ENTITY cssselect-md5sum        "&cssselect-md5sum;">
-  <!ENTITY cssselect-size          "1.2 MB">
-  <!ENTITY cssselect-buildsize     "512 KB (add 488 KB for tests)">
-  <!ENTITY cssselect-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="cssselect" xreflabel="cssselect-&cssselect-version;">
-
-    <title>CSSSelect-&cssselect-version;</title>
-
-    <indexterm zone="cssselect">
-      <primary sortas="a-cssselect">cssselect</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to CSSSelect Module</title>
-
-      <para>
-        <application>CSSSelect</application> provides CSS selectors
-        for Python.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&cssselect-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&cssselect-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &cssselect-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &cssselect-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &cssselect-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &cssselect-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">CSSSelect Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="setuptools_scm"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="lxml"/> and
-        <xref linkend="pytest"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of CSSSelect</title>
-
-      <para> Build the module: </para>
-
-&build-wheel;
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; cssselect</userinput></screen>
-
-      <para>
-        To test the installation issue <command>pytest</command>.
-      </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/cssselect
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-modules/cython.xml
===================================================================
--- general/prog/python-modules/cython.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,163 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 cython-download-http "https://github.com/cython/cython/releases/download/&cython-version;/Cython-&cython-version;.tar.gz">
-  <!ENTITY cython-download-ftp  " ">
-  <!ENTITY cython-md5sum        "&cython-md5sum;">
-  <!ENTITY cython-size          "2.1 MB">
-  <!ENTITY cython-buildsize     "67 MB">
-  <!ENTITY cython-time          "0.5 SBU">
-]>
-
-  <sect2 id="cython" xreflabel="cython-&cython-version;">
-
-    <title>Cython-&cython-version;</title>
-
-    <indexterm zone="cython">
-      <primary sortas="a-cython">cython</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Cython Module</title>
-
-      <para>
-        The <application>Cython</application> package provides a
-         compiler for writing C extensions for the Python language.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&cython-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&cython-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &cython-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &cython-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &cython-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &cython-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Cython</title>
-
-      <para>
-        Build the module:
-      </para>
-
-&build-wheel;
-
-      <para>
-        This package does not come with a test suite.
-      </para>
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; Cython</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            cygdb,
-            cython, and
-            cythonize
-          </seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/Cython,
-            /usr/lib/python&python3-majorver;/site-packages/Cython-&cython-version;.dist-info, and
-            /usr/lib/python&python3-majorver;/site-packages/pyximport
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect5">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="cygdb">
-          <term><command>cygdb</command></term>
-          <listitem>
-            <para>
-              is the Cython debugger
-            </para>
-            <indexterm zone="cython cygdb">
-              <primary sortas="b-cygdb">cygdb</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="cython-prog">
-          <term><command>cython</command></term>
-          <listitem>
-            <para>
-              is a compiler for code written in the Cython language. It outputs
-              a C/C++ program which can be compiled with a C/C++ compiler
-            </para>
-            <indexterm zone="cython cython-prog">
-              <primary sortas="b-cython-prog">cython</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="cythonize">
-          <term><command>cythonize</command></term>
-          <listitem>
-            <para>
-              is a compiler for code written in the Cython language. It outputs
-              an extension module which is directly importable from Python
-            </para>
-            <indexterm zone="cython cythonize">
-              <primary sortas="b-cythonize">cythonize</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-modules/dbus-python.xml
===================================================================
--- general/prog/python-modules/dbus-python.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,142 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 dbus-python-download-http "https://dbus.freedesktop.org/releases/dbus-python/dbus-python-&dbus-python-version;.tar.gz">
-  <!ENTITY dbus-python-download-ftp  " ">
-  <!ENTITY dbus-python-md5sum        "33be8a4a766e1c7c9a377b8f934ce21a">
-  <!ENTITY dbus-python-size          "592 KB">
-  <!ENTITY dbus-python-buildsize     "4.0 MB" >
-  <!ENTITY dbus-python-time          "less than 0.1 SBU">
-  <!ENTITY dbus-python-egg-info      "&python3-site;/dbus_python-&dbus-python-version;.egg-info">
-]>
-
-  <!-- Begin D-Bus Python -->
-  <sect2 id="dbus-python" xreflabel="D-Bus Python-&dbus-python-version;">
-    <title>D-Bus Python-&dbus-python-version;</title>
-
-    <indexterm zone="dbus-python">
-      <primary sortas="a-dbus-python">dbus-python</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to D-Bus Python Module</title>
-
-      <para>
-        <application>D-Bus Python</application> provides
-        <application>Python</application> bindings to the
-        <application>D-Bus</application> API interface.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&dbus-python-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&dbus-python-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &dbus-python-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &dbus-python-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &dbus-python-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &dbus-python-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">D-Bus Python Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="dbus"/>,
-        <xref linkend="glib2"/>,
-        <xref linkend="meson_python"/>, and
-        <xref linkend="patchelf"/>
-      </para>
-<!--  no tests available yet
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <xref linkend="pygobject3"/> and
-        <ulink url="https://pypi.python.org/pypi/tap.py/">tap.py</ulink>
-        (required for some tests)
-      </para>
--->
-<!--  how to build the doc?
-      <bridgehead renderas="sect5">
-       Optional (Required to build the API and HTML Documentation)</bridgehead>
-      <para role="optional">
-        <xref linkend="sphinx_rtd_theme"/>
-      </para>
--->
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of D-Bus Python</title>
-
-      <para>
-        Build the D-Bus Python module by running the following command:
-      </para>
-
-&build-wheel;
-
-      <para>
-        This package does not come with a test suite.
-      </para>
-
-      <para>
-        Now install the module as the &root; user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; dbus-python</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            &python3-site;/dbus and &dbus-python-egg-info;
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-modules/docutils.xml
===================================================================
--- general/prog/python-modules/docutils.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,323 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 docutils-download-http "https://files.pythonhosted.org/packages/source/d/docutils/docutils-&docutils-version;.tar.gz">
-  <!ENTITY docutils-download-ftp  " ">
-  <!ENTITY docutils-md5sum        "5cdc4aee7a8a11fb0d5ce8039a37c809">
-  <!ENTITY docutils-size          "2.1 MB">
-  <!ENTITY docutils-buildsize     "10 MB">
-  <!ENTITY docutils-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin docutils -->
-  <sect2 id="docutils" xreflabel="docutils-&docutils-version;">
-
-    <title>docutils-&docutils-version;</title>
-
-    <indexterm zone="docutils">
-      <primary sortas="a-docutils">docutils</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to docutils</title>
-
-      <para>
-        <application>docutils</application> is a set of
-        <application>Python</application> modules and programs
-        for processing plaintext docs into formats such as HTML, XML, or LaTeX.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&docutils-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&docutils-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &docutils-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &docutils-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &docutils-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &docutils-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of docutils</title>
-
-<!-- Editors note: Use - -root= instead of DESTDIR= when updating. -->
-
-      <para>
-        First, remove some files installed in a previous version
-        that are no longer valid. As the &root; user:
-      </para>
-
-<screen role="root"><userinput>for f in /usr/bin/rst*.py; do
-  sudo rm -fv /usr/bin/$(basename $f .py)
-done</userinput></screen>
-
-      <para>
-        To build the <application>Python 3</application> applications,
-        run the following command:
-      </para>
-
-&build-wheel;
-
-      <para>
-        To install the <application>Python</application> applications
-        run the following as the &root; user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; docutils</userinput></screen>
-
-      <!-- FHS 3.0 section 4.4.2:
-           "There must be no subdirectories in /usr/bin."
-           But pip maintainers closed this as WONTFIX:
-           https://github.com/pypa/pip/issues/6906 -->
-      <para>
-        To reduce the time needed for loading Python scripts,
-        <command>pip3 install</command> will compile the scripts with
-        extension <filename class='extension'>.py</filename> into byte code
-        and save the result into
-        <filename class='extension'>.pyc</filename> files in the directory
-        <filename class='directory'>__pycache__</filename>.
-        But this package installs <filename class='extension'>.py</filename>
-        scripts into <filename class='directory'>/usr/bin</filename>.
-        So the byte code files for them will be installed into
-        <filename class='directory'>/usr/bin/__pycache__</filename>, which
-        is not allowed by FHS.  Still as the &root; user, remove this
-        directory:
-      </para>
-
-<screen role="root"><userinput>rm -rfv /usr/bin/__pycache__</userinput></screen>
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            docutils, rst2html4, rst2html5, rst2html, rst2latex, rst2man,
-            rst2odt_prepstyles, rst2odt, rst2pseudoxml, rst2s5,
-            rst2xetex, rst2xml, and rstpep2html
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/docutils{,-&docutils-version;.dist-info}
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect5">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="docutils-prog">
-          <term><command>docutils</command></term>
-          <listitem>
-            <para>
-              converts documents into various formats
-            </para>
-            <indexterm zone="docutils docutils-prog">
-              <primary sortas="b-docutils-prog">docutils</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="rst2html">
-          <term><command>rst2html</command></term>
-          <listitem>
-            <para>
-              generates (X)HTML documents from standalone reStructuredText
-              sources
-            </para>
-            <indexterm zone="docutils rst2html">
-              <primary sortas="b-rst2html">rst2html</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="rst2html4">
-          <term><command>rst2html4</command></term>
-          <listitem>
-            <para>
-              generates (X)HTML documents from standalone reStructuredText
-              sources
-            </para>
-            <indexterm zone="docutils rst2html4">
-              <primary sortas="b-rst2html4">rst2html4</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="rst2html5">
-          <term><command>rst2html5</command></term>
-          <listitem>
-            <para>
-              generates HTML5 documents from standalone reStructuredText
-              sources
-            </para>
-            <indexterm zone="docutils rst2html5">
-              <primary sortas="b-rst2html5">rst2html5</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="rst2latex">
-          <term><command>rst2latex</command></term>
-          <listitem>
-            <para>
-              generates LaTeX documents from standalone reStructuredText
-              sources
-            </para>
-            <indexterm zone="docutils rst2latex">
-              <primary sortas="b-rst2latex">rst2latex</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="rst2man">
-          <term><command>rst2man</command></term>
-          <listitem>
-            <para>
-              generates plain unix manual documents from standalone
-              reStructuredText sources
-            </para>
-            <indexterm zone="docutils rst2man">
-              <primary sortas="b-rst2man">rst2man</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="rst2odt">
-          <term><command>rst2odt</command></term>
-          <listitem>
-            <para>
-              generates OpenDocument/OpenOffice/ODF documents from standalone
-              reStructuredText sources
-            </para>
-            <indexterm zone="docutils rst2odt">
-              <primary sortas="b-rst2odt">rst2odt</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="rst2odt_prepstyles">
-          <term><command>rst2odt_prepstyles</command></term>
-          <listitem>
-            <para>
-              Fix a word-processor-generated styles.odt for odtwriter use
-            </para>
-            <indexterm zone="docutils rst2odt_prepstyles">
-              <primary sortas="b-rst2odt_prepstyles">rst2odt_prepstyles</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="rst2pseudoxml">
-          <term><command>rst2pseudoxml</command></term>
-          <listitem>
-            <para>
-              generates pseudo-XML from standalone reStructuredText sources
-              (for testing purposes)
-            </para>
-            <indexterm zone="docutils rst2pseudoxml">
-              <primary sortas="b-rst2pseudoxml">rst2pseudoxml</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="rst2s5">
-          <term><command>rst2s5</command></term>
-          <listitem>
-            <para>
-              generates S5 (X)HTML slideshow from standalone reStructuredText
-              sources
-            </para>
-            <indexterm zone="docutils rst2s5">
-              <primary sortas="b-rst2s5">rst2s5</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="rst2xetex">
-          <term><command>rst2xetex</command></term>
-          <listitem>
-            <para>
-              generates LaTeX documents  from standalone reStructuredText
-              sources for compilation with the Unicode-aware TeX variants
-              XeLaTeX or LuaLaTeX
-            </para>
-            <indexterm zone="docutils rst2xetex">
-              <primary sortas="b-rst2xetex">rst2xetex</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="rst2xml">
-          <term><command>rst2xml</command></term>
-          <listitem>
-            <para>
-              generates Docutils-native XML from standalone reStructuredText
-              sources
-            </para>
-            <indexterm zone="docutils rst2xml">
-              <primary sortas="b-rst2xml">rst2xml</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="rstpep2html">
-          <term><command>rstpep2html</command></term>
-          <listitem>
-            <para>
-              generates (X)HTML from reStructuredText-format PEP files
-            </para>
-            <indexterm zone="docutils rstpep2html">
-              <primary sortas="b-rstpep2html">rstpep2html</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-modules/doxypypy.xml
===================================================================
--- general/prog/python-modules/doxypypy.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,139 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 doxypypy-download-http "https://files.pythonhosted.org/packages/source/d/doxypypy/doxypypy-&doxypypy-version;.tar.gz">
-  <!ENTITY doxypypy-download-ftp  " ">
-  <!ENTITY doxypypy-md5sum        "&doxypypy-md5sum;">
-  <!ENTITY doxypypy-size          "45 KB">
-  <!ENTITY doxypypy-buildsize     "2.1 MB">
-  <!ENTITY doxypypy-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="doxypypy" xreflabel="doxypypy-&doxypypy-version;">
-
-    <title>Doxypypy-&doxypypy-version;</title>
-
-    <indexterm zone="doxypypy">
-      <primary sortas="a-doxypypy">doxypypy</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Doxypypy Module</title>
-
-      <para>
-        The <application>Doxypypy</application> package is a doxygen filter
-        for python.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&doxypypy-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&doxypypy-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &doxypypy-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &doxypypy-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &doxypypy-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &doxypypy-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Doxypypy Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="chardet"/> and
-        <xref role="runtime" linkend="doxygen"/> (at run time)
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Doxypypy</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; doxypypy</userinput></screen>
-
-    <para>
-      This package does not come with a working test suite.
-    </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>doxypypy</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/doxypypy and
-            /usr/lib/python&python3-majorver;/site-packages/doxypypy-&doxypypy-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect5">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="doxypypy-prog">
-          <term><command>doxypypy</command></term>
-          <listitem>
-            <para>
-              filters Python code for use with Doxygen, using a syntax-aware
-              approach.
-            </para>
-            <indexterm zone="doxypypy doxypypy-prog">
-              <primary sortas="b-doxypypy-prog">doxypypy</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-modules/doxyqml.xml
===================================================================
--- general/prog/python-modules/doxyqml.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 doxyqml-download-http "https://files.pythonhosted.org/packages/source/d/doxyqml/doxyqml-&doxyqml-version;.tar.gz">
-  <!ENTITY doxyqml-download-ftp  " ">
-  <!ENTITY doxyqml-md5sum        "&doxyqml-md5sum;">
-  <!ENTITY doxyqml-size          "28 KB">
-  <!ENTITY doxyqml-buildsize     "652 KB (with tests)">
-  <!ENTITY doxyqml-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <sect2 id="doxyqml" xreflabel="doxyqml-&doxyqml-version;">
-
-    <title>Doxyqml-&doxyqml-version;</title>
-
-    <indexterm zone="doxyqml">
-      <primary sortas="a-doxyqml">doxyqml</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Doxyqml Module</title>
-
-      <para>
-        The <application>Doxyqml</application> package allows using Doxygen
-        to document QML classes.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&doxyqml-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&doxyqml-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &doxyqml-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &doxyqml-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &doxyqml-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &doxyqml-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Doxyqml Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required (Run Time)</bridgehead>
-      <para role="required">
-        <xref role="runtime" linkend="doxygen"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Doxyqml</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; doxyqml</userinput></screen>
-
-    <para>
-      To test the installation, run:
-    </para>
-
-<screen remap="test"><userinput>pytest</userinput></screen>
-
-    <para>
-      The <emphasis>test_qmlclass.py</emphasis> test is known to fail.
-    </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>doxyqml</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/doxyqml and
-            /usr/lib/python&python3-majorver;/site-packages/doxyqml-&doxyqml-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect5">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="doxyqml-prog">
-          <term><command>doxyqml</command></term>
-          <listitem>
-            <para>
-              is a Doxygen input filter for QML files.
-            </para>
-            <indexterm zone="doxyqml doxyqml-prog">
-              <primary sortas="b-doxyqml-prog">doxyqml</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-modules/gi-docgen.xml
===================================================================
--- general/prog/python-modules/gi-docgen.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,162 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 gi-docgen-download-http "https://files.pythonhosted.org/packages/source/g/gi-docgen/gi-docgen-&gi-docgen-version;.tar.gz">
-  <!ENTITY gi-docgen-download-ftp  " ">
-  <!ENTITY gi-docgen-md5sum        "&gi-docgen-md5sum;">
-  <!ENTITY gi-docgen-size          "2.4 MB">
-  <!ENTITY gi-docgen-buildsize     "18 MB (with tests)">
-  <!ENTITY gi-docgen-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <sect2 id="gi-docgen" xreflabel="Gi-DocGen-&gi-docgen-version;">
-
-    <title>Gi-DocGen-&gi-docgen-version;</title>
-
-    <indexterm zone="gi-docgen">
-      <primary sortas="a-gi-docgen">gi-docgen</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Gi-DocGen Module</title>
-
-      <para>
-        <application>Gi-DocGen</application> is a document generator for
-        GObject-based libraries. GObject is the base type system of the GNOME
-        project. GI-Docgen reuses the introspection data generated by
-        GObject-based libraries to generate the API reference of these
-        libraries, as well as other ancillary documentation.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&gi-docgen-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&gi-docgen-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &gi-docgen-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &gi-docgen-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &gi-docgen-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &gi-docgen-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Gi-DocGen Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="markdown"/>,
-        <xref linkend="packaging"/>,
-        <xref linkend="pygments"/>,
-        and <xref linkend="typogrify"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <xref role='runtime' linkend='graphviz'/> (runtime, for visualizing
-        class hierarchy graphs) and
-        <xref linkend="pytest"/> (for testing)
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of gi-docgen</title>
-
-    <!-- https://gitlab.gnome.org/GNOME/gi-docgen/-/issues/188 -->
-    <para>
-      Silence a warning from the Graphviz <command>dot</command> utility
-      which will cause documentation of various packages fail to build
-      if Graphviz is installed but built without Pango, and
-      <command>gi-docgen</command> is invoked with the
-      <option>--fatal-warnings</option> option:
-    </para>
-
-    <screen><userinput>sed '/if err:/s/err/proc.returncode/' \
-    -i gidocgen/utils.py</userinput></screen>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; gi-docgen</userinput></screen>
-
-    <para>
-      To test the installation, issue <command>pytest</command>.
-    </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>gi-docgen</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/gidocgen and
-            /usr/lib/python&python3-majorver;/site-packages/gi_docgen-&gi-docgen-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="gi-docgen-prog">
-          <term><command>gi-docgen</command></term>
-          <listitem>
-            <para>
-              manages documentation for libgobject based libraries.
-            </para>
-            <indexterm zone="gi-docgen gi-docgen-prog">
-              <primary sortas="b-gi-docgen">gi-docgen</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-modules/html5lib.xml
===================================================================
--- general/prog/python-modules/html5lib.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,123 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 html5lib-download-http "&pymodules-dl;/h/html5lib/html5lib-&html5lib-version;.tar.gz">
-  <!ENTITY html5lib-download-ftp  " ">
-  <!ENTITY html5lib-md5sum        "&html5lib-md5sum;">
-  <!ENTITY html5lib-size          "268 KB">
-  <!ENTITY html5lib-buildsize     "3.9 MB">
-  <!ENTITY html5lib-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin html5lib -->
-  <sect2 id="html5lib" xreflabel="html5lib-&html5lib-version;">
-
-    <title>html5lib-&html5lib-version;</title>
-
-    <indexterm zone="html5lib">
-      <primary sortas="a-html5lib">html5lib</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to html5lib Module</title>
-
-      <para>
-        <application>html5lib</application> provides a pure-python library for
-        parsing HTML. It is designed to conform to the WHATWG HTML
-        specification.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&html5lib-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&html5lib-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &html5lib-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &html5lib-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &html5lib-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &html5lib-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">html5lib Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="six"/> and
-        <xref linkend="webencodings"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of html5lib</title>
-
-      <para>
-        To build the <application>Python 3</application> module, run:
-      </para>
-
-&build-wheel;
-
-      <para>
-        To install the module, issue the following command as the &root; user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; html5lib</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/html5lib and
-            /usr/lib/python&python3-majorver;/site-packages/html5lib-&html5lib-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-modules/lxml.xml
===================================================================
--- general/prog/python-modules/lxml.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,122 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 lxml-download-http "&pymodules-dl;/l/lxml/lxml-&lxml-version;.tar.gz">
-  <!ENTITY lxml-download-ftp  " ">
-  <!ENTITY lxml-md5sum        "&lxml-md5sum;">
-  <!ENTITY lxml-size          "3.4 MB">
-  <!ENTITY lxml-buildsize     "89 MB">
-  <!ENTITY lxml-time          "1.0 SBU">
-]>
-
-  <!-- Begin lxml -->
-  <sect2 id="lxml" xreflabel="lxml-&lxml-version;">
-
-    <title>lxml-&lxml-version;</title>
-
-    <indexterm zone="lxml">
-      <primary sortas="a-lxml">lxml</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to lxml Module</title>
-
-      <para>
-        <application>lxml</application> provides
-        <application>Python</application> bindings for
-        <xref linkend="libxslt"/> and <xref linkend="libxml2"/>.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&lxml-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&lxml-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &lxml-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &lxml-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &lxml-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &lxml-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">lxml Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="libxslt"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of lxml</title>
-
-      <para>
-        To build the <application>Python 3</application> module, run:
-      </para>
-
-&build-wheel;
-
-      <para>
-        To install the module, issue the following command as the &root; user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; lxml</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/lxml and
-            /usr/lib/python&python3-majorver;/site-packages/lxml-&lxml-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-modules/mako.xml
===================================================================
--- general/prog/python-modules/mako.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,145 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-   <!ENTITY % general-entities SYSTEM "../../../general.ent">
-  %general-entities;
-
-  <!ENTITY Mako-download-http "&pymodules-dl;/M/Mako/Mako-&mako-version;.tar.gz">
-  <!ENTITY Mako-download-ftp  " ">
-  <!ENTITY Mako-md5sum        "&mako-md5sum;">
-  <!ENTITY Mako-size          "384 KB">
-  <!ENTITY Mako-buildsize     "2.9 MB (add 1.2 MB for tests)">
-  <!ENTITY Mako-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <!-- Begin Mako -->
-  <sect2 id="Mako" xreflabel="Mako-&mako-version;">
-
-    <title>Mako-&mako-version;</title>
-
-    <indexterm zone="Mako">
-      <primary sortas="a-Mako">Mako</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Mako Module</title>
-
-      <para>
-        <application>Mako</application> is a <application>Python</application>
-        module that implements hyperfast and lightweight templating for the
-        <application>Python</application> platform.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&Mako-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&Mako-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &Mako-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &Mako-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &Mako-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &Mako-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Mako Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (for Testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Mako</title>
-
-      <para>
-        Build the module:
-      </para>
-
-&build-wheel;
-
-      <para>
-        Install the module as the &root; user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; Mako</userinput></screen>
-
-    <para>
-      To test the installation, issue <command>pytest</command>.
-    </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            mako-render
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/mako and
-            /usr/lib/python&python3-majorver;/site-packages/Mako-&mako-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect5">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="mako-render">
-          <term><command>mako-render</command></term>
-          <listitem>
-            <para>
-             renders a template
-            </para>
-            <indexterm zone="Mako mako-render">
-              <primary sortas="b-mako-render">mako-render</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-modules/numpy.xml
===================================================================
--- general/prog/python-modules/numpy.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,178 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 numpy-download-http "https://files.pythonhosted.org/packages/source/n/numpy/numpy-&numpy-version;.tar.gz">
-  <!ENTITY numpy-download-ftp  " ">
-  <!ENTITY numpy-md5sum        "&numpy-md5sum;">
-  <!ENTITY numpy-size          "15 MB">
-  <!ENTITY numpy-buildsize     "91 MB (add 333 MB for tests)">
-  <!ENTITY numpy-time          "0.4 SBU (add 2.8 SBU for tests)">
-]>
-
-  <sect2 id="numpy" xreflabel="NumPy-&numpy-version;">
-
-    <title>NumPy-&numpy-version;</title>
-
-    <indexterm zone="numpy">
-      <primary sortas="a-numpy">numpy</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to NumPy Module</title>
-
-      <para>
-        <application>NumPy</application> is the fundamental package for
-        scientific computing with Python.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&numpy-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&numpy-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &numpy-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &numpy-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &numpy-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &numpy-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">NumPy Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="cython"/>,
-        <xref linkend="meson_python"/>, and
-        <xref linkend="pyproject-metadata"/>
-      </para>
-
-<!--  <bridgehead renderas="sect5">Recommended</bridgehead>
-      <para role="recommended">
-        <xref linkend="setuptools_scm"/>
-      </para>-->
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        fortran from <xref linkend="gcc"/>,
-        <ulink url="https://www.netlib.org/lapack/">lapack and cblas</ulink>, and
-        <ulink url="https://www.openblas.net/">openblas</ulink>
-      </para>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="attrs"/>,
-        <xref linkend="pytest"/>,
-        <xref linkend="pytz"/>, and
-        <ulink url="https://pypi.org/project/hypothesis/">hypothesis</ulink>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of NumPy</title>
-
-      <para> Build the module: </para>
-
-<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps --no-cache-dir -Csetup-args=-Dallow-noblas=true $PWD</userinput></screen>
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; numpy</userinput></screen>
-
-      <para>
-        The installation can be tested with the following commands:
-      </para>
-
-<screen remap="test"><userinput>python3 -m venv --system-site-packages testenv &amp;&amp;
-source testenv/bin/activate                    &amp;&amp;
-pip3 install hypothesis                        &amp;&amp;
-python3 runtests.py<!-- no && because of a possible error -->
-deactivate</userinput></screen>
-
-      <para>
-        Three tests, out of over 35000 tests, are known to fail.
-        <!-- test_f2py2e.py::test_untitled_cli, 
-             test_f2py2e.py::test_no_py312_distutils_fcompiler
-             test_public_api.py::test_all_modules_are_expected
-             3 failed, 35182 passed, 1835 skipped, 1306 deselected, 
-                          32 xfailed, 2 xpassed -->
-      </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            f2py, f2py3 and f2py&python3-majorver; (3 copies of the same script)
-          </seg>
-          <!-- we seem not to record the solibs, see e.g. lxml, cairo
-           actually, this one has a lot, all with awkward
-           * .cpython-311-x86_64-linux-gnu.so names -->
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/numpy
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect5">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="f2py">
-          <term><command>f2py</command></term>
-          <listitem>
-            <para>
-              is the Fortran to Python interface generator utility.
-            </para>
-            <indexterm zone="numpy f2py">
-              <primary sortas="b-f2py">f2py</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-modules/packaging.xml
===================================================================
--- general/prog/python-modules/packaging.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,130 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 packaging-download-http "https://files.pythonhosted.org/packages/source/p/packaging/packaging-&packaging-version;.tar.gz">
-  <!ENTITY packaging-download-ftp  " ">
-  <!ENTITY packaging-md5sum        "&packaging-md5sum;">
-  <!ENTITY packaging-size          "148 KB">
-  <!ENTITY packaging-buildsize     "2.6 MB (add 20 MB for tests)">
-  <!ENTITY packaging-time          "less than 0.1 SBU (0.2 SBU for tests)">
-]>
-
-  <sect2 id="packaging" xreflabel="packaging-&packaging-version;">
-
-    <title>Packaging-&packaging-version;</title>
-
-    <indexterm zone="packaging">
-      <primary sortas="a-packaging">packaging</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Packaging Module</title>
-
-      <para>
-        The <application>Packaging</application> library provides utilities
-        that implement the interoperability specifications which have clearly
-        one correct behaviour or benefit greatly from having a single shared
-        implementation.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&packaging-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&packaging-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &packaging-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &packaging-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &packaging-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &packaging-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Packaging Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/> and
-        <ulink url="https://pypi.org/project/pretend/">pretend</ulink>
-      </para>
-
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Packaging</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; packaging</userinput></screen>
-
-    <para>
-      Assuming <xref linkend="pytest"/> is installed, but the other optional
-      dependency is not, the installation can be tested with the following
-      commands:
-    </para>
-
-<screen remap="test"><userinput>python3 -m venv --system-site-packages testenv &amp;&amp;
-source testenv/bin/activate                    &amp;&amp;
-pip3 install pretend                           &amp;&amp;
-python3 /usr/bin/pytest<!-- no && because of a possible error -->
-deactivate</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/packaging and
-            /usr/lib/python&python3-majorver;/site-packages/packaging-&packaging-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-modules/psutil.xml
===================================================================
--- general/prog/python-modules/psutil.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,121 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 psutil-download-http "&pymodules-dl;/p/psutil/psutil-&psutil-version;.tar.gz">
-  <!ENTITY psutil-download-ftp  " ">
-  <!ENTITY psutil-md5sum        "&psutil-md5sum;">
-  <!ENTITY psutil-size          "492 KB">
-  <!ENTITY psutil-buildsize     "4.3 MB">
-  <!ENTITY psutil-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin psutil -->
-  <sect2 id="psutil" xreflabel="psutil-&psutil-version;">
-
-    <title>psutil-&psutil-version;</title>
-
-    <indexterm zone="psutil">
-      <primary sortas="a-psutil">psutil</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to psutil Module</title>
-
-      <para>
-        psutil (process and system utilities) is a cross-platform library 
-        for retrieving information on running processes and system utilization 
-        (CPU, memory, disks, network, sensors) in Python. It is useful mainly 
-        for system monitoring, profiling and limiting process resources and 
-        management of running processes. It implements many functionalities offered 
-        by classic UNIX command line tools such as ps, top, iotop, lsof, netstat, 
-        ifconfig, free and others.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&psutil-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&psutil-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &psutil-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &psutil-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &psutil-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &psutil-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of psutil</title>
-
-      <para>
-        Build the module:
-      </para>
-
-&build-wheel;
-
-      <para>
-        This package does not come with a test suite.
-      </para>
-
-      <para>
-        Now, as the &root; user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; psutil</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/psutil-&psutil-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-    </sect3>
-
-  </sect2>
Index: general/prog/python-modules/py3c.xml
===================================================================
--- general/prog/python-modules/py3c.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,132 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 py3c-download-http
-           "https://github.com/encukou/py3c/archive/v&py3c-version;/py3c-&py3c-version;.tar.gz">
-  <!ENTITY py3c-md5sum        "53029afde7e0cf8672a2d69d378a0cfc">
-  <!ENTITY py3c-size          "47 KB">
-  <!ENTITY py3c-buildsize     "608 KB (with tests)">
-  <!ENTITY py3c-time          "less than 0.1 SBU (with tests)">
-]>
-
-   <!-- Begin Py3c -->
-  <sect2 id="py3c" xreflabel="Py3c-&py3c-version;">
-
-    <title>Py3c-&py3c-version;</title>
-
-    <indexterm zone="py3c">
-      <primary sortas="a-Py3c">Py3c</primary>
-   </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Py3c</title>
-
-      <para>
-        <application>Py3c</application> helps you port C extensions to
-        Python 3. It provides a detailed guide, and a set of macros to
-        make porting easy and reduce boilerplate.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&py3c-download-http;"/>
-          </para>
-        </listitem>
-<!--
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&py3c-download-ftp;"/>
-          </para>
-        </listitem>
--->
-        <listitem>
-          <para>
-            Download MD5 sum: &py3c-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &py3c-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &py3c-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &py3c-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-<!--
-      <bridgehead renderas="sect4">Py3c Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
--->
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Py3c</title>
-
-      <para>
-        The <application>Py3c</application> package is a headers-only package
-        and because of that, no configuration and compilation is
-        required.
-      </para>
-
-      <para>
-        To test the package, issue:
-      </para>
-
-<screen remap="test"><userinput>make test-python3 &amp;&amp;
-make test-python3-cpp</userinput></screen>
-
-      <para>
-        To install the <application>Python 3</application> module,
-        run the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<!-- Note:
-  Now, doing a DESTDIR install is just
-    "make prefix=/usr DESTDIR=<dest> install"
--->
-<screen role="root"><userinput>make prefix=/usr install</userinput></screen>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/include/py3c
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-modules/pyatspi2.xml
===================================================================
--- general/prog/python-modules/pyatspi2.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,133 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-   <!ENTITY % general-entities SYSTEM "../../../general.ent">
-  %general-entities;
-
-  <!ENTITY pyatspi2-download-http
-           "&gnome-download-http;/pyatspi/2.46/pyatspi-&pyatspi2-version;.tar.xz">
-  <!ENTITY pyatspi2-download-ftp  " ">
-  <!ENTITY pyatspi2-md5sum        "0f2bfade055457cb0c2389fd46d1ad70">
-  <!ENTITY pyatspi2-size          "316 KB">
-  <!ENTITY pyatspi2-buildsize     "3.9 MB">
-  <!ENTITY pyatspi2-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin PyAtSpi2 -->
-  <sect2 id="pyatspi2" xreflabel="PyAtSpi2-&pyatspi2-version;">
-
-    <title>PyAtSpi2-&pyatspi2-version;</title>
-
-    <indexterm zone="pyatspi2">
-      <primary sortas="a-PyAtSpi2">PyAtSpi2</primary>
-   </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to PyAtSpi2</title>
-
-      <para>
-        The <application>PyAtSpi2</application> package contains
-        <application>Python</application> bindings for the core
-        components of the <application>GNOME</application>
-        Accessibility.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pyatspi2-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pyatspi2-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pyatspi2-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pyatspi2-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pyatspi2-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pyatspi2-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">PyAtSpi2 Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="pygobject3"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended</bridgehead>
-      <para role="recommended">
-        <xref linkend="at-spi2-core"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of PyAtSpi2</title>
-
-      <para>
-        To build <application>PyAtSpi2</application> as a
-        <application>Python 3</application> module, run the
-        following commands:
-      </para>
-
-<screen><userinput>./configure --prefix=/usr --with-python=/usr/bin/python3</userinput></screen>
-
-      <para>
-        This package does not come with a test suite.
-      </para>
-
-      <para>
-        To install the <application>Python 3</application> module,
-        run the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/pyatspi
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-modules/pycairo.xml
===================================================================
--- general/prog/python-modules/pycairo.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,143 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 pycairo-download-http "https://github.com/pygobject/pycairo/releases/download/v&pycairo-version;/pycairo-&pycairo-version;.tar.gz">
-  <!ENTITY pycairo-download-ftp  " ">
-  <!ENTITY pycairo-md5sum        "395b9eb21bb2d18801ebe26501ff2b8e">
-  <!ENTITY pycairo-size          "340 KB">
-  <!ENTITY pycairo-buildsize     "3.1 MB">
-  <!ENTITY pycairo-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin PyCairo -->
-  <sect2 id="pycairo" xreflabel="PyCairo-&pycairo-version;">
-
-    <title>PyCairo-&pycairo-version;</title>
-
-    <indexterm zone="pycairo">
-      <primary sortas="a-PyCairo">PyCairo</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to PyCairo Module</title>
-
-      <para>
-        PyCairo provides <application>Python</application> bindings to
-        <application>Cairo</application>.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pycairo-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pycairo-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pycairo-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pycairo-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pycairo-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pycairo-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">PyCairo Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="cairo"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <ulink url="https://hypothesis.readthedocs.io">Hypothesis</ulink> and
-        <xref linkend="pytest"/> (for tests)
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of PyCairo</title>
-
-      <note>
-        <para>
-           The current version of pycairo no longer builds the Python2 module.
-           If you need that module for packages such as <xref linkend="gimp"/>, use
-           <xref linkend="pycairo2"/>
-        </para>
-      </note>
-
-      <para>
-        Install <application>PyCairo</application> for Python3 by
-        running the following commands:
-      </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-      <para>
-        To run the tests, this package requires the optional pytest module. If
-        it is installed, run the tests by running <command>ninja test</command>.
-        <!--The <emphasis>test_surface.py</emphasis> test has a failure.-->
-      </para>
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Program</segtitle>
-        <segtitle>Installed Library</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/include/pycairo,
-            /usr/lib/python&python3-majorver;/site-packages/cairo, and
-            /usr/lib/python&python3-majorver;/site-packages/pycairo-&pycairo-version;.egg-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-    </sect3>
-
-  </sect2>
Index: general/prog/python-modules/pycairo2.xml
===================================================================
--- general/prog/python-modules/pycairo2.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,140 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 pycairo2-download-http "https://github.com/pygobject/pycairo/releases/download/v&pycairo2-version;/pycairo-&pycairo2-version;.tar.gz">
-  <!ENTITY pycairo2-download-ftp  " ">
-  <!ENTITY pycairo2-md5sum        "be2ba51f234270dec340f28f1695a95e">
-  <!ENTITY pycairo2-size          "196 KB">
-  <!ENTITY pycairo2-buildsize     "2.3 MB">
-  <!ENTITY pycairo2-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin PyCairo -->
-  <sect2 id="pycairo2" xreflabel="PyCairo-&pycairo2-version;">
-
-    <title>PyCairo-&pycairo2-version;</title>
-
-    <indexterm zone="pycairo2">
-      <primary sortas="a-PyCairo2">PyCairo2</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to PyCairo for Python2 Module</title>
-
-      <para>
-        This version of
-        PyCairo provides <application>Python2</application> bindings to
-        <application>Cairo</application>.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pycairo2-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pycairo2-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pycairo2-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pycairo2-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pycairo2-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pycairo2-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">PyCairo Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="cairo"/> and
-        <xref linkend="python2"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <ulink url="https://hypothesis.readthedocs.io">Hypothesis</ulink>
-          (for tests)
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of PyCairo</title>
-
-      <note>
-        <para>
-           This version of PyCairo is only retained for packages such as <xref
-           linkend="gimp"/> which is stuck on Python2 until Gimp-3 is released.
-        </para>
-      </note>
-
-      <para>
-        Install <application>PyCairo</application> for Python2 by
-        running the following commands:
-      </para>
-
-<screen><userinput>python2 setup.py build</userinput></screen>
-
-      <para>
-        This package does not come with a test suite.
-      </para>
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>python2 setup.py install --optimize=1   &amp;&amp;
-python2 setup.py install_pycairo_header &amp;&amp;
-python2 setup.py install_pkgconfig</userinput></screen>
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Program</segtitle>
-        <segtitle>Installed Library</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            <!--_cairo.so (python2) and -->
-            _cairo.so
-          </seg>
-          <seg>
-            /usr/include/pycairo,
-            /usr/lib/python&python2-majorver;/site-packages/cairo,
-            /usr/lib/python&python2-majorver;/site-packages/pycairo-&pycairo2-version;-py&python2-majorver;.egg,
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-    </sect3>
-
-  </sect2>
Index: general/prog/python-modules/pygdbmi.xml
===================================================================
--- general/prog/python-modules/pygdbmi.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,119 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 pygdbmi-download-http "&pymodules-dl;/p/pygdbmi/pygdbmi-&pygdbmi-version;.tar.gz">
-  <!ENTITY pygdbmi-download-ftp  " ">
-  <!ENTITY pygdbmi-md5sum        "&pygdbmi-md5sum;">
-  <!ENTITY pygdbmi-size          "28 KB">
-  <!ENTITY pygdbmi-buildsize     "280 MB">
-  <!ENTITY pygdbmi-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin pygdbmi -->
-  <sect2 id="pygdbmi" xreflabel="pygdbmi-&pygdbmi-version;">
-
-    <title>pygdbmi-&pygdbmi-version;</title>
-
-    <indexterm zone="pygdbmi">
-      <primary sortas="a-pygdbmi">pygdbmi</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to pygdbmi Module</title>
-
-      <para>
-        GDB/MI is a line based machine oriented text interface to GDB and is
-        activated by specifying using the --interpreter command line option
-        (see Mode Options). It is specifically intended to support the
-        development of systems which use the debugger as just one small
-        component of a larger system.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pygdbmi-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pygdbmi-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pygdbmi-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pygdbmi-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pygdbmi-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pygdbmi-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of pygdbmi</title>
-
-      <para>
-        Build the module:
-      </para>
-
-&build-wheel;
-
-      <para>
-        This package does not come with a test suite.
-      </para>
-
-      <para>
-        Now, as the &root; user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; pygdbmi</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/pygdbmi-&pygdbmi-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-    </sect3>
-
-  </sect2>
Index: general/prog/python-modules/pygments.xml
===================================================================
--- general/prog/python-modules/pygments.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,142 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 pygments-download-http
-           "https://files.pythonhosted.org/packages/source/P/Pygments/pygments-&pygments-version;.tar.gz">
-  <!ENTITY pygments-download-ftp " ">
-  <!ENTITY pygments-md5sum        "&pygments-md5sum;">
-  <!ENTITY pygments-size          "4.7 MB">
-  <!ENTITY pygments-buildsize     "52 MB">
-  <!ENTITY pygments-time          "less than 0.1 SBU">
-]>
-
- <!-- Begin Pygments -->
-  <sect2 id="pygments" xreflabel="Pygments-&pygments-version;">
-
-    <title>Pygments-&pygments-version;</title>
-
-    <indexterm zone="pygments">
-      <primary sortas="a-Pygments">Pygments</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Pygments Module</title>
-
-      <para>
-        <application>Pygments</application> is a general syntax highlighter
-        written in <application>Python</application>, for more than 300
-        languages.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pygments-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pygments-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pygments-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pygments-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pygments-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pygments-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect3">Pygments Dependencies</bridgehead>
-
-      <bridgehead renderas="sect4">Required</bridgehead>
-      <para role="required">
-        <xref linkend="hatchling"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Pygments</title>
-
-      <para>
-        Build the <application>Python 3</application> module:
-      </para>
-
-&build-wheel;
-
-      <para>
-        To install the package run the following as the &root; user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; Pygments</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Library</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            pygmentize
-           </seg>
-          <seg>
-            None
-           </seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/pygments and
-            /usr/lib/python&python3-majorver;/site-packages/Pygments-&pygments-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="pygmentize">
-          <term><command>pygmentize</command></term>
-          <listitem>
-            <para>
-              highlights an input file and writes the result to an output file
-            </para>
-            <indexterm zone="pygments pygmentize">
-              <primary sortas="b-pygmentize">pygmentize</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-modules/pygobject2.xml
===================================================================
--- general/prog/python-modules/pygobject2.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,161 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 pygobject2-download-http
-           "&gnome-download-http;/pygobject/2.28/pygobject-&pygobject2-version;.tar.xz">
-  <!ENTITY pygobject2-download-ftp  " ">
-  <!ENTITY pygobject2-md5sum        "ae48b60c690c4aa894e69e0c97802745">
-  <!ENTITY pygobject2-size          "728 KB">
-  <!ENTITY pygobject2-buildsize     "17 MB">
-  <!ENTITY pygobject2-time          "0.1 SBU">
-]>
-
-   <!-- Begin PyGObject2 -->
-  <sect2 id="pygobject2" xreflabel="PyGObject-&pygobject2-version;">
-
-    <title>PyGObject-&pygobject2-version;</title>
-
-    <indexterm zone="pygobject2">
-      <primary sortas="a-PyGObject">PyGObject</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to PyGObject Module</title>
-
-      <para>
-        PyGObject-&pygobject2-version; provides
-        <application>Python 2</application> bindings to the GObject class from
-        <application>GLib</application>.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pygobject2-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pygobject2-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pygobject2-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pygobject2-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pygobject2-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pygobject2-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-<!--
-    <bridgehead renderas="sect4">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/pygobject-&pygobject2-version;-fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-      <bridgehead renderas="sect4">PyGObject Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="glib2"/>,
-        <xref linkend="pycairo2"/> and
-        <xref linkend="python2"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <xref linkend="libxslt"/> (to Build Documentation)
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of PyGObject</title>
-
-      <para>
-        Install <application>PyGObject</application> by running the following
-        commands:
-      </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-      <para>
-        This package does not have a working test suite.
-      </para>
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-    </sect3>
-
-    <sect3 role="commands">
-      <title>Command Explanations</title>
-
-      <para>
-        <option>--disable-introspection</option>: Add this switch if you have
-        installed <xref linkend='glib2'/> without GObject Introspection.
-        Note that it conflicts with <xref linkend="pygobject3"/>.
-      </para>
-
-      <para>
-        <option>--disable-docs</option>: This option disables the rebuilding of
-        the html documentation if <xref linkend="libxslt"/> is installed.
-      </para>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>pygobject-codegen-2.0</seg>
-          <seg>
-            libpyglib-2.0-python.so,
-            _gio.so,
-            unix.so,
-            _glib.so and
-            _gobject.so.
-          </seg>
-          <seg>
-            /usr/include/pygtk-2.0,
-            /usr/lib/python&python2-majorver;/site-packages/gtk-2.0/{gio,glib,gobject},
-            /usr/share/gtk-doc/html/pygobject and
-            /usr/share/pygobject/2.0
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-    </sect3>
-
-  </sect2>
Index: general/prog/python-modules/pygobject3.xml
===================================================================
--- general/prog/python-modules/pygobject3.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,157 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 pygobject3-download-http
-           "&gnome-download-http;/pygobject/&gnome-minor-48;/pygobject-&pygobject3-version;.tar.xz">
-  <!ENTITY pygobject3-download-ftp  " ">
-  <!ENTITY pygobject3-md5sum        "fe1cb825adc8a49d1629b97b7d26dffc">
-  <!ENTITY pygobject3-size          "544 KB">
-  <!ENTITY pygobject3-buildsize     "7.0 MB (add 2.5 MB for tests)">
-  <!ENTITY pygobject3-time          "0.2 SBU (with tests)">
-]>
-
- <!-- Begin PyGObject3 -->
-  <sect2 id="pygobject3" xreflabel="PyGObject-&pygobject3-version;">
-
-    <title>PyGObject-&pygobject3-version;</title>
-
-    <indexterm zone="pygobject3">
-      <primary sortas="a-PyGObject3">PyGObject3</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to PyGObject3 Module</title>
-
-      <para>
-        <application>PyGObject3</application> provides
-        <application>Python</application> bindings to the GObject
-        class from <application>GLib</application>.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pygobject3-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pygobject3-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pygobject3-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pygobject3-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pygobject3-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pygobject3-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">PyGObject3 Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        &gobject-introspection; and
-        <xref linkend="pycairo"/>
-          (<application>Python 3</application> module)
-      </para>
-
-      <bridgehead renderas="sect5">Optional (for the tests)</bridgehead>
-      <para role="optional">
-        <xref linkend="gtk4"/>,
-        <ulink url="https://pypi.python.org/pypi/pep8">pep8</ulink>,
-        <ulink url="https://pypi.python.org/pypi/pyflakes">pyflakes</ulink>, and
-        <xref linkend="pytest"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of PyGObject3</title>
-
-    <para>
-      First, remove two faulty tests:
-    </para>
-
-<screen><userinput remap="pre">mv -v tests/test_gdbus.py{,.nouse} &amp;&amp;
-mv -v tests/test_overrides_gtk.py{,.nouse}</userinput></screen>
-
-    <para>
-      Install <application>pygobject3</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-      An already active graphical session with a bus address is necessary
-      to run the tests. <!--One test, <filename>tests/test_gdbus.py</filename>,
-      is known to fail.--> Another round of tests may report ERROR if
-      <xref linkend="gtk4" role="nodep"/> is not installed.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    </sect3>
-
-    <sect3 role="commands">
-      <title>Command Explanations</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-        href="../../../xincludes/meson-buildtype-release.xml"/>
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Library</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-           </seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/gi/_gi{,_cairo}.&python3-lib-suffix;.so
-           </seg>
-          <seg>
-            /usr/include/pygobject-3.0 and
-            /usr/lib/python&python3-majorver;/site-packages/{gi,pygtkcompat}
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-modules/pygtk.xml
===================================================================
--- general/prog/python-modules/pygtk.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,218 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 pygtk-download-http
-           "&gnome-download-http;/pygtk/2.24/pygtk-&pygtk-version;.tar.bz2">
-  <!ENTITY pygtk-download-ftp  " ">
-  <!ENTITY pygtk-md5sum        "a1051d5794fd7696d3c1af6422d17a49">
-  <!ENTITY pygtk-size          "2.2 MB">
-  <!ENTITY pygtk-buildsize     "83 MB">
-  <!ENTITY pygtk-time          "0.7 SBU">
-]>
-
-   <!-- Begin PyGTK -->
-  <sect2 id="pygtk" xreflabel="PyGTK-&pygtk-version;">
-
-    <title>PyGTK-&pygtk-version;</title>
-
-    <indexterm zone="pygtk">
-      <primary sortas="a-PyGTK">PyGTK</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to PyGTK Module</title>
-
-      <para>
-        PyGTK lets you to easily create programs with a graphical user interface
-        using the <application>Python</application> programming language.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pygtk-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pygtk-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pygtk-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pygtk-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pygtk-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pygtk-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">PyGTK Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="pygobject2"/> and
-        <xref linkend="python2"/>
-      </para>
-
-      <bridgehead renderas="sect5">Required (atk module)</bridgehead>
-      <para role="required">
-        <xref linkend="at-spi2-core"/>
-      </para>
-
-      <bridgehead renderas="sect5">Required (pango module)</bridgehead>
-      <para role="required">
-        <xref linkend="pango"/>
-      </para>
-
-      <bridgehead renderas="sect5">Required (pangocairo module)</bridgehead>
-      <para role="required">
-        <xref linkend="pycairo2"/> and
-        <xref linkend="pango"/>
-      </para>
-
-      <bridgehead renderas="sect5">Required (gtk and gtk.unixprint modules)</bridgehead>
-      <para role="required">
-        <xref linkend="pycairo2"/> and
-        <xref linkend="gtk2"/>
-      </para>
-
-      <bridgehead renderas="sect5">Required (gtk.glade module)</bridgehead>
-      <para role="required">
-        <xref linkend="pycairo2"/> and
-        <xref linkend="libglade"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <xref linkend="numpy"/>
-        <!--<ulink url="https://www.numpy.org/">NumPy</ulink>-->
-      </para>
-
-      <bridgehead renderas="sect5">Optional (to Build Documentation)</bridgehead>
-      <para role="optional">
-        <xref linkend="libxslt"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of PyGTK</title>
-
-      <para>
-         First, adapt PyGTK to changes in Pango by removing undefined
-         APIs:
-      </para>
-
-<screen><userinput remap="pre">sed -i '1394,1402 d' pango.defs</userinput></screen>
-
-      <para>
-        Install <application>PyGTK</application> by running the following
-        commands:
-      </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-      <para>
-        The tests must be run from an active X display. If this is so, issue:
-        <command>make check</command>.
-      </para>
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-    </sect3>
-
-    <sect3 role="commands">
-      <title>Command Explanations</title>
-
-      <para>
-        <parameter>--enable-docs</parameter>: This option enables rebuilding the
-        html documentation if <xref linkend="libxslt"/> is installed.
-      </para>
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>pygtk-codegen-2.0 and pygtk-demo.</seg>
-          <seg>
-            atk.so,
-            _gtk.so,
-            glade.so,
-            gtkunixprint.so,
-            pango.so and
-            pangocairo.so.
-          </seg>
-          <seg>
-            /usr/include/pygtk-2.0,
-            /usr/lib/pygtk,
-            /usr/lib/python&python2-majorver;/site-packages/gtk-2.0,
-            /usr/share/gtk-doc/html/pygtk and
-            /usr/share/pygtk.
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="pygtk-codegen-2.0">
-          <term><command>pygtk-codegen-2.0</command></term>
-          <listitem>
-            <para>
-              is a wrapper script to run the <application>PyGTK</application>
-              codegen module
-            </para>
-            <indexterm zone="pygtk pygtk-codegen-2.0">
-              <primary sortas="b-pygtk-codegen-2.0">pygtk-codegen-2.0</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="pygtk-demo">
-          <term><command>pygtk-demo</command></term>
-          <listitem>
-            <para>
-              is a Python wrapper to run the <application>PyGTK</application>
-              demo program
-            </para>
-            <indexterm zone="pygtk pygtk-demo">
-              <primary sortas="b-pygtk-demo">pygtk-demo</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-      </variablelist>
-    </sect3>
-
-  </sect2>
Index: general/prog/python-modules/pyparsing.xml
===================================================================
--- general/prog/python-modules/pyparsing.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,136 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 pyparsing-download-http "https://files.pythonhosted.org/packages/source/p/pyparsing/pyparsing-&pyparsing-version;.tar.gz">
-  <!ENTITY pyparsing-download-ftp  " ">
-  <!ENTITY pyparsing-md5sum        "&pyparsing-md5sum;">
-  <!ENTITY pyparsing-size          "872 KB">
-  <!ENTITY pyparsing-buildsize     "3.3 MB (add 27 MB for tests)">
-  <!ENTITY pyparsing-time          "less than 0.1 SBU (0.3 SBU for tests)">
-]>
-
-  <sect2 id="pyparsing" xreflabel="pyparsing-&pyparsing-version;">
-
-    <title>pyparsing-&pyparsing-version;</title>
-
-    <indexterm zone="pyparsing">
-      <primary sortas="a-pyparsing">pyparsing</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to pyparsing Module</title>
-
-      <para>
-        The <application>pyparsing</application> module is an alternative
-        approach to creating and executing simple grammars, vs. the
-        traditional lex/yacc approach, or the use of regular expressions.
-        It provides a library of classes that client code uses to construct
-        the grammar directly in Python code.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pyparsing-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pyparsing-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pyparsing-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pyparsing-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pyparsing-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pyparsing-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">pyparsing Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <ulink url="https://pypi.org/project/railroad-diagrams/">
-          railroad-diagrams
-        </ulink> (also needed for tests)
-      </para>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of pyparsing</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; pyparsing</userinput></screen>
-
-    <para>
-      Assuming <xref linkend="pytest"/> is
-      installed, but the other optional dependency is not, the installation
-      can be tested with the following commands:
-    </para>
-
-<screen remap="test"><userinput>python3 -m venv --system-site-packages testenv &amp;&amp;
-source testenv/bin/activate                    &amp;&amp;
-pip3 install railroad-diagrams                 &amp;&amp;
-python3 /usr/bin/pytest<!-- no && because of a possible error -->
-deactivate</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/pyparsing and
-            /usr/lib/python&python3-majorver;/site-packages/pyparsing-&pyparsing-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-modules/pyserial.xml
===================================================================
--- general/prog/python-modules/pyserial.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,156 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 pyserial-download-http "https://files.pythonhosted.org/packages/source/p/pyserial/pyserial-&pyserial-version;.tar.gz">
-  <!ENTITY pyserial-download-ftp  " ">
-  <!ENTITY pyserial-md5sum        "&pyserial-md5sum;">
-  <!ENTITY pyserial-size          "156 KB">
-  <!ENTITY pyserial-buildsize     "2.1 MB (add 0.2 MB for tests)">
-  <!ENTITY pyserial-time          "less than 0.1 SBU">
-]>
-
-  <!-- capitalization as in https://pythonhosted.org/pyserial/ -->
-  <sect2 id="pyserial" xreflabel="pySerial-&pyserial-version;">
-
-    <title>pySerial-&pyserial-version;</title>
-
-    <indexterm zone="pyserial">
-      <primary sortas="a-pyserial">pyserial</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to pySerial Module</title>
-
-      <para>
-        The <application>pySerial</application> module encapsulates
-        access to the serial port.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pyserial-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pyserial-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pyserial-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pyserial-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pyserial-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pyserial-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">pySerial Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="setuptools_scm"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of pySerial</title>
-
-      <para> Build the module: </para>
-
-&build-wheel;
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; pyserial</userinput></screen>
-
-      <para>
-        To test the installation issue <command>pytest</command>.
-      </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            pyserial-miniterm and pyserial-ports
-          </seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/pyserial-&pyserial-version;.dist-info and
-            /usr/lib/python&python3-majorver;/site-packages/serial
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect5">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-        <varlistentry id="pyserial-miniterm">
-          <term><command>pyserial-miniterm</command></term>
-          <listitem>
-            <para>
-              is a console application that provides a small terminal application.
-              It may inherit terminal features from the terminal in which it is
-              run.
-            </para>
-            <indexterm zone="pyserial pyserial-miniterm">
-              <primary sortas="b-pyserial-miniterm">pyserial-miniterm</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-        <varlistentry id="pyserial-ports">
-          <term><command>pyserial-ports</command></term>
-          <listitem>
-            <para>
-              lists available ports.
-            </para>
-            <indexterm zone="pyserial pyserial-ports">
-              <primary sortas="b-pyserial-ports">pyserial-ports</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-modules/pytest.xml
===================================================================
--- general/prog/python-modules/pytest.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,174 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 pytest-download-http "https://files.pythonhosted.org/packages/source/p/pytest/pytest-&pytest-version;.tar.gz">
-  <!ENTITY pytest-download-ftp  " ">
-  <!ENTITY pytest-md5sum        "&pytest-md5sum;">
-  <!ENTITY pytest-size          "1.3 MB">
-  <!ENTITY pytest-buildsize     "42 MB (with tests)">
-  <!ENTITY pytest-time          "1.3 SBU (with tests)">
-]>
-
-  <sect2 id="pytest" xreflabel="pytest-&pytest-version;">
-
-    <title>Pytest-&pytest-version;</title>
-
-    <indexterm zone="pytest">
-      <primary sortas="a-pytest">pytest</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Pytest Module</title>
-
-      <para>
-        The <application>Pytest</application> framework makes it easy to
-        write small, readable tests, and can scale to support complex
-        functional testing for applications and libraries.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pytest-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pytest-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pytest-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pytest-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pytest-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pytest-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Pytest Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="iniconfig"/>,
-        <xref linkend="packaging"/>,
-        <xref linkend="pluggy"/>, and
-        <xref linkend="py"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended</bridgehead>
-      <para role="recommended">
-        <xref linkend="setuptools_scm"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pygments"/>,
-        <xref linkend="requests"/>,
-        <ulink url="https://pypi.org/project/argcomplete/">argcomplete</ulink>,
-        <ulink url="https://pypi.org/project/elementpath/">elementpath</ulink>,
-        <ulink url="https://pypi.org/project/hypothesis/">hypothesis</ulink>,
-        <ulink url="https://pypi.org/project/mock/">mock</ulink>,
-        <ulink url="https://pypi.org/project/nose/">nose</ulink>,
-        <ulink url="https://pypi.org/project/sortedcontainers/">sortedcontainers</ulink>, and
-        <ulink url="https://pypi.org/project/xmlschema/">xmlschema</ulink>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Pytest</title>
-
-      <para> Build the module: </para>
-
-&build-wheel;
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; pytest</userinput></screen>
-
-      <para>
-        The installation can be tested with the following commands:
-      </para>
-
-<screen remap="test"><userinput>python3 -m venv --system-site-packages testenv &amp;&amp;
-source testenv/bin/activate                    &amp;&amp;
-pip3 install pytest[testing]                   &amp;&amp;
-python3 /usr/bin/pytest<!-- no && because of a possible error -->
-deactivate</userinput></screen>
-
-<!-- With 7.4.0 and the toolchain from LFS 12.0, there are now 11 XFAILS
-      <para>
-        A few tests (11 of 3429) are known to fail.
-      </para>
--->
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            pytest and py.test (different files but with same content)
-          </seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/_pytest,
-            /usr/lib/python&python3-majorver;/site-packages/pytest, and
-            /usr/lib/python&python3-majorver;/site-packages/pytest-&pytest-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect5">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="pytest-prog">
-          <term><command>pytest</command></term>
-          <listitem>
-            <para>
-              sets up, manages, and/or runs test in python module source
-              directories
-            </para>
-            <indexterm zone="pytest pytest-prog">
-              <primary sortas="b-pytest-prog">pytest</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-modules/python-dbusmock.xml
===================================================================
--- general/prog/python-modules/python-dbusmock.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,134 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 dbusmock-download-http "https://files.pythonhosted.org/packages/source/p/python-dbusmock/python-dbusmock-&dbusmock-version;.tar.gz">
-  <!ENTITY dbusmock-download-ftp  " ">
-  <!ENTITY dbusmock-md5sum        "3c2c46611ec87913d0426e197f76d96c">
-  <!ENTITY dbusmock-size          "100 KB">
-  <!ENTITY dbusmock-buildsize     "1.0 MB (with tests)">
-  <!ENTITY dbusmock-time          "less than 0.1 SBU (add 0.3 SBU for tests)">
-]>
-
-  <!-- Begin dbusmock -->
-  <sect2 id="python-dbusmock" xreflabel="dbusmock-&dbusmock-version;">
-
-    <title>dbusmock-&dbusmock-version;</title>
-
-    <indexterm zone="python-dbusmock">
-      <primary sortas="a-dbusmock">dbusmock</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to dbusmock</title>
-
-      <para>
-        <application>dbusmock</application> is a Python library
-        useful for writing tests for software which talks to D-Bus services.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&dbusmock-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&dbusmock-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &dbusmock-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &dbusmock-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &dbusmock-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &dbusmock-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">dbusmock Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="dbus-python"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/> (required to run the test suite),
-        <xref linkend="pygobject3"/> (required to run the test suite),
-        <xref linkend="bluez"/> (optional for the test suite), and
-        <xref linkend="upower"/> (optional for the test suite; if not
-        installed one test will fail)
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of dbusmock</title>
-
-      <para>
-        Build the package with:
-      </para>
-
-&build-wheel;
-
-      <para>
-        To install the package run the following as the &root; user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; python-dbusmock</userinput></screen>
-
-      <para>
-        To test the results, issue: <command>LC_ALL=C pytest</command>
-      </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/dbusmock and
-            /usr/lib/python&python3-majorver;/site-packages/python_dbusmock-&dbusmock-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-modules/pyxdg.xml
===================================================================
--- general/prog/python-modules/pyxdg.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,114 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 pyxdg-download-http
-           "https://files.pythonhosted.org/packages/b0/25/7998cd2dec731acbd438fbf91bc619603fc5188de0a9a17699a781840452/pyxdg-&pyxdg-version;.tar.gz">
-  <!ENTITY pyxdg-download-ftp  " ">
-  <!ENTITY pyxdg-md5sum        "d9a1d04fe60c956f5e3b9de3b4ef4722">
-  <!ENTITY pyxdg-size          "76 KB">
-  <!ENTITY pyxdg-buildsize     "808 KB">
-  <!ENTITY pyxdg-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin PyXDG -->
-  <sect2 id="pyxdg" xreflabel="PyXDG-&pyxdg-version;">
-
-    <title>PyXDG-&pyxdg-version;</title>
-
-    <indexterm zone="pyxdg">
-      <primary sortas="a-PyXDG">PyXDG</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to PyXDG Module</title>
-
-      <para>
-        <application>PyXDG</application> is a <application>Python</application>
-        library to access freedesktop.org standards.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pyxdg-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pyxdg-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pyxdg-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pyxdg-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pyxdg-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pyxdg-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-<!--
-      <bridgehead renderas="sect4">PyXDG Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <xref linkend="python2"/>
-      </para>
--->
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of PyXDG</title>
-
-      <para>
-        Build the module:
-      </para>
-
-&build-wheel;
-
-       <para>
-         Install the module as the &root; user:
-       </para>
-
-<screen role='root'><userinput>&install-wheel; pyxdg</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Directory</segtitle>
-
-        <seglistitem>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/xdg and
-            /usr/lib/python&python3-majorver;/site-packages/pyxdg-&pyxdg-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-modules/pyyaml.xml
===================================================================
--- general/prog/python-modules/pyyaml.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,121 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-   <!ENTITY % general-entities SYSTEM "../../../general.ent">
-  %general-entities;
-
-  <!ENTITY PyYAML-download-http "https://files.pythonhosted.org/packages/source/P/PyYAML/PyYAML-&PyYAML-version;.tar.gz">
-  <!ENTITY PyYAML-download-ftp  " ">
-  <!ENTITY PyYAML-md5sum        "&PyYAML-md5sum;">
-  <!ENTITY PyYAML-size          "124 KB">
-  <!ENTITY PyYAML-buildsize     "8.0 MB">
-  <!ENTITY PyYAML-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin PyYAML -->
-  <sect2 id="PyYAML" xreflabel="PyYAML-&PyYAML-version;">
-
-    <title>PyYAML-&PyYAML-version;</title>
-
-    <indexterm zone="PyYAML">
-      <primary sortas="a-PyYAML">PyYAML</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to PyYAML Module</title>
-
-      <para>
-        <application>PyYAML</application> is a <application>Python</application>
-        module that implements the next generation YAML parser and emitter.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&PyYAML-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&PyYAML-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &PyYAML-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &PyYAML-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &PyYAML-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &PyYAML-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">PyYAML Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="cython"/> and
-        <xref linkend="libyaml"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of PyYAML</title>
-
-      <para>
-        Build PyYAML with the following command:
-      </para>
-
-&build-wheel;
-
-      <para>
-        Now, install the module as the &root; user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; PyYAML</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/PyYAML-&yaml-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-modules/recommonmark.xml
===================================================================
--- general/prog/python-modules/recommonmark.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,217 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 recommonmark-download-http "https://files.pythonhosted.org/packages/source/r/recommonmark/recommonmark-&recommonmark-version;.tar.gz">
-  <!ENTITY recommonmark-download-ftp  " ">
-  <!ENTITY recommonmark-md5sum        "&recommonmark-md5sum;">
-  <!ENTITY recommonmark-size          "34 KB">
-  <!ENTITY recommonmark-buildsize     "680 KB (with tests)">
-  <!ENTITY recommonmark-time          "less than 0.1 SBU (with tests)">
-]>
-
-  <sect2 id="recommonmark" xreflabel="recommonmark-&recommonmark-version;">
-
-    <title>Recommonmark-&recommonmark-version;</title>
-
-    <indexterm zone="recommonmark">
-      <primary sortas="a-recommonmark">recommonmark</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Recommonmark Module</title>
-
-      <para>
-        <application>Recommonmark</application> is a docutils-compatibility
-        bridge to CommonMark. It allows writing CommonMark inside of Docutils
-        and Sphinx projects. <application>Recommonmark</application> is now
-        deprecated in favor of
-        <ulink url="https://pypi.org/project/myst-parser/">MyST-Parser</ulink>.
-        Unfortunately, <xref linkend="llvm"/> still depends on this module.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&recommonmark-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&recommonmark-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &recommonmark-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &recommonmark-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &recommonmark-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &recommonmark-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Recommonmark Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="commonmark"/> and
-        <xref linkend="sphinx"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>
-      </para>
-
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Recommonmark</title>
-
-    <para> Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; recommonmark</userinput></screen>
-
-    <para>
-      <application>Recommonmark</application> is now deprecated in favor of
-      <ulink url="https://pypi.org/project/myst-parser/">MyST-Parser</ulink>.
-      For this reason, a lot of tests
-      have to be disabled because they do not pass with recent versions of
-      <application>Sphinx</application>. The installation can be partially
-      tested with the following command:
-    </para>
-
-    <screen remap="test"><userinput>pytest -k 'not (test_integration or test_code or test_headings or test_image or test_links or test_lists)'</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            cm2html, cm2latex, cm2man, cm2pseudoxml, cm2xetex, and cm2xml
-          </seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/recommonmark and
-            /usr/lib/python&python3-majorver;/site-packages/recommonmark-&recommonmark-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="cm2html">
-          <term><command>cm2html</command></term>
-          <listitem>
-            <para>
-              generates a html document from markdown sources
-            </para>
-            <indexterm zone="recommonmark cm2html">
-              <primary sortas="b-cm2html">cm2html</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="cm2latex">
-          <term><command>cm2latex</command></term>
-          <listitem>
-            <para>
-              generates a latex document from markdown sources
-            </para>
-            <indexterm zone="recommonmark cm2latex">
-              <primary sortas="b-cm2latex">cm2latex</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="cm2man">
-          <term><command>cm2man</command></term>
-          <listitem>
-            <para>
-              generates a manpage from markdown sources
-            </para>
-            <indexterm zone="recommonmark cm2man">
-              <primary sortas="b-cm2man">cm2man</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="cm2pseudoxml">
-          <term><command>cm2pseudoxml</command></term>
-          <listitem>
-            <para>
-              generates a pseudo-XML document from markdown sources
-            </para>
-            <indexterm zone="recommonmark cm2pseudoxml">
-              <primary sortas="b-cm2pseudoxml">cm2pseudoxml</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="cm2xetex">
-          <term><command>cm2xetex</command></term>
-          <listitem>
-            <para>
-              generates a xetex document from markdown sources
-            </para>
-            <indexterm zone="recommonmark cm2xetex">
-              <primary sortas="b-cm2xetex">cm2xetex</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="cm2xml">
-          <term><command>cm2xml</command></term>
-          <listitem>
-            <para>
-              generates an XML document from markdown sources
-            </para>
-            <indexterm zone="recommonmark cm2xml">
-              <primary sortas="b-cm2xml">cm2xml</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-modules/requests.xml
===================================================================
--- general/prog/python-modules/requests.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,190 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 requests-download-http "https://files.pythonhosted.org/packages/source/r/requests/requests-&requests-version;.tar.gz">
-  <!ENTITY requests-download-ftp  " ">
-  <!ENTITY requests-md5sum        "&requests-md5sum;">
-  <!ENTITY requests-size          "108 KB">
-  <!ENTITY requests-buildsize     "1.4 MB (add 127 MB for tests)">
-  <!ENTITY requests-time          "less than 0.1 SBU (0.7 SBU for tests)">
-]>
-
-  <sect2 id="requests" xreflabel="requests-&requests-version;">
-
-    <title>Requests-&requests-version;</title>
-
-    <indexterm zone="requests">
-      <primary sortas="a-requests">requests</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Requests Module</title>
-
-      <para>
-        The <application>Requests</application> package is an elegant and
-        simple HTTP library for Python, built for human beings. It allows
-        sending HTTP/1.1 requests extremely easily.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&requests-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&requests-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &requests-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &requests-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &requests-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &requests-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Additional Download</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Recommended patch: <ulink
-            url="&patch-root;/requests-&requests-version;-use_system_certs-1.patch"/>
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Requests Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="charset-normalizer"/>,
-        <xref linkend="idna"/>, and
-        <xref linkend="urllib3"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended</bridgehead>
-      <para role="recommended">
-        <xref linkend="make-ca"/>, with
-        <xref linkend="p11-kit"/> (both needed to use system https: certificates,
-        removing an unnecessary dependency on the <application>Certifi</application>
-        module).
-      </para>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <ulink url="https://pypi.org/project/PySocks/">PySocks</ulink> (also needed for testing)
-      </para>
-
-      <bridgehead renderas="sect5">Optional (for testing)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/>,
-        <ulink url="https://pypi.org/project/Flask/">Flask</ulink>&lt;2,
-        <ulink url="https://pypi.org/project/httpbin/">httpbin</ulink>,
-        <ulink url="https://pypi.org/project/MarkupSafe/">MarkupSafe</ulink>&lt;2.1,
-        <ulink url="https://pypi.org/project/pytest-mock/">pytest-mock</ulink>,
-        <ulink url="https://pypi.org/project/pytest-httpbin/">pytest-httpbin</ulink>,
-        <ulink url="https://pypi.org/project/sphinx/">sphinx</ulink>&lt;5,
-        <ulink url="https://pypi.org/project/trustme/">trustme</ulink>, and
-        <ulink url="https://pypi.org/project/Werkzeug/">Werkzeug</ulink>&lt;2
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Requests</title>
-
-    <para>
-      First apply a patch so that the same environment variable already used to
-      point to system certificates in <application>Python3</application> following
-      the installation of <application>make-ca</application> can also be used by
-      this module:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../requests-&requests-version;-use_system_certs-1.patch</userinput></screen>
-
-    <para>Build the module: </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; requests</userinput></screen>
-
-    <para>
-      Assuming <xref linkend="pytest"/> is installed, but the other optional
-      dependencies are not, the installation can be tested with the following
-      commands:
-    </para>
-
-<screen remap="test"><userinput>python3 -m venv --system-site-packages testenv &amp;&amp;
-source testenv/bin/activate                    &amp;&amp;
-pip3 install --force-reinstall sphinx\&lt;5       &amp;&amp;
-pip3 install pytest-mock    \
-             werkzeug\&lt;2    \
-             flask\&lt;2       \
-             pytest-httpbin \
-             pysocks        \
-             trustme                           &amp;&amp;
-pip3 install --force-reinstall Markupsafe\&lt;2.1 &amp;&amp;
-python3 /usr/bin/pytest tests
-deactivate</userinput></screen>
-
-    <note>
-      <para>
-        See <xref linkend="make-ca"/> for how to set the environment variable,
-        and for how local copies of the Certifi and Requests modules installed
-        in a virtual environment <emphasis>will</emphasis> override the system
-        certificates.
-      </para>
-    </note>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/requests and
-            /usr/lib/python&python3-majorver;/site-packages/requests-&requests-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-modules/scour.xml
===================================================================
--- general/prog/python-modules/scour.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,141 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 scour-download-http "https://github.com/scour-project/scour/archive/v0.38.2/scour-&scour-version;.tar.gz">
-  <!ENTITY scour-download-ftp  " ">
-  <!ENTITY scour-md5sum        "ae30f52602802f8c7df3a32e1f72b325">
-  <!ENTITY scour-size          "100 KB">
-  <!ENTITY scour-buildsize     "1.3 MB">
-  <!ENTITY scour-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin scour -->
-  <sect2 id="scour" xreflabel="Scour-&scour-version;">
-
-    <title>Scour-&scour-version;</title>
-
-    <indexterm zone="scour">
-      <primary sortas="a-scour">scour</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Scour Module</title>
-
-      <para>
-        <application>Scour</application> is an SVG (Scalable Vector Graphics)
-        optimizer/cleaner that reduces their size by optimizing structure and
-        removing unnecessary data.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&scour-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&scour-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &scour-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &scour-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &scour-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &scour-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Scour Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="six"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of scour</title>
-
-      <para>
-        Build the module:
-      </para>
-
-&build-wheel;
-
-      <para>
-        To install the module, run the following command as the &root; user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; scour</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            scour
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/scour and
-            /usr/lib/python&python3-majorver;/site-packages/scour-&scour-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="scour-prog">
-        <term><command>scour</command></term>
-        <listitem>
-          <para>
-            is a program to optimize and clean SVG files
-          </para>
-          <indexterm zone="scour scour-prog">
-            <primary sortas="b-scour">scour</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-modules/sentry-sdk.xml
===================================================================
--- general/prog/python-modules/sentry-sdk.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,116 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 sentry-sdk-download-http "https://files.pythonhosted.org/packages/source/s/sentry-sdk/sentry-sdk-&sentry-sdk-version;.tar.gz">
-  <!ENTITY sentry-sdk-download-ftp  " ">
-  <!ENTITY sentry-sdk-md5sum        "&sentry-sdk-md5sum;">
-  <!ENTITY sentry-sdk-size          "240 KB">
-  <!ENTITY sentry-sdk-buildsize     "2.8 KB">
-  <!ENTITY sentry-sdk-time          "less than 0.1 SBU">
-]>
-
-  <sect2 id="sentry-sdk" xreflabel="sentry-sdk-&sentry-sdk-version;">
-
-    <title>sentry-sdk-&sentry-sdk-version;</title>
-
-    <indexterm zone="sentry-sdk">
-      <primary sortas="a-sentry-sdk">sentry-sdk</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to sentry-sdk Module</title>
-
-      <para>
-        The <application>sentry-sdk</application> module is the official Python 
-        SDK for Sentry.io.  <!-- I know.  This doesn't say much, but I couldn't
-        find a better short description. - bdubbs -->
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&sentry-sdk-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&sentry-sdk-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &sentry-sdk-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &sentry-sdk-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &sentry-sdk-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &sentry-sdk-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">sentry-sdk Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="certifi"/> and
-        <xref linkend="urllib3"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of sentry-sdk</title>
-
-      <para> Build the module: </para>
-
-&build-wheel;
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>&install-wheel; sentry-sdk</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None </seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/sentry_sdk-&sentry-sdk-version;.dist-info and
-            /usr/lib/python&python3-majorver;/site-packages/sentry_sdk
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-modules/six.xml
===================================================================
--- general/prog/python-modules/six.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,142 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 six-download-http "&pymodules-dl;/s/six/six-&six-version;.tar.gz">
-  <!ENTITY six-download-ftp  " ">
-  <!ENTITY six-md5sum        "&six-md5sum;">
-  <!ENTITY six-size          "36 KB">
-  <!ENTITY six-buildsize     "376 KB">
-  <!ENTITY six-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin six -->
-  <sect2 id="six" xreflabel="six-&six-version;">
-
-    <title>six-&six-version;</title>
-
-    <indexterm zone="six">
-      <primary sortas="a-six">six</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Six Module</title>
-
-      <para>
-        Six is a Python 2 to 3 compatibility library.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&six-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&six-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &six-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &six-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &six-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &six-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-<!--
-      <bridgehead renderas="sect4">Six Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended Dependencies</bridgehead>
-      <para role="recommended">
-        <xref linkend="python2"/>
-      </para>
--->
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Six</title>
-<!--
-      <note>
-        <para>
-          Both <application>Python 2</application> and
-          <application>Python 3</application> modules can
-          be built and installed without any conflicts.
-        </para>
-      </note>
-
-      <para>
-        Install <application>six</application> for Python 2 and Python 3
-        by running the following commands:
-      </para>
-
-<screen><userinput>python2 setup.py build &amp;&amp;
-python3 setup.py build</userinput></screen>
--->
-      <para>
-        Build the module:
-      </para>
-
-&build-wheel;
-
-      <para>
-        This package does not come with a test suite.
-      </para>
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-<!--
-<screen role="root"><userinput>python2 setup.py install - -optimize=1 &amp;&amp;
-python3 setup.py install - -optimize=1</userinput></screen>
--->
-
-<screen role="root"><userinput>&install-wheel; six</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/six-&six-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-    </sect3>
-
-  </sect2>
Index: general/prog/python-modules/sphinx.xml
===================================================================
--- general/prog/python-modules/sphinx.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,217 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 sphinx-download-http "https://files.pythonhosted.org/packages/source/s/sphinx/sphinx-&sphinx-version;.tar.gz">
-  <!ENTITY sphinx-download-ftp  " ">
-  <!ENTITY sphinx-md5sum        "18971ebdd6ec1b7788ff0898682fe0da">
-  <!ENTITY sphinx-size          "6.7 MB">
-  <!ENTITY sphinx-buildsize     "45 MB (add 35 MB for tests)">
-  <!ENTITY sphinx-time          "less than 0.1 SBU (1.3 SBU for tests)">
-]>
-
-  <sect2 id="sphinx" xreflabel="sphinx-&sphinx-version;">
-
-    <title>Sphinx-&sphinx-version;</title>
-
-    <indexterm zone="sphinx">
-      <primary sortas="a-sphinx">sphinx</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Sphinx Module</title>
-
-      <para>
-        The <application>Sphinx</application> package is a set of tools
-        for translating some structured text formats into pretty documentation
-        in various formats.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&sphinx-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&sphinx-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &sphinx-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &sphinx-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &sphinx-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &sphinx-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Sphinx Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="alabaster"/>,
-        <xref linkend="babel"/>,
-        <xref linkend="docutils"/>,
-        <xref linkend="imagesize"/>,
-        <xref linkend="packaging"/>,
-        <xref linkend="pygments"/>,
-        <xref linkend="requests"/>,
-        <xref linkend="snowballstemmer"/>,
-        <xref linkend="sc-applehelp"/>,
-        <xref linkend="sc-devhelp"/>,
-        <xref linkend="sc-htmlhelp"/>,
-        <xref linkend="sc-jsmath"/>,
-        <xref linkend="sc-qthelp"/>, and
-        <xref linkend="sc-serializinghtml"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional (for tests)</bridgehead>
-      <para role="optional">
-        <xref linkend="cython"/>,
-        <xref linkend="html5lib"/>,
-        <xref linkend="pytest"/>,
-        <xref linkend="texlive"/>, and
-        <ulink url="https://pypi.org/project/filelock/">filelock</ulink>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Sphinx</title>
-
-    <para>First fix a problem with docutils-0.21.1:</para>
-
-<screen><userinput>sed -i 's/0.21/0.22/' pyproject.toml</userinput></screen>
-
-    <para>Build the module:</para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; sphinx</userinput></screen>
-
-    <para>
-      Assuming <xref linkend="cython"/> and <xref linkend="pytest"/> are
-      installed, but the other optional dependencies are not, the installation
-      can be tested with the following commands:
-    </para>
-
-<screen remap="test"><userinput>python3 -m venv --system-site-packages testenv &amp;&amp;
-source testenv/bin/activate                    &amp;&amp;
-pip3 install filelock                          &amp;&amp;
-python3 -m pytest<!-- no && because of a possible error -->
-deactivate</userinput></screen>
-<!-- No failure in 7.0.1 [pierre]
-     7.1.0: 4 failed, 1896 passed, 10 skipped in 108.14s (0:01:48)
-     test_imgmath_png, test_imgmath_svg, test_imgmath_svg_embed, test_imgmath_numfig_html
-     7.2.5: 2051 passed, 11 skipped, 4 warnings [pierre]
-     7.2.6:i 2052 passed, 10 skipped, 6 warnings [pierre]
--->
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            sphinx-apidoc, sphinx-autogen, sphinx-build, and sphinx-quickstart
-          </seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/sphinx and
-            /usr/lib/python&python3-majorver;/site-packages/sphinx-&sphinx-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect5">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="sphinx-apidoc">
-          <term><command>sphinx-apidoc</command></term>
-          <listitem>
-            <para>
-              creates an reST file from python modules and packages
-            </para>
-            <indexterm zone="sphinx sphinx-apidoc">
-              <primary sortas="b-sphinx-apidoc">sphinx-apidoc</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="sphinx-autogen">
-          <term><command>sphinx-autogen</command></term>
-          <listitem>
-            <para>
-              generates ReStructuredText from special directives contained
-              in given input files
-            </para>
-            <indexterm zone="sphinx sphinx-autogen">
-              <primary sortas="b-sphinx-autogen">sphinx-autogen</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="sphinx-build">
-          <term><command>sphinx-build</command></term>
-          <listitem>
-            <para>
-              generates documentation in various formats from ReStructuredText
-              source files
-            </para>
-            <indexterm zone="sphinx sphinx-build">
-              <primary sortas="b-sphinx-build">sphinx-build</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="sphinx-quickstart">
-          <term><command>sphinx-quickstart</command></term>
-          <listitem>
-            <para>
-              generates required files for a sphinx project
-            </para>
-            <indexterm zone="sphinx sphinx-quickstart">
-              <primary sortas="b-sphinx-quickstart">sphinx-quickstart</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-modules/sphinx_rtd_theme.xml
===================================================================
--- general/prog/python-modules/sphinx_rtd_theme.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,152 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 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 sphinx_rtd_theme-download-http "https://files.pythonhosted.org/packages/source/s/sphinx_rtd_theme/sphinx_rtd_theme-&sphinx_rtd_theme-version;.tar.gz">
-  <!ENTITY sphinx_rtd_theme-download-ftp  " ">
-  <!ENTITY sphinx_rtd_theme-md5sum        "&sphinx_rtd_theme-md5sum;">
-  <!ENTITY sphinx_rtd_theme-size          "2.7 MB">
-  <!ENTITY sphinx_rtd_theme-buildsize     "36 MB (with tests)">
-  <!ENTITY sphinx_rtd_theme-time          "0.1 SBU (with tests)">
-]>
-
-  <sect2 id="sphinx_rtd_theme" xreflabel="sphinx_rtd_theme-&sphinx_rtd_theme-version;">
-
-    <title>Sphinx_rtd_theme-&sphinx_rtd_theme-version;</title>
-
-    <indexterm zone="sphinx_rtd_theme">
-      <primary sortas="a-sphinx_rtd_theme">sphinx_rtd_theme</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Sphinx_rtd_theme Module</title>
-
-      <para>
-        The <application>sphinx_rtd_theme</application> module is a Sphinx
-        theme designed to provide a great reader experience for documentation
-        users on both desktop and mobile devices. This theme is used primarily
-        on Read the Docs but can work with any Sphinx project.
-      </para>
-
-      &lfs121_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&sphinx_rtd_theme-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&sphinx_rtd_theme-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &sphinx_rtd_theme-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &sphinx_rtd_theme-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &sphinx_rtd_theme-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &sphinx_rtd_theme-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Sphinx_rtd_theme Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="sphinx"/> and
-        <xref linkend="sc-jquery"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional (for tests)</bridgehead>
-      <para role="optional">
-        <xref linkend="pytest"/> and
-        <ulink url="https://pypi.org/project/readthedocs-sphinx-ext">
-          readthedocs-sphinx-ext
-        </ulink>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Sphinx_rtd_theme</title>
-<!-- Upstream tentative fix: not completely tested, it seems
-     but otherwise we fall into dependency hell
-     Fixed in 2.0.0 -renodr
-      <para>
-        Fix wrong versions for dependencies:
-      </para>
-
-<screen><userinput>sed -e s/0.19/0.21/ \
-    -i setup.cfg</userinput></screen>
--->
-      <para>
-        Build the module:
-      </para>
-
-&build-wheel;
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; sphinx_rtd_theme</userinput></screen>
-
-    <para>
-      Assuming <xref linkend="pytest"/> is
-      installed, but the other optional dependency is not, the installation
-      can be tested with the following commands:
-    </para>
-
-<screen remap="test"><userinput>python3 -m venv --system-site-packages testenv &amp;&amp;
-source testenv/bin/activate                    &amp;&amp;
-pip3 install readthedocs-sphinx-ext            &amp;&amp;
-python3 /usr/bin/pytest<!-- no && because of a possible error -->
-deactivate</userinput></screen>
-
-    <para>
-      Several tests return warnings because they use a deprecated sphinx API.
-    </para>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/sphinx_rtd_theme and
-            /usr/lib/python&python3-majorver;/site-packages/sphinx_rtd_theme-&sphinx_rtd_theme-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python.xml
===================================================================
--- general/prog/python.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/prog/python.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,7 @@
+<sect1 id="python" xreflabel="python">
+<?dbhtml filename="python.html" dir="general"?>
+<title>python</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
Index: general/prog/python2.xml
===================================================================
--- general/prog/python2.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,356 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 python2-download-http
-     "https://www.python.org/ftp/python/&python2-version;/Python-&python2-version;.tar.xz">
-  <!ENTITY python2-download-ftp  " ">
-  <!ENTITY python2-md5sum        "fd6cc8ec0a78c44036f825e739f36e5a">
-  <!ENTITY python2-size          "12.2 MB">
-  <!ENTITY python2-buildsize     "228 MB (add 17 MB for tests)">
-  <!ENTITY python2-time          "0.5 SBU (Using parallelism=4; add 5.9 SBU for tests)">
-
-  <!ENTITY python2htmldoc-download-http
-     "https://www.python.org/ftp/python/doc/&python2-version;/python-&python2-version;-docs-html.tar.bz2">
-]>
-
-<sect1 id="python2" xreflabel="Python-&python2-version;">
-  <?dbhtml filename="python2.html" ?>
-
-
-  <title>Python-&python2-version;</title>
-
-  <indexterm zone="python2">
-    <primary sortas="a-Python2">Python2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Python 2</title>
-
-    <para>
-      The <application>Python 2</application> package contains the
-      <application>Python</application> development environment. It is useful
-      for object-oriented programming, writing scripts, prototyping large
-      programs or developing entire applications. This version is for backward
-      compatibility with other dependent packages.
-    </para>
-
-    <note>
-      <para>
-        Python2 has been deprecated by the upstream developers.
-        Support for Python2 was discontinued on January 1st, 2020.
-      </para>
-
-      <para>
-        BLFS is attempting to use Python3 as much as possible, but some
-        packages have not been updated to support Python3.
-      </para>
-    </note>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&python2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&python2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &python2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &python2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &python2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &python2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/Python-&python2-version;-security_fixes-1.patch"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Optional HTML Documentation: <ulink url="&python2htmldoc-download-http;"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-
-    <bridgehead renderas="sect3">Python 2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="sqlite"/> (For an additional module)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="bluez"/> and
-      <xref linkend="valgrind"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (For more additional modules)</bridgehead>
-    <para role="optional">
-      <xref linkend="libnsl"/> and
-      <xref linkend="tk"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Python 2</title>
-
-    <para>
-      First, disable the installation of a script that overwrites a more
-      recent script:
-    </para>
-
-<screen><userinput>sed -i '/2to3/d' ./setup.py</userinput></screen>
-
-    <para>
-      Install <application>Python 2</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../Python-&python2-version;-security_fixes-1.patch &amp;&amp;
-./configure --prefix=/usr                              \
-            --enable-shared                            \
-            --with-system-expat                        \
-            --with-system-ffi                          \
-            --enable-unicode=ucs4                     &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you invoke the tests, they will run through twice.
-      To test the results, issue: <command>make -k test</command>.
-      <!-- https://bugs.python.org/issue46811 -->
-      Several tests are known to fail, including
-      <literal>test_ftplib</literal>,
-      <literal>test_ssl</literal>,
-      <literal>test_urllib2_localnet</literal>,
-      <literal>test_xml_etree</literal>,
-      <literal>test_xml_etree_c</literal>, and
-      <literal>test_minidom</literal>. These failures are due to
-      OpenSSL-3 and Expat-2.4.6.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make altinstall                                &amp;&amp;
-ln -s python2.7        /usr/bin/python2        &amp;&amp;
-ln -s python2.7-config /usr/bin/python2-config &amp;&amp;
-chmod -v 755 /usr/lib/libpython&python2-majorver;.so.1.0</userinput></screen>
-
-    <para>
-      Since <application>Python 2</application> is in maintenance mode, and
-      <application>Python 3</application> is recommended by upstream for
-      development, you probably do not need to install the documentation.
-      However, if you still want to install documentation for both
-      <application>Python</application> versions, be sure to define the
-      <envar>PYTHONDOCS</envar>
-      variable for the version you want to use, each time you need to consult
-      the documentation. If you have downloaded the preformatted documentation
-      from <ulink url="https://docs.python.org/download.html"/>, install it
-      as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -dm755 /usr/share/doc/python-&python2-version; &amp;&amp;
-
-tar --strip-components=1                     \
-    --no-same-owner                          \
-    --directory /usr/share/doc/python-&python2-version; \
-    -xvf ../python-&python2-version;-docs-html.tar.bz2 &amp;&amp;
-
-find /usr/share/doc/python-&python2-version; -type d -exec chmod 0755 {} \; &amp;&amp;
-find /usr/share/doc/python-&python2-version; -type f -exec chmod 0644 {} \;</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-system-expat</parameter>: This switch enables linking
-      against system version of <application>Expat</application>.
-    </para>
-
-    <para>
-      <parameter>--with-system-ffi</parameter>: This switch enables linking
-      against system version of <application>libffi</application>.
-    </para>
-
-    <para>
-      <parameter>--enable-unicode=ucs4</parameter>: This switch enables
-      32-bit Unicode support in <application>Python</application>.
-    </para>
-
-    <para>
-      <option>--with-ensurepip=yes</option> : This switch enables building
-      <command>pip</command> and <command>setuptools</command> packaging programs.
-      <command>setuptools</command> is needed for building some Python modules.
-      This switch is not recommended because this version of Python is no longer
-      maintained.
-    </para>
-
-    <para>
-      <option>--with-dbmliborder=bdb:gdbm:ndbm</option>: Use this switch
-      if you want to build <application>Python</application> DBM Module
-      against <application>Berkeley DB</application> instead of
-      <application>GDBM</application>.
-    </para>
-
-    <para>
-      <command>make altinstall</command>: This make target omits some default
-      symbolic links that may interfere with Python 3.
-    </para>
-
-    <para>
-      <command>chmod ...</command>: Fix permissions for libraries to be
-      consistent with other libraries.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Python 2</title>
-
-    <para>
-      In order for <command>python</command> to find the installed
-      documentation, you must add the following environment variable to
-      individual user's or the system's profile:
-    </para>
-
-<screen role="root"><userinput>export PYTHONDOCS=/usr/share/doc/python-&python2-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          pydoc,
-          python2 (symlink),
-          python2-config (symlink),
-          python&python2-majorver;,
-          python&python2-majorver;-config,
-          smtpd.py, and
-          idle
-        </seg>
-        <seg>
-          libpython&python2-majorver;.so
-        </seg>
-        <seg>
-          /usr/{include,lib}/python&python2-majorver; and
-          /usr/share/doc/python-&python2-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="idle">
-        <term><command>idle</command></term>
-        <listitem>
-          <para>
-            is a wrapper script that opens a <application>Python</application>
-            aware GUI editor. For this script to run, you must have installed
-            <application>Tk</application> before Python so that the Tkinter
-            Python module is built
-          </para>
-          <indexterm zone="python2 idle">
-            <primary sortas="b-idle">idle</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pydoc2">
-        <term><command>pydoc</command></term>
-        <listitem>
-          <para>
-            is the <application>Python</application> documentation tool
-          </para>
-          <indexterm zone="python2 pydoc2">
-            <primary sortas="b-pydoc2">pydoc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="python">
-        <term><command>python2</command></term>
-        <listitem>
-          <para>
-            is an interpreted, interactive, object-oriented programming
-            language
-          </para>
-          <indexterm zone="python2 python">
-            <primary sortas="b-python2">python</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="python2-ver">
-        <term><command>python&python2-majorver;</command></term>
-        <listitem>
-          <para>
-            is a version-specific name for the <command>python</command>
-            program
-          </para>
-          <indexterm zone="python2 python2-ver">
-            <primary sortas="b-python&python2-majorver;">python&python2-majorver;</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="smtpd.py">
-        <term><command>smtpd.py</command></term>
-        <listitem>
-          <para>
-            is an SMTP proxy implemented in <application>Python</application>
-          </para>
-          <indexterm zone="python2 smtpd.py">
-            <primary sortas="b-smtpd.py">smtpd.py</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/prog/python3.xml
===================================================================
--- general/prog/python3.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,436 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 python3-download-http
-           "https://www.python.org/ftp/python/&python3-version;/Python-&python3-version;.tar.xz">
-  <!ENTITY python3-download-ftp  " ">
-  <!ENTITY python3-md5sum        "8defb33f0c37aa4bdd3a38ba52abde4e">
-  <!ENTITY python3-size          "20 MB">
-  <!ENTITY python3-buildsize     "335 MB (add 57 MB for tests)">
-  <!ENTITY python3-time          "2.2 SBU (add 1.0 SBU for tests; both using parallelism=4)">
-  <!--
-  Note: Size does not reflect docs that were installed in LFS.
-  -->
-  <!ENTITY python3htmldoc-download-http
-  "https://www.python.org/ftp/python/doc/&python3-version;/python-&python3-version;-docs-html.tar.bz2">
-  <!ENTITY python3-docs-md5sum "6025ee63c0ded34aac874f5da8f1a90c" >
-]>
-
-<sect1 id="python3" xreflabel="Python-&python3-version;">
-  <?dbhtml filename="python3.html" ?>
-
-
-  <title>Python-&python3-version;</title>
-
-  <indexterm zone="python3">
-    <primary sortas="a-Python3">Python3</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Python 3</title>
-
-    <para>
-      The <application>Python 3</application> package contains the
-      <application>Python</application> development environment.
-      This is useful for object-oriented programming, writing scripts,
-      prototyping large programs or developing entire applications.
-    </para>
-
-    <note>
-      <para>
-        <application>Python 3</application> was installed in LFS.
-        The only reason to rebuild it here is if optional modules
-        are needed, or to upgrade this package.
-      </para>
-    </note>
-
-    &lfs121_checked;
-
-    <important>
-      <para>
-         If upgrading to a new Python-3 minor version (for example,
-         from Python-3.11.x to Python-3.12.0), you will need to reinstall
-         any Python3 modules you have installed.  You should also
-         reinstall packages that generate Python3 modules
-         including
-         &gobject-introspection;,
-         <xref linkend="libxml2"/>,
-         <xref linkend="opencv"/>,
-         <xref linkend="fontforge"/>,
-         <xref linkend="gnome-tweaks"/>,
-         <xref linkend="samba"/>, and
-         <xref linkend="graphviz"/> (if swig is installed).
-      </para>
-
-      <para>Before you upgrade, you can get a list of modules installed
-        with <command>pip3 list</command>.  The list may be incomplete as
-        some Python modules are not installed with <command>pip3</command>,
-        for example the <literal>cracklib</literal> module installed by
-        <xref role='nodep' linkend='cracklib'/>.  Use <command>ls
-        /usr/lib/python3.<replaceable>minor</replaceable>/site-packages</command>
-        for a comprehensive list.
-      </para>
-
-      <para>
-         The Python modules from LFS will also have to be reinstalled:
-         <ulink url="&lfs-root;/chapter08/flit-core.html">flit-core</ulink>,
-         <ulink url="&lfs-root;/chapter08/wheel.html">wheel</ulink>,
-         <ulink url="&lfs-root;/chapter08/setuptools.html">setuptools</ulink>,
-         <ulink url="&lfs-root;/chapter08/meson.html">meson</ulink>,
-         <ulink url="&lfs-root;/chapter08/markupsafe.html">MarkupSafe</ulink>,
-         and <ulink url="&lfs-root;/chapter08/jinja2.html">Jinja2</ulink>.
-      </para>
-    </important>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&python3-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&python3-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &python3-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &python3-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &python3-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &python3-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Optional Download</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&python3htmldoc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &python3-docs-md5sum;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Python 3 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="sqlite"/> (required if building firefox or thunderbird)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="bluez"/>,
-      <xref linkend="gdb"/> (required for some tests),
-      <xref linkend="valgrind"/>, and
-      <ulink url="https://www.bytereef.org/mpdecimal/">libmpdec</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (For Additional Modules)</bridgehead>
-    <para role="optional">
-      <xref linkend="libnsl"/>, 
-      <xref linkend="tk"/>, and
-      &berkeley-db;
-    </para>
-
-    <para condition="html" role="usernotes">Editor Notes:
-      <ulink url="&blfs-wiki;/Python3"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Python 3</title>
-
-    <para>
-      Install <application>Python 3</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>CXX="/usr/bin/g++"               \
-./configure --prefix=/usr        \
-            --enable-shared      \
-            --with-system-expat  \
-            --enable-optimizations &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      <!-- I'm getting a test failure with empty $LANG:
-           "test test_curses failed"
-           "_curses.error: inswstr() returned ERR"
-           not sure why, but let's just work around it with LC_ALL.  
-  
-           For Python-3.12.0 all tests pass with only LANG=en_US.utf8.
-           Total tests: run=41,505 skipped=1,199
-           Total test files: run=477/483 skipped=12 resource_denied=6
-
-           For Python-3.12.1 all tests pass
-           Total tests: run=40,624 skipped=1,136
-           Total test files: run=486/489 skipped=24 resource_denied=3
-
-           For Python-3.12.2 all tests pass
-           Total tests: run=41,580 skipped=1,144
-           Total test files: run=485/488 skipped=23 resource_denied=3
-
-           For Python-3.12.3 all tests pass
-           Total tests: run=41,778 skipped=1,155
-           Total test files: run=485/488 skipped=24 resource_denied=3
-      -->
-      To test the result, issue <command>LC_ALL=en_US.UTF-8
-      make test</command>.
-      Some tests may need an Internet connection.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If upgrading and the documentation has been downloaded, optionally install
-      it as the &root; user:
-    </para>
-
-<screen role="root"><userinput>install -v -dm755 /usr/share/doc/python-&python3-version;/html
-
-tar --strip-components=1  \
-    --no-same-owner       \
-    --no-same-permissions \
-    -C /usr/share/doc/python-&python3-version;/html \
-    -xvf ../python-&python3-version;-docs-html.tar.bz2</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command> CXX="/usr/bin/g++" ./configure ...</command>: Avoid an annoying
-      message during configuration.
-    </para>
-
-    <para>
-      <parameter>--with-system-expat</parameter>: This switch enables linking
-      against the system version of <application>Expat</application>.
-    </para>
-
-<!--
-    <para>
-      <parameter>- -with-ensurepip=yes</parameter> : This switch enables building
-      the <command>pip</command> and <command>setuptools</command> packaging
-      programs. <command>setuptools</command> is needed for building some
-      Python modules.
-    </para>
--->
-    <para>
-      <option>--with-dbmliborder=bdb:gdbm:ndbm</option>: Use this switch
-      if you want to build the <application>Python</application> DBM Module
-      against <application>Berkeley DB</application> instead of
-      <application>GDBM</application>.
-    </para>
-
-    <para>
-      <parameter>--enable-optimizations</parameter>: This switch enables
-      stable, but expensive, optimizations.
-    </para>
-
-    <para>
-      <option>--with-lto</option>: This optional switch enables thick Link
-      Time Optimization. Unusually, it creates a much larger <filename
-      class="libraryfile">/usr/lib/python&python3-majorver;/config-&python3-majorver;-&lt;arch&gt;-linux-gnu/libpython&python3-majorver;.a</filename>
-      with a small increase in the time to compile
-      <application>Python</application>. Run-time results do not appear to show
-      any benefit from doing this.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Python 3</title>
-
-    <para>
-      In order for <command>python3</command> to find the installed
-      documentation, create the following version independent symlink:
-    </para>
-
-<screen role="root"><userinput>ln -svfn python-&python3-version; /usr/share/doc/python-3</userinput></screen>
-
-    <para>
-      and add the following environment variable to the individual user's or
-      system's profile:
-    </para>
-
-<screen role="root"><userinput>export PYTHONDOCS=/usr/share/doc/python-3/html</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          2to3 (symlink) and
-          2to3-&python3-majorver;,
-
-          <!--
-          easy_install-&python3-majorver;,
-          -->
-
-          idle3 (symlink) and
-          idle&python3-majorver;,
-
-          pip3 and
-          pip&python3-majorver;,
-
-          pydoc3 (symlink) and
-          pydoc&python3-majorver;,
-
-          python3 (symlink) and
-          python&python3-majorver;, and
-
-          python3-config (symlink) and
-          python&python3-majorver;-config
-        </seg>
-        <seg>
-          libpython&python3-majorver;.so and libpython3.so
-        </seg>
-        <seg>
-          /usr/include/python&python3-majorver;,
-          /usr/lib/python&python3-majorver;, and
-          /usr/share/doc/python-&python3-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-      <!--
-      <varlistentry id="2to3">
-        <term><command>2to3</command></term>
-        <listitem>
-          <para>
-            is designed to assist in the transition between python2 and python3
-            by automatically converting code to be Python3 compatible.
-          </para>
-          <indexterm zone="python3 2to3">
-            <primary sortas="b-2to3">2to3</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      Put here for easy use when removing Python2 -->
-      <!--
-      <varlistentry id="easy_install">
-        <term><command>easy_install</command></term>
-        <listitem>
-          <para>
-            is a frontend to pip3 to make it easier to configure python modules
-            through the PIP package manager
-          </para>
-          <indexterm zone="python3 easy_install">
-            <primary sortas="python3 easy_install">easy_install</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      -->
-      <varlistentry id="idle3">
-        <term><command>idle3</command></term>
-        <listitem>
-          <para>
-            is a wrapper script that opens a <application>Python</application>
-            aware GUI editor. For this script to run, you must have installed
-            <application>Tk</application> before Python so that the Tkinter
-            Python module is built
-          </para>
-          <indexterm zone="python3 idle3">
-            <primary sortas="b-idle3">idle3</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pydoc3">
-        <term><command>pydoc3</command></term>
-        <listitem>
-          <para>
-            is the <application>Python</application> documentation
-            tool
-          </para>
-          <indexterm zone="python3 pydoc3">
-            <primary sortas="b-pydoc3">pydo3c</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="python3-prog">
-        <term><command>python3</command></term>
-        <listitem>
-          <para>
-            is an interpreted, interactive, object-oriented programming
-            language
-          </para>
-          <indexterm zone="python3 python3-prog">
-            <primary sortas="b-python3">python3</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="python-ver">
-        <term><command>python&python3-majorver;</command></term>
-        <listitem>
-          <para>
-            is a version-specific name for the <command>python</command>
-            program
-          </para>
-          <indexterm zone="python3 python-ver">
-            <primary sortas="b-python&python3-majorver;">python&python3-majorver;</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <!--
-      <varlistentry id="pyvenv">
-        <term><command>pyvenv</command></term>
-        <listitem>
-          <para>
-            creates virtual <application>Python</application> environments in
-            one or more target directories.
-          </para>
-          <indexterm zone="python3 pyvenv">
-            <primary
-            sortas="b-python&python3-majorver;">python&python3-majorver;</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      -->
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/prog/python311.xml
===================================================================
--- general/prog/python311.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,183 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
-  <!-- Remove once mozilla programs can use python 3.12 -->
-  <!ENTITY python311-download-http
-           "https://www.python.org/ftp/python/&python311-version;/Python-&python311-version;.tar.xz">
-  <!ENTITY python311-md5sum        "4efe92adf28875c77d3b9b2e8d3bc44a">
-  <!ENTITY python311-size          "19 MB">
-  <!ENTITY python311-buildsize     "301 MB">
-  <!ENTITY python311-time          "1.1 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="python311" xreflabel="Python-&python311-version;">
-  <?dbhtml filename="python311.html" ?>
-
-  <title>Python-&python311-version;</title>
-
-  <indexterm zone="python311">
-    <primary sortas="a-Python3.11">Python3.11</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Python 3.11</title>
-
-    <para>
-      The <application>Python 3.11</application> package contains an
-      older version of the <application>Python</application> development 
-      environment. This is <emphasis role="bold">only</emphasis> needed for 
-      building specific programs in BLFS
-      that have not updated their build systems to support 
-      <xref linkend="python3"/> (e.g <xref linkend="firefox"/>, and
-      <xref linkend="thunderbird"/>, <xref linkend="seamonkey"/>)
-    </para>
-
-    <note>
-      <para>
-        Do NOT install this package if you are not installing one of 
-        the above programs.
-      </para>
-    </note>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&python311-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &python311-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &python311-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &python311-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &python311-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Python 3.11 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="sqlite"/> (required if building firefox or thunderbird)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Python 3.11</title>
-
-    <para>
-      Install <application>Python 3.11</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>CXX="/usr/bin/g++"                     \
-./configure --prefix=/opt/python3.11   \
-            --disable-shared           \
-            --with-system-expat        &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      Since this package is only used in very limited situations,
-      tests are not recommended.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command> CXX="/usr/bin/g++" ./configure ...</command>: Avoid an annoying
-      message during configuration.
-    </para>
-
-    <para>
-      <parameter>--prefix=/opt/python3.11</parameter>: This installs python
-      3.11 into /opt in order to avoid conflicts with the system version of
-      python, and allows for easy removal/isolation once programs update to
-      python3.12 or later.
-    </para>
-
-    <para>
-      <parameter>--disable-shared</parameter>: This switch disables building
-      shared libraries. Since all the packages that need python-3.11 have built
-      in modules and don't directly link to python, it is safe to turn off
-      shared library support.
-    </para>
-
-    <para>
-      <parameter>--with-system-expat</parameter>: This switch enables linking
-      against the system version of <application>Expat</application>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          python3.11
-        </seg>
-        <seg>
-          libpython3.11.a
-        </seg>
-        <seg>
-          /opt/python3.11/include/python3.11, and
-          /opt/python3.11/lib/python3.11,
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="python311-ver">
-        <term><command>python3.11</command></term>
-        <listitem>
-          <para>
-            is a version-specific name for the <command>python</command>
-            program
-          </para>
-          <indexterm zone="python311 python311-ver">
-            <primary sortas="b-python3.11">python3.11</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/prog/ruby.xml
===================================================================
--- general/prog/ruby.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,398 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 ruby-download-http "https://cache.ruby-lang.org/pub/ruby/&ruby-minor-version;/ruby-&ruby-version;.tar.xz">
-  <!ENTITY ruby-download-ftp  " ">
-  <!ENTITY ruby-md5sum        "0931370806081135e80f4be24d4b27ed">
-  <!ENTITY ruby-size          "16 MB">
-  <!ENTITY ruby-buildsize     "663 MB (with tests and C API docs)">
-  <!ENTITY ruby-time          "3.4 SBU (using parallelism=4; with tests and C API docs)">
-]>
-
-<sect1 id="ruby" xreflabel="Ruby-&ruby-version;">
-  <?dbhtml filename="ruby.html"?>
-
-
-  <title>Ruby-&ruby-version;</title>
-
-  <indexterm zone="ruby">
-    <primary sortas="a-Ruby">Ruby</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Ruby</title>
-
-    <para>
-      The <application>Ruby</application> package contains the
-      <application>Ruby</application> development environment. This
-      is useful for object-oriented scripting.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&ruby-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&ruby-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &ruby-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &ruby-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &ruby-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &ruby-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Ruby Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libyaml"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>,
-      <xref linkend="graphviz"/>,
-      <xref linkend="rust"/>,
-      <xref linkend="tk"/>,
-      <xref linkend="valgrind"/>, 
-      &berkeley-db; and 
-      <ulink url="https://dtrace.org/about/">DTrace</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Ruby</title>
-
-    <para>
-      Install <application>Ruby</application> by running the following
-      command:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr         \
-            --disable-rpath       \
-            --enable-shared       \
-            --without-valgrind    \
-            --without-baseruby    \
-            ac_cv_func_qsort_r=no \
-            --docdir=/usr/share/doc/ruby-&ruby-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      Optionally, build the CAPI documents by running the following
-      commands:
-    </para>
-
-<screen><userinput>make capi</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make -j1 -k check</command>.
-      Note that running the test suite with parallel jobs may cause test
-      failures outputted as cryptic <computeroutput>unknown
-      object</computeroutput> messages, resulting a summary falsely claiming
-      <quote>all tests passed</quote>.  If the environment has variables
-      related to proxy settings (<envar>all_proxy</envar>,
-      <envar>ALL_PROXY</envar>, <envar>http_proxy</envar>, and etc.) set,
-      the test suite will bail out early with messages like
-      <computeroutput>net/ftp is not found</computeroutput>. Make sure that you
-      unset these variables for the test suite. There are over 26,000 tests.
-      <!-- https://bugs.ruby-lang.org/issues/20106 -->
-      12 tests are known to fail because of expired certificates in the
-      test data.
-      <!-- https://github.com/ruby/ruby/pull/10616
-           https://github.com/ruby/ruby/commit/dd5e625d7bcb -->
-      Three tests named
-      <literal>TestNetHTTPS#test_session_reuse_but_expire</literal>,
-      <literal>OpenSSL::TestASN1#test_utctime</literal>, and
-      <literal>OpenSSL::TestASN1#test_generalizedtime</literal> are known
-      to fail with OpenSSL-3.3.0 or later.
-      Some tests related to ipv6 may indicate errors.  If the
-      tests are run in a directory that has a world writable component (e.g.
-      /tmp) then several additional tests may fail.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <note>
-      <para>
-        If you have Ruby-On-Rails applications installed and did an
-        upgrade of <application>Ruby</application> by installing this
-        package, you might need to run an update there, too
-        (as the &root; user):
-      </para>
-
-<screen role="nodump"><userinput>cd /path/to/web/app
-bundle update rake</userinput></screen>
-
-      <para>
-        and restart the webserver which serves the application.
-      </para>
-
-    </note>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-rpath</parameter>: This switch disables embedding
-      <filename class='directory'>/usr/lib</filename> as a library search
-      path into the <command>ruby</command> program.  Doing so is not needed
-      (because <filename class='directory'>/usr/lib</filename> is a system
-      library path) and it may cause the test suite running with the system
-      <filename class='libraryfile'>libruby.so</filename> instead of the
-      just built one when Ruby has been installed.
-    </para>
-
-    <para>
-      <parameter>--enable-shared</parameter>: This switch enables building
-      the <filename class="libraryfile">libruby</filename> shared library.
-    </para>
-
-    <para>
-      <parameter>--without-baseruby</parameter>: This switch prevents using the
-      system <command>ruby</command> if it is already installed. The build
-      system will use the newly built version instead.
-    </para>
-
-    <para>
-      <parameter>ac_cv_func_qsort_r=no</parameter>: This switch prevents
-      using the <function>qsort_r</function> function from Glibc.  Ruby
-      makes some aggressive optimization assuming some implementation
-      details of the sorting algorithm, but the assumption is not true with
-      the Glibc implementation.  With this switch Ruby will use its own sort
-      implementation instead.
-    </para>
-
-    <para>
-      <option>--disable-install-doc</option>: This switch disables building and
-      installing rdoc indexes and C API documents.
-    </para>
-
-    <para>
-      <option>--disable-install-rdoc</option>: This switch disables building
-      and installing rdoc indexes.
-    </para>
-
-    <para>
-      <option>--disable-install-capi</option>: This switch disables building
-      and installing C API documents.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          bundle,
-          bundler,
-          erb,
-          gem,
-          irb,
-          racc,
-          rake,
-          rbs,
-          rdbg,
-          rdoc,
-          ri,
-          ruby, and
-          typeprof
-        </seg>
-        <seg>
-          libruby.so
-        </seg>
-        <seg>
-          /usr/include/ruby-&ruby-minor-version;.0,
-          /usr/lib/ruby,
-          /usr/share/doc/ruby-&ruby-version; and
-          /usr/share/ri
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bundle">
-        <term><command>bundle</command></term>
-        <listitem>
-          <para>
-            creates bundles of Ruby Gems
-          </para>
-          <indexterm zone="ruby bundle">
-            <primary sortas="b-bundle">bundle</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bundler">
-        <term><command>bundler</command></term>
-        <listitem>
-          <para>
-            manages an application's dependencies throughout it's lifecycle
-          </para>
-          <indexterm zone="ruby bundler">
-            <primary sortas="b-bundler">bundler</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="erb">
-        <term><command>erb</command></term>
-        <listitem>
-          <para>
-            is a command line front-end for eRuby, which provides a templating
-            system for <application>Ruby</application>
-          </para>
-          <indexterm zone="ruby erb">
-            <primary sortas="b-erb">erb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gem">
-        <term><command>gem</command></term>
-        <listitem>
-          <para>
-            is the command for RubyGems, which is a sophisticated package
-            manager for <application>Ruby</application>. This is similar
-            to Python's 'pip' command
-          </para>
-          <indexterm zone="ruby gem">
-            <primary sortas="b-gem">gem</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="irb">
-        <term><command>irb</command></term>
-        <listitem>
-          <para>
-            is the interactive interface for
-            <application>Ruby</application>
-          </para>
-          <indexterm zone="ruby irb">
-            <primary sortas="b-irb">irb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rake">
-        <term><command>rake</command></term>
-        <listitem>
-          <para>
-            is a make-like build utility for <application>Ruby</application>
-          </para>
-          <indexterm zone="ruby rake">
-            <primary sortas="b-rake">rake</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rdbg">
-        <term><command>rdbg</command></term>
-        <listitem>
-          <para>
-            is an interactive debugger for <application>Ruby</application>
-          </para>
-          <indexterm zone="ruby rdbg">
-            <primary sortas="b-rdbg">rdbg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rdoc">
-        <term><command>rdoc</command></term>
-        <listitem>
-          <para>
-            generates <application>Ruby</application> documentation
-          </para>
-          <indexterm zone="ruby rdoc">
-            <primary sortas="b-rdoc">rdoc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ri">
-        <term><command>ri</command></term>
-        <listitem>
-          <para>
-            displays documentation from a database on
-            <application>Ruby</application> classes, modules, and methods
-          </para>
-          <indexterm zone="ruby ri">
-            <primary sortas="b-ri">ri</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ruby-prog">
-        <term><command>ruby</command></term>
-        <listitem>
-          <para>
-            is an interpreted scripting language for quick
-            and easy object-oriented programming
-          </para>
-          <indexterm zone="ruby ruby-prog">
-            <primary sortas="b-ruby">ruby</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libruby">
-        <term><filename role="libraryfile">libruby.so</filename></term>
-        <listitem>
-          <para>
-            contains the API functions required by <application>Ruby</application>
-          </para>
-          <indexterm zone="ruby libruby">
-            <primary sortas="c-libruby">libruby.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/prog/rust.xml
===================================================================
--- general/prog/rust.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,849 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 rust-download-http "https://static.rust-lang.org/dist/rustc-&rust-version;-src.tar.xz">
-  <!ENTITY rust-download-ftp  " ">
-  <!ENTITY rust-md5sum        "7df442945fb2e32cbccd45a7faa3a5e1">
-  <!ENTITY rust-size          "156 MB">
-  <!ENTITY rust-buildsize     "8.9 GB (298 MB installed); add 6.4 GB if running the tests">
-  <!ENTITY rust-time          "6.7 SBU (including download time; add 6.2 SBU for tests, both using parallelism=8)">
-]>
-
-<sect1 id="rust" xreflabel="rustc-&rust-version;">
-  <?dbhtml filename="rust.html"?>
-
-
-  <title>Rustc-&rust-version;</title>
-
-  <indexterm zone="rust">
-    <primary sortas="a-rust">Rust</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Rust</title>
-    <para>
-      The <application>Rust</application> programming language is designed
-      to be a safe, concurrent, practical language.
-    </para>
-
-    <para>
-      This package is updated on a six-weekly release cycle. Because it is
-      such a large and slow package to build, is at the moment only required
-      by a few packages in this book, and particularly because newer versions
-      tend to break older mozilla packages, the BLFS editors take the view that
-      it should only be updated when that is necessary (either to fix problems,
-      or to allow a new version of a package to build).
-    </para>
-
-    <para>
-      As with many  other programming languages, rustc (the rust compiler)
-      needs a binary from which to bootstrap. It will download a stage0
-      binary at the start of the build, so you cannot compile it without an
-      Internet connection.
-    </para>
-
-    <note>
-      <para>
-        Although BLFS usually installs in <filename
-        class="directory">/usr</filename>, when you later upgrade to a newer
-        version of <application>rust</application> the old libraries in <filename
-        class="directory">/usr/lib/rustlib</filename> will remain, with various
-        hashes in their names, but will not be usable and will waste space. The
-        editors recommend placing the files in the <filename
-        class="directory">/opt</filename> directory.  In particular, if you
-        have reason to rebuild with a modified configuration (e.g. using the
-        shipped LLVM after building with shared LLVM, perhaps to compile crates
-        for architectures which the BLFS LLVM build does not support)
-        it is possible for the install to leave a broken
-        <command>cargo</command> program. In such a situation, either remove
-        the existing installation first, or use a different prefix such as
-        /opt/rustc-&rust-version;-build2.
-      </para>
-
-      <para>
-        If you prefer, you can of course change the prefix to <filename
-        class="directory">/usr</filename>.
-      </para>
-    </note>
-
-    <para>
-      The current <application>rustbuild</application> build-system will use
-      all processors, although it does not scale well and often falls
-      back to just using one core while waiting for a library to compile.
-      However it can be mostly limited to a specified number of processors by
-      a combination of adding the switch <literal>--jobs &lt;N&gt;</literal>
-      (e.g. '--jobs 4' to limit to 4 processors) on each invocation of
-      <command>python3 x.py</command> <emphasis>and</emphasis> using an
-      environment variable <envar>CARGO_BUILD_JOBS=&lt;N&gt;</envar>. At the
-      moment this is not effective when some of the rustc tests are run.
-    </para>
-
-    <para>
-      The current version of rust's num_cpus crate now recognizes that cgroups
-      can be used to restrict which processors it is allowed to use. So if your
-      machine lacks DRAM (typically, less than 2GB DRAM per core) that might be
-      an alternative to taking CPUs offline.
-      Read <xref linkend='build-in-cgroup'/> for how to use a cgroup.
-    </para>
-
-    <para>
-      At the moment <application>Rust</application> does not provide any
-      guarantees of a stable ABI.
-    </para>
-
-    <note>
-      <para>
-        Rustc defaults to building for ALL supported architectures, using a
-        shipped copy of LLVM. In BLFS the build is only for the X86
-        architecture.
-        If you intend to develop rust crates, this build may not be good
-        enough for your purposes.
-      </para>
-      <para>
-        The build times of this version when repeated on the same machine are
-        often reasonably consistent, but as with all compilations using
-        <command>rustc</command> there can be some very slow outliers.
-      </para>
-    </note>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&rust-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&rust-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &rust-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &rust-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &rust-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &rust-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-    <!-- only keep this here for reuse in case we need a patch
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional patch (recommended if running the test suite):
-          <ulink url="&patch-root;/rustc-&rust-version;-testsuite_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-    -->
-    <bridgehead renderas="sect3">Rust Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/> and
-      <!-- Required for downloading stage 0 binaries.
-           Otherwise it's recommended (if not installed, a vendored copy
-           will be built). -->
-      <xref linkend="curl"/>
-    </para>
-
-    &build-use-internet;
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libssh2"/>,
-      <xref linkend="llvm"/>
-      (built with -DLLVM_LINK_LLVM_DYLIB=ON so that rust can link to
-      system LLVM instead of building its shipped version), and
-      <xref linkend="sqlite"/>
-    </para>
-
-    <note>
-      <para>
-        If a recommended dependency is not installed, a shipped copy in the
-        Rustc source tarball will be built and used.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gdb"/> (used by the test suite if it is present),
-      <xref linkend="git"/> (required by the test suite),
-      <ulink url="https://github.com/bytecodealliance/wasmtime/tree/main/cranelift">cranelift</ulink>,
-      <ulink url="https://jemalloc.net/">jemalloc</ulink>,
-      libgccjit (read command explanation in
-      <xref role="nodep" linkend="gcc"/>), and
-      <ulink url='https://libgit2.org/'>libgit2</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      Editor Notes: <ulink url="&blfs-wiki;/rust"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Rust</title>
-
-    <note>
-      <para>
-        Currently the rust compiler produces SSE2 instructions for 32-bit x86,
-        causing the generated code to be broken on 32-bit systems without a
-        SSE2-capable processor.  All x86 processor models released after
-        2004 should be SSE2-capable.  Run
-        <command>lscpu | grep sse2</command> as a test.  If it outputs
-        anything, your CPU is SSE2-capable and OK.  Otherwise you may try
-        to build this package <emphasis>on a SSE2-capable system</emphasis>
-        with the following fix applied:
-      </para>
-
-      <!-- computeroutput used deliberately to stop anyone from copying
-           blindly -->
-<screen role="nodump"><computeroutput>sed 's@pentium4@pentiumpro@' -i \
-    compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs</computeroutput></screen>
-
-      <para>
-        And copy the resulting
-        <filename class="directory">/opt/rustc-&rust-version;</filename>
-        to the system without SSE2 capability. But this change is still
-        under upstream review and not tested by BLFS editors.
-      </para>
-    </note>
-
-    <para>
-      To install into the
-      <filename class="directory">/opt</filename> directory, remove any
-      existing <filename>/opt/rustc</filename> symlink
-      and create a new directory (i.e. with a different name if trying a
-      modified build of the same version).
-      As the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>mkdir -pv /opt/rustc-&rust-version;      &amp;&amp;
-ln -svfn rustc-&rust-version; /opt/rustc</userinput></screen>
-
-    <note>
-      <para>
-        If multiple versions of <application>Rust</application> are installed
-        in <filename class="directory">/opt</filename>, changing to another
-        version only requires changing the <filename> /opt/rustc</filename>
-        symbolic link and then running <command>ldconfig</command>.
-      </para>
-    </note>
-
-    <para>
-      Create a suitable <filename>config.toml</filename> file which will
-      configure the build.
-    </para>
-
-<screen><userinput>cat &lt;&lt; EOF &gt; config.toml
-<literal># see config.toml.example for more possible options
-# See the 8.4 book for an old example using shipped LLVM
-# e.g. if not installing clang, or using a version before 13.0
-
-# Tell x.py the editors have reviewed the content of this file
-# and updated it to follow the major changes of the building system,
-# so x.py will not warn us to do such a review.
-change-id = 102579
-
-[llvm]
-# by default, rust will build for a myriad of architectures
-targets = "X86"
-
-# When using system llvm prefer shared libraries
-link-shared = true
-
-[build]
-# omit docs to save time and space (default is to build them)
-docs = false
-
-# install extended tools: cargo, clippy, etc
-extended = true
-
-# Do not query new versions of dependencies online.
-locked-deps = true
-
-# Specify which extended tools (those from the default install).
-tools = ["cargo", "clippy", "rustdoc", "rustfmt"]
-
-# Use the source code shipped in the tarball for the dependencies.
-# The combination of this and the "locked-deps" entry avoids downloading
-# many crates from Internet, and makes the Rustc build more stable.
-vendor = true
-
-[install]
-prefix = "/opt/rustc-&rust-version;"
-docdir = "share/doc/rustc-&rust-version;"
-
-[rust]
-channel = "stable"
-description = "for BLFS &version;"
-
-# BLFS used to not install the FileCheck executable from llvm,
-# so disabled codegen tests.  The assembly tests rely on FileCheck
-# and cannot easily be disabled, so those will anyway fail if
-# FileCheck has not been installed.
-#codegen-tests = false
-
-# Enable the same optimizations as the official upstream build.
-lto = "thin"
-codegen-units = 1
-
-[target.x86_64-unknown-linux-gnu]
-# NB the output of llvm-config (i.e. help options) may be
-# dumped to the screen when config.toml is parsed.
-llvm-config = "/usr/bin/llvm-config"
-
-[target.i686-unknown-linux-gnu]
-# NB the output of llvm-config (i.e. help options) may be
-# dumped to the screen when config.toml is parsed.
-llvm-config = "/usr/bin/llvm-config"</literal>
-EOF</userinput></screen>
-
-    <note>
-      <para>
-        The <command>python3 x.py</command> commands may output a warning
-        message complaining <quote><computeroutput>no codegen-backends
-        config matched the requested path to build a codegen
-        backend</computeroutput></quote>.  And the provided
-        <quote>suggestion</quote> (<computeroutput>add backend to
-        codegen-backends in config.toml</computeroutput>) will not silence
-        it.  This warning is <ulink
-        url='https://github.com/rust-lang/rust/issues/110692'>bogus</ulink>
-        and it should be ignored.
-      </para>
-    </note>
-
-    <para>
-      Compile <application>Rust</application> by running the following
-      commands:
-    </para>
-
-<!-- fixed in 1.58.0, retain as a reminder that fixed crates can be used
-<screen><userinput>sed -i -e '/^curl /s/0.4.38/0.4.40/' \
-       -e '/^curl-sys /s/0.4.48/0.4.50/' \
-       src/tools/cargo/Cargo.toml &amp;&amp; -->
-
-<screen><userinput>{ [ ! -e /usr/include/libssh2.h ] ||
-  export LIBSSH2_SYS_USE_PKG_CONFIG=1; }    &amp;&amp;
-{ [ ! -e /usr/include/sqlite3.h ] ||
-  export LIBSQLITE3_SYS_USE_PKG_CONFIG=1; } &amp;&amp;
-python3 x.py build</userinput></screen>
-
-    <note>
-      <para>
-        The test suite will generate some messages in the
-        <phrase revision="sysv">system log</phrase>
-        <phrase revision="systemd">systemd journal</phrase>
-        for traps on invalid opcodes, and for segmentation faults.
-        In themselves these are nothing to worry about, just a way for the
-        test to be terminated.
-      </para>
-    </note>
-
-    <para>
-      To run the tests (again using all available CPUs) issue:
-    </para>
-
-<screen remap="test"><userinput>SSL_CERT_DIR=/etc/ssl/certs \
-python3 x.py test --verbose --no-fail-fast | tee rustc-testlog</userinput></screen>
-
-    <!-- https://github.com/rust-lang/rust/pull/115869 -->
-    <para>
-      Two tests, <filename>tests/ui/issues/issue-21763.rs</filename> and
-      <filename>tests/debuginfo/regression-bad-location-list-67992.rs</filename>,
-      are known to fail.
-    </para>
-
-    <!-- https://github.com/rust-lang/rust/pull/120529 -->
-    <para>
-      With LLVM-18, two <literal>[run-make]</literal> tests named
-      <filename>rustdoc-target-spec-json-path</filename> and
-      <filename>target-specs</filename> are known to fail.
-    </para>
-
-    <para>
-      If <command>FileCheck</command> from <application>LLVM</application> has
-      not been installed, all 47 tests from the <quote>assembly</quote> suite
-      will fail.
-    </para>
-
-    <para>
-      As with all large test suites, other tests might fail on some machines -
-      if the number of additional failures is low,
-      check the log for 'failures:' and review lines above that, particularly the
-      'stderr:' lines. Any mention of
-      SIGSEGV or signal 11 in a failing test is a cause for concern.
-    </para>
-
-    <para>
-      If you get any <emphasis>other</emphasis> failing test which reports an
-      issue number then you should search for that issue.  For example, when
-      rustc &gt;= 1.41.1 was built with a version of sysllvm before 10.0 the test
-      for issue 69225 failed <ulink
-      url="https://github.com/rust-lang/rust/issues/69225"/> and that should be
-      regarded as a critical failure (they released 1.41.1 because of it).
-      Most other failures will not be critical.
-    </para>
-
-    <para>
-      Therefore, you should determine the number of failures.
-    </para>
-
-    <para>
-      The number of tests which passed and failed can be found by running:
-    </para>
-
-<!-- split into two lines for narrower screen windows -->
-<screen remap="test"><userinput>grep '^test result:' rustc-testlog |
- awk '{sum1 += $4; sum2 += $6} END { print sum1 " passed; " sum2 " failed" }'</userinput></screen>
-
-    <para>
-      The other available fields are $8 for those which were ignored
-      (i.e. skipped),  $10 for 'measured' and $12 for 'filtered out' but both
-      those last two are probably zero.
-    </para>
-
-    <para>
-      Now, as the &root; user, install the package:
-    </para>
-
-    <note>
-      <para>
-        If <command>sudo</command> or <command>su</command> is invoked for
-        switching to the &root; user, ensure
-        <envar>LIBSSH2_SYS_USE_PKG_CONFIG</envar> and
-        <envar>LIBSQLITE3_SYS_USE_PKG_CONFIG</envar> are correctly passed or
-        the following command may rebuild <command>cargo</command> with
-        shipped copies of libssh2 and sqlite.  For <command>sudo</command>,
-        use the
-        <option>--preserve-env=LIB{SSH2,SQLITE3}_SYS_USE_PKG_CONFIG</option>
-        option.  For <command>su</command>, do <emphasis>not</emphasis> use
-        the <option>-</option> or <option>--login</option> options.
-      </para>
-    </note>
-
-<screen role='root'><userinput>python3 x.py install rustc std &amp;&amp;
-python3 x.py install --stage=1 cargo clippy rustfmt</userinput></screen>
-
-    <para>
-      Still as the &root; user, fix the installation of documentations
-      and symlink a <application>Zsh</application>
-      completion file into the correct location:
-    </para>
-
-    <screen role='root'><userinput>rm -fv /opt/rustc-&rust-version;/share/doc/rustc-&rust-version;/*.old   &amp;&amp;
-install -vm644 README.md                                \
-               /opt/rustc-&rust-version;/share/doc/rustc-&rust-version; &amp;&amp;
-
-install -vdm755 /usr/share/zsh/site-functions      &amp;&amp;
-ln -sfv /opt/rustc/share/zsh/site-functions/_cargo \
-        /usr/share/zsh/site-functions</userinput></screen>
-
-    <para>
-      Finally, unset the exported environment variables:
-    </para>
-
-<screen><userinput>unset LIB{SSH2,SQLITE3}_SYS_USE_PKG_CONFIG</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>ln -svfn rustc-&rust-version; /opt/rustc</command>: if this is
-      not the first use of the <filename class="directory">/opt/rustc</filename>
-      symlink, overwrite it by forcing, and use the '-n' flag to avoid getting
-      confusing results from e.g. <command>ls -l</command>.
-    </para>
-
-    <para>
-      <literal>targets = "X86"</literal>: this avoids building all the available
-      linux cross-compilers (AArch64, MIPS, PowerPC, SystemZ, etc). Unfortunately,
-      rust insists on installing source files for these below
-      <filename class="directory">/opt/rustc/lib/src</filename>.
-    </para>
-
-    <para>
-      <literal>extended = true</literal>: this installs several tools
-      (specified by the <literal>tools</literal> entry) alongside
-      <command>rustc</command>.
-    </para>
-
-    <para>
-      <literal>tools = ["cargo", "clippy", "rustdoc", "rustfmt"]</literal>:
-      only build the tools from the 'default' profile in binary command
-      <command>rustup</command> which are recommended for most users.
-      The other tools are unlikely to be useful unless using (old) code
-      analyzers or editing the standard library.
-    </para>
-
-    <para>
-      <literal>channel = "stable"</literal>: this ensures only stable features
-      can be used, the default in <filename>config.toml</filename> is to use
-      development features, which is not appropriate for a released version.
-    </para>
-
-    <!-- comment while using shipped LLVM -->
-    <para>
-      <literal>[target.x86_64-unknown-linux-gnu]</literal>: the syntax of
-      <filename>config.toml</filename> requires an <literal>llvm-config</literal>
-      entry for each target for which system-llvm is to be used. Change the target
-      to <literal>[target.i686-unknown-linux-gnu]</literal> if you are building
-      on 32-bit x86. This whole section may be omitted if you wish to build
-      against the shipped llvm, or do not have clang, but the resulting build will
-      be larger and take longer.
-    </para>
-
-<!--<para>
-      <command>sed -i -e '/^curl /s/0.4.38/0.4.40/' ... </command>: two crates
-      normally downloaded for this release do not correctly initialise
-      <application>curl</application> if using
-      <application>openssl-3.0.0</application>. Upstream has fixed that for a
-      future release, this sed causes the fixed versions to be used.
-    </para>-->
-
-    <!-- https://github.com/alexcrichton/ssh2-rs/issues/173 -->
-    <para>
-      <command>export LIBSSH2_SYS_USE_PKG_CONFIG=1</command>: Allow
-      <command>cargo</command> to link to system libssh2.
-    </para>
-
-    <!-- src/tools/cargo/Cargo.toml is specifying "bundled" as the
-         upstream is suggesting to avoid issues building for Windoge.
-         We don't care about Windoge so override this if we have
-         system sqlite3.  -->
-    <para>
-      <command>export LIBSQLITE3_SYS_USE_PKG_CONFIG=1</command>: Allow
-      <command>cargo</command> to link to system sqlite.
-    </para>
-
-<!--<para>
-      <command>export RUSTFLAGS="$RUSTFLAGS -C link-args=-lffi"</command>:
-      This adds a link to libffi to any RUSTFLAGS you may already be passing
-      to the build. On some systems, linking fails to include libffi unless
-      this is used. The reason why this is needed is not clear.
-      2023-01-14 : assumed to be no longer needed, but it is some years
-      since one person reported needing this, keep it commented for the moment.
-    </para>-->
-
-    <!-- https://github.com/alexcrichton/openssl-probe/issues/25 -->
-    <para>
-      <envar>SSL_CERT_DIR=/etc/ssl/certs</envar>: Work around an issue
-      causing test failures with the CA certificate store layout used by
-      <xref linkend='make-ca'/>.
-    </para>
-
-    <para>
-      <parameter>--verbose</parameter>: this switch can sometimes provide more
-      information about a test which fails.
-    </para>
-
-    <para>
-      <parameter>--no-fail-fast</parameter>: this switch ensures that the test suite
-      will not stop at the first error.
-    </para>
-
-    <!-- https://github.com/rust-lang/rust/issues/94147 -->
-    <para>
-      <parameter>--stage=1</parameter>: this switch works around an issue
-      causing some Rustc components unnecessarily rebuilt running
-      <command>python3 x.py install</command>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Rust</title>
-
-    <sect3 id="rustc-config">
-      <title>Configuration Information</title>
-
-      <para>
-        If you installed <application>rustc</application> in
-        <filename class="directory">/opt</filename>, you need to update the
-        following configuration files so that <application>rustc</application>
-        is correctly found by other packages and system processes.
-      </para>
-
-      <para>
-        As the <systemitem class="username">root</systemitem> user, create
-        the <filename>/etc/profile.d/rustc.sh</filename> file:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/rustc.sh &lt;&lt; "EOF"
-<literal># Begin /etc/profile.d/rustc.sh
-
-pathprepend /opt/rustc/bin           PATH
-
-# End /etc/profile.d/rustc.sh</literal>
-EOF</userinput></screen>
-
-      <para>
-        Immediately after installation, update the current PATH
-        for your current shell as a normal user:
-      </para>
-
-<screen><userinput>source /etc/profile.d/rustc.sh</userinput></screen>
-
-    </sect3>
-  </sect2>
-
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          cargo-clippy, cargo-fmt, cargo, clippy-driver, rust-gdb,
-          rust-gdbgui, rust-lldb, rustc, rustdoc, and rustfmt
-        </seg>
-        <seg>
-          librustc-driver-&lt;16-byte-hash&gt;.so,
-          libstd-&lt;16-byte-hash&gt;.so, and
-          libtest-&lt;16-byte-hash&gt;.so
-        </seg>
-        <seg>
-          ~/.cargo,
-          /opt/rustc, symbolic link to
-          /opt/rustc-&rust-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cargo-clippy">
-        <term><command>cargo-clippy</command></term>
-        <listitem>
-          <para>
-            provides lint checks for a cargo package
-          </para>
-          <indexterm zone="rust cargo-clippy">
-            <primary sortas="b-cargo-clippy">cargo-clippy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cargo-fmt">
-        <term><command>cargo-fmt</command></term>
-        <listitem>
-          <para>
-            formats all bin and lib files of the current crate using
-            rustfmt
-          </para>
-          <indexterm zone="rust cargo-fmt">
-            <primary sortas="b-cargo-fmt">cargo-fmt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!--  <varlistentry id="cargo-miri">
-        <term><command>cargo-miri</command></term>
-        <listitem>
-          <para>
-            is for use by Miri to interpret bin crates and tests. It is
-            not installed by default.
-          </para>
-          <indexterm zone="rust cargo-miri">
-            <primary sortas="b-cargo-miri">cargo-miri</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
-
-      <varlistentry id="cargo">
-        <term><command>cargo</command></term>
-        <listitem>
-          <para>
-            is the Package Manager for Rust
-          </para>
-          <indexterm zone="rust cargo">
-            <primary sortas="b-cargo">cargo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="clippy-driver">
-        <term><command>clippy-driver</command></term>
-        <listitem>
-          <para>
-            provides lint checks for Rust
-          </para>
-          <indexterm zone="rust clippy-driver">
-            <primary sortas="b-clippy-driver">clippy-driver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!--  <varlistentry id="miri">
-        <term><command>miri</command></term>
-        <listitem>
-          <para>
-            is an interpreter for Rust's mid-level intermediate representation
-            (MIR). It is not installed by default.
-          </para>
-          <indexterm zone="rust miri">
-            <primary sortas="b-miri">miri</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rls">
-        <term><command>rls</command></term>
-        <listitem>
-          <para>
-            is the Rust Language Server. This can run in the background to
-            provide IDEs, editors, and other tools with information about Rust
-            programs
-          </para>
-          <indexterm zone="rust rls">
-            <primary sortas="b-rls">rls</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rust-analyzer">
-        <term><command>rust-analyzer</command></term>
-        <listitem>
-          <para>
-            is an implementation of Language Server Protocol for the Rust
-            programming language.
-          </para>
-          <indexterm zone="rust rust-analyzer">
-            <primary sortas="b-rust-analyzer">rust-analyzer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rust-demangler">
-        <term><command>rust-demangler</command></term>
-        <listitem>
-          <para>
-            converts a list of Rust mangled symbols into a
-            corresponding list of demangled symbols
-          </para>
-          <indexterm zone="rust rust-demangler">
-            <primary sortas="b-rust-demangler">rust-demangler</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry> -->
-
-      <varlistentry id="rust-gdb">
-        <term><command>rust-gdb</command></term>
-        <listitem>
-          <para>
-            is a wrapper script for gdb, pulling in Python pretty-printing
-            modules installed in
-            <filename class="directory">/opt/rustc-&rust-version;/lib/rustlib/etc</filename>
-          </para>
-          <indexterm zone="rust rust-gdb">
-            <primary sortas="b-rust-gdb">rust-gdb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rust-gdbgui">
-        <term><command>rust-gdbgui</command></term>
-        <listitem>
-          <para>
-            is a wrapper script for a graphical front end to gdb that runs in a
-            browser
-          </para>
-          <indexterm zone="rust rust-gdbgui">
-            <primary sortas="b-rust-gdbgui">rust-gdbgui</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rust-lldb">
-        <term><command>rust-lldb</command></term>
-        <listitem>
-          <para>
-            is a wrapper script for LLDB (the LLVM debugger)
-            pulling in the Python pretty-printing modules
-          </para>
-          <indexterm zone="rust rust-lldb">
-            <primary sortas="b-rust-lldb">rust=lldb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rustc">
-        <term><command>rustc</command></term>
-        <listitem>
-          <para>
-            is the rust compiler
-          </para>
-          <indexterm zone="rust rustc">
-            <primary sortas="b-rustc">rustc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rustdoc">
-        <term><command>rustdoc</command></term>
-        <listitem>
-          <para>
-            generates documentation from rust source code
-          </para>
-          <indexterm zone="rust rustdoc">
-            <primary sortas="b-rustdoc">rustdoc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rustfmt">
-        <term><command>rustfmt</command></term>
-        <listitem>
-          <para>
-            formats rust code
-          </para>
-          <indexterm zone="rust rustfmt">
-            <primary sortas="b-rustfmt">rustfmt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libstd">
-        <term><filename class="libraryfile">libstd-&lt;16-byte-hash&gt;.so</filename></term>
-        <listitem>
-          <para>
-            is the Rust Standard Library, the foundation of portable Rust software
-          </para>
-          <indexterm zone="rust libstd">
-            <primary sortas="c-libstd">libstd-&lt;16-byte-hash&gt;.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/prog/scons.xml
===================================================================
--- general/prog/scons.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,187 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 scons-download-http "&sourceforge-dl;/scons/SCons-&scons-version;.tar.gz">
-  <!ENTITY scons-download-ftp  " ">
-  <!ENTITY scons-md5sum        "f931948234687b507e2c8ae6ec18fb1c">
-  <!ENTITY scons-size          "3.1 MB">
-  <!ENTITY scons-buildsize     "50 MB">
-  <!ENTITY scons-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="scons" xreflabel="SCons-&scons-version;">
-  <?dbhtml filename="scons.html"?>
-
-
-  <title>SCons-&scons-version;</title>
-
-  <indexterm zone="scons">
-    <primary sortas="a-SCons">SCons</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to SCons</title>
-
-    <para>
-      <application>SCons</application> is a tool for building software
-      (and other files) implemented in <application>Python</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&scons-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&scons-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &scons-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &scons-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &scons-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &scons-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">SCons Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="docbook-xsl"/> and
-      <xref role="runtime" linkend="libxslt"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of SCons</title>
-
-    <!-- Commented out because I don't think it's still needed.  If
-         something bad happens please uncomment.
-    <screen><userinput>sed -i 's/env python/&amp;3/' SCons/Utilities/*.py &amp;&amp;</userinput></screen> -->
-
-    <para>
-      Fix the install location of the man pages:
-    </para>
-
-    <screen><userinput>sed -i '/scons.1/s@^.@share/man/man1@' -i setup.cfg</userinput></screen>
-
-    <para>
-      Build the package:
-    </para>
-
-    &build-wheel;
-
-    <para>
-      As the &root; user, install the package:
-    </para>
-
-    <screen role='root'><userinput>&install-wheel; SCons</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          scons, scons-configure-cache, and sconsign
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/python&python3-majorver;/site-packages/SCons{,-&scons-version;.dist-info}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="scons-prog">
-        <term><command>scons</command></term>
-        <listitem>
-          <para>
-            is a software construction tool
-          </para>
-          <indexterm zone="scons scons-prog">
-            <primary sortas="b-scons">scons</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="scons-configure-cache">
-        <term><command>scons-configure-cache</command></term>
-        <listitem>
-          <para>
-            shows or converts the configuration of an
-            <application>SCons</application> cache directory
-          </para>
-          <indexterm zone="scons scons-configure-cache">
-            <primary sortas="b-scons-configure-cache">scons-configure-cache</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sconsign">
-        <term><command>sconsign</command></term>
-        <listitem>
-          <para>
-            prints <application>SCons</application>
-            <filename>.sconsign</filename> file information
-          </para>
-          <indexterm zone="scons sconsign">
-            <primary sortas="b-sconsign">sconsign</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
- <!-- Removed in 4.0.0
-      <varlistentry id="scons-time">
-        <term><command>scons-time</command></term>
-        <listitem>
-          <para>
-            generates and displays <application>SCons</application>
-            timing information.
-          </para>
-          <indexterm zone="scons scons-time">
-            <primary sortas="b-scons-time">scons-time</primary>
-          </indexterm>
-        </listitem>
-     </varlistentry>
--->
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/prog/slang.xml
===================================================================
--- general/prog/slang.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,186 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 slang-download-http "https://www.jedsoft.org/releases/slang/slang-&slang-version;.tar.bz2">
-  <!ENTITY slang-download-ftp  " ">
-  <!ENTITY slang-md5sum        "69015c8300088373eb65ffcc6ed4db8c">
-  <!ENTITY slang-size          "1.6 MB">
-  <!ENTITY slang-buildsize     "22 MB (add 15 MB for tests)">
-  <!ENTITY slang-time          "0.4 SBU (add 0.5 SBU for tests)">
-]>
-
-<sect1 id="slang" xreflabel="slang-&slang-version;">
-  <?dbhtml filename="slang.html"?>
-
-
-  <title>slang-&slang-version;</title>
-
-  <indexterm zone="slang">
-    <primary sortas="a-slang">slang</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to slang</title>
-
-    <para>
-      <application>S-Lang</application> (slang) is an interpreted language
-      that may be embedded into an application to make the application
-      extensible.  It provides facilities required by interactive applications
-      such as display/screen management, keyboard input and keymaps.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&slang-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&slang-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &slang-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &slang-size;</para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &slang-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &slang-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Slang Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libpng"/> and
-      <ulink url="https://github.com/kkos/oniguruma">Oniguruma</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Slang</title>
-
-    <note>
-      <para>
-        This package does not support parallel build.
-      </para>
-    </note>
-
-    <para>
-      Install <application>slang</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --with-readline=gnu &amp;&amp;
-make -j1</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_doc_dir=/usr/share/doc/slang-&slang-version;   \
-     SLSH_DOC_DIR=/usr/share/doc/slang-&slang-version;/slsh \
-     install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-readline=gnu</parameter>: This parameter sets GNU
-      <application>Readline</application> to be used by the parser interface
-      instead of the <application>slang</application> internal version.
-    </para>
-
-    <para>
-      <command>make install_doc_dir=/usr/share/doc/slang-&slang-version;
-      SLSH_DOC_DIR=/usr/share/doc/slang-&slang-version;/slsh install</command>:
-      This command installs this package with a versioned documentation
-      installation directory.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring slang</title>
-
-    <sect3 id="slang-config">
-      <title>Config Files</title>
-      <para>
-        <filename>~/.slshrc</filename> and
-        <filename>/etc/slsh.rc</filename>
-      </para>
-
-      <indexterm zone="slang slang-config">
-        <primary sortas="e-AA.slshrc">~/.slshrc</primary>
-      </indexterm>
-
-      <indexterm zone="slang slang-config">
-        <primary sortas="e-etc-slsh">/etc/slsh.rc</primary>
-      </indexterm>
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>slsh</seg>
-        <seg>libslang.so and numerous support modules</seg>
-        <seg>/usr/lib/slang, /usr/share/doc/slang-&slang-version;
-        and /usr/share/slsh</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="slsh">
-        <term><command>slsh</command></term>
-        <listitem>
-          <para>
-            is a simple program for interpreting
-            <application>slang</application> scripts. It supports dynamic
-            loading of <application>slang</application> modules and includes a
-            <application>Readline</application> interface for interactive use
-          </para>
-          <indexterm zone="slang slsh">
-            <primary sortas="b-slsh">slsh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/prog/subversion.xml
===================================================================
--- general/prog/subversion.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,588 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY subversion-download-http "https://archive.apache.org/dist/subversion/subversion-&subversion-version;.tar.bz2">
-  <!ENTITY subversion-download-ftp  " ">
-  <!ENTITY subversion-md5sum        "19756a5ceb32a022698a66e48616ef6b">
-  <!ENTITY subversion-size          "8.2 MB">
-  <!-- for 1.12.0                    1.12.2         1.13.0
-       make javahl: 0.5 SBU  28 MB; not avail
-       swig-pl:     0.8      42 MB; 0.7 SBU  43 MB; 0.6 SBU 44 MB
-       swig-py:     0.6      26 MB; 0.5      28 MB; 0.5     28 MB
-       swig-rb:     0.4      22 MB; 0.4      21 MB; 0.3     21 MB
-       docs:        2 secs   26 MB; 2 sec    27 MB; 2 sec   26 MB
-       tests       46 min  1104 MB  46:52  1103 MB  47 min   -->
-  <!ENTITY subversion-buildsize     "193 MB (add 189 MB for bindings, 54 MB for docs, 1.3 GB for tests)">
-  <!ENTITY subversion-time          "0.5 SBU (Using parallelism=4; add 2.0 SBU for bindings, 30 SBU for tests)">
-]>
-
-<sect1 id="subversion" xreflabel="Subversion-&subversion-version;">
-  <?dbhtml filename="subversion.html"?>
-
-
-  <title>Subversion-&subversion-version;</title>
-
-  <indexterm zone="subversion">
-    <primary sortas="a-Subversion">Subversion</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Subversion</title>
-
-    <para>
-      <application>Subversion</application> is a version control system that is
-      designed to be a compelling replacement for <application>CVS</application>
-      in the open source community. It extends and enhances
-      <application>CVS</application>' feature set, while maintaining a similar
-      interface for those already familiar with <application>CVS</application>.
-      These instructions install the client and server software used to
-      manipulate a <application>Subversion</application> repository. Creation of
-      a repository is covered at <xref linkend="svnserver"/>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&subversion-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&subversion-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &subversion-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &subversion-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &subversion-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &subversion-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch for building with <xref linkend="apr"/>:
-          <ulink url="&patch-root;/subversion-&subversion-version;-apr_1.7.0_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Subversion Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="apr-util"/> and
-      <xref linkend="sqlite"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="serf"/> (for handling http:// and https:// URLs)
-    </para>
-
-<!-- support for berkeley db is deprecated since 1.8
-    <note>
-      <para>
-        If you require the <application>Berkeley DB</application> back-end hooks
-        in <application>Subversion</application> to build or support BDB based
-        repositories, you must have <application>APR-util</application> linked to
-        the <application>Berkeley DB</application> library.
-      </para>
-    </note>
--->
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="apache"/>,
-      <xref linkend="boost"/>,
-      <xref linkend="cyrus-sasl"/>,
-      <xref linkend="dbus"/>,
-      <xref linkend="doxygen"/> (for generating HTML documentation),
-      <xref linkend="gnome-keyring"/>,
-      <xref linkend="libsecret"/>,
-<!--      <xref linkend="kdelibs"/> (for <ulink url="http://utils.kde.org/projects/kwalletmanager/">KWallet</ulink> support), -->
-      <xref linkend="py3c"/> (for the python bindings, and tests),
-      <xref linkend="python3"/> (with sqlite support for the tests),
-      <xref linkend="ruby"/>,
-      <xref linkend="swig"/> (for building Perl, Python and Ruby bindings),
-      and
-      <ulink url="https://git.netsurf-browser.org/libutf8proc.git/">UTF8proc</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (for the Java Bindings)</bridgehead>
-    <para role="optional">
-      One of <xref linkend="openjdk"/>,
-      <ulink url="https://www.inet.no/dante/">Dante</ulink> or
-      <ulink url="https://jikes.sourceforge.net/">Jikes</ulink>,
-      <ulink url="https://junit.org/junit4/">JUnit 4</ulink> (to test the Java bindings) and
-      <xref linkend="apache-ant"/>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Subversion</title>
-<!--
-      <note>
-        <para>
-          This package may fail during the make phase when using multiple
-          processors.  If this occurs try continuing with
-          <emphasis>make -j1</emphasis> or redo the entire build process with
-          fresh sources using <emphasis>-j1</emphasis>.
-        </para>
-      </note>
--->
-
-    <para>
-      First, adapt some Python scripts to use python3:
-    </para>
-
-<screen><userinput remap="pre">grep -rl '^#!.*python$' | xargs sed -i '1s/python/&amp;3/'</userinput></screen>
-
-    <para>
-      Next, adapt the Ruby bindings to ruby-3.2 and later:
-    </para>
-
-    <screen><userinput remap="pre">sed -e 's/File.exists?/File.exist?/'               \
-    -i subversion/bindings/swig/ruby/svn/util.rb   \
-       subversion/bindings/swig/ruby/test/test_wc.rb</userinput></screen>
-
-    <para>
-      Install <application>Subversion</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>PYTHON=python3                        \
-./configure --prefix=/usr             \
-            --disable-static          \
-            --with-apache-libexecdir  \
-            --with-utf8proc=internal &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have <xref linkend="doxygen"/> installed and you wish to build the
-      API documentation, issue:
-    </para>
-
-<screen remap="doc"><userinput>doxygen doc/doxygen.conf</userinput></screen>
-
-    <para>
-      If you wish to build the Java bindings pass the <option>--enable-javahl</option>
-      parameter to the <command>configure</command> command. In addition, if
-      you want to run the Java test suite, you have to specify the location
-      of the <application>JUnit</application> file by adding
-      <option>--with-junit=&lt;path to junit jar&gt;</option> (for
-      instance <option>--with-junit=/usr/local/java/lib/junit-4.13.jar</option>)
-      to <command>configure</command>. The JUnit jar file is no longer
-      included in <xref linkend="apache-ant"/> and must be downloaded
-      separately. To build the Java bindings, issue the following command:
-    </para>
-    <para>
-      <screen><command>make -j1 javahl</command></screen>
-    </para>
-
-    <para>
-      If you want to compile <application>Perl</application>,
-      <application>Python</application>, or <application>Ruby</application>
-      bindings, issue any of the following command:
-    </para>
-    <para>
-      <screen><command>make swig-pl</command> # for <application>Perl</application>
-<command>make swig-py \
-     swig_pydir=/usr/lib/python&python3-majorver;/site-packages/libsvn \
-     swig_pydir_extra=/usr/lib/python&python3-majorver;/site-packages/svn</command> # for <application>Python</application>
-<command>make swig-rb</command> # for <application>Ruby</application></screen>
-    </para>
-
-    <para>
-      To test the results, issue: <command>make check</command>. Four tests in
-      the <filename>commit_tests.py</filename>,
-      <filename>prop_tests.py</filename>, and
-      <filename>update_tests.py</filename> suites are known to fail. Due to
-      changes in Python-3.12, you can expect to see around 200 Syntax Warnings
-      during the test suite due to invalid escape sequences.
-    </para>
-
-    <para>
-      To test the results of any of the <application>SWIG</application>
-      bindings, you can use any of the following commands:
-      <command>make check-swig-pl</command>,
-      <command>make check-swig-py</command>, or
-      <command>make check-swig-rb</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-
-install -v -m755 -d /usr/share/doc/subversion-&subversion-version; &amp;&amp;
-cp      -v -R doc/* /usr/share/doc/subversion-&subversion-version;</userinput></screen>
-
-    <para>
-      If you built the Java bindings, issue the following command as the
-      <systemitem class="username">root</systemitem> user to install them:
-    </para>
-    <para>
-<screen><command>make install-javahl</command></screen>
-    </para>
-
-    <para>
-      If you built the <application>Perl</application>,
-      <application>Python</application>, or
-      <application>Ruby</application> bindings, issue any of the following
-      commands as the <systemitem class="username">root</systemitem> user
-      to install them:
-    </para>
-    <para>
-<screen><command>make install-swig-pl</command>
-<command>make install-swig-py \
-      swig_pydir=/usr/lib/python&python3-majorver;/site-packages/libsvn \
-      swig_pydir_extra=/usr/lib/python&python3-majorver;/site-packages/svn</command>
-<command>make install-swig-rb</command></screen>
-    </para>
-
-    <para>
-      The java bindings need to be installed in order for the tests to run,
-      since the tests attempt to look for them in CLASSPATH. To test the
-      results of the Java bindings build, issue
-      <command>LANG=C make check-javahl</command>.
-      <!-- ~~ This explanation is added to the configure above ~~
-      The <application>JUnit</application> testing framework must be installed,
-      and the location of the JUnit jar has to be specified by passing the
-      <option>- -with-junit=&lt;path to junit jar&gt;</option> parameter to
-      <command>configure</command>. Note that <application>JUnit</application>
-      is included in <xref linkend="apache-ant"/>, and can be accessed by
-      passing <option>- -with-junit=/opt/ant/lib/junit-4.12.jar</option>
-      to <command>configure</command>.
-      -->
-    </para>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <parameter>--with-apache-libexecdir</parameter>:
-      If <xref linkend="apache"/> is installed, the shared
-      <application>Apache</application> modules are
-      built. This switch allows to have those modules installed to
-      <application>Apache</application>'s configured module dir instead
-      of <filename class="directory">/usr/libexec</filename>. It has no effect
-      if <application>Apache</application> is not installed.
-    </para>
-
-    <para>
-      <parameter>--with-utf8proc=internal</parameter>:
-      Remove these switches if you have installed the optional dependencies.
-    </para>
-
-    <para>
-      <option>--enable-javahl</option>: enables compilation of Java high level
-      bindings. Running <command>make javahl</command> is necessary to do
-      the compilation.
-    </para>
-
-    <para>
-      <option>--with-junit=&lt;location of the junit jar file&gt;</option>:
-      gives the location of the junit jar, otherwise the javahl tests cannot
-      be run.
-    </para>
-
-    <para>
-      <option>--disable-gmock</option>: Do not use the Googlemock testing
-      framework.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Subversion</title>
-
-    <sect3 id="subversion-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>~/.subversion/config</filename> and
-        <filename>/etc/subversion/config</filename>
-      </para>
-
-      <indexterm zone="subversion subversion-config">
-        <primary sortas="e-AA.subversion/config">~/.subversion/config</primary>
-      </indexterm>
-
-      <indexterm zone="subversion subversion-config">
-        <primary sortas="e-etc-subversion-config">/etc/subversion/config</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        <filename>/etc/subversion/config</filename> is the
-        <application>Subversion</application> system-wide configuration file.
-        This file is used to specify defaults for different
-        <command>svn</command> commands.
-      </para>
-
-      <para>
-        <filename>~/.subversion/config</filename> is the user's personal
-        configuration file. It is used to override the system-wide defaults set
-        in <filename>/etc/subversion/config</filename>.
-      </para>
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          svn, svnadmin, svnbench, svndumpfilter, svnfsfs, svnlook, svnmucc,
-          svnrdump, svnserve, svnsync, and svnversion
-        </seg>
-        <seg>
-          libsvn_*-1.so and optionally, a Java library, the mod_dav_svn.so and
-          mod_authz_svn.so <application>Apache HTTP</application> DSO
-          modules and various <application>Perl</application>,
-          <application>Python</application> and
-          <application>Ruby</application> modules.
-        </seg>
-        <seg>
-          /usr/include/subversion-1,
-          /usr/lib/perl5/site_perl/&lfs-perl-version;/{,auto/}SVN,
-          /usr/lib/python&python3-majorver;/site-packages/{libsvn,svn},
-          /usr/lib/ruby/site_ruby/&lt;x.y.z&gt;/{,&lt;arch-linux&gt;-linux/}svn,
-          /usr/lib/svn-javahl, and
-          /usr/share/doc/subversion-&subversion-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="svn">
-        <term><command>svn</command></term>
-        <listitem>
-          <para>
-            is a command-line client program used to access
-            <application>Subversion</application> repositories
-          </para>
-          <indexterm zone="subversion svn">
-            <primary sortas="b-svn">svn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="svnadmin">
-        <term><command>svnadmin</command></term>
-        <listitem>
-          <para>
-            is a tool for creating, tweaking or repairing a
-            <application>Subversion</application> repository
-          </para>
-          <indexterm zone="subversion svnadmin">
-            <primary sortas="b-svnadmin">svnadmin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="svnbench">
-        <term><command>svnbench</command></term>
-        <listitem>
-          <para>
-            is a benchmarking tool
-          </para>
-          <indexterm zone="subversion svnbench">
-            <primary sortas="b-svnbench">svnbench</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="svndumpfilter">
-        <term><command>svndumpfilter</command></term>
-        <listitem>
-          <para>
-            is a program for filtering <application>Subversion</application>
-            repository dumpfile format streams
-          </para>
-          <indexterm zone="subversion svndumpfilter">
-            <primary sortas="b-svndumpfilter">svndumpfilter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="svnfsfs">
-        <term><command>svnfsfs</command></term>
-        <listitem>
-          <para>
-            is the FSFS (FileSystem atop of the FileSystem -
-            <application>Subversion</application> filesystem implementation)
-            repository manipulation tool
-          </para>
-          <indexterm zone="subversion svnfsfs">
-            <primary sortas="b-svnfsfs">svnfsfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="svnlook">
-        <term><command>svnlook</command></term>
-        <listitem>
-          <para>
-            is a tool for inspecting a <application>Subversion</application>
-            repository
-          </para>
-          <indexterm zone="subversion svnlook">
-            <primary sortas="b-svnlook">svnlook</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="svnmucc">
-        <term><command>svnmucc</command></term>
-        <listitem>
-          <para>
-            is a Multiple URL Command Client for <application>Subversion</application>
-          </para>
-          <indexterm zone="subversion svnmucc">
-            <primary sortas="b-svnmucc">svnmucc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="svnrdump">
-        <term><command>svnrdump</command></term>
-        <listitem>
-          <para>
-            is a tool for dumping or loading a remote
-            <application>Subversion</application> repository
-          </para>
-          <indexterm zone="subversion svnrdump">
-            <primary sortas="b-svnrdump">svnrdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="svnserve">
-        <term><command>svnserve</command></term>
-        <listitem>
-          <para>
-            is a custom standalone server program, able to run as a daemon
-            process or invoked by SSH
-          </para>
-          <indexterm zone="subversion svnserve">
-           <primary sortas="b-svnserve">svnserve</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="svnsync">
-        <term><command>svnsync</command></term>
-        <listitem>
-          <para>
-            is a <application>Subversion</application> repository
-            synchronisation tool
-          </para>
-          <indexterm zone="subversion svnsync">
-           <primary sortas="b-svnsync">svnsync</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="svnversion">
-        <term><command>svnversion</command></term>
-        <listitem>
-          <para>
-            is used to report the version number and state of a working
-            <application>Subversion</application> repository copy
-          </para>
-          <indexterm zone="subversion svnversion">
-            <primary sortas="b-svnversion">svnversion</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libsvn_star-1">
-        <term><filename class="libraryfile">libsvn_*-1.so</filename></term>
-        <listitem>
-          <para>
-            are the support libraries used by the
-            <application>Subversion</application> programs
-          </para>
-          <indexterm zone="subversion libsvn_star-1">
-            <primary sortas="c-libsvn_star-1">libsvn_*-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mod_authz_svn">
-        <term><filename class="libraryfile">mod_authz_svn.so</filename></term>
-        <listitem>
-          <para>
-            is a plug-in module for the <application>Apache</application> HTTP
-            server, used to authenticate users to a
-            <application>Subversion</application> repository over the Internet
-            or an intranet
-          </para>
-          <indexterm zone="subversion mod_authz_svn">
-            <primary sortas="c-mod_authz_svn">mod_authz_svn.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mod_dav_svn">
-        <term><filename class="libraryfile">mod_dav_svn.so</filename></term>
-        <listitem>
-          <para>
-            is a plug-in module for the <application>Apache</application> HTTP
-            server, used to make a <application>Subversion</application>
-            repository available to others over the Internet or an intranet
-          </para>
-          <indexterm zone="subversion mod_dav_svn">
-            <primary sortas="c-mod_authz_svn">mod_dav_svn.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/prog/svnserver.xml
===================================================================
--- general/prog/svnserver.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,289 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="svnserver" xreflabel="Running a Subversion Server">
-  <?dbhtml filename="svnserver.html"?>
-
-
-  <title>Running a Subversion Server</title>
-
-  <sect2 role="package">
-    <title>Running a Subversion Server</title>
-
-    <para>
-      This section will describe how to set up, administer and secure
-      a <application>Subversion</application> server.
-    </para>
-
-    <bridgehead renderas="sect3">Subversion Server Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="subversion"/> and
-      <xref linkend="openssh"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Setting up a Subversion Server.</title>
-
-    <para>
-      The following instructions will install a
-      <application>Subversion</application> server, which will be set up
-      to use <application>OpenSSH</application> as the secure remote access
-      method, with <command>svnserve</command> available for anonymous
-      access.
-    </para>
-
-    <para>
-      Configuration of the <application>Subversion</application> server
-      consists of the following steps:
-    </para>
-
-    <sect3>
-      <title>1. Set Uup Users, Groups, and Permissions</title>
-
-      <para>
-        You'll need to be user
-        <systemitem class='username'>root</systemitem> for the initial portion
-        of configuration. Create the <systemitem
-        class="username">svn</systemitem> user and group with the following
-        commands:
-      </para>
-
-<screen role="root"><userinput>groupadd -g 56 svn &amp;&amp;
-useradd -c "SVN Owner" -d /home/svn -m -g svn -s /bin/false -u 56 svn</userinput></screen>
-
-      <para>
-        If you plan to have multiple repositories, you should have a
-        group dedicated to each repository for ease of administration. Create
-        the <systemitem class="groupname">svntest</systemitem> group for the
-        test repository and add the <systemitem
-        class="username">svn</systemitem> user to that group with the
-        following commands:
-      </para>
-
-<screen role="root"><userinput>groupadd -g 57 svntest &amp;&amp;
-usermod -G svntest -a svn</userinput></screen>
-
-      <para>
-        Additionally you should set <command>umask 002</command> while
-        working with a repository so that all new files will be writable by
-        owner and group. This is made mandatory by creating a wrapper script
-        for <command>svn</command> and <command>svnserve</command>:
-      </para>
-
-<screen role="root"><userinput>mv /usr/bin/svn /usr/bin/svn.orig &amp;&amp;
-mv /usr/bin/svnserve /usr/bin/svnserve.orig &amp;&amp;
-cat &gt;&gt; /usr/bin/svn &lt;&lt; "EOF"
-<literal>#!/bin/sh
-umask 002
-/usr/bin/svn.orig "$@"</literal>
-EOF
-cat &gt;&gt; /usr/bin/svnserve &lt;&lt; "EOF"
-<literal>#!/bin/sh
-umask 002
-/usr/bin/svnserve.orig "$@"</literal>
-EOF
-chmod 0755 /usr/bin/svn{,serve}</userinput></screen>
-
-      <note>
-        <para>
-          If you use <application>Apache</application> for working with
-          the repository over HTTP, even for anonymous access, you should wrap
-          <command>/usr/sbin/httpd</command> in a similar script.
-        </para>
-      </note>
-
-    </sect3>
-
-    <sect3>
-      <title>2. Create a Subversion repository.</title>
-
-      <para>
-        There are several ways to set up a subversion repository. It is
-        recommended to have a look at the <ulink
-        url="https://svnbook.red-bean.com/nightly/en/svn.reposadmin.html">SVN
-        Book</ulink> corresponding chapter. A basic repository can be set up
-        with the instructions below.
-      </para>
-
-      <para>
-        Create a new <application>Subversion</application> repository with
-        the following commands (as the <systemitem class="username">root
-        </systemitem> user):
-      </para>
-
-<screen role="root"><userinput>install -v -m 0755 -d /srv/svn &amp;&amp;
-install -v -m 0755 -o svn -g svn -d /srv/svn/repositories &amp;&amp;
-svnadmin create /srv/svn/repositories/svntest</userinput></screen>
-
-      <para>
-        Now that the repository is created, it should be populated with
-        something useful. You'll need to have a predefined directory
-        layout set up exactly as you want your repository to look. For
-        example, here is a sample BLFS layout setup with a root of
-        <filename>svntest/</filename>. You'll need to set up a directory
-        tree similar to the following:
-      </para>
-
-<screen><literal>svntest/            # The name of the repository
-   trunk/           # Contains the existing source tree
-      BOOK/
-      bootscripts/
-      edguide/
-      patches/
-      scripts/
-   branches/        # Needed for additional branches
-   tags/            # Needed for tagging release points</literal></screen>
-
-      <para>
-        Once you've created your directory layout as shown above, you
-        are ready to do the initial import:
-      </para>
-
-<screen role="root"><userinput>svn import -m "Initial import." \
-    <replaceable>&lt;/path/to/source/tree&gt;</replaceable>      \
-    file:///srv/svn/repositories/svntest</userinput></screen>
-
-      <para>
-        Now change owner and group information on the
-        repository, and add an unprivileged user to the
-        <systemitem class="groupname">svn</systemitem> and
-        <systemitem class="groupname">svntest</systemitem> groups:
-      </para>
-
-<screen role="root"><userinput>chown -R svn:svntest /srv/svn/repositories/svntest    &amp;&amp;
-chmod -R g+w         /srv/svn/repositories/svntest    &amp;&amp;
-chmod g+s            /srv/svn/repositories/svntest/db &amp;&amp;
-usermod -G svn,svntest -a <replaceable>&lt;username&gt;</replaceable></userinput></screen>
-
-      <para>
-        <systemitem class="groupname">svntest</systemitem> is the group
-        assigned to the svntest repository. As mentioned earlier, this eases
-        administration of multiple repositories when using
-        <application>OpenSSH</application> for authentication. Going forward,
-        you'll need to add your unprivileged user, and any additional users
-        that you wish to have write access to the repository, to the
-        <systemitem class="groupname">svn</systemitem> and <systemitem
-        class="groupname">svntest</systemitem> groups.
-      </para>
-
-      <para>
-        In addition, you'll notice that the new repository's
-        <filename>db</filename> directory is set-groupID. If the reasoning is
-        not immediately obvious, when using any external authentication method
-        (such as <command>ssh</command>), the sticky bit is set so that all
-        new files will be owned by the user, but group of
-        <systemitem class="groupname">svntest</systemitem>. Anyone in the
-        <systemitem class="groupname">svntest</systemitem> group can create
-        files, but still give the entire group write access to those
-        files. This avoids locking out other users from the repository.
-      </para>
-
-      <para>
-        Now, return to an unprivileged user account, and take a
-        look at the new repository using <command>svnlook</command>:
-      </para>
-
-<screen><userinput>svnlook tree /srv/svn/repositories/svntest/</userinput></screen>
-
-      <note>
-        <para>
-          You may need to log out and back in again to refresh your group
-          memberships. <command>su
-          <replaceable>&lt;username&gt;</replaceable></command>
-          should work as well.
-        </para>
-      </note>
-
-    </sect3>
-
-    <sect3>
-      <title>3. Configure the Server</title>
-
-      <para>
-        As mentioned previously, these instructions will configure the
-        server to use only <command>ssh</command> for write access to the
-        repository and to provide anonymous access using
-        <command>svnserve</command>. There are several other ways to provide
-        access to the repository. These additional configurations are best
-        explained at <ulink url="https://svnbook.red-bean.com/"/>.
-      </para>
-
-      <para>
-        Access configuration needs to be done for each repository.
-        Create the <filename>svnserve.conf</filename> file for the svntest
-        repository using the following commands:
-      </para>
-
-<screen role="root"><userinput>cp /srv/svn/repositories/svntest/conf/svnserve.conf \
-   /srv/svn/repositories/svntest/conf/svnserve.conf.default &amp;&amp;
-
-cat &gt; /srv/svn/repositories/svntest/conf/svnserve.conf &lt;&lt; "EOF"
-<literal>[general]
-anon-access = read
-auth-access = write</literal>
-EOF</userinput></screen>
-
-      <para>
-        There is not a lot to the configuration file at all. You'll notice
-        that only the general section is required. Take a look at the
-        <filename>svnserve.conf.default</filename> file for information on
-        using <command>svnserve</command>'s built-in authentication method.
-      </para>
-
-    </sect3>
-
-    <sect3 id="svnserver-init">
-      <title>4. Starting the Server</title>
-
-      <para revision="sysv">
-        To start the server at boot time, install the svn
-        bootscript included in the <xref linkend="bootscripts"/> package:
-      </para>
-
-      <para revision="systemd">
-        To start the server at boot time, install the
-        <filename>svnserve.service</filename> unit from the
-        <xref linkend="systemd-units"/> package:
-      </para>
-
-      <indexterm zone="svnserver svnserver-init" revision="sysv">
-        <primary sortas="f-svn">svn</primary>
-      </indexterm>
-
-<screen role="root" revision="sysv"><userinput>make install-svn</userinput></screen>
-
-      <indexterm zone="svnserver svnserver-init" revision="systemd">
-        <primary sortas="f-svnserve">svnserve</primary>
-      </indexterm>
-
-<screen role="root" revision="systemd"><userinput>make install-svnserve</userinput></screen>
-
-      <para revision="systemd">
-        Additionally, the instructions above require
-        that svn server uses <command>umask 002</command> so that all new files
-        will be writable by owner and group. This can be achieved by creating
-        a systemd unit override file by running the following command:
-      </para>
-
-<screen role="root" revision="systemd"><userinput>mkdir -p /etc/systemd/system/svnserve.service.d
-echo "UMask=0002" > /etc/systemd/system/svnserve.service.d/99-user.conf</userinput></screen>
-
-      <para revision="systemd">
-        Options which are passed to
-        <command>svnserve</command> daemon can be changed in
-        <filename>/etc/default/svnserve</filename>.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-</sect1>
Index: general/prog/swig.xml
===================================================================
--- general/prog/swig.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,224 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 swig-download-http "&sourceforge-dl;/swig/swig-&swig-version;.tar.gz">
-  <!ENTITY swig-download-ftp  " ">
-  <!ENTITY swig-md5sum        "7697b443d7845381d64c90ab54d244af">
-  <!ENTITY swig-size          "8.0 MB">
-  <!ENTITY swig-buildsize     "81 MB (1.8 GB with tests)">
-  <!ENTITY swig-time          "0.1 SBU (add 7.7 SBU for tests; both using parallelism=4)">
-]>
-
-<sect1 id="swig" xreflabel="SWIG-&swig-version;">
-  <?dbhtml filename="swig.html"?>
-
-
-  <title>SWIG-&swig-version;</title>
-
-  <indexterm zone="swig">
-    <primary sortas="a-swig">SWIG</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to SWIG</title>
-
-    <para>
-       <application>SWIG</application> (Simplified Wrapper and Interface
-       Generator) is a compiler that integrates <application>C</application>
-       and <application>C++</application> with languages including
-       <application>Perl</application>,
-       <application>Python</application>,
-       <application>Tcl</application>,
-       <application>Ruby</application>,
-       <application>PHP</application>,
-       <application>Java</application>,
-       <application>JavaScript</application>,
-       <application>C#</application>,
-       <application>D</application>,
-       <application>Go</application>,
-       <application>Lua</application>,
-       <application>Octave</application>,
-       <application>R</application>,
-       <application>Racket</application>,
-       <application>Scilab</application>,
-       <application>Scheme</application>, and
-       <application>Ocaml</application>.
-       <application>SWIG</application> can
-       also export its parse tree into <application>Lisp</application>
-       s-expressions and <application>XML</application>.
-    </para>
-    <para>
-       <application>SWIG</application> reads annotated
-       <application>C/C++</application> header files and creates wrapper
-       code (glue code) in order to make the corresponding
-       <application>C/C++</application> libraries available to the listed
-       languages, or to extend <application>C/C++</application> programs
-       with a scripting language.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&swig-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&swig-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &swig-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &swig-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &swig-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &swig-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">SWIG Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="pcre2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="boost"/> for tests, and any of the languages mentioned
-      in the introduction, as run-time dependencies
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of SWIG</title>
-
-    <para>
-      Install <application>SWIG</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr                      \
-            --without-javascript               \
-            --without-maximum-compile-warnings &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>PY3=1 make TCL_INCLUDE= -k check</command>.
-      The unsetting of the variable <envar>TCL_INCLUDE</envar> is
-      necessary since it is not correctly set by
-      <emphasis>configure</emphasis>. The tests are only executed for the
-      languages installed on your machine, so the disk space and SBU values
-      given for the tests may vary, and should be considered as mere orders of
-      magnitude. According to
-      <application>SWIG</application>'s documentation, the failure of some
-      tests should not be considered harmful. The go tests are buggy and may
-      generate a lot of meaningless output.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-cp -v -R Doc -T /usr/share/doc/swig-&swig-version;</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--without-maximum-compile-warnings</parameter>: disables
-      compiler ansi conformance enforcement, which triggers errors in
-      the <application>Lua</application> headers (starting with Lua 5.3).
-    </para>
-
-    <para>
-      <option>--without-&lt;language&gt;</option>: allows disabling the
-      building of tests and examples for &lt;language&gt;, but all the
-      languages capabilities of <application>SWIG</application> are always
-      built. This switch is used for <application>JavaScript</application>
-      because the SWIG implementation is incomplete and a lot of tests fail
-      due to API changes in Node-20.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          swig and ccache-swig
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/doc/swig-&swig-version; and
-          /usr/share/swig
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="swig-prog">
-        <term><command>swig</command></term>
-        <listitem>
-          <para>
-            takes an interface file containing C/C++ declarations and
-            SWIG special instructions, and generates the corresponding
-            wrapper code needed to build extension modules
-          </para>
-          <indexterm zone="swig swig-prog">
-            <primary sortas="b-swig">swig</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ccache-swig">
-        <term><command>ccache-swig</command></term>
-        <listitem>
-          <para>
-            is a compiler cache, which speeds up re-compilation of
-            C/C++/SWIG code
-          </para>
-          <indexterm zone="swig ccache-swig">
-            <primary sortas="b-ccache-swig">ccache-swig</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/prog/tk.xml
===================================================================
--- general/prog/tk.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,238 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 tk-download-http "&sourceforge-dl;/tcl/tk&tk-version;-src.tar.gz">
-  <!ENTITY tk-download-ftp  " ">
-  <!ENTITY tk-md5sum        "cf2aaac0478ef468b48e65c10e6b0d07">
-  <!ENTITY tk-size          "4.3 MB">
-  <!ENTITY tk-buildsize     "25 MB">
-  <!ENTITY tk-time          "0.3 SBU (add 2.0 SBU for tests)">
-
-  <!-- Ensure this is updated when Tk moves from the 8.6.x branch -->
-  <!ENTITY tk-ver           "8.6">
-]>
-
-<sect1 id="tk" xreflabel="Tk-&tk-version;">
-  <?dbhtml filename="tk.html"?>
-
-
-  <title>Tk-&tk-version;</title>
-
-  <indexterm zone="tk">
-    <primary sortas="a-Tk">Tk</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Tk</title>
-
-    <para>
-      The <application>Tk</application> package contains a
-      TCL GUI Toolkit.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&tk-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&tk-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &tk-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &tk-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &tk-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &tk-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Tk Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <!-- <xref linkend="tcl"/> and -->
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Tk</title>
-
-    <para>
-      Install <application>Tk</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>cd unix &amp;&amp;
-./configure --prefix=/usr \
-            --mandir=/usr/share/man \
-            $([ $(uname -m) = x86_64 ] &amp;&amp; echo --enable-64bit) &amp;&amp;
-
-make &amp;&amp;
-
-sed -e "s@^\(TK_SRC_DIR='\).*@\1/usr/include'@" \
-    -e "/TK_B/s@='\(-L\)\?.*unix@='\1/usr/lib@" \
-    -i tkConfig.sh</userinput></screen>
-
-    <para>
-      Running the tests is not recommended. Failures will be reported during the
-      tests, depending on the screen resolution/capabilities, fonts installed
-      and other X related parameters, but the end report can show 0 failures.
-      Some tests will steal focus and some might crash your X Server. To test
-      the results anyway, issue: <command>make test</command>. Ensure you run
-      it from an X Window display device with the GLX extensions loaded, but
-      even so, tests might hang.
-      <!-- Test Statistics (tk8.6.9 - renodr):
-      Total: 466
-      Passed: 447
-      Skipped: 17
-      Failed: 2
-      The two tests that fail have to do with ttk.test
-
-      tk8.6.10 - bdubbs 11/25/2019
-      Total   480     Passed  463     Skipped 17      Failed  0
-
-      tk8.6.11.1 - pierre 01/16/2021 There are two summary lines apparently:
-      Total   9650    Passed  8847    Skipped 708     Failed  95
-      Total   488     Passed  470     Skipped 17      Failed  1
-      -->
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-make install-private-headers &amp;&amp;
-ln -v -sf wish&tk-ver; /usr/bin/wish &amp;&amp;
-chmod -v 755 /usr/lib/libtk&tk-ver;.so</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-64bit</parameter>: This switch is used to enable
-      64 bit support in <application>Tk</application> on 64 bit operating
-      systems.
-    </para>
-
-    <para>
-      <command>make install-private-headers</command>: This command is
-      used to install the <application>Tk</application> library interface
-      headers used by other packages if they link to the
-      <application>Tk</application> library.
-    </para>
-
-    <para>
-      <command>ln -v -sf wish&tk-ver; /usr/bin/wish</command>: This
-      command is used to create a compatibility symbolic link to the
-      <command>wish&tk-ver;</command> file as many packages expect a file
-      named <command>wish</command>.
-    </para>
-
-    <para>
-      <command>sed -e ... tkConfig.sh</command>: The
-      <application>Tk</application> package expects that its source tree is
-      preserved so that packages depending on it for their compilation
-      can utilize it. This <command>sed</command> removes the references to the
-      build directory and replaces them with saner system-wide locations.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          wish and wish&tk-ver;
-        </seg>
-        <seg>
-          libtk&tk-ver;.so and libtkstub&tk-ver;.a
-        </seg>
-        <seg>
-          /usr/lib/tk&tk-ver;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="wish">
-        <term><command>wish</command></term>
-        <listitem>
-          <para>
-            is a symlink to the <command>wish&tk-ver;</command> program
-          </para>
-          <indexterm zone="tk wish">
-            <primary sortas="b-wish">wish</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wish-eight">
-        <term><command>wish&tk-ver;</command></term>
-        <listitem>
-          <para>
-            is a simple shell containing the
-            <application>Tk</application> toolkit that creates a main window and
-            then processes <application>Tcl</application> commands
-          </para>
-          <indexterm zone="tk wish-eight">
-            <primary sortas="b-wish&tk-ver;">wish&tk-ver;</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtk">
-        <term><filename class="libraryfile">libtk&tk-ver;.so</filename></term>
-        <listitem>
-          <para>
-            contains the API functions required
-            by <application>Tk</application>
-          </para>
-          <indexterm zone="tk libtk">
-            <primary sortas="c-libtk">libtk&tk-ver;.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/prog/unifdef.xml
===================================================================
--- general/prog/unifdef.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,142 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 unifdef-download-http "https://dotat.at/prog/unifdef/unifdef-&unifdef-version;.tar.gz">
-  <!ENTITY unifdef-download-ftp  " ">
-  <!ENTITY unifdef-md5sum        "b225312c110cd2600ca7166bd0419751">
-  <!ENTITY unifdef-size          "88 KB">
-  <!ENTITY unifdef-buildsize     "1.9 MB">
-  <!ENTITY unifdef-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="unifdef" xreflabel="unifdef-&unifdef-version;">
-  <?dbhtml filename="unifdef.html"?>
-
-  <title>unifdef-&unifdef-version;</title>
-
-  <indexterm zone="unifdef">
-    <primary sortas="a-unifdef">unifdef</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to unifdef</title>
-
-    <para>
-      The <application>unifdef</application> package contains a utility that
-      is useful for removing preprocessor conditionals from code.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&unifdef-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&unifdef-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &unifdef-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &unifdef-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &unifdef-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &unifdef-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of unifdef</title>
-
-    <para>
-      Install <application>unifdef</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make prefix=/usr install</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          unifdef and unifdefall
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="unifdef-prog">
-        <term><command>unifdef</command></term>
-        <listitem>
-          <para>
-            removes preprocessor conditionals from code
-          </para>
-          <indexterm zone="unifdef unifdef-prog">
-            <primary sortas="b-unifdef">unifdef</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unifdefall">
-        <term><command>unifdefall</command></term>
-        <listitem>
-          <para>
-            removes preprocessor conditionals from code across a whole tree
-          </para>
-          <indexterm zone="unifdef unifdefall">
-            <primary sortas="b-unifdefall">unifdefall</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: general/prog/vala.xml
===================================================================
--- general/prog/vala.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,274 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 vala-download-http "&gnome-download-http;/vala/&vala-major-version;/vala-&vala-version;.tar.xz">
-  <!ENTITY vala-download-ftp  " ">
-  <!ENTITY vala-md5sum        "134075855867fdd9c51ca7555c4951bb">
-  <!ENTITY vala-size          "3.8 MB">
-  <!ENTITY vala-buildsize     "160 MB (add 19 MB for tests)">
-  <!ENTITY vala-time          "0.5 SBU (add 1.0 SBU for tests; both using parallelism=4)">
-]>
-
-<sect1 id="vala" xreflabel="Vala-&vala-version;">
-  <?dbhtml filename="vala.html"?>
-
-  <title>Vala-&vala-version;</title>
-
-  <indexterm zone="vala">
-    <primary sortas="a-Vala">Vala</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Vala</title>
-
-    <para>
-      <application>Vala</application> is a new programming language that
-      aims to bring modern programming language features to
-      <application>GNOME</application> developers without imposing any
-      additional runtime requirements and without using a different ABI
-      compared to applications and libraries written in C.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&vala-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&vala-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &vala-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &vala-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &vala-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &vala-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Vala Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> (GObject Introspection required for the tests)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="graphviz"/> (Required for valadoc)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="dbus"/> (Required for the tests),
-      <xref linkend="libxslt"/> (Required for generating the documentation),
-      <ulink url="https://ftpmirror.gnu.org/gnu/help2man/">help2man</ulink>,
-      <ulink url="https://github.com/relaxng/jing-trang">jing</ulink>, and
-      <ulink url="https://weasyprint.org/">weasyprint</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Vala</title>
-
-    <!-- https://gitlab.gnome.org/GNOME/vala/-/issues/1485 -->
-    <!-- Fixed in vala-0.56.14 
-    <para>
-      At first, fix an issue causing <command>vapigen</command> to crash
-      building some packages (for example NetworkManager):
-    </para>
-
-<screen><userinput>sed -e "/next_pos =/s/$/ \
-        char buf[16]; \
-        Memory.copy (buf, next_pos, \
-        (end - next_pos >= buf.length ? buf.length - 1 : end - next_pos));/" \
-    -e 's/(string) next_pos/(string) buf/' \
-    -i vala/valamarkupreader.vala</userinput></screen>
-    -->
-
-    <!-- See Ticket #19283 and
-    https://gitlab.gnome.org/GNOME/vala/-/issues/1524
-    <para>
-      First, fix a build failure that occurs with graphviz-10.x:
-    </para>
-
-<screen><userinput>sed -i '/gvc.h/a#define TRUE 1' libvaladoc/gvc-compat.c</userinput></screen>
--->
-
-    <para>
-      Install <application>Vala</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>bootstrap</option>: This <command>make</command>
-      target forces the building system to build the package twice and use
-      the <command>vala</command> executable produced in the first build
-      to regenerate the <filename class="extension">.c</filename> files
-      from the <filename class="extension">.vala</filename> files if needed.
-      If a <command>vala</command> executable is not installed yet and
-      you've modified any <filename class="extension">.vala</filename> files
-      in the source tree, run <command>make bootstrap</command> instead of
-      <command>make</command>.
-    </para>
-
-    <para>
-      <option>--disable-valadoc</option>: This option is
-      required if <xref linkend="graphviz"/> is not installed.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          vala,
-          vala-&vala-major-version;,
-          valac,
-          valadoc,
-          vala-gen-introspect, and
-          vapigen (symlinks);
-
-          valac-&vala-major-version;,
-          valadoc-&vala-major-version;,
-          vala-gen-introspect-&vala-major-version;, and
-          vapigen-&vala-major-version;
-        </seg>
-        <seg>
-          libvala-&vala-major-version;.so and
-          libvaladoc-&vala-major-version;.so
-        </seg>
-        <seg>
-          /usr/include/vala-&vala-major-version;,
-          /usr/include/valadoc-&vala-major-version;,
-          /usr/lib/vala-&vala-major-version;,
-          /usr/lib/valadoc-&vala-major-version;,
-          /usr/share/vala,
-          /usr/share/vala-&vala-major-version;,
-          /usr/share/valadoc-&vala-major-version;, and
-          /usr/share/devhelp/books/vala-&vala-major-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="valac">
-        <term><command>valac</command></term>
-        <listitem>
-          <para>
-            is a compiler that translates <application>Vala</application>
-            source code into C source and header files
-          </para>
-          <indexterm zone="vala valac">
-            <primary sortas="b-valac">valac</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="valadoc">
-        <term><command>valadoc</command></term>
-        <listitem>
-          <para>
-            is a documentation generator for generating API documentation
-            from <application>Vala</application> source code based on libvala
-          </para>
-          <indexterm zone="vala valadoc">
-            <primary sortas="b-valadoc">valadoc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vala-gen-introspect">
-        <term><command>vala-gen-introspect</command></term>
-        <listitem>
-          <para>
-            generates a GI file for GObject and
-            <application>GLib</application> based packages
-          </para>
-          <indexterm zone="vala vala-gen-introspect">
-            <primary sortas="b-vala-gen-introspect">vala-gen-introspect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vapigen">
-        <term><command>vapigen</command></term>
-        <listitem>
-          <para>
-            is an utility which generates <application>Vala</application> API
-            (VAPI) files from GI files
-          </para>
-          <indexterm zone="vala vapigen">
-            <primary sortas="b-vapigen">vapigen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libvala">
-        <term><filename class="libraryfile">libvala-&vala-major-version;.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Vala</application> API functions
-          </para>
-          <indexterm zone="vala libvala">
-            <primary sortas="c-libvala">libvala-&vala-major-version;.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/prog/valgrind.xml
===================================================================
--- general/prog/valgrind.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,366 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 valgrind-download-http "https://sourceware.org/pub/valgrind/valgrind-&valgrind-version;.tar.bz2">
-  <!ENTITY valgrind-download-ftp  " ">
-  <!ENTITY valgrind-md5sum        "38ea14f567efa09687a822b33b4d9d60">
-  <!ENTITY valgrind-size          "16 MB">
-  <!ENTITY valgrind-buildsize     "390 MB (add 66 MB for tests)">
-  <!ENTITY valgrind-time          "0.5 SBU (add 6.8 SBU for tests; both using parallelism=4)">
-]>
-
-<sect1 id="valgrind" xreflabel="Valgrind-&valgrind-version;">
-  <?dbhtml filename="valgrind.html"?>
-
-
-  <title>Valgrind-&valgrind-version;</title>
-
-  <indexterm zone="valgrind">
-    <primary sortas="a-Valgrind">Valgrind</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Valgrind</title>
-
-    <para>
-      <application>Valgrind</application> is an instrumentation framework for
-      building dynamic analysis tools. There are Valgrind tools that can
-      automatically detect many memory management and threading bugs, and
-      profile programs in detail. Valgrind can also be used to build new
-      tools.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&valgrind-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&valgrind-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &valgrind-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &valgrind-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &valgrind-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &valgrind-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/valgrind-&valgrind-version;-upstream_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Valgrind Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gdb"/> (for tests),
-      <xref linkend="llvm"/> (with Clang), and
-      <xref linkend="which"/> (for tests)
-    </para>
-
-<!-- See "maintainer note", below
-    <bridgehead renderas="sect4">Optional for regenerating the documentation</bridgehead>
-    <para role="optional">
-      <xref linkend="libxslt"/> and
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
-    </para>
--->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Valgrind</title>
-
-    <para>
-      First, make several changes that are required for Valgrind to function on
-      systems with glibc-2.39 and binutils-2.42 installed:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../valgrind-&valgrind-version;-upstream_fixes-1.patch</userinput></screen>
-
-    <para>
-      Install <application>Valgrind</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i 's|/doc/valgrind||' docs/Makefile.in &amp;&amp;
-
-./configure --prefix=/usr \
-            --datadir=/usr/share/doc/valgrind-&valgrind-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make regtest</command>. The tests
-      may hang forever if <xref linkend="gdb"/> is not installed. Some tests
-      are known to hang also, depending on the version of glibc. A few tests
-      can fail in various suites. Problematic
-      tests can be disabled by changing the <userinput>prereq:</userinput> line
-      in the corresponding <filename>.vgtest</filename> file to
-      <userinput>prereq: false</userinput>. For example:
-    </para>
-
-<screen role="nodump"><userinput>sed -e 's@prereq:.*@prereq: false@' \
-    -i {helgrind,drd}/tests/pth_cond_destroy_busy.vgtest</userinput></screen>
-
-    <!-- 731 tests, 6 stderr failures, 0 stdout failures, 1 stderrB failure,
-         0 stdoutB failures, 1 post failure -bdubbs Apr 13. 22
-         valgrind-3.19.0
-
-         732 tests, 4 stderr failures, 0 stdout failures, 1 stderrB failure,
-         0 stdoutB failures, 1 post failure - bdubbs Oct 26, 22
-           gdbserver_tests/hginfo                   (stderrB)
-           memcheck/tests/cdebug_zlib_gnu           (stderr)
-           memcheck/tests/overlap                   (stderr)
-           helgrind/tests/tls_threads               (stderr)
-           drd/tests/pth_mutex_signal               (stderr)
-
-         765 tests, 2 stderr failures, 0 stdout failures, 0 stderrB failure,
-         0 stdoutB failures, 0 post failure -bdubbs May 2, 23
-         valgrind-3.21.0
-           memcheck/tests/overlap                   (stderr)
-           helgrind/tests/pth_mempcpy_false_races   (stderr) 
-
-         792 tests, 1 stderr failure, 0 stdout failures, 0 stderrB failures, 
-         0 stdoutB failures, 0 post failures
-         valgrind-3.22.0
-           helgrind/tests/pth_mempcpy_false_races   (stderr)
-           -->
-
-    <note>
-      <para>
-        The <application>OpenMP</application> tests are skipped if libgomp
-        has been compiled with <option>--enable-linux-futex</option> (the
-        default). If needed, just recompile the libgomp library from
-        the gcc build tree, passing <option>--disable-linux-futex</option>
-        to configure, storing the library to some place and changing the link
-        from <filename>/usr/lib/libgomp.so.1</filename> to point to the new
-        library.
-      </para>
-    </note>
-
-<!--  Note to maintainer: there is a long thread in ticket #5882 explaining
-      why we do not provide instructions to rebuild the documentation.
-      (still broken with TeXLive 2016) -->
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i ... docs/Makefile.in </command>: This sed provides for
-      installing the documentation in a versioned directory.
-    </para>
-
-    <para>
-      <option>--enable-lto=yes</option>: This option allows building Valgrind
-      with LTO (link time optimization).  This produces a smaller/faster
-      Valgrind (up to 10%), but build time increases to about 5.5 SBU.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          callgrind_annotate,
-          callgrind_control,
-          cg_annotate,
-          cg_diff,
-          cg_merge,
-          ms_print,
-          valgrind,
-          valgrind-di-server,
-          valgrind-listener, and
-          vgdb
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/valgrind,
-          /usr/libexec/valgrind,
-          /usr/include/valgrind, and
-          /usr/share/doc/valgrind-&valgrind-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="valgrind-prog">
-        <term><command>valgrind</command></term>
-        <listitem>
-          <para>
-            is a program for debugging and profiling Linux executables
-          </para>
-          <indexterm zone="valgrind valgrind-prog">
-            <primary sortas="b-valgrind">valgrind</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="callgrind_annotate">
-        <term><command>callgrind_annotate</command></term>
-        <listitem>
-          <para>
-            takes an output file produced by the
-            <application>Valgrind</application> tool Callgrind and prints the
-            information in an easy-to-read form
-          </para>
-          <indexterm zone="valgrind callgrind_annotate">
-            <primary sortas="b-callgrind_annotate">callgrind_annotate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="callgrind_control">
-        <term><command>callgrind_control</command></term>
-        <listitem>
-          <para>
-            controls programs being run by the <application>Valgrind</application>
-            tool Callgrind
-          </para>
-          <indexterm zone="valgrind callgrind_control">
-            <primary sortas="b-callgrind_control">callgrind_control</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cg_annotate">
-        <term><command>cg_annotate</command></term>
-        <listitem>
-          <para>
-            is a post-processing tool for the <application>Valgrind</application>
-            tool Cachegrind
-          </para>
-          <indexterm zone="valgrind cg_annotate">
-            <primary sortas="b-cg_annotate">cg_annotate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cg_diff">
-        <term><command>cg_diff</command></term>
-        <listitem>
-          <para>
-            compares two Cachegrind output files
-          </para>
-          <indexterm zone="valgrind cg_diff">
-            <primary sortas="b-cg_diff">cg_diff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cg_merge">
-        <term><command>cg_merge</command></term>
-        <listitem>
-          <para>
-            merges multiple Cachegrind output files into one
-          </para>
-          <indexterm zone="valgrind cg_merge">
-            <primary sortas="b-cg_merge">cg_merge</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ms_print">
-        <term><command>ms_print</command></term>
-        <listitem>
-          <para>
-            takes an output file produced by the <application>Valgrind</application>
-            tool Massif and prints the information in an easy-to-read form
-          </para>
-          <indexterm zone="valgrind ms_print">
-            <primary sortas="b-ms_print">ms_print</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="valgrind-di-server">
-        <term><command>valgrind-di-server</command></term>
-        <listitem>
-          <para>
-            is a server that reads debuginfo from objects stored on a
-            different machine
-          </para>
-          <indexterm zone="valgrind valgrind-di-server">
-            <primary sortas="b-valgrind-di-server">valgrind-di-server</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="valgrind-listener">
-        <term><command>valgrind-listener</command></term>
-        <listitem>
-          <para>
-            listens on a socket for Valgrind commentary
-          </para>
-          <indexterm zone="valgrind valgrind-listener">
-            <primary sortas="b-valgrind-listener">valgrind-listener</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vgdb">
-        <term><command>vgdb</command></term>
-        <listitem>
-          <para>
-            is an intermediary between Valgrind and GDB or a shell
-          </para>
-          <indexterm zone="valgrind vgdb">
-            <primary sortas="b-vgdb">vgdb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/prog/yasm.xml
===================================================================
--- general/prog/yasm.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,173 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 yasm-download-http "https://www.tortall.net/projects/yasm/releases/yasm-&yasm-version;.tar.gz">
-  <!ENTITY yasm-download-ftp  " ">
-  <!ENTITY yasm-md5sum        "fc9e586751ff789b34b1f21d572d96af">
-  <!ENTITY yasm-size          "1.5 MB">
-  <!ENTITY yasm-buildsize     "27 MB (additional 12 MB for the tests)">
-  <!ENTITY yasm-time          "0.1 SBU (additional 0.1 SBU for the tests)">
-]>
-
-<sect1 id="yasm" xreflabel="yasm-&yasm-version;">
-  <?dbhtml filename="yasm.html"?>
-
-
-  <title>yasm-&yasm-version;</title>
-
-  <indexterm zone="yasm">
-    <primary sortas="a-yasm">yasm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to yasm</title>
-
-    <para>
-      <application>Yasm</application> is a complete rewrite of the
-      <xref linkend="nasm"/> assembler. It supports the x86 and AMD64
-      instruction sets, accepts NASM and GAS assembler syntaxes and outputs
-      binary, ELF32 and ELF64 object formats.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&yasm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&yasm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &yasm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &yasm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &yasm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &yasm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">yasm Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="python2"/> and
-      <xref linkend="cython"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of yasm</title>
-
-    <para>
-      Install <application>yasm</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i 's#) ytasm.*#)#' Makefile.in &amp;&amp;
-
-./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make -j1 check</command>.
-    </para>
-
-<!-- The tests seem to intermittently fail on nasmpp_test.sh and rawpp_test.sh.
-     When run at -j1, all of the tests pass, and those tests randomly fail if
-     they are run in parallel. -renodr -->
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i 's#) ytasm.*#)#' Makefile.in</command>: This sed
-      prevents it compiling 2 programs (vsyasm and ytasm) that are only of use
-      on Microsoft Windows.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>yasm</seg>
-        <seg>libyasm.a</seg>
-        <seg>/usr/include/libyasm</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="yasm-prog">
-        <term><command>yasm</command></term>
-        <listitem>
-          <para>
-            is a portable, retargetable assembler that supports the x86 and
-            AMD64 instruction sets, accepts NASM and GAS assembler syntaxes and
-            outputs binaries in ELF32 and ELF64 object formats
-          </para>
-          <indexterm zone="yasm yasm">
-            <primary sortas="b-yasm">yasm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libyasm">
-        <term><filename class="libraryfile">libyasm.a</filename></term>
-        <listitem>
-          <para>
-            provides all of the core functionality of <command>yasm</command>,
-            for manipulating machine instructions and object file constructs
-          </para>
-          <indexterm zone="yasm libyasm">
-            <primary sortas="c-libyasm">libyasm.a</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/accountsservice.xml
===================================================================
--- general/sysutils/accountsservice.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,275 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 accountsservice-download-http
-           "https://www.freedesktop.org/software/accountsservice/accountsservice-&accountsservice-version;.tar.xz">
-  <!ENTITY accountsservice-download-ftp  " ">
-  <!ENTITY accountsservice-md5sum        "03dccfe1b306b7ca19743e86d118e64d">
-  <!ENTITY accountsservice-size          "621 KB">
-  <!ENTITY accountsservice-buildsize     "9.8 MB (add 0.5 MB for tests)">
-  <!ENTITY accountsservice-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="accountsservice" xreflabel="AccountsService-&accountsservice-version;">
-  <?dbhtml filename="accountsservice.html"?>
-
-
-  <title>AccountsService-&accountsservice-version;</title>
-
-  <indexterm zone="accountsservice">
-    <primary sortas="a-AccountsService">AccountsService</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to AccountsService</title>
-
-    <para>
-      The <application>AccountsService</application> package provides a
-      set of <application>D-Bus</application> interfaces for querying
-      and manipulating user account information and an implementation
-      of those interfaces based on the
-      <ulink role='man' url='&man;usermod.8'>usermod(8)</ulink>,
-      <ulink role='man' url='&man;useradd.8'>useradd(8)</ulink>, and
-      <ulink role='man' url='&man;userdel.8'>userdel(8)</ulink> commands.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&accountsservice-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&accountsservice-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &accountsservice-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &accountsservice-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &accountsservice-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &accountsservice-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">AccountsService Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <!--<xref linkend="libgcrypt"/> and-->
-      <xref linkend="polkit"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection;,
-      <phrase revision="sysv"><xref linkend="elogind"/></phrase>
-      <phrase revision="systemd"><xref role='runtime' linkend="systemd"/>
-        (runtime)</phrase>, and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="xmlto"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (for tests)</bridgehead>
-    <para role="optional">
-      <xref linkend="python-dbusmock"/> and
-      <xref linkend="pygobject3"/>
-      <!-- I did not have gtk-doc installed this time, and it worked fine. -->
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of AccountsService</title>
-
-    <para>
-      First, rename a directory whose presence prevents the build system from
-      running if <xref linkend="python-dbusmock"/> is not installed:
-    </para>
-
-<screen><userinput>mv tests/dbusmock{,-tests}</userinput></screen>
-
-    <para>
-      Then fix a test script so that the new directory is found, and adapt
-      it for Python 3.12.0 or later:
-    </para>
-
-<screen><userinput>sed -e '/accounts_service\.py/s/dbusmock/dbusmock-tests/' \
-    -e 's/assertEquals/assertEqual/'                      \
-    -i tests/test-libaccountsservice.py</userinput></screen>
-
-    <para>
-      Fix one test that fails if the <option>en_IE.UTF-8</option> locale
-      is not installed:
-    </para>
-
-<screen><userinput>sed -i '/^SIMULATED_SYSTEM_LOCALE/s/en_IE.UTF-8/en_HK.iso88591/' tests/test-daemon.py</userinput></screen>
-
-    <para>
-      Install <application>AccountsService</application> by running the following
-      commands:
-    </para>
-
-<screen revision="sysv"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..            \
-      --prefix=/usr       \
-      --buildtype=release \
-      -Dadmin_group=adm   \
-      -Delogind=true      \
-      -Dsystemdsystemunitdir=no &amp;&amp;
-ninja</userinput></screen>
-
-<screen revision="systemd"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..            \
-      --prefix=/usr       \
-      --buildtype=release \
-      -Dadmin_group=adm   &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the package, issue <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <parameter>-Dadmin_group=adm</parameter>: This switch sets
-      the group for administrator accounts.
-    </para>
-
-    <para>
-      <option>-Ddocbook=true</option>: This switch enables building
-      the D-Bus interface API documentation (needs <xref linkend="xmlto"/>).
-    </para>
-
-    <para>
-      <option>-Dgtk_doc=true</option>: This switch enables building
-      the libaccountsservice API documentation (needs
-      <xref linkend="gtk-doc"/>).
-    </para>
-
-    <para>
-      <option>-Dvapi=false</option>: This switch disables building
-      the vala bindings. Use it if you have not installed
-      <xref linkend="vala"/>.
-    </para>
-
-  </sect2>
-
- <sect2 role="configuration">
-    <title>Configuring AccountsService</title>
-
-    <para>
-      To allow users in the adm group to be listed as Administrators,
-      execute the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cat &gt; /etc/polkit-1/rules.d/40-adm.rules &lt;&lt; "EOF"
-<literal>polkit.addAdminRule(function(action, subject) {
-   return ["unix-group:adm"];
-   });</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          accounts-daemon (in
-          <filename class="directory">/usr/libexec</filename>)
-        </seg>
-        <seg>
-          libaccountsservice.so
-        </seg>
-        <seg>
-          /usr/include/accountsservice-1.0,
-          /usr/share/accountsservice,
-          /usr/share/gtk-doc/html/libaccountsservice (optional), and
-          /var/lib/AccountsService
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="accounts-daemon">
-        <term><command>accounts-daemon</command></term>
-        <listitem>
-          <para>
-            is the <application>AccountsService</application> daemon
-          </para>
-          <indexterm zone="accountsservice accounts-daemon">
-            <primary sortas="b-accounts-daemon">accounts-daemon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libaccountsservice">
-        <term><filename class="libraryfile">libaccountsservice.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>AccountsService</application> API functions
-          </para>
-          <indexterm zone="accountsservice libaccountsservice">
-            <primary sortas="c-libaccountsservice">libaccountsservice.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/acpid.xml
===================================================================
--- general/sysutils/acpid.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,288 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 acpid-download-http "&sourceforge-dl;/acpid2/acpid-&acpid-version;.tar.xz">
-  <!ENTITY acpid-download-ftp  " ">
-  <!ENTITY acpid-md5sum        "988c2e3fd5ba0ea4492d3ba7273af295">
-  <!ENTITY acpid-size          "160 KB">
-  <!ENTITY acpid-buildsize     "1.9 MB">
-  <!ENTITY acpid-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="acpid" xreflabel="acpid-&acpid-version;">
-  <?dbhtml filename="acpid.html"?>
-
-
-  <title>acpid-&acpid-version;</title>
-
-  <indexterm zone="acpid">
-    <primary sortas="a-acpid">acpid</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to acpid</title>
-
-    <para>
-      The <application>acpid</application> (Advanced Configuration and Power
-      Interface event daemon) is a completely flexible, totally extensible
-      daemon for delivering ACPI events. It listens on netlink interface and
-      when an event occurs, executes programs to handle the event. The programs
-      it executes are configured through a set of configuration files, which can
-      be dropped into place by packages or by the user.
-    </para>
-
-    <note>
-      <para>
-        Some other packages may handle some ACPI events as well and they
-        may conflict with this package.  For example, &logind;
-        (read the documentation for <option>Handle*=</option> in
-        <ulink role='man' url='&man;logind.conf.5'>logind.conf(5)</ulink>
-        for details) and
-        <xref linkend='upower'/> (used by many desktop environments such as
-        GNOME, KDE, and XFCE for handling ACPI events).  If you've installed
-        such a package and it's enough for your use case, this package is
-        probably not needed.  If you really need this package, you must be
-        careful configuring it and the other packages handling ACPI events
-        to avoid conflicts.  Notably, &logind; handles some ACPI events
-        by default, so the handling of these events by &logind; should be
-        disabled first if handling these events with acpid
-        (again, read <ulink role='man'
-        url='&man;logind.conf.5'>logind.conf(5)</ulink> for details).
-      </para>
-    </note>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&acpid-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&acpid-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &acpid-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &acpid-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &acpid-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &acpid-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of acpid</title>
-
-    <para>
-      Install <application>acpid</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --docdir=/usr/share/doc/acpid-&acpid-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install                         &amp;&amp;
-install -v -m755 -d /etc/acpi/events &amp;&amp;
-cp -r samples /usr/share/doc/acpid-&acpid-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring acpid</title>
-
-    <para>
-      <application>acpid</application> is configured by user defined events.
-      Place event files under
-      <filename class="directory">/etc/acpi/events</filename> directory. If an
-      event occurs, <command>acpid</command> recurses through the event files in
-      order to see if the regex defined after "event" matches. If they do,
-      action is executed.
-    </para>
-
-    <para>
-      The following brief example will suspend the system when the laptop
-      lid is closed<phrase revision='sysv'> (it requires
-      <xref linkend="pm-utils"/>)</phrase>.  The example also disables
-      the default handling of the lid close event by &logind; when the
-      system is on battery and not connected to any external monitor,
-      in order to avoid a conflict:
-    </para>
-
-<screen revision='sysv' role="nodump"><userinput>cat &gt; /etc/acpi/events/lid &lt;&lt; "EOF"
-<literal>event=button/lid
-action=/etc/acpi/lid.sh</literal>
-EOF
-
-cat &gt; /etc/acpi/lid.sh &lt;&lt; "EOF"
-<literal>#!/bin/sh
-/bin/grep -q open /proc/acpi/button/lid/LID/state &amp;&amp; exit 0
-/usr/sbin/pm-suspend</literal>
-EOF
-chmod +x /etc/acpi/lid.sh
-
-mkdir -pv /etc/elogind/logind.conf.d
-echo <literal>HandleLidSwitch=ignore</literal> &gt; /etc/elogind/logind.conf.d/acpi.conf</userinput></screen>
-
-<screen revision='systemd' role="nodump"><userinput>cat &gt; /etc/acpi/events/lid &lt;&lt; "EOF"
-<literal>event=button/lid
-action=/etc/acpi/lid.sh</literal>
-EOF
-
-cat &gt; /etc/acpi/lid.sh &lt;&lt; "EOF"
-<literal>#!/bin/sh
-/bin/grep -q open /proc/acpi/button/lid/LID/state &amp;&amp; exit 0
-/usr/bin/systemctl suspend</literal>
-EOF
-chmod +x /etc/acpi/lid.sh
-
-mkdir -pv /etc/systemd/logind.conf.d
-echo <literal>HandleLidSwitch=ignore</literal> &gt; /etc/systemd/logind.conf.d/acpi.conf</userinput></screen>
-
-    <para>
-      Unfortunately, not every computer labels ACPI events in the same way
-      (for example, the lid may be recognized as <filename>LID0</filename>
-      instead of <filename>LID</filename>).
-      To determine how your buttons are recognized, use the
-      <command>acpi_listen</command> tool. Also, look in the <filename
-      class="directory">samples</filename> directory under <filename
-      class="directory">/usr/share/doc/acpid-&acpid-version;</filename>
-      for more examples.
-    </para>
-
-    <sect3  id="acpid-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Socket</phrase></title>
-
-      <para revision="sysv">
-        To automatically start <command>acpid</command> when the system is
-        rebooted, install the <filename>/etc/rc.d/init.d/acpid</filename>
-        boot script from the <xref linkend="bootscripts"/> package.
-      </para>
-
-      <para revision="systemd">
-        To start the <command>acpid</command> daemon at boot,
-        install the systemd unit from the <xref linkend="systemd-units"/>
-        package by running the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-      <indexterm zone="acpid acpid-init">
-        <primary sortas="f-acpid">acpid</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-acpid</userinput></screen>
-
-      <note revision="systemd">
-        <para>
-          This package uses socket based activation and will be started when
-          something needs it. No standalone unit file is provided for this
-          package.
-        </para>
-      </note>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          acpid, acpi_listen, and kacpimon
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /etc/acpi and /usr/share/doc/acpid-&acpid-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="acpid-prog">
-        <term><command>acpid</command></term>
-        <listitem>
-          <para>
-            is a program that listens for ACPI events and executes the rules
-            that match the received event
-          </para>
-          <indexterm zone="acpid acpid-prog">
-            <primary sortas="b-acpid">acpid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="acpi_listen">
-        <term><command>acpi_listen</command></term>
-        <listitem>
-          <para>
-            is a simple tool which connects to <command>acpid</command> and
-            listens for events
-          </para>
-          <indexterm zone="acpid acpi_listen">
-            <primary sortas="b-acpi_listen">acpi_listen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kacpimon">
-        <term><command>kacpimon</command></term>
-        <listitem>
-          <para>
-            is a monitor program that connects to three sources of ACPI events
-            (events file, netlink and input layer) and then reports on what it
-            sees while it is connected
-          </para>
-          <indexterm zone="acpid kacpimon">
-            <primary sortas="b-kacpimon">kacpimon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/at.xml
===================================================================
--- general/sysutils/at.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,312 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 at-download-http "&sources-anduin-http;/at/at_&at-version;.orig.tar.gz">
-  <!ENTITY at-download-ftp  " ">
-  <!ENTITY at-md5sum        "ca3657a1c90d7c3d252e0bc17feddc6e">
-  <!ENTITY at-size          "130 KB">
-  <!ENTITY at-buildsize     "1.9 MB (including tests)">
-  <!ENTITY at-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="at" xreflabel="At-&at-version;">
-  <?dbhtml filename="at.html"?>
-
-
-  <title>at-&at-version;</title>
-
-  <indexterm zone="at">
-    <primary sortas="a-at">at</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to at</title>
-
-    <para>
-      The <application>at</application> package provides delayed job execution
-      and batch processing. It is required for Linux Standards Base (LSB)
-      conformance.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&at-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&at-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &at-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &at-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &at-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &at-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">at Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      An <xref linkend="server-mail"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="linux-pam"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of at</title>
-
-    <para>
-      Before building <application>at</application>, as the
-      <systemitem class="username">root</systemitem> user you should create
-      the group and user <systemitem class="username">atd</systemitem> which
-      will run the <command>atd</command> daemon:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 17 atd                                                  &amp;&amp;
-useradd -d /dev/null -c "atd daemon" -g atd -s /bin/false -u 17 atd</userinput></screen>
-
-    <para>
-      Install <application>at</application> with the following
-      commands:
-    </para>
-
-    <screen revision="sysv"><userinput>./configure --with-daemon_username=atd        \
-            --with-daemon_groupname=atd       \
-            --with-jobdir=/var/spool/atjobs   \
-            --with-atspool=/var/spool/atspool \
-            SENDMAIL=/usr/sbin/sendmail       &amp;&amp;
-make -j1</userinput></screen>
-
-    <screen revision="systemd"><userinput>./configure --with-daemon_username=atd        \
-            --with-daemon_groupname=atd       \
-            SENDMAIL=/usr/sbin/sendmail       \
-            --with-jobdir=/var/spool/atjobs   \
-            --with-atspool=/var/spool/atspool \
-            --with-systemdsystemunitdir=/lib/systemd/system &amp;&amp;
-make -j1</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-    </para>
-
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install docdir=/usr/share/doc/at-&at-version; \
-             atdocdir=/usr/share/doc/at-&at-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring at</title>
-
-    <sect3 id="at-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/at.allow</filename> and
-        <filename>/etc/at.deny</filename> determines who can submit jobs via at
-        or batch.
-      </para>
-
-      <indexterm zone="at at-config">
-        <primary sortas="e-etc-at.allow">/etc/at.allow</primary>
-      </indexterm>
-
-      <indexterm zone="at at-config">
-        <primary sortas="e-etc-at.deny">/etc/at.deny</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Linux PAM Configuration</title>
-
-      <para>
-        If <application>At</application> has been built with
-        <application>Linux PAM</application> support, you need to create a
-        <application>PAM</application> configuration file, to get it working
-        correctly with BLFS.
-      </para>
-
-      <para>
-        Issue the following commands as the <systemitem
-        class="username">root</systemitem> user to create the configuration
-        file for <application>Linux PAM</application>:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/pam.d/atd &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/atd
-
-auth     required pam_unix.so
-account  required pam_unix.so
-password required pam_unix.so
-session  required pam_unix.so
-
-# End /etc/pam.d/atd</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-    <sect3  id="at-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para revision="sysv">
-        Install the <filename>/etc/init.d/atd</filename>
-        init script from the <xref linkend="bootscripts"/> package.
-      </para>
-
-      <para revision="systemd">
-        To start the <command>atd</command> daemon at boot,
-        enable the previously installed systemd unit by
-        running the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-      <indexterm zone="at at-init">
-        <primary sortas="f-at">at</primary>
-      </indexterm>
-
-<screen role="root" revision="sysv"><userinput>make install-atd</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>systemctl enable atd</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          at, atd, atq (symlink), atrm (symlink), atrun, and batch
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/doc/at-&at-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="at-prog">
-        <term><command>at</command></term>
-        <listitem>
-          <para>
-            queues, examines or deletes jobs for later execution
-          </para>
-          <indexterm zone="at at-prog">
-            <primary sortas="b-at">at</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="atd">
-        <term><command>atd</command></term>
-        <listitem>
-          <para>
-            is the daemon that runs jobs queued for later execution
-          </para>
-          <indexterm zone="at atd">
-            <primary sortas="b-atd">atd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="atq">
-        <term><command>atq</command></term>
-        <listitem>
-          <para>
-            lists the user's pending jobs, or all jobs, if superuser
-          </para>
-          <indexterm zone="at atq">
-            <primary sortas="b-atq">atq</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="atrm">
-        <term><command>atrm</command></term>
-        <listitem>
-          <para>
-            deletes jobs, identified by their job number
-          </para>
-          <indexterm zone="at atrm">
-            <primary sortas="b-atrm">atrm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="atrun">
-        <term><command>atrun</command></term>
-        <listitem>
-          <para>
-            runs jobs queued for later execution
-          </para>
-          <indexterm zone="at atrun">
-            <primary sortas="b-atrun">atrun</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="batch">
-        <term><command>batch</command></term>
-        <listitem>
-          <para>
-            is a script that executes commands when system load levels permit
-          </para>
-          <indexterm zone="at batch">
-            <primary sortas="b-batch">batch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/autofs-kernel.xml
===================================================================
--- general/sysutils/autofs-kernel.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,7 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>F</emphasis>ile systems ---&gt;
-  &lt;*/M&gt; <emphasis role='blue'>K</emphasis>ernel automounter support (supports v3, v4 and v5)          [AUTOFS_FS]</screen>
Index: general/sysutils/autofs-optional-kernel.xml
===================================================================
--- general/sysutils/autofs-optional-kernel.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,9 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>F</emphasis>ile systems ---&gt;
-  [*] N<emphasis role='blue'>e</emphasis>twork File Systems ---&gt;                            [NETWORK_FILESYSTEMS]
-    &lt;*/M&gt; N<emphasis role='blue'>F</emphasis>S client support                                            [NFS_FS]
-    &lt;*/M&gt; <emphasis role='blue'>S</emphasis>MB3 and CIFS support (advanced network filesystem)             [CIFS]</screen>
Index: general/sysutils/autofs.xml
===================================================================
--- general/sysutils/autofs.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,434 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 autofs-download-http "&kernel-dl;/linux/daemons/autofs/v5/autofs-&autofs-version;.tar.xz">
-  <!ENTITY autofs-download-ftp  " ">
-  <!ENTITY autofs-md5sum        "06fb59a03c82364a0d788435b6853d70">
-  <!ENTITY autofs-size          "328 KB">
-  <!ENTITY autofs-buildsize     "5.7 MB">
-  <!ENTITY autofs-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="autofs" xreflabel="Autofs-&autofs-version;">
-  <?dbhtml filename="autofs.html"?>
-
-
-  <title>autofs-&autofs-version;</title>
-
-  <indexterm zone="autofs">
-    <primary sortas="a-Autofs">Autofs</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Autofs</title>
-
-    <para>
-      <application>Autofs</application> controls the operation of the automount
-      daemons. The automount daemons automatically mount filesystems when they
-      are accessed and unmount them after a period of inactivity. This is done
-      based on a set of pre-configured maps.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&autofs-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&autofs-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &autofs-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &autofs-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &autofs-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &autofs-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Autofs Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libtirpc"/> and
-      <xref linkend="rpcsvc-proto"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="nfs-utils"/>,
-      <xref linkend="libnsl"/>,
-      <xref linkend="libxml2"/>,
-      <xref linkend="mitkrb"/>,
-      <xref linkend="openldap"/> (client only), and
-      <xref linkend="cyrus-sasl"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="kernel" id="autofs-kernel">
-    <title>Kernel Configuration</title>
-
-    <indexterm zone="autofs autofs-kernel">
-      <primary sortas="d-Automounter">Automounter</primary>
-    </indexterm>
-
-    <para>
-      Verify that automounter kernel support has been enabled:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="autofs-kernel.xml"/>
-
-    <para>
-      Optionally, enable the following options in the kernel configuration:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="autofs-optional-kernel.xml"/>
-
-    <para>
-      Recompile and install the new kernel, if necessary.
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-
-    <title>Installation of Autofs</title>
-<!--
-    <para>
-      First fix an issue introduced by glibc-2.36:
-    </para>
-
-    <screen><userinput>grep -rl linux/fs modules | xargs sed -i "/linux\/fs/d"</userinput></screen>
--->
-    <para>
-      Install <application>Autofs</application> by running the following
-      commands:
-    </para>
-
-<screen revision="sysv"><userinput>./configure --prefix=/usr             \
-            --with-mapdir=/etc/autofs \
-            --with-libtirpc           \
-            --without-openldap        \
-            --mandir=/usr/share/man   &amp;&amp;
-make</userinput></screen>
-
-<screen revision="systemd"><userinput>./configure --prefix=/usr             \
-            --with-mapdir=/etc/autofs \
-            --with-libtirpc           \
-            --with-systemd            \
-            --without-openldap        \
-            --mandir=/usr/share/man   &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-<!-- As of version 5.1.5, the configuration files are not installed anymore -->
-    <caution>
-      <para>
-        If <application>autofs</application> is already installed on your
-        system, be sure to backup your configuration files. They'll be
-        overwritten by the following command.
-      </para>
-    </caution>
-
-    <para>
-      Install the default configuration files, still as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install_samples</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-libtirpc</parameter>: This switch forces the package to
-      use libtirpc for RPC functionality instead of relying on implementation
-      from Glibc, which was removed in LFS 8.1.
-    </para>
-
-    <para revision="systemd">
-      <parameter>--with-systemd</parameter>: This switch enables installation
-      of the bundled systemd units.
-    </para>
-
-    <para>
-      <parameter>--without-openldap</parameter>: This switch disables openldap
-      if found.  If openldap is desired, omit this switch.  Note that openldap
-      support in autofs requires <xref linkend="mitkrb"/>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Autofs</title>
-
-    <sect3 id="autofs-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/sysconfig/autofs.conf</filename>,
-        <filename>/etc/autofs/auto.master</filename>,
-        <filename>/etc/autofs/auto.misc</filename>, and
-        <filename>/etc/autofs/auto.net</filename>
-      </para>
-
-      <indexterm zone="autofs autofs-config" >
-        <primary sortas="e-etc-sysconfig-autofs.conf">/etc/sysconfig/autofs.conf</primary>
-      </indexterm>
-
-      <indexterm zone="autofs autofs-config">
-        <primary sortas="e-etc-auto.master">/etc/autofs/auto.master</primary>
-      </indexterm>
-
-      <indexterm zone="autofs autofs-config">
-        <primary sortas="e-etc-auto.misc">/etc/autofs/auto.misc</primary>
-      </indexterm>
-
-      <indexterm zone="autofs autofs-config">
-        <primary sortas="e-etc-auto.net">/etc/autofs/auto.net</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        The installation process creates <filename>auto.master</filename>,
-        <filename>auto.misc</filename>,  <filename>auto.smb</filename>, and
-        <filename>auto.net</filename>. Replace the
-        <filename>auto.master</filename> file with the following commands
-        as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>mv /etc/autofs/auto.master /etc/autofs/auto.master.bak &amp;&amp;
-cat &gt; /etc/autofs/auto.master &lt;&lt; "EOF"
-<literal># Begin /etc/autofs/auto.master
-
-/media/auto  /etc/autofs/auto.misc  --ghost
-#/home        /etc/autofs/auto.home
-
-# End /etc/autofs/auto.master</literal>
-EOF</userinput></screen>
-
-      <para>
-        This file creates a new media directory,
-        <filename>/media/auto</filename> that will overlay any existing
-        directory of the same name.  In this example, the file,
-        <filename>/etc/autofs/auto.misc</filename>, has a line:
-      </para>
-
-<screen>cd   -fstype=iso9660,ro,nosuid,nodev :/dev/cdrom</screen>
-
-      <para>
-        that will mount a cdrom as <filename>/media/auto/cd</filename> if
-        that directory is accessed.  The <option>--ghost</option> option tells
-        the automounter to create <quote>ghost</quote> versions (i.e. empty
-        directories) of all the mount points listed in the configuration file
-        regardless whether any of the file systems are actually mounted or not.
-        This is very convenient and highly recommended, because it will show
-        you the available auto-mountable file systems as existing directories,
-        even when their file systems aren't currently mounted. Without the
-        <option>--ghost</option> option, you'll have to remember the names of
-        the directories. As soon as you try to access one of them, the
-        directory will be created and the file system will be mounted. When
-        the file system gets unmounted again, the directory is destroyed too,
-        unless the <option>--ghost</option> option was given.
-      </para>
-
-      <note>
-        <para>
-          An alternative method would be to specify another automount
-          location such as <filename
-          class='directory'>/var/lib/auto/cdrom</filename> and create a
-          symbolic link from <filename
-          class='directory'>/media/cdrom</filename> to the automount location.
-        </para>
-      </note>
-
-      <para>
-        The <filename>auto.misc</filename> file must be configured to your
-        working hardware. The loaded configuration file should load your cdrom
-        if <filename>/dev/cdrom</filename> is active or it can be edited to
-        match your device setup.  Examples for floppies are available in the
-        file and easily activated. Documentation for this file is available
-        using the <command>man 5 autofs</command> command.
-      </para>
-
-      <para>
-        In the second line, if enabled, a user's home directory would be
-        mounted via NFS upon login.  The <filename>/etc/home.auto</filename>
-        would need to exist and have an entry similar to:
-      </para>
-
-<screen>joe  example.org:/export/home/joe</screen>
-
-      <para>
-        where the directory <filename>/export/home/joe</filename> is
-        exported via NFS from the system example.org.  NFS shares
-        are covered on the next page.
-      </para>
-
-      <para>
-        This package could also be used to mount SMB shares, however that
-        feature is not configured in these instructions.  For additional
-        configuration information, see the man pages for
-        <ulink role='man' url='&man;auto.master.5'>auto.master(5)</ulink>.
-        There are also web resources such as this <ulink
-        url='https://wiki.gentoo.org/wiki/AutoFS'>AUTOFS
-        HOWTO</ulink> available.
-      </para>
-
-    </sect3>
-
-    <sect3  id="autofs-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para revision="sysv">
-        <application>autofs</application> installs its own
-        boot script, but it has no capability for logging or visual conformance
-        with other BLFS scripts. It will be replaced by an enhanced version.
-      </para>
-
-      <para revision="sysv">
-        Install the <filename>/etc/init.d/autofs</filename>
-        mount script included with the <xref linkend="bootscripts"/>
-        package.
-      </para>
-
-      <para revision="systemd">
-        To start <application>Autofs</application> at boot, enable the
-        previously installed systemd unit by running the following command as
-        the <systemitem class="username">root</systemitem> user:
-      </para>
-
-      <indexterm zone="autofs autofs-init">
-        <primary sortas="f-autofs-init">autofs</primary>
-      </indexterm>
-
-<screen role="root" revision="sysv"><userinput>make install-autofs</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>systemctl enable autofs</userinput></screen>
-
-      <para revision="sysv">
-        The time-out variable is set in
-        <filename>/etc/sysconfig/autofs.conf</filename>. The installed file sets
-        a default of 60 seconds of inactivity before unmounting the device.  A
-        much shorter time may be necessary to protect buffer writing to a floppy
-        if users tend to remove the media prior to the timeout setting.
-      </para>
-
-      <note revision="systemd">
-        <para>
-          You can also specify <envar>OPTIONS</envar> variable in the
-          <filename>/etc/sysconfig/autofs</filename> file with any additional
-          parameters that you might want to pass to the automount daemon.
-        </para>
-      </note>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>automount</seg>
-        <seg>
-          libautofs.so.
-          lookup_dir.so, 
-          lookup_file.so, 
-          lookup_files.so (symlink to lookup_file.so), 
-          lookup_hosts.so,
-          lookup_ldap.so (optional), 
-          lookup_multi.so, 
-          lookup_nis.so (symlink to lookup_yp.so),
-          lookup_program.so, 
-          lookup_userhome.so, 
-          lookup_yp.so, 
-          mount_afs.so,
-          mount_autofs.so, 
-          mount_bind.so, 
-          mount_changer.so, 
-          mount_ext2.so,
-          mount_ext3.so (symlink to mount_ext2.so), 
-          mount_ext4.so (symlink to mount_ext2.so), 
-          mount_generic.so, 
-          mount_nfs.so,
-          mount_nfs4.so (symlink to mount_nfs.so), 
-          parse_amd.so, and 
-          parse_sun.so
-        </seg>
-        <seg>
-          /usr/lib/autofs and 
-          /etc/autofs
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="automount">
-        <term><command>automount</command></term>
-        <listitem>
-          <para>
-            is the daemon that performs the mounting when a request is
-            made for the device
-          </para>
-          <indexterm zone="autofs automount">
-            <primary sortas="b-automount">automount</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/blocaled.xml
===================================================================
--- general/sysutils/blocaled.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,239 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 blocaled-download-http "https://github.com/lfs-book/blocaled/releases/download/v&blocaled-version;/blocaled-&blocaled-version;.tar.xz">
-  <!ENTITY blocaled-download-ftp  " ">
-  <!ENTITY blocaled-md5sum        "04d9833d0dfbf3609b0d8f6d276812ff">
-  <!ENTITY blocaled-size          "262 KB">
-  <!ENTITY blocaled-buildsize     "4.2 MB (with tests)">
-  <!ENTITY blocaled-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="blocaled" revision="sysv" xreflabel="blocaled-&blocaled-version;">
-  <?dbhtml filename="blocaled.html"?>
-
-
-  <title>blocaled-&blocaled-version;</title>
-
-  <indexterm zone="blocaled">
-    <primary sortas="a-blocaled">blocaled</primary>
-  </indexterm>
-
-  <!--Required section-->
-  <sect2 role="package">
-    <title>Introduction to blocaled</title>
-
-    <para>
-      <application>blocaled</application> is an implementation of the
-      <emphasis>org.freedesktop.locale1</emphasis> D-Bus protocol,
-      which normally comes with <application>systemd</application>. It is
-      needed by the <application>GNOME</application> desktop.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&blocaled-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&blocaled-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &blocaled-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &blocaled-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &blocaled-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &blocaled-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">blocaled Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="polkit"/> and
-      <xref linkend="libdaemon"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of blocaled</title>
-
-    <para>
-      Install <application>blocaled</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring blocaled</title>
-
-    <sect3 id="blocaled-config">
-      <title>Config Files</title>
-      <para>
-        <filename>/etc/blocaled.conf</filename>
-      </para>
-
-      <indexterm zone="blocaled blocaled-config">
-        <primary
-        sortas="e-etc-blocaled.conf">/etc/blocaled.conf</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3><title>Configuration Information</title>
-
-      <para>
-        <filename>/etc/blocaled.conf</filename> contains the location of
-        the settings files used by <application>blocaled</application>. The
-        defaults are suitable for BLFS. Information about the entries is
-        available as comments in the file.
-      </para>
-
-      <para>
-        The <emphasis>org.freedesktop.locale1</emphasis> protocol is
-        unable to export locale variables. Locale settings are stored
-        by default in <filename>/etc/locale.conf</filename>. We need to
-        retrieve them in the bash profile. As the <systemitem class="username">
-        root</systemitem> user, issue:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/i18n.sh &lt;&lt; "EOF"
-<literal># Begin /etc/profile.d/i18n.sh
-
-if [ -r /etc/locale.conf ]; then source /etc/locale.conf; fi
-
-if [ -n "$LANG" ];              then export LANG; fi
-if [ -n "$LC_TYPE" ];           then export LC_TYPE; fi
-if [ -n "$LC_NUMERIC" ];        then export LC_NUMERIC; fi
-if [ -n "$LC_TIME" ];           then export LC_TIME; fi
-if [ -n "$LC_COLLATE" ];        then export LC_COLLATE; fi
-if [ -n "$LC_MONETARY" ];       then export LC_MONETARY; fi
-if [ -n "$LC_MESSAGES" ];       then export LC_MESSAGES; fi
-if [ -n "$LC_PAPER" ];          then export LC_PAPER; fi
-if [ -n "$LC_NAME" ];           then export LC_NAME; fi
-if [ -n "$LC_ADDRESS" ];        then export LC_ADDRESS; fi
-if [ -n "$LC_TELEPHONE" ];      then export LC_TELEPHONE; fi
-if [ -n "$LC_MEASUREMENT" ];    then export LC_MEASUREMENT; fi
-if [ -n "$LC_IDENTIFICATION" ]; then export LC_IDENTIFICATION; fi
-
-# End /etc/profile.d/i18n.sh</literal>
-EOF</userinput></screen>
-
-      <para>
-        Then the <filename>/etc/locale</filename> file should be generated,
-        as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/locale.conf &lt;&lt; EOF
-<literal># Begin /etc/locale.conf
-
-LANG=$LANG
-
-# End /etc/locale.conf</literal>
-EOF</userinput></screen>
-
-      <para>
-        If you plan to run an X (or Wayland) Window system, you may want to
-        set up your X keyboard. The best way to do it is to retrieve the
-        settings from <filename>/etc/sysconfig/console</filename>, and feed
-        them to the <application>blocaled</application> daemon. As the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>source /etc/sysconfig/console &amp;&amp;
-KEYMAP=${KEYMAP:-us}          &amp;&amp;
-
-gdbus call --system                                             \
-           --dest org.freedesktop.locale1                       \
-           --object-path /org/freedesktop/locale1               \
-           --method org.freedesktop.locale1.SetVConsoleKeyboard \
-           "$KEYMAP" "$KEYMAP_CORRECTIONS" true true</userinput></screen>
-
-      <para>
-        This should create or modify the Xorg configuration file (default is
-        <filename>/etc/X11/xorg.conf.d/30-keyboard.conf</filename>) to match
-        the keyboard settings set in <envar>KEYMAP</envar>.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          blocaled (in <filename class="directory">/usr/libexec</filename>)
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/blocaled
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="blocaled-prog">
-        <term><command>blocaled</command></term>
-        <listitem>
-          <para>
-            is the daemon implementing the
-            <emphasis>org.freedesktop.locale1</emphasis> D-Bus protocol
-          </para>
-          <indexterm zone="blocaled blocaled-prog">
-            <primary sortas="b-blocaled">blocaled</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/sysutils/bluez-kernel.xml
===================================================================
--- general/sysutils/bluez-kernel.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,43 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>G</emphasis>eneral setup ---&gt;
-  # If it is disabled, [TIMERFD] and [EVENTFD] will be hidden and
-  # enabled implicitly.  We DO NOT recommend to enable [EXPERT]
-  # unless you are really an expert user:
-  [ /*] <emphasis role='blue'>C</emphasis>onfigure standard kernel features (expert users) ---&gt;          [EXPERT]
-    [*] <emphasis role='blue'>E</emphasis>nable timerfd() system call                                   [TIMERFD]
-    [*] <emphasis role='blue'>E</emphasis>nable eventfd() system call                                   [EVENTFD]
-
-[*] N<emphasis role='blue'>e</emphasis>tworking support ---&gt;                                                [NET]
-  &lt;*/M&gt; <emphasis role='blue'>B</emphasis>luetooth subsystem support ---&gt;                                    [BT]
-    [*]   <emphasis role='blue'>B</emphasis>luetooth Classic (BR/EDR) features                         [BT_BREDR]
-    &lt;*/M&gt;   <emphasis role='blue'>R</emphasis>FCOMM protocol support                                  [BT_RFCOMM]
-    [*]       <emphasis role='blue'>R</emphasis>FCOMM TTY support                                 [BT_RFCOMM_TTY]
-    &lt;*/M&gt;   <emphasis role='blue'>B</emphasis>NEP protocol support                                      [BT_BNEP]
-    [*]       M<emphasis role='blue'>u</emphasis>lticast filter support                       [BT_BNEP_MC_FILTER]
-    [*]       <emphasis role='blue'>P</emphasis>rotocol filter support                     [BT_BNEP_PROTO_FILTER]
-    &lt;*/M&gt;   H<emphasis role='blue'>I</emphasis>DP protocol support                                      [BT_HIDP]
-    <emphasis role='blue'>B</emphasis>luetooth device drivers ---&gt;
-      # Select the appropriate drivers for your bluetooth hardware.
-      # There are more vendor-specific drivers not listed here:
-      &lt; /*/M&gt; H<emphasis role='blue'>C</emphasis>I USB driver                                       [BT_HCIBTUSB]
-      &lt; /*/M&gt; H<emphasis role='blue'>C</emphasis>I SDIO driver                                     [BT_HCIBTSDIO]
-      &lt; /*/M&gt; H<emphasis role='blue'>C</emphasis>I UART driver                                       [BT_HCIUART]
-  &lt;*/M&gt; <emphasis role='blue'>R</emphasis>F switch subsystem support ---&gt;                                [RFKILL]
-
--*- <emphasis role='blue'>C</emphasis>ryptographic API ---&gt;                                              [CRYPTO]
-  <emphasis role='blue'>C</emphasis>rypto core or helper ---&gt;
-    &lt;*/M&gt; <emphasis role='blue'>U</emphasis>serspace cryptographic algorithm configuration          [CRYPTO_USER]
-  <emphasis role='blue'>B</emphasis>lock ciphers ---&gt;
-    &lt;*/M&gt; <emphasis role='blue'>A</emphasis>ES (Advanced Encryption Standard)                        [CRYPTO_AES]
-  <emphasis role='blue'>A</emphasis>EAD (authenticated encryption with associated data) ciphers ---&gt;
-    &lt;*/M&gt; <emphasis role='blue'>C</emphasis>CM (Counter with Cipher Block Chaining-MAC)              [CRYPTO_CCM]
-  H<emphasis role='blue'>a</emphasis>shes, digests, and MACs ---&gt;
-    &lt;*/M&gt; <emphasis role='blue'>C</emphasis>MAC (Cipher-based MAC)                                  [CRYPTO_CMAC]
-  <emphasis role='blue'>U</emphasis>serspace interface ---&gt;
-    &lt;*/M&gt; H<emphasis role='blue'>a</emphasis>sh algorithms                                 [CRYPTO_USER_API_HASH]
-    &lt;*/M&gt; <emphasis role='blue'>S</emphasis>ymmetric key cipher algorithms             [CRYPTO_USER_API_SKCIPHER]
-    &lt;*/M&gt; <emphasis role='blue'>A</emphasis>EAD cipher algorithms                          [CRYPTO_USER_API_AEAD]</screen>
Index: general/sysutils/bluez.xml
===================================================================
--- general/sysutils/bluez.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,468 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 bluez-download-http "&kernel-dl;/linux/bluetooth/bluez-&bluez-version;.tar.xz">
-  <!ENTITY bluez-download-ftp  " ">
-  <!ENTITY bluez-md5sum        "e6a640a70a808a2dd46b9ad44a888602">
-  <!ENTITY bluez-size          "2.3 MB">
-  <!ENTITY bluez-buildsize     "167 MB (with tests)">
-  <!ENTITY bluez-time          "0.7 SBU (using parallelism=4; with tests)">
-]>
-
-<sect1 id="bluez" xreflabel="BlueZ-&bluez-version;">
-  <?dbhtml filename="bluez.html"?>
-
-
-  <title>BlueZ-&bluez-version;</title>
-
-  <indexterm zone="bluez">
-    <primary sortas="a-BlueZ">BlueZ</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to BlueZ</title>
-
-    <para>
-      The <application>BlueZ</application> package contains the
-      Bluetooth protocol stack for Linux.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&bluez-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&bluez-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &bluez-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &bluez-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &bluez-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &bluez-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-    <!--
-    <bridgehead renderas="sect3" revision="sysv">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact" revision="sysv">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/bluez-&bluez-version;-obexd_without_systemd-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-      -->
-
-    <bridgehead renderas="sect3">BlueZ Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dbus"/>,
-      <xref linkend="glib2"/>, and
-      <xref linkend="libical"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="docutils"/> (to generate man pages)
-    </para>
-
-  </sect2>
-
-
-  <sect2 role="kernel" id="bluez-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      If you are building this package to use bluetooth devices (rather than as a
-      build dependency), enable the following options in the kernel configuration,
-      also the options in the <quote>Cryptographic API</quote> section if
-      you intend to run the tests, and recompile the kernel if necessary:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="bluez-kernel.xml"/>
-
-    <indexterm zone="bluez bluez-kernel">
-      <primary sortas="d-bluez">bluez</primary>
-    </indexterm>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of BlueZ</title>
-
-<!--
-    <para>
-      At first, fix an issue building the package with Glibc-2.34 or later:
-    </para>
-
-<screen><userinput>sed 's/pause(/bluez_&amp;/' -i profiles/audio/media.c</userinput></screen>
-
-    <para revision="sysv">Now, make some changes needed for SystemV systems:</para>
-
-<screen revision="sysv"><userinput>patch -Np1 -i ../bluez-&bluez-version;-obexd_without_systemd-1.patch</userinput></screen>
-
--->
-    <para>
-      Install <application>BlueZ</application> by running the following
-      commands:
-    </para>
-
-<screen revision="sysv"><userinput>./configure --prefix=/usr         \
-            --sysconfdir=/etc     \
-            --localstatedir=/var  \
-            --enable-library      \
-            --disable-manpages    \
-            --disable-systemd     &amp;&amp;
-make</userinput></screen>
-
-<screen revision="systemd"><userinput>./configure --prefix=/usr         \
-            --sysconfdir=/etc     \
-            --localstatedir=/var  \
-            --disable-manpages    \
-            --enable-library      &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <userinput>make check</userinput>.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-ln -svf ../libexec/bluetooth/bluetoothd /usr/sbin</userinput></screen>
-
-    <para>
-      Install the main configuration file as the &root; user:
-    </para>
-
-<screen role="root"><userinput>install -v -dm755 /etc/bluetooth &amp;&amp;
-install -v -m644 src/main.conf /etc/bluetooth/main.conf</userinput></screen>
-
-    <para>
-      If desired, install the API documentation as the &root; user:
-    </para>
-
-<screen role="root"><userinput>install -v -dm755 /usr/share/doc/bluez-&bluez-version; &amp;&amp;
-install -v -m644 doc/*.txt /usr/share/doc/bluez-&bluez-version;</userinput></screen>
-
-  </sect2>
-
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-manpages</parameter>: This switch disables generating
-      the manual pages because of the reliance on 'rst2man' in docutils. Remove
-      this switch if you have <xref role="nodep" linkend="docutils"/> installed
-      and wish to generate the manual pages.
-    </para>
-
-    <para>
-      <parameter>--enable-library</parameter>: This switch enables building the
-      <application>BlueZ</application> 4 compatibility library which is required by
-      some applications.
-    </para>
-
-    <para revision="sysv">
-      <parameter>--disable-systemd</parameter>: This switch is needed because
-      <application>systemd</application> is not part of LFS/BLFS. If you are
-      using systemd, remove this switch.
-    </para>
-
-    <para>
-      <command>ln -svf ../libexec/bluetooth/bluetoothd /usr/sbin</command>:
-      This command makes access to the bluetooth daemon more convenient.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring BlueZ</title>
-
-    <sect3 id="bluez-config">
-      <title>Configuration Files</title>
-      <para revision="sysv">
-        <filename>/etc/bluetooth/main.conf</filename> is installed automatically
-        during the install.  Additionally, there are three supplementary
-        configuration files.  /etc/sysconfig/bluetooth is installed as a part
-        of the boot script below.  In addition, you optionally can install the
-        following, as the &root; user:
-      </para>
-
-      <para revision="systemd">
-        <filename>/etc/bluetooth/main.conf</filename> is installed automatically
-        during the installation. Additionally, there are two supplementary
-        configuration files. You can optionally install the following files
-        as the &root; user:
-     </para>
-
-<screen role="root"><userinput>cat > /etc/bluetooth/rfcomm.conf &lt;&lt; "EOF"</userinput>
-<literal># Start rfcomm.conf
-# Set up the RFCOMM configuration of the Bluetooth subsystem in the Linux kernel.
-# Use one line per command
-# See the rfcomm man page for options
-
-
-# End of rfcomm.conf</literal>
-EOF</screen>
-
-<screen role="root"><userinput>cat > /etc/bluetooth/uart.conf &lt;&lt; "EOF"</userinput>
-<literal># Start uart.conf
-# Attach serial devices via UART HCI to BlueZ stack
-# Use one line per device
-# See the hciattach man page for options
-
-# End of uart.conf</literal>
-EOF</screen>
-
-      <indexterm zone="bluez bluez-config">
-        <primary
-        sortas="e-etc-bluetooth-main.conf">/etc/bluetooth/main.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3  id="bluez-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Bluez Services</phrase></title>
-
-      <para revision="sysv">
-        To automatically start the <command>bluetoothd</command> daemon when the
-        system is rebooted, install the
-        <filename>/etc/rc.d/init.d/bluetooth</filename> bootscript from the
-        <xref linkend="bootscripts"/> package.
-      </para>
-
-      <para revision="systemd">
-        To start the <command>bluetoothd</command> daemon at boot,
-        enable the previously installed systemd unit by
-        running the following command as the &root; user:
-      </para>
-
-<screen role="root" revision="systemd"><userinput>systemctl enable bluetooth</userinput></screen>
-
-      <para revision="systemd">
-         To start the <command>obexd</command> daemon for a user session (to
-         support some Bluetooth programs using it), enable the previously
-         installed systemd unit for all users by running the following command
-         as the &root; user:
-       </para>
-
-<screen role="root" revision="systemd"><userinput>systemctl enable --global obex</userinput></screen>
-
-      <indexterm zone="bluez bluez-init">
-        <primary sortas="f-bluetooth">bluetooth</primary>
-      </indexterm>
-
-<screen role="root" revision="sysv"><userinput>make install-bluetooth</userinput></screen>
-
-
-      <note revision="systemd">
-        <para>
-          <application>Systemd</application> will start the Bluetooth daemon
-          only when a bluetooth device is detected on the system.
-        </para>
-      </note>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-      <!--bccmd, -->
-          bluemoon,
-          bluetoothctl,
-          bluetoothd (symlink),
-          btattach,
-          btmon,
-          hex2hcd,
-          l2ping,
-          l2test,
-          mpris-proxy, and
-          rctest
-        </seg>
-        <seg>
-          libbluetooth.so
-        </seg>
-        <seg>
-          /etc/bluetooth,
-          /usr/{include,libexec}/bluetooth, and
-          /usr/share/doc/bluez-&bluez-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <!--
-      <varlistentry id="bccmd">
-        <term><command>bccmd</command></term>
-        <listitem>
-          <para>
-            is used to issue BlueCore commands to Cambridge Silicon
-            Radio devices
-          </para>
-          <indexterm zone="bluez bccmd">
-            <primary sortas="b-bccmd">bccmd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      -->
-
-      <varlistentry id="bluemoon">
-        <term><command>bluemoon</command></term>
-        <listitem>
-          <para>
-            is a Bluemoon configuration utility
-          </para>
-          <indexterm zone="bluez bluemoon">
-            <primary sortas="b-bluemoon">bluemoon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bluetoothctl">
-        <term><command>bluetoothctl</command></term>
-        <listitem>
-          <para>
-            is the interactive Bluetooth control program
-          </para>
-          <indexterm zone="bluez bluetoothctl">
-            <primary sortas="b-bluetoothctl">bluetoothctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bluetoothd">
-        <term><command>bluetoothd</command></term>
-        <listitem>
-          <para>
-            is the Bluetooth daemon
-          </para>
-          <indexterm zone="bluez bluetoothd">
-            <primary sortas="b-bluetoothd">bluetoothd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="btmon">
-        <term><command>btmon</command></term>
-        <listitem>
-          <para>
-            provides access to the Bluetooth subsystem monitor
-            infrastructure for reading HCI traces
-          </para>
-          <indexterm zone="bluez btmon">
-            <primary sortas="b-btmon">btmon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-
-      <varlistentry id="hex2hcd">
-        <term><command>hex2hcd</command></term>
-        <listitem>
-          <para>
-            is used to convert a file needed by Broadcom devices
-            to hcd (Broadcom bluetooth firmware) format
-          </para>
-          <indexterm zone="bluez hex2hcd">
-            <primary sortas="b-hex2hcd">hex2hcd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="l2ping">
-        <term><command>l2ping</command></term>
-        <listitem>
-          <para>
-            is used to send a L2CAP echo request to the Bluetooth MAC
-            address given in dotted hex notation
-          </para>
-          <indexterm zone="bluez l2ping">
-            <primary sortas="b-l2ping">l2ping</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="l2test">
-        <term><command>l2test</command></term>
-        <listitem>
-          <para>
-            is a L2CAP testing program
-          </para>
-          <indexterm zone="bluez l2test">
-            <primary sortas="b-l2test">l2test</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rctest">
-        <term><command>rctest</command></term>
-        <listitem>
-          <para>
-            is used to test RFCOMM communications on the
-            Bluetooth stack
-          </para>
-          <indexterm zone="bluez rctest">
-            <primary sortas="b-rctest">rctest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libbluetooth">
-        <term><filename class="libraryfile">libbluetooth.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>BlueZ</application> 4 API functions
-          </para>
-          <indexterm zone="bluez libbluetooth">
-            <primary sortas="c-libbluetooth">libbluetooth.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/bubblewrap-kernel.xml
===================================================================
--- general/sysutils/bubblewrap-kernel.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,8 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>G</emphasis>eneral setup ---&gt;
-  -*- N<emphasis role='blue'>a</emphasis>mespaces support ---&gt;                                       [NAMESPACES]
-    [*] <emphasis role='blue'>U</emphasis>ser namespace                                                 [USER_NS]</screen>
Index: general/sysutils/bubblewrap.xml
===================================================================
--- general/sysutils/bubblewrap.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,183 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 bubblewrap-download-http "https://github.com/containers/bubblewrap/releases/download/v&bubblewrap-version;/bubblewrap-&bubblewrap-version;.tar.xz">
-  <!ENTITY bubblewrap-download-ftp  " ">
-  <!ENTITY bubblewrap-md5sum        "adcbd7c08ac068a9328ec93cd83716e5">
-  <!ENTITY bubblewrap-size          "120 KB">
-  <!ENTITY bubblewrap-buildsize     "3.3 MB (with tests)">
-  <!ENTITY bubblewrap-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="bubblewrap" xreflabel="bubblewrap-&bubblewrap-version;">
-  <?dbhtml filename="bubblewrap.html"?>
-
-
-  <title>Bubblewrap-&bubblewrap-version;</title>
-
-  <indexterm zone="bubblewrap">
-    <primary sortas="a-bubblewrap">bubblewrap</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Bubblewrap</title>
-
-    <para>
-      <application>Bubblewrap</application> is a setuid implementation of user
-      namespaces, or sandboxing, that provides access to a subset of kernel
-      user namespace features. Bubblewrap allows user owned processes to run in
-      an isolated environment with limited access to the underlying filesystem.
-      <!-- Thanks for the reword DJ -->
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&bubblewrap-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&bubblewrap-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &bubblewrap-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &bubblewrap-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &bubblewrap-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &bubblewrap-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Bubblewrap Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libxslt"/> (to generate manual pages) and
-      <xref linkend="libseccomp"/> (built with python bindings, for tests)
-    </para>
-
-  </sect2>
-
-  <sect2 role="kernel" id="bubblewrap-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      When this package began, upstream expected it could be installed
-      suid-root. That was a long time ago, suid-root is generally considered
-      a bad idea. As well as the default namespaces, this package requires the
-      optional User namespace to be enabled. If that has not yet been enabled,
-      select the following option in the kernel configuration and recompile the
-      kernel:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="bubblewrap-kernel.xml"/>
-
-    <indexterm zone="bubblewrap bubblewrap-kernel">
-      <primary sortas="d-bubblewrap">bubblewrap</primary>
-    </indexterm>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Bubblewrap</title>
-
-    <para>
-      Install <application>Bubblewrap</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      Next, if you desire to run the test suite, fix an issue caused by the
-      merged-/usr configuration in LFS:
-    </para>
-
-<screen remap="test"><userinput>sed 's@symlink usr/lib64@ro-bind-try /lib64@' -i ../tests/libtest.sh</userinput></screen>
-
-    <para>
-      To test the results, issue (as a user other than the
-      <systemitem class="username">root</systemitem> user):
-      <command>ninja test</command>
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          bwrap
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bwrap">
-        <term><command>bwrap</command></term>
-        <listitem>
-          <para>
-            generates a sandbox for a program to run in
-          </para>
-          <indexterm zone="bubblewrap bwrap">
-            <primary sortas="b-bwrap">bwrap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/sysutils/colord.xml
===================================================================
--- general/sysutils/colord.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,387 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 colord-download-http "https://www.freedesktop.org/software/colord/releases/colord-&colord-version;.tar.xz">
-  <!ENTITY colord-download-ftp  " ">
-  <!ENTITY colord-md5sum        "94bd795efa1931a34990345e4ac439a8">
-  <!ENTITY colord-size          "1.7 MB">
-  <!ENTITY colord-buildsize     "18 MB (with tests)">
-  <!ENTITY colord-time          "0.4 SBU (with tests)">
-]>
-
-<sect1 id="colord" xreflabel="colord-&colord-version;">
-  <?dbhtml filename="colord.html"?>
-
-
-  <title>Colord-&colord-version;</title>
-
-  <indexterm zone="colord">
-    <primary sortas="a-colord">Colord</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Colord</title>
-
-    <para>
-      <application>Colord</application> is a system service that makes it easy
-      to manage, install, and generate color profiles. It is used mainly by
-      <application>GNOME Color Manager</application> for system integration
-      and use when no users are logged in.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&colord-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&colord-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &colord-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &colord-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &colord-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &colord-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Colord Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dbus"/>,
-      <xref linkend="glib2"/> (GObject Introspection recommended),
-      <xref linkend="lcms2"/>,
-      <xref linkend="polkit"/>, and
-      <!-- Polkit now needed, see #11481 in Trac -->
-      <xref linkend="sqlite"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <phrase revision="sysv"><xref linkend="elogind"/>,</phrase>
-      <xref linkend="libgudev"/>,
-      <xref linkend="libgusb"/>,
-      <phrase revision="systemd" role="runtime"><xref linkend="systemd"/>
-      (runtime),</phrase>
-      and <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gnome-desktop"/> and
-      <xref linkend="colord-gtk"/> (to build the example tools),
-      <xref linkend="docbook-utils"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="libxslt"/>,
-      <xref linkend="sane"/>,
-      <ulink url="https://www.argyllcms.com/">ArgyllCMS</ulink>, and
-      <ulink url="https://github.com/scop/bash-completion/">Bash Completion</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Colord</title>
-
-    <para>
-      There should be a dedicated user and group to take control of the colord
-      daemon after it has started. Issue the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 71 colord &amp;&amp;
-useradd -c "Color Daemon Owner" -d /var/lib/colord -u 71 \
-        -g colord -s /bin/false colord</userinput></screen>
-
-    <para>
-      Install <application>Colord</application> by running the following
-      commands:
-    </para>
-
-<screen revision="sysv"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..                 \
-      --prefix=/usr            \
-      --buildtype=release      \
-      -Ddaemon_user=colord     \
-      -Dvapi=true              \
-      -Dsystemd=false          \
-      -Dlibcolordcompat=true   \
-      -Dargyllcms_sensor=false \
-      -Dbash_completion=false  \
-      -Ddocs=false             \
-      -Dman=false              &amp;&amp;
-ninja</userinput></screen>
-
-<screen revision="systemd"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..                 \
-      --prefix=/usr            \
-      --buildtype=release      \
-      -Ddaemon_user=colord     \
-      -Dvapi=true              \
-      -Dsystemd=true           \
-      -Dlibcolordcompat=true   \
-      -Dargyllcms_sensor=false \
-      -Dbash_completion=false  \
-      -Ddocs=false             \
-      -Dman=false              &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-      One test, <filename>colord-self-test-daemon</filename>, will fail if the
-      package is already installed. The test suite must be run with the
-      system-wide D-Bus Daemon running.
-    </para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <parameter>-Ddaemon_user=colord</parameter>: This switch is used
-      so the colord daemon will run as an unprivileged user instead of the
-      <systemitem class="username">root</systemitem> user.
-    </para>
-
-    <para>
-      <parameter>-Dvapi=true</parameter>: This switch enables building
-      the <application>Vala</application> bindings. Remove if you don't have
-      <xref linkend="vala"/> installed.
-    </para>
-
-    <para revision="sysv">
-      <parameter>-Dsystemd=false</parameter>: This switch disables
-      support for <application>systemd</application> login in Colord
-      applications.
-    </para>
-
-    <para revision="systemd">
-      <parameter>-Dsystemd=true</parameter>: This switch enables
-      installation of the <application>systemd</application> service.
-    </para>
-
-    <para>
-      <parameter>-Dlibcolordcompat=true</parameter>: This switch enables
-      building a compatibility library for older packages that use
-      <application>Colord</application>.
-    </para>
-
-    <para>
-      <parameter>-Dargyllcms_sensor=false</parameter>: This switch
-      disables the ArgLLCMS sensor driver. Omit if you have
-      <ulink url="https://www.argyllcms.com/">ArgyllCMS</ulink> installed
-      and wish to use it.
-    </para>
-
-    <para>
-      <parameter>-Dbash_completion=false</parameter>: This switch
-      disables Bash Completion support for Colord applications.
-    </para>
-
-    <para>
-      <parameter>-Ddocs=false</parameter>: This switch disables building
-      of documentation. Omit if you have <xref linkend="gtk-doc"/> available.
-    </para>
-
-    <para>
-      <parameter>-Dman=false</parameter>: This switch disables building
-      of man pages. Omit if you have <xref linkend="docbook-utils"/>
-      available. Namespaced versions of the docbook-xsl stylesheets
-      are also required.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          cd-create-profile,
-          cd-fix-profile,
-          cd-iccdump,
-          cd-it8, and
-          colormgr
-        </seg>
-        <seg>
-          libcolord.so,
-          libcolordcompat.so,
-          libcolordprivate.so, and
-          libcolorhug.so
-        </seg>
-        <seg>
-          /usr/include/colord-1,
-          /usr/lib/colord-{plugins,sensors},
-          /usr/share/color{d},
-          /usr/share/gtk-doc/html/colord, and
-          /var/lib/colord
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <!-- If the program or library name conflicts (is the same) as the
-      package name, add -prog or -lib to the varlistentry entity id
-      and the 2nd entry of the indexterm zone entity -->
-
-      <varlistentry id="cd-create-profile">
-        <term><command>cd-create-profile</command></term>
-        <listitem>
-          <para>
-            is the Color Manager Profile Creation Tool
-          </para>
-          <indexterm zone="colord cd-create-profile">
-            <primary sortas="b-cd-create-profile">cd-create-profile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cd-fix-profile">
-        <term><command>cd-fix-profile</command></term>
-        <listitem>
-          <para>
-            is a tool used to fix metadata in ICC profiles
-          </para>
-          <indexterm zone="colord cd-fix-profile">
-            <primary sortas="b-cd-fix-profile">cd-fix-profile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cd-iccdump">
-        <term><command>cd-iccdump</command></term>
-        <listitem>
-          <para>
-            dumps the contents of an ICC profile as human readable text
-          </para>
-          <indexterm zone="colord cd-iccdump">
-            <primary sortas="b-cd-iccdump">cd-iccdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cd-it8">
-        <term><command>cd-it8</command></term>
-        <listitem>
-          <para>
-            is the Color Manager Testing Tool
-          </para>
-          <indexterm zone="colord cd-it8">
-            <primary sortas="b-cd-it8">cd-it8</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="colormgr">
-        <term><command>colormgr</command></term>
-        <listitem>
-          <para>
-            is a text-mode program that allows you to interact with colord on
-            the command line
-          </para>
-          <indexterm zone="colord colormgr">
-            <primary sortas="b-colormgr">colormgr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcolord.so">
-        <term><filename class="libraryfile">libcolord.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Colord</application> API functions
-          </para>
-          <indexterm zone="colord libcolord.so">
-            <primary sortas="c-libcolord.so">libcolord.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcolordcompat.so">
-        <term><filename class="libraryfile">libcolordcompat.so</filename></term>
-        <listitem>
-          <para>
-            contains legacy API functions for compatibility with older
-            applications
-          </para>
-          <indexterm zone="colord libcolordcompat.so">
-            <primary sortas="c-libcolordcompat.so">libcolordcompat.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcolordprivate.so">
-        <term><filename class="libraryfile">libcolordprivate.so</filename></term>
-        <listitem>
-          <para>
-            contains internal API functions for the programs included with
-            <application>Colord</application>
-          </para>
-          <indexterm zone="colord libcolordprivate.so">
-            <primary sortas="c-libcolordprivate.so">libcolordprivate.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcolorhug.so">
-        <term><filename class="libraryfile">libcolorhug.so</filename></term>
-        <listitem>
-          <para>
-            contains a simple display hardware colorimiter
-          </para>
-          <indexterm zone="colord libcolorhug.so">
-            <primary sortas="c-libcolorhug.so">libcolorhug.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/sysutils/cpio.xml
===================================================================
--- general/sysutils/cpio.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,202 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 cpio-download-http "&gnu-http;/cpio/cpio-&cpio-version;.tar.bz2">
-  <!ENTITY cpio-download-ftp  " ">
-  <!ENTITY cpio-md5sum        "3394d444ca1905ea56c94b628b706a0b">
-  <!ENTITY cpio-size          "1.6 MB">
-  <!ENTITY cpio-buildsize     "21 MB (with tests and docs)">
-  <!ENTITY cpio-time          "0.3 SBU (with tests and docs)">
-]>
-
-<sect1 id="cpio" xreflabel="cpio-&cpio-version;">
-  <?dbhtml filename="cpio.html"?>
-
-
-  <title>cpio-&cpio-version;</title>
-
-  <indexterm zone="cpio">
-    <primary sortas="a-Cpio">Cpio</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to cpio</title>
-
-    <para>
-      The <application>cpio</application> package contains
-      tools for archiving.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&cpio-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&cpio-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cpio-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cpio-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &cpio-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &cpio-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">CPIO Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of cpio</title>
-
-    <para>
-      Install <application>cpio</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --enable-mt   \
-            --with-rmt=/usr/libexec/rmt &amp;&amp;
-make &amp;&amp;
-makeinfo --html            -o doc/html      doc/cpio.texi &amp;&amp;
-makeinfo --html --no-split -o doc/cpio.html doc/cpio.texi &amp;&amp;
-makeinfo --plaintext       -o doc/cpio.txt  doc/cpio.texi</userinput></screen>
-
-    <para>
-      If you have <xref linkend="texlive"/> installed and wish to create PDF
-      or Postscript documentation, issue one or both of the following commands:
-    </para>
-
-<screen remap="doc"><userinput>make -C doc pdf &amp;&amp;
-make -C doc ps</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 -m755 -d /usr/share/doc/cpio-&cpio-version;/html &amp;&amp;
-install -v -m644    doc/html/* \
-                    /usr/share/doc/cpio-&cpio-version;/html &amp;&amp;
-install -v -m644    doc/cpio.{html,txt} \
-                    /usr/share/doc/cpio-&cpio-version;</userinput></screen>
-
-    <para>
-      If you built PDF or Postscript documentation, install it
-      by issuing the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -v -m644 doc/cpio.{pdf,ps,dvi} \
-                 /usr/share/doc/cpio-&cpio-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <!-- FIXME: Removed due to merged-/usr transition
-    <para>
-      <parameter>- -bindir=/bin</parameter>: This parameter installs
-      <command>cpio</command> to <filename class="directory">/bin</filename>
-      instead of <filename class="directory">/usr/bin</filename> as recommended
-      by the FHS guidelines.
-    </para>
-    -->
-
-    <para>
-      <parameter>--enable-mt</parameter>: This parameter forces the
-      building and installation of the <command>mt</command> program.
-    </para>
-
-    <para>
-      <parameter>--with-rmt=/usr/libexec/rmt</parameter>: This parameter
-      inhibits building the <command>rmt</command> program as it is already
-      installed by the <application>Tar</application> package in LFS.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>cpio and mt</seg>
-        <seg>None</seg>
-        <seg>/usr/share/doc/cpio-&cpio-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cpio-prog">
-        <term><command>cpio</command></term>
-        <listitem>
-          <para>
-            copies files to and from archives
-          </para>
-          <indexterm zone="cpio cpio-prog">
-            <primary sortas="b-cpio">cpio</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mt">
-        <term><command>mt</command></term>
-        <listitem>
-          <para>
-            controls magnetic tape drive operations
-          </para>
-          <indexterm zone="cpio mt">
-            <primary sortas="b-mt">mt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/cups-pk-helper.xml
===================================================================
--- general/sysutils/cups-pk-helper.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,156 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY cups-pk-helper-download-http
-           "https://www.freedesktop.org/software/cups-pk-helper/releases/cups-pk-helper-&cups-pk-helper-version;.tar.xz">
-  <!ENTITY cups-pk-helper-download-ftp  " ">
-  <!ENTITY cups-pk-helper-md5sum        "0cdadec9ea8f88b7fc7af8ca206da2bd">
-  <!ENTITY cups-pk-helper-size          "56 KB">
-  <!ENTITY cups-pk-helper-buildsize     "5.3 MB">
-  <!ENTITY cups-pk-helper-time          "0.1 SBU">
-]>
-
-<sect1 id="cups-pk-helper" xreflabel="cups-pk-helper-&cups-pk-helper-version;">
-  <?dbhtml filename="cups-pk-helper.html"?>
-
-
-  <title>cups-pk-helper-&cups-pk-helper-version;</title>
-
-  <indexterm zone="cups-pk-helper">
-    <primary sortas="a-cups-pk-helper">cups-pk-helper</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to cups-pk-helper</title>
-
-    <para>
-      The <application>cups-pk-helper</application> package contains a
-      <application>PolicyKit</application> helper used to configure
-      <application>Cups</application> with fine-grained privileges.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&cups-pk-helper-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&cups-pk-helper-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cups-pk-helper-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cups-pk-helper-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &cups-pk-helper-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &cups-pk-helper-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/cups-pk-helper-&cups-pk-helper-version;-consolidated_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">cups-pk-helper Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cups"/> and
-      <xref linkend="polkit"/>
-    </para>
-
-<!--
-    <para condition="html" role="usernotes">
-      Editor Notes: <ulink url="&blfs-wiki;/cups-pk-helper"/>
-    </para>
--->
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of cups-pk-helper</title>
-
-<!--
-    <para>
-      First, fix some deprecated syntax that will prevent cups-pk-helper from
-      building on future versions of CUPS:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../cups-pk-helper-&cups-pk-helper-version;-consolidated_fixes-1.patch</userinput></screen>
--->
-
-    <para>
-      Install <application>cups-pk-helper</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          cups-pk-helper-mechanism (library executable)
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/dbus.xml
===================================================================
--- general/sysutils/dbus.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,717 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 dbus-download-http "https://dbus.freedesktop.org/releases/dbus/dbus-&dbus-version;.tar.xz">
-  <!ENTITY dbus-download-ftp  " ">
-  <!ENTITY dbus-md5sum        "46070a3487817ff690981f8cd2ba9376">
-  <!ENTITY dbus-size          "1.3 MB">
-  <!ENTITY dbus-buildsize     "23 MB (add 25 MB for tests)">
-  <!ENTITY dbus-time          "0.2 SBU (add 1.5 SBU for tests)">
-  <!-- The former value was 0.8 SBU, which was far more sensible. -->
-  <!-- I got 'real  0m14.355s' for make check at -j1; bdubbs dbus-1.14.2 -->
-  <!-- Now 'real 2m51.642ss' for make check at -j1; bdubbs dbus-1.14.6
-# TOTAL: 217
-# PASS:  217
-
-Sane test results for 1.14.8.  -bdubbs
-
-For 1.14.10:
-# TOTAL: 219
-# PASS:  218
-# FAIL:  1
-
-not ok 2 test-autolaunch
-  -->
-]>
-
-<sect1 id="dbus" xreflabel="dbus-&dbus-version;">
-  <?dbhtml filename="dbus.html"?>
-
-
-  <title>dbus-&dbus-version;</title>
-
-  <indexterm zone="dbus">
-    <primary sortas="a-D-Bus">D-Bus</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to D-Bus</title>
-
-    <para revision="sysv">
-      <application>D-Bus</application> is a message bus system, a simple way
-      for applications to talk to one another.
-      <application>D-Bus</application> supplies both a system daemon (for
-      events such as <quote>new hardware device added</quote> or <quote>printer
-      queue changed</quote>) and a per-user-login-session daemon (for general
-      IPC needs among user applications). Also, the message bus is built on top
-      of a general one-to-one message passing framework, which can be used by
-      any two applications to communicate directly (without going through the
-      message bus daemon).
-    </para>
-
-    <para revision="systemd">
-      Even though <application>D-Bus</application> was built in LFS, there are
-      some features provided by the package that other BLFS packages need, but
-      their dependencies didn't fit into LFS.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&dbus-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&dbus-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &dbus-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &dbus-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &dbus-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &dbus-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">D-Bus Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="xorg7-lib"/> (for <command>dbus-launch</command> program)
-      <!-- elogind cannot be used by dbus: dbus only uses the systemd service,
-      not the logind one
-      <phrase revision="sysv">and <xref linkend="elogind"/> (These are
-      circular dependencies. First build without them, and then again after
-      both packages are installed.)</phrase>-->
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <phrase revision="systemd"><xref role="runtime" linkend="systemd"/>
-      (runtime, for registering services launched by D-Bus session daemon as
-      systemd user services);</phrase>
-      For the tests:
-      <xref linkend="dbus-python"/>,
-      <xref linkend="pygobject3"/>,
-      and <xref linkend="valgrind"/>;
-
-      for documentation:
-      <xref linkend="doxygen"/>,
-      <xref linkend="xmlto"/>,
-      <ulink url="https://pypi.python.org/pypi/mallard-ducktype">Ducktype</ulink>,
-      and
-      <ulink url="&gnome-download-http;/yelp-tools/">Yelp Tools</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of D-Bus</title>
-    <!--
-    <para revision="sysv">
-      If they do not already exist,
-      as the <systemitem class="username">root</systemitem> user, create a
-      system user and group to handle the system message bus activity:
-    </para>
-
-<screen role="root" revision="sysv"><userinput>groupadd -g 18 messagebus &amp;&amp;
-useradd -c "D-Bus Message Daemon User" -d /var/run/dbus \
-        -u 18 -g messagebus -s /bin/false messagebus</userinput></screen>
-    -->
-
-    <para>
-      Install <application>D-Bus</application> by running the following
-      commands (you may wish to review the output from <command>./configure
-      --help</command> first and add any desired parameters to the
-      <command>configure</command> command shown below):
-    </para>
-
-    <!-- Only usefull for systemd: it installs the services files in the
-    systemd/user
-    - -enable-user-session                \ -->
-<screen revision="sysv"><userinput>./configure --prefix=/usr                        \
-            --sysconfdir=/etc                    \
-            --localstatedir=/var                 \
-            --runstatedir=/run                   \
-            --disable-doxygen-docs               \
-            --disable-xml-docs                   \
-            --disable-static                     \
-            --with-systemduserunitdir=no         \
-            --with-systemdsystemunitdir=no       \
-            --docdir=/usr/share/doc/dbus-&dbus-version;  \
-            --with-system-socket=/run/dbus/system_bus_socket &amp;&amp;
-make</userinput></screen>
-
-<screen revision="systemd"><userinput>./configure --prefix=/usr                        \
-            --sysconfdir=/etc                    \
-            --localstatedir=/var                 \
-            --runstatedir=/run                   \
-            --enable-user-session                \
-            --disable-doxygen-docs               \
-            --disable-xml-docs                   \
-            --disable-static                     \
-            --docdir=/usr/share/doc/dbus-&dbus-version;  \
-            --with-system-socket=/run/dbus/system_bus_socket &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      See below for test instructions.
-    </para>
-
-<!--
-    <warning revision="systemd">
-      <para>
-        Installing the package will override all files installed by
-        <application>D-Bus</application> in LFS. It is critical that
-        nothing uses <application>D-Bus</application> libraries or
-        programs during the installation. The best way to ensure that these
-        libraries are not being used is to run the installation in rescue mode.
-        To switch to rescue mode, run the following command as the
-        <systemitem class="username">root</systemitem> user (from a TTY):
-      </para>
-
-<screen role="root"><userinput>systemctl start rescue.target</userinput></screen>
-
-    </warning>
--->
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-<!-- FIXME: No longer needed with usr merge
-    <para>
-      The shared library needs to be moved to
-      <filename class="directory">/lib</filename>, and as a result the
-      <filename class="extension">.so</filename> file in
-      <filename class="directory">/usr/lib</filename> will need to be
-      recreated. Run the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>mv -v /usr/lib/libdbus-1.so.* /lib &amp;&amp;
-ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</userinput></screen>
--->
-
-    <para>
-      If you are using a DESTDIR install,
-      <command>dbus-daemon-launch-helper</command> needs to be fixed
-      afterwards. Issue, as <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>chown -v root:messagebus /usr/libexec/dbus-daemon-launch-helper &amp;&amp;
-chmod -v      4750       /usr/libexec/dbus-daemon-launch-helper</userinput></screen>
-
-    <para revision="sysv">
-      If you are still building your system in chroot or you did not start the
-      daemon yet, but you want to compile some packages that require
-      <application>D-Bus</application>, generate the
-      <application>D-Bus</application> UUID to avoid warnings when compiling
-      some packages with the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root" revision="sysv"><userinput>dbus-uuidgen --ensure</userinput></screen>
-
-    <para revision="sysv">
-      If using <xref linkend="elogind"/>, create a symlink to the
-      <filename>/var/lib/dbus/machine-id</filename> file:
-    </para>
-
-<screen role="root" revision="sysv"><userinput>ln -sfv /var/lib/dbus/machine-id /etc</userinput></screen>
-
-<!--
-    <para revision="systemd">
-      If not in chroot, at this point, you should reload the systemd daemon,
-      and reenter multi-user mode with the following commands (as the
-      <systemitem class="username">root</systemitem> user):
-    </para>
-
-<screen role="root" revision="systemd"><userinput>systemctl daemon-reload
-systemctl start multi-user.target</userinput></screen>
--->
-
-    <!-- Without dbus-python and pygobject3, only 39 tests are run and
-         11 out of 39 are skipped.  With dbus-python and pygobject3
-         installed, 238 tests are run and 37 out of 238 are skipped.  -->
-
-    <para>
-      Many tests are disabled unless both <xref linkend="dbus-python"/>
-      and <xref linkend="pygobject3"/> have been installed.  They must be
-      run as an unprivileged user from a local session with bus address.
-      To run the standard tests issue <command>make check</command>.
-    </para>
-
-    <!-- With dbus-python and pygobject3 installed and these additional
-         debug options, 347 tests are run and 21 out of 347 are skipped.
-         Additionally,  217 tests in the "name-test" directory are run
-         and none is skipped.  -->
-    <para>
-      If you want to run the unit regression tests, configure requires
-      additional parameters which expose additional functionality in the
-      binaries that are not intended to be used in a production build of
-      <application>D-Bus</application>.  If you would like to run the tests,
-      issue the following commands (for the tests, you don't need to build the
-      docs):
-    </para>
-
-<screen remap="test"><userinput>make distclean                                    &amp;&amp;
-PYTHON=python3 ./configure --enable-tests         \
-                           --enable-asserts       \
-                           --disable-doxygen-docs \
-                           --disable-xml-docs     &amp;&amp;
-make                                              &amp;&amp;
-make check</userinput></screen>
-
-    <para>
-      One test, test-autolaunch, is known to fail.
-      There have also been reports that the tests may fail if running inside a
-      Midnight Commander shell. You may get out-of-memory error messages when
-      running the tests. These are normal and can be safely ignored.
-    </para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-doxygen-docs</parameter>: This switch disables
-      doxygen documentation build and install, if you have
-      <application>doxygen</application> installed. If
-      <application>doxygen</application> is installed, and you wish to build
-      them, remove this parameter.
-    </para>
-
-    <para>
-      <parameter>--disable-xml-docs</parameter>: This switch disables html
-      documentation build and install, if you have
-      <application>xmlto</application> installed. If
-      <application>xmlto</application> is installed, and you wish to build
-      them, remove this parameter.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para revision="systemd">
-      <parameter>--enable-user-session</parameter>: This parameter enables
-      per-user DBus sessions with
-      <application>systemd</application>.
-    </para>
-
-    <para revision="sysv">
-      <parameter>--with-systemd{user,system}unitdir=no</parameter>: These
-      switches disable installation of systemd units on elogind based systems.
-    </para>
-<!-- not in instructions anymore
-    <para>
-      <parameter>- -with-system-pid-file=/run/dbus/pid</parameter>: This
-      parameter specifies the location of the PID file.
-    </para>
--->
-    <para>
-      <parameter>--with-system-socket=/run/dbus/system_bus_socket</parameter>:
-      This parameter specifies the location of the system bus socket.
-    </para>
-
-    <para>
-      <parameter>--enable-tests</parameter>: Builds extra parts of the code to
-      support all tests. Do not use on a production build.
-    </para>
-
-    <para>
-      <option>--enable-embedded-tests</option>: Builds extra parts of the
-      code to support only unit tests. Do not use on a production build.
-    </para>
-
-    <para>
-      <parameter>--enable-asserts</parameter>: Enables debugging code to run
-      assertions for statements normally assumed to be true. This prevents a
-      warning that '<parameter>--enable-tests</parameter>' on its own is only
-      useful for profiling and might not give true results for all tests, but
-      adds its own NOTE that this should not be used in a production build.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring D-Bus</title>
-
-    <sect3 id="dbus-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/dbus-1/session.conf</filename>,
-        <filename>/etc/dbus-1/system.conf</filename> and
-        <filename>/etc/dbus-1/system.d/*</filename>
-      </para>
-
-      <indexterm zone="dbus dbus-config">
-        <primary sortas="e-etc-dbus-1-session.conf">/etc/dbus-1/session.conf</primary>
-      </indexterm>
-
-      <indexterm zone="dbus dbus-config">
-        <primary sortas="e-etc-dbus-1/system.conf">/etc/dbus-1/system.conf</primary>
-      </indexterm>
-
-      <indexterm zone="dbus dbus-config">
-        <primary sortas="e-etc-dbus-1-system.d-star">/etc/dbus-1/system.d/*</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3 id="dbus-session-config" xreflabel="D-Bus custom services directory">
-      <title>Configuration Information</title>
-
-      <para>
-        The configuration files listed above should probably not be
-        modified. If changes are required, you should create
-        <filename>/etc/dbus-1/session-local.conf</filename> and/or
-        <filename>/etc/dbus-1/system-local.conf</filename> and make any
-        desired changes to these files.
-     </para>
-
-      <para>
-        If any packages install a
-        <application>D-Bus</application> <filename>.service</filename>
-        file outside of the standard <filename
-        class="directory">/usr/share/dbus-1/services</filename> directory,
-        that directory should be added to the local session configuration.
-        For instance, <filename
-        class="directory">/usr/local/share/dbus-1/services</filename> can
-        be added by performing the following commands as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/dbus-1/session-local.conf &lt;&lt; "EOF"
-<literal>&lt;!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"&gt;
-&lt;busconfig&gt;
-
-  &lt;!-- Search for .service files in /usr/local --&gt;
-  &lt;servicedir&gt;/usr/local/share/dbus-1/services&lt;/servicedir&gt;
-
-&lt;/busconfig&gt;</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-    <sect3  id="dbus-session">
-      <title>D-Bus Session Daemon</title>
-
-      <para revision="sysv">
-        To automatically start <command>dbus-daemon</command> when the
-        system is rebooted, install the
-        <filename>/etc/rc.d/init.d/dbus</filename> bootscript from the
-        <xref linkend="bootscripts"/> package.
-      </para>
-
-      <indexterm zone="dbus dbus-session" revision="sysv">
-        <primary sortas="f-dbus">dbus</primary>
-      </indexterm>
-
-<screen role="root" revision="sysv"><userinput>make install-dbus</userinput></screen>
-
-      <para revision="sysv">
-        If this is the first time to install
-        <application>D-Bus</application> on the system and you are not
-        operating in a chroot environment, you can immediately start
-        <command>dbus-daemon</command> without rebooting the system:
-      </para>
-
-      <!-- nodump because maybe the user is building in chroot -->
-      <screen role="nodump" revision="sysv"><userinput>/etc/init.d/dbus start</userinput></screen>
-
-      <para revision="sysv">
-        Note that this boot script only starts the system-wide
-        <application>D-Bus</application> daemon. Each user requiring access to
-        <application>D-Bus</application> services will also need to run a
-        session daemon as well. There are many methods you can use to start a
-        session daemon using the <command>dbus-launch</command> command. Review
-        the <command>dbus-launch</command> man page for details about the
-        available parameters and options. Here are some suggestions and
-        examples:
-      </para>
-
-      <para revision="systemd">
-        There are many methods you can use to start a session daemon
-        using the <command>dbus-launch</command> command. Review the
-        <command>dbus-launch</command> man page for details about the
-        available parameters and options. Here are some suggestions and
-        examples:
-      </para>
-
-
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Add <command>dbus-launch</command> to the line in the
-            <filename>~/.xinitrc</filename> file that starts your graphical
-            desktop environment.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            If you use <command>gdm</command> or some other display manager
-            that calls the <filename>~/.xsession</filename> file, you can add
-            <command>dbus-launch</command> to the line in your
-            <filename>~/.xsession</filename> file that starts your graphical
-            desktop environment. The syntax would be similar to the example in
-            the <filename>~/.xinitrc</filename> file.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            The examples shown previously use
-            <command>dbus-launch</command> to specify a program to be run. This
-            has the benefit (when also using the
-            <parameter>--exit-with-x11</parameter> parameter) of stopping the
-            session daemon when the specified program is stopped. You can also
-            start the session daemon in your system or personal startup scripts
-            by adding the following lines:
-          </para>
-
-<screen role="nodump"><userinput><literal># Start the D-Bus session daemon
-eval `dbus-launch`
-export DBUS_SESSION_BUS_ADDRESS</literal></userinput></screen>
-
-          <para>
-            This method will not stop the session daemon when you exit
-            your shell, therefore you should add the following line to your
-            <filename>~/.bash_logout</filename> file:
-          </para>
-
-<screen role="nodump"><userinput><literal># Kill the D-Bus session daemon
-kill $DBUS_SESSION_BUS_PID</literal></userinput></screen>
-        </listitem>
-
-        <!-- KDM is no longer usable, SDDM is it's replacement
-        <listitem>
-          <para>
-            A hint has been written that provides ways to start scripts
-            using the KDM session manager of KDE. The concepts in this hint could
-            possibly be used with other session managers as well. The hint is
-            located at <ulink
-            url="&hints-root;/downloads/files/execute-session-scripts-using-kdm.txt"/>.
-          </para>
-        </listitem>
-        -->
-
-      </itemizedlist>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content" revision="sysv">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          dbus-cleanup-sockets, dbus-daemon, dbus-launch, dbus-monitor,
-          dbus-run-session, dbus-send, dbus-test-tool,
-          dbus-update-activation-environment, and dbus-uuidgen
-        </seg>
-        <seg>
-           libdbus-1.so
-        </seg>
-        <seg>
-          /etc/dbus-1,
-          /usr/{include,lib}/dbus-1.0,
-          /usr/lib/cmake/DBus1,
-          /usr/share/dbus-1,
-          /usr/share/xml/dbus-1,
-          /usr/share/doc/dbus-&dbus-version;, and
-          /var/{lib,run}/dbus
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="dbus-cleanup-sockets">
-        <term><command>dbus-cleanup-sockets</command></term>
-        <listitem>
-          <para>
-            is used to clean up leftover sockets in a directory
-          </para>
-          <indexterm zone="dbus dbus-cleanup-sockets">
-            <primary sortas="b-dbus-cleanup-sockets">dbus-cleanup-sockets</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dbus-daemon">
-        <term><command>dbus-daemon</command></term>
-        <listitem>
-          <para>
-            is the <application>D-Bus</application> message bus daemon
-          </para>
-          <indexterm zone="dbus dbus-daemon">
-            <primary sortas="b-dbus-daemon">dbus-daemon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dbus-launch">
-        <term><command>dbus-launch</command></term>
-        <listitem>
-          <para>
-            is used to start <command>dbus-daemon</command> from a shell
-            script. It  would  normally be called from a user's login
-            scripts
-          </para>
-          <indexterm zone="dbus dbus-launch">
-            <primary sortas="b-dbus-launch">dbus-launch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dbus-monitor">
-        <term><command>dbus-monitor</command></term>
-        <listitem>
-          <para>
-            is used to monitor messages going through a
-            <application>D-Bus</application> message bus
-          </para>
-          <indexterm zone="dbus dbus-monitor">
-            <primary sortas="b-dbus-monitor">dbus-monitor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dbus-run-session">
-        <term><command>dbus-run-session</command></term>
-        <listitem>
-          <para>
-            starts a process as a new <application>D-Bus</application> session
-          </para>
-          <indexterm zone="dbus dbus-run-session">
-            <primary sortas="b-dbus-run-session">dbus-run-session</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dbus-send">
-        <term><command>dbus-send</command></term>
-        <listitem>
-          <para>
-            is used to send a message to a <application>D-Bus</application>
-            message bus
-          </para>
-          <indexterm zone="dbus dbus-send">
-            <primary sortas="b-dbus-send">dbus-send</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dbus-test-tool">
-        <term><command>dbus-test-tool</command></term>
-        <listitem>
-          <para>
-            is a <application>D-Bus</application> traffic generator and test
-            tool; it is a multi-purpose tool for debugging and profiling
-            <application>D-Bus</application>
-          </para>
-          <indexterm zone="dbus dbus-test-tool">
-            <primary sortas="b-dbus-test-tool">dbus-test-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dbus-update-activation-environment">
-        <term><command>dbus-update-activation-environment</command></term>
-        <listitem>
-          <para>
-            is used to update the environment used for
-            <application>D-Bus</application> session services;
-            it updates the list of environment variables used by
-            <command>dbus-daemon --session</command> when it activates session
-            services without using systemd
-          </para>
-          <indexterm zone="dbus dbus-update-activation-environment">
-            <primary sortas="b-dbus-update-activation-environment">
-            dbus-update-activation-environment</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dbus-uuidgen">
-        <term><command>dbus-uuidgen</command></term>
-        <listitem>
-          <para>
-            is used to generate a universally unique ID
-          </para>
-          <indexterm zone="dbus dbus-uuidgen">
-            <primary sortas="b-dbus-uuidgen">dbus-uuidgen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libdbus-1">
-        <term><filename class="libraryfile">libdbus-1.so</filename></term>
-        <listitem>
-          <para>
-            contains the API functions used by the
-            <application>D-Bus</application> message daemon.
-            <application>D-Bus</application> is first a library that provides
-            one-to-one communication between any two applications;
-            <command>dbus-daemon</command> is an application that uses this
-            library to implement a message bus daemon
-          </para>
-          <indexterm zone="dbus libdbus-1">
-            <primary sortas="c-libdbus-1">libdbus-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-  <sect2 role="content" revision="systemd">
-    <title>Contents</title>
-
-      <para>
-        A list of the installed files, along with their short
-        descriptions can be found at
-        <ulink url="&lfs-root;/chapter08/dbus.html#contents-dbus"/>.
-      </para>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/elogind-kernel.xml
===================================================================
--- general/sysutils/elogind-kernel.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>F</emphasis>ile systems ---&gt;
-  [*] <emphasis role='blue'>I</emphasis>notify support for userspace                               [INOTIFY_USER]
-  <emphasis role='blue'>P</emphasis>seudo filesystems ---&gt;
-    [*] <emphasis role='blue'>T</emphasis>mpfs virtual memory file system support (former shm fs)         [TMPFS]
-    [*]   <emphasis role='blue'>T</emphasis>mpfs POSIX Access Control Lists                     [TMPFS_POSIX_ACL]</screen>
Index: general/sysutils/elogind-test-kernel.xml
===================================================================
--- general/sysutils/elogind-test-kernel.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen>-*- <emphasis role='blue'>C</emphasis>ryptographic API ---&gt;                                              [CRYPTO]
-  <emphasis role='blue'>C</emphasis>rypto core or helper ---&gt;
-    &lt;*/M&gt; <emphasis role='blue'>U</emphasis>serspace cryptographic algorithm configuration          [CRYPTO_USER]
-  <emphasis role='blue'>U</emphasis>serspace interface ---&gt;
-    &lt;*/M&gt; H<emphasis role='blue'>a</emphasis>sh algorithms                                 [CRYPTO_USER_API_HASH]</screen>
Index: general/sysutils/elogind.xml
===================================================================
--- general/sysutils/elogind.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,418 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 elogind-download-http "https://github.com/elogind/elogind/archive/v&elogind-version;/elogind-&elogind-version;.tar.gz">
-  <!ENTITY elogind-download-ftp  " ">
-  <!ENTITY elogind-md5sum        "864463a809190c724c11084f908db72c">
-  <!ENTITY elogind-size          "2.0 MB">
-  <!ENTITY elogind-buildsize     "48 MB (with tests)">
-  <!ENTITY elogind-time          "0.4 SBU (with parallelism=4; with tests)">
-]>
-
-<sect1 id="elogind" revision="sysv" xreflabel="elogind-&elogind-version;">
-  <?dbhtml filename="elogind.html"?>
-
-
-  <title>elogind-&elogind-version;</title>
-
-  <indexterm zone="elogind">
-    <primary sortas="a-elogind">elogind</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to elogind</title>
-
-    <para>
-      <application>elogind</application> is the
-      <application>systemd</application> project's "logind", extracted to
-      be a standalone daemon.  It integrates with <xref linkend="linux-pam"/>
-      to track all the users logged in to a system, and whether they
-      are logged in graphically, on the console, or remotely.
-      <application>Elogind</application> exposes this information via the
-      standard org.freedesktop.login1 <application>D-Bus</application>
-      interface, and also through the file system using systemd's standard
-      <filename class="directory">/run/systemd</filename> layout.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&elogind-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&elogind-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &elogind-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &elogind-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &elogind-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &elogind-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">elogind Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref role="runtime" linkend="dbus"/> (runtime),
-      <xref linkend="linux-pam"/> (required for Xorg),
-      <xref role="runtime" linkend="polkit"/> (runtime),
-      <xref linkend="DocBook"/>,
-      <xref linkend="docbook-xsl"/>, and
-      <xref linkend="libxslt"/> (all three to build the man pages)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="lxml"/>,
-      <xref linkend="zsh"/>,
-      <xref linkend="valgrind"/> (needed for tests),
-      <ulink url="https://github.com/linux-audit/audit-userspace">
-      audit-userspace</ulink>,
-      <ulink url="https://github.com/scop/bash-completion">
-      bash-completion</ulink>,
-      <ulink url="https://mirrors.edge.kernel.org/pub/linux/utils/kernel/kexec/">
-      kexec</ulink>, and
-      <ulink url="https://selinuxproject.org/page/Main_Page">
-      SELinux</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      Editor Notes: <ulink url="&blfs-wiki;/Logind"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="kernel" id="elogind-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration and recompile the
-      kernel if necessary:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="elogind-kernel.xml"/>
-
-    <para>
-      In addition, some tests need the userspace cryptographic kernel API, which
-      is enabled with:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="elogind-test-kernel.xml"/>
-
-    <indexterm zone="elogind elogind-kernel">
-      <primary sortas="d-elogind">elogind</primary>
-    </indexterm>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of elogind</title>
-
-    <para>
-      Install <application>elogind</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..                              \
-      --prefix=/usr                         \
-      --buildtype=release                   \
-      -Dman=auto                            \
-      -Ddocdir=/usr/share/doc/elogind-&elogind-version; \
-      -Dcgroup-controller=elogind           \
-      -Ddev-kvm-mode=0660                   \
-      -Ddbuspolicydir=/etc/dbus-1/system.d &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>. A few tests
-      are skipped if not run with &root; privileges.  
-      Three tests, <filename>test-login</filename>, <filename>dbus-docs-fresh</filename>,
-      and <filename>check-version-history</filename>, are known to fail.
-      <!--
-      <filename>test-id128</filename> require the
-      <filename>/etc/machine-id</filename> symlink, so they will fail if
-      this symlink is not created following the instruction in
-      <xref linkend='dbus'/> yet.
-
-      I did have the symlink and test-fs-util still failed (the only
-      one).  The error was 
-         Assertion 'chase_symlinks(q, NULL, CHASE_SAFE, NULL, NULL) >= 0' 
-         failed at src/test/test-fs-util.c:303, function 
-         test_chase_symlinks(). Aborting.
-      Looking at teh code, I don't think that is related to the 
-      /etc/machine-id symlink. - bdubbs, version 252.23
-      -->
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install                                           &amp;&amp;
-ln -sfv  libelogind.pc /usr/lib/pkgconfig/libsystemd.pc &amp;&amp;
-ln -sfvn elogind /usr/include/systemd</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-    <!--
-    <para>
-      <command>sed ... meson.build</command>: This change allows the
-      package to be built without polkit being installed (it is still a
-      runtime dependency) but able to use polkit after that package is
-      installed.
-    </para>
-
-    <para>
-      <command>sed ... src/login/logind.c</command>: This change allows the
-      elogind daemon to exit when it is disconnected from dbus (for example
-      when dbus is killed).
-    </para>
-    -->
-    <para>
-      <parameter>-Ddocdir=/usr/share/doc/elogind-&elogind-version;</parameter>:
-      This is needed to install documentation in a versioned directory.
-    </para>
-
-    <para>
-      <parameter>-Dcgroup-controller=elogind</parameter>: This switch is
-      necessary to build this package when the kernel is not built with
-      <option>CONFIG_CGROUPS</option> enabled.  Note that
-      <application>elogind</application> strictly needs
-      a kernel with <option>CONFIG_CGROUPS</option> enabled at runtime,
-      but this switch will allow building the package first.
-    </para>
-
-    <para>
-      <parameter>-Ddbuspolicydir=/etc/dbus-1/system.d</parameter>: This switch
-      sets the location of the <application>D-Bus</application> policy
-      directory.
-    </para>
-
-    <para>
-      <parameter>-Ddev-kvm-mode=0660</parameter>: The LFS udev rule sets the
-      mode of <filename class='devicefile'>/dev/kvm</filename> to 0660.
-      This option ensures the elogind udev rules consistent with the LFS
-      configuration.
-    </para>
-
-    <para>
-      <parameter>-Dman=auto</parameter>: The default value of this switch is
-      <emphasis>false</emphasis>. Setting it to <emphasis>auto</emphasis>
-      allows building and installing the man pages if the recommended
-      dependencies are installed.
-    </para>
-
-    <para>
-      <option>-Dhtml=auto</option>: The default value of this switch is
-      <emphasis>false</emphasis>. Setting it to <emphasis>auto</emphasis>
-      allows building and installing the html documentation if the recommended
-      dependencies are installed.
-    </para>
-
-    <para>
-      <option>-Ddefault-kill-user-processes=false</option>: Determines whether
-      the processes of a user should be killed when the user logs out. The
-      default is <emphasis>true</emphasis>, but this defeats the traditional
-      use of <command>screen</command> or <command>tmux</command>. This can
-      also be changed in the configuration file (see below).
-    </para>
-
-    <para>
-      <command>ln -s ...</command>: These commands install symlinks so that
-      software packages can find the systemd-compatible library and headers.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-  <title>Configuring elogind</title>
-
-    <sect3 id="elogind-config">
-      <title>Config File</title>
-      <para>
-        <filename>/etc/elogind/logind.conf</filename>
-      </para>
-
-      <indexterm zone="elogind elogind-config">
-        <primary
-        sortas="e-etc-elogind-logind.conf">/etc/elogind/logind.conf</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3><title>Configuration Information</title>
-
-      <para>
-        The installed file <filename>/etc/elogind/logind.conf</filename>
-        contains all the possible options with their defaults, commented
-        out. You may wish to disable automatically killing user processes when the user logs
-        out, by running, as the <systemitem class="username">root</systemitem>
-        user:
-      </para>
-
-<screen role="root"><userinput>sed -e '/\[Login\]/a KillUserProcesses=no' \
-    -i /etc/elogind/logind.conf</userinput></screen>
-
-      <para>
-        Each user will need to register a user session using
-        <application>Linux-PAM</application> at login. The
-        <filename>/etc/pam.d/system-session</filename> file needs to
-        be modified and a new file must be created in order for
-        <command>elogind</command> to work correctly. Run the following
-        commands as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/pam.d/system-session &lt;&lt; "EOF" &amp;&amp;
-<literal># Begin elogind addition
-
-session  required    pam_loginuid.so
-session  optional    pam_elogind.so
-
-# End elogind addition</literal>
-EOF
-cat &gt; /etc/pam.d/elogind-user &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/elogind-user
-
-account  required    pam_access.so
-account  include     system-account
-
-session  required    pam_env.so
-session  required    pam_limits.so
-session  required    pam_unix.so
-session  required    pam_loginuid.so
-session  optional    pam_keyinit.so force revoke
-session  optional    pam_elogind.so
-
-auth     required    pam_deny.so
-password required    pam_deny.so
-
-# End /etc/pam.d/elogind-user</literal>
-EOF</userinput></screen>
-
-    <note>
-      <para>After completion of <application>elogind</application>, 
-      you should check that it functions properly.  First ensure that
-      <application>dbus</application> is running.  It may be easiest
-      to do this by rebooting the system.  After logging in again, run 
-      the command <command>loginctl</command>.  The result should indicate 
-      that a SESSION and a SEAT have been created.</para>
-    </note>
-
-    </sect3>
-  </sect2>
-
-  <sect2 role="content" revision="sysv">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          busctl,
-          elogind-inhibit, and
-          loginctl
-        </seg>
-        <seg>
-           libelogind.so
-        </seg>
-        <seg>
-          /usr/lib/elogind,
-          /etc/elogind,
-          /usr/include/elogind, and
-          /usr/share/doc/elogind-&elogind-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="busctl">
-        <term><command>busctl</command></term>
-        <listitem>
-          <para>
-            is used to introspect and monitor the D-Bus bus
-          </para>
-          <indexterm zone="elogind busctl">
-            <primary sortas="b-busctl">busctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="elogind-inhibit">
-        <term><command>elogind-inhibit</command></term>
-        <listitem>
-          <para>
-            is used to execute a program with a shutdown, sleep or idle
-            inhibitor lock taken
-          </para>
-          <indexterm zone="elogind elogind-inhibit">
-            <primary sortas="b-elogind-inhibit">elogind-inhibit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="loginctl">
-        <term><command>loginctl</command></term>
-        <listitem>
-          <para>
-            is used to introspect and control the state of the elogind Login
-            Manager
-          </para>
-          <indexterm zone="elogind loginctl">
-            <primary sortas="b-loginctl">loginctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libelogind">
-        <term><filename class="libraryfile">libelogind.so</filename></term>
-        <listitem>
-          <para>
-            is the main elogind utility library
-          </para>
-          <indexterm zone="elogind libelogind">
-            <primary sortas="c-libelogind">libelogind.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/fcron.xml
===================================================================
--- general/sysutils/fcron.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ general/sysutils/fcron.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,485 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
+<sect1 id="fcron" xreflabel="fcron-&fcron-version;">
+<?dbhtml filename="fcron.html" dir="general"?>
+<title>fcron-&fcron-version;</title>
 
-  <!ENTITY fcron-download-http "http://fcron.free.fr/archives/fcron-&fcron-version;.src.tar.gz">
-  <!ENTITY fcron-download-ftp " ">
-  <!ENTITY fcron-md5sum "bd4996e941a40327d11efc5e3fd1f839">
-  <!ENTITY fcron-size "587 KB">
-  <!ENTITY fcron-buildsize "5.1 MB">
-  <!ENTITY fcron-time "0.1 SBU">
-]>
-
-<sect1 id="fcron" xreflabel="Fcron-&fcron-version;">
-  <?dbhtml filename="fcron.html"?>
-
-
-  <title>Fcron-&fcron-version;</title>
-
-  <indexterm zone="fcron">
-    <primary sortas="a-Fcron">Fcron</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Fcron</title>
-
-    <para>
-      The <application>Fcron</application> package contains a periodical
-      command scheduler which aims at replacing <application>Vixie
-      Cron</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&fcron-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&fcron-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &fcron-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &fcron-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &fcron-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &fcron-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/fcron-&fcron-version;-sendmail_upstream-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Fcron Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      An <xref linkend="server-mail"/>,
-      <ulink url="../postlfs/editors.html">text editor</ulink> (default is
-      <command>vi</command> from the <xref linkend="vim"/> package),
-      <xref linkend="linux-pam"/>, and
-      <xref linkend="docbook-utils"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Fcron</title>
-
-    <para id="fcron-syslog" revision="sysv">
-      <application>Fcron</application>
-      uses the cron facility of <command>syslog</command> to log all messages.
-      Since LFS does not set up this facility in
-      <filename>/etc/syslog.conf</filename>, it needs to be done prior to
-      installing <application>Fcron</application>. This command will append the
-      necessary line to the current <filename>/etc/syslog.conf</filename>
-      (perform as the <systemitem class='username'>root</systemitem> user):
-    </para>
-
-    <indexterm zone="fcron fcron-syslog" revision="sysv">
-      <primary sortas="e-etc-syslog.conf">/etc/syslog.conf</primary>
-    </indexterm>
-
-<screen role="root" revision="sysv"><userinput>cat &gt;&gt; /etc/syslog.conf &lt;&lt; "EOF"
-<literal># Begin fcron addition to /etc/syslog.conf
-
-cron.* -/var/log/cron.log
-
-# End fcron addition</literal>
-EOF</userinput></screen>
-
-    <para revision="sysv">
-      The configuration file has been modified, so reloading the
-      <command>sysklogd</command> daemon will activate the changes (again as
-      the <systemitem class='username'>root</systemitem> user).
-    </para>
-
-<screen role="root" revision="sysv"><userinput>/etc/rc.d/init.d/sysklogd reload</userinput></screen>
-
-    <para>
-      For security reasons, an unprivileged user and group for
-      <application>Fcron</application> should be created (perform as the
-      <systemitem class='username'>root</systemitem> user):
-    </para>
-
-<screen role="root"><userinput>groupadd -g 22 fcron &amp;&amp;
-useradd -d /dev/null -c "Fcron User" -g fcron -s /bin/false -u 22 fcron</userinput></screen>
-
-    <para>
-      Now fix some locations hard coded in the documentation:
-    </para>
-
-<screen><userinput>find doc -type f -exec sed -i 's:/usr/local::g' {} \;</userinput></screen>
-    <para>
-      Install <application>Fcron</application> by running the following
-      commands:
-    </para>
-
-<screen revision="sysv"><userinput>./configure --prefix=/usr          \
-            --sysconfdir=/etc      \
-            --localstatedir=/var   \
-            --without-sendmail     \
-            --with-boot-install=no \
-            --with-systemdsystemunitdir=no &amp;&amp;
-make</userinput></screen>
-
-<screen revision="systemd"><userinput>./configure --prefix=/usr          \
-            --sysconfdir=/etc      \
-            --localstatedir=/var   \
-            --without-sendmail     \
-            --with-piddir=/run     \
-            --with-boot-install=no &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      DESTDIR install must be done as <systemitem
-      class="username">root</systemitem> user. Furthermore, if PAM
-      configuration files should be installed in <filename class="directory">
-      /etc/pam.d</filename>, you have to create this directory in the
-      DESTDIR before doing the install.
-    </para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-<!--
-    <para>
-      <command>autoconf</command>: This command is required to rebuild
-      <filename>configure</filename> using the fixed input file.
-    </para>-->
-
-    <para>
-      <parameter>--without-sendmail</parameter>: By default,
-      <application>Fcron</application> will attempt to use the
-      <command>sendmail</command> command from an <xref linkend="server-mail"/>
-      package to email you the results of the <command>fcron</command> script.
-      This switch is used to disable default email notification. Omit the
-      switch to enable the default. Alternatively, you can use the
-      <option>--with-sendmail=<replaceable>&lt;/path/to/MTA
-      command&gt;</replaceable></option> to use a different mailer command.
-    </para>
-
-    <para>
-      <parameter>--with-boot-install=no</parameter>: This prevents
-      installation of the bootscript included with the package.
-    </para>
-
-    <para revision="systemd">
-      <parameter>--with-piddir=/run</parameter>:
-      This fixes the systemd unit to use the proper directory for PID files so
-      that systemctl does not hang and the unit starts correctly.
-    </para>
-
-    <para revision="sysv">
-      <parameter>--with-systemdsystemunitdir=no</parameter>:
-      This prevents building the <application>systemd</application> units,
-      which are not needed for a <application>SYS V</application> system.
-    </para>
-
-    <para>
-      <option>--with-editor=<replaceable>&lt;/path/to/editor&gt;</replaceable></option>:
-      This switch allows you to set the default text editor.
-    </para>
-
-    <para>
-      <option>--with-dsssl-dir=<replaceable>&lt;/path/to/dsssl-stylesheets&gt;</replaceable></option>:
-      May be used if you have <xref linkend="docbook-utils"/> installed.
-      Currently, the dsssl stylesheets are located at
-    <filename class="directory">/usr/share/sgml/docbook/dsssl-stylesheets-1.79</filename>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Fcron</title>
-
-    <sect3 id="fcron-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/fcron.conf</filename>,
-        <filename>/etc/fcron.allow</filename>, and
-        <filename>/etc/fcron.deny</filename>
-      </para>
-
-      <indexterm zone="fcron fcron-config">
-        <primary sortas="e-etc-fcron.conf">/etc/fcron.conf</primary>
-      </indexterm>
-
-      <indexterm zone="fcron fcron-config">
-        <primary sortas="e-etc-fcron.allow">/etc/fcron.allow</primary>
-      </indexterm>
-
-      <indexterm zone="fcron fcron-config">
-        <primary sortas="e-etc-fcron.deny">/etc/fcron.deny</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3 id="run-parts" xreflabel="Fcron Configuration Information">
-      <title>Configuration Information</title>
-
-      <para>
-        There are no required changes in any of the config files.
-        Configuration information can be found in the man page for
-        <filename>fcron.conf</filename>.
-      </para>
-
-      <para>
-        <command>fcron</command> scripts are written using
-        <command>fcrontab</command>. Refer to the <command>fcrontab</command>
-        man page for proper parameters to address your situation.
-      </para>
-
-      <para id="fcron-pam">
-        If <application>Linux-PAM</application> is installed, two PAM
-        configuration files are installed in <filename class='directory'>
-        etc/pam.d</filename>. Alternatively if <filename class='directory'>
-        etc/pam.d</filename> is not used, the installation will append two
-        configuration sections to the existing <filename>/etc/pam.conf
-        </filename> file. You should ensure the files match your preferences.
-        Modify them as required to suit your needs.
-      </para>
-
-      <indexterm zone="fcron fcron-pam">
-        <primary sortas="e-etc-pam.d">/etc/pam.d/*</primary>
-      </indexterm>
-
-      <indexterm zone="fcron fcron-pam">
-        <primary sortas="e-etc-pam.conf">/etc/pam.conf</primary>
-      </indexterm>
-
-      <bridgehead renderas="sect4">Periodic Jobs</bridgehead>
-
-      <para>
-        If you would like to set up a periodic hierarchy for the root user,
-        first issue the following commands (as the
-        <systemitem class="username">root</systemitem> user) to create the
-        <filename>/usr/bin/run-parts</filename> script:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /usr/bin/run-parts &lt;&lt; "EOF" &amp;&amp;
-<literal>#!/bin/sh
-# run-parts:  Runs all the scripts found in a directory.
-# from Slackware, by Patrick J. Volkerding with ideas borrowed
-# from the Red Hat and Debian versions of this utility.
-
-# keep going when something fails
-set +e
-
-if [ $# -lt 1 ]; then
-  echo "Usage: run-parts &lt;directory&gt;"
-  exit 1
-fi
-
-if [ ! -d $1 ]; then
-  echo "Not a directory: $1"
-  echo "Usage: run-parts &lt;directory&gt;"
-  exit 1
-fi
-
-# There are several types of files that we would like to
-# ignore automatically, as they are likely to be backups
-# of other scripts:
-IGNORE_SUFFIXES="~ ^ , .bak .new .rpmsave .rpmorig .rpmnew .swp"
-
-# Main loop:
-for SCRIPT in $1/* ; do
-  # If this is not a regular file, skip it:
-  if [ ! -f $SCRIPT ]; then
-    continue
-  fi
-  # Determine if this file should be skipped by suffix:
-  SKIP=false
-  for SUFFIX in $IGNORE_SUFFIXES ; do
-    if [ ! "$(basename $SCRIPT $SUFFIX)" = "$(basename $SCRIPT)" ]; then
-      SKIP=true
-      break
-    fi
-  done
-  if [ "$SKIP" = "true" ]; then
-    continue
-  fi
-  # If we've made it this far, then run the script if it's executable:
-  if [ -x $SCRIPT ]; then
-    $SCRIPT || echo "$SCRIPT failed."
-  fi
-done
-
-exit 0</literal>
-EOF
-chmod -v 755 /usr/bin/run-parts</userinput></screen>
-
-      <para>
-        Next, create the directory layout for the periodic jobs (again as the
-        <systemitem class="username">root</systemitem> user):
-      </para>
-
-<screen role="root"><userinput>install -vdm754 /etc/cron.{hourly,daily,weekly,monthly}</userinput></screen>
-
-      <para>
-        Finally, add the <command>run-parts</command> to the system fcrontab
-        (while still the <systemitem class="username">root</systemitem> user):
-      </para>
-
-<screen role="root"><userinput>cat &gt; /var/spool/fcron/systab.orig &lt;&lt; "EOF"
-<literal>&amp;bootrun 01 * * * * root run-parts /etc/cron.hourly
-&amp;bootrun 02 4 * * * root run-parts /etc/cron.daily
-&amp;bootrun 22 4 * * 0 root run-parts /etc/cron.weekly
-&amp;bootrun 42 4 1 * * root run-parts /etc/cron.monthly</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-    <sect3  id="fcron-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para revision="sysv">
-        Install the
-        <filename>/etc/rc.d/init.d/fcron</filename> init script from the
-        <xref linkend="bootscripts"/> package.
-      </para>
-
-      <para revision="systemd">
-        Enable <application>fcron</application> to start
-        at boot using the previously installed systemd unit.
-      </para>
-
-      <indexterm zone="fcron fcron-init">
-        <primary sortas="f-fcron">fcron</primary>
-      </indexterm>
-
-<screen role="root" revision="sysv"><userinput>make install-fcron</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>systemctl enable fcron</userinput></screen>
-
-      <para>
-        Finally, again as the <systemitem class="username">root</systemitem>
-        user, start fcron and generate the
-        <filename>/var/spool/fcron/systab</filename> file:
-      </para>
-
-<screen role="root" revision="sysv"><userinput>/etc/rc.d/init.d/fcron start &amp;&amp;
-fcrontab -z -u systab</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>systemctl start fcron &amp;&amp;
-fcrontab -z -u systab</userinput></screen>
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>fcron, fcrondyn, fcronsighup, and fcrontab</seg>
-        <seg>None</seg>
-        <seg>/usr/share/doc/fcron-&fcron-version; and /var/spool/fcron</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="fcron-prog">
-        <term><command>fcron</command></term>
-        <listitem>
-          <para>
-            is the scheduling daemon
-          </para>
-          <indexterm zone="fcron fcron-prog">
-            <primary sortas="b-fcron">fcron</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fcrondyn">
-        <term><command>fcrondyn</command></term>
-        <listitem>
-          <para>
-            is a user tool intended to interact with a running
-            <command>fcron</command> daemon
-          </para>
-          <indexterm zone="fcron fcrondyn">
-            <primary sortas="b-fcrondyn">fcrondyn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fcronsighup">
-        <term><command>fcronsighup</command></term>
-        <listitem>
-          <para>
-            instructs <command>fcron</command> to reread the
-            <application>Fcron</application> tables
-          </para>
-          <indexterm zone="fcron fcronsighup">
-            <primary sortas="b-fcronsighup">fcronsighup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fcrontab">
-        <term><command>fcrontab</command></term>
-        <listitem>
-          <para>
-            is a program used to install, edit, list and remove the
-            tables used by <command>fcron</command>
-          </para>
-          <indexterm zone="fcron fcrontab">
-            <primary sortas="b-fcrontab">fcrontab</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+&fcron-intro;
+&fcron-inst;
+&fcron-exp;
+&fcron-config;
+&fcron-desc;
 
 </sect1>
+
Index: general/sysutils/fcron/fcron-config.xml
===================================================================
--- general/sysutils/fcron/fcron-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/fcron/fcron-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,74 @@
+<sect2>
+<title>Configuring fcron</title>
+
+<sect3><title>make install script</title>
+
+<para>After the files are installed, the make install script enters into a
+configuration routine.  The first test will be for a group named fcron.  If
+it does not exist, you will be given the command line that the script proposes
+to run and a prompt for a 'y' or 'n'.  This is repeated to create a user named
+fcron and to install a script in the init.d directory with the appropriate
+symbolic links in runlevels 2, 3, 4, and 5.  The final configuation step is to
+stop any current fcron processes and start the new fcron.  A yes here will stop
+current fcron processes but will fail to start new fcron.  The following
+commands will correct this:</para>
+
+<para><screen><userinput>cat &gt; /etc/rc.d/init.d/fcron &lt;&lt; "EOF"</userinput>
+#!/bin/sh
+# Begin $rc_base/init.d/fcron
+
+# Based on sysklogd script from LFS-3.1 and earlier.
+# Rewritten by Gerard Beekmans  - gerard@linuxfromscratch.org
+
+source /etc/sysconfig/rc
+source $rc_functions
+
+case "$1" in
+        start)
+                echo "Starting fcron..."
+                loadproc fcron
+                ;;
+
+        stop)
+                echo "Stopping fcron..."
+                killproc fcron
+                ;;
+
+        restart)
+                $0 stop
+                sleep 1
+                $0 start
+                ;;
+
+        status)
+                statusproc fcron
+                ;;
+
+        *)
+                echo "Usage: $0 {start|stop|restart|status}"
+                exit 1
+                ;;
+esac
+
+# End $rc_base/init.d/fcron
+<userinput>EOF
+chmod 755 /etc/rc.d/init.d/fcron &amp;&amp;
+/etc/rc.d/init.d/fcron start &amp;&amp;
+mv /etc/rc.d/rc0.d/K60fcron /etc/rc.d/rc0.d/K08fcron &amp;&amp;
+mv /etc/rc.d/rc6.d/K60fcron /etc/rc.d/rc6.d/K08fcron</userinput></screen></para>
+</sect3>
+
+<sect3><title>Config files</title>
+
+<para><userinput>/etc/fcron.conf, /etc/fcron.allow,
+/etc/fcron.deny</userinput></para>
+
+<para>There are no required changes in any of these files.
+Configuration information can be found in the man page for
+fcron.conf.</para>
+
+<para>fcron scripts are written using fcrontab.  Refer to the man page
+for fcrontab for proper parameters for your situation.</para></sect3>
+
+</sect2>
+
Index: general/sysutils/fcron/fcron-desc.xml
===================================================================
--- general/sysutils/fcron/fcron-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/fcron/fcron-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,28 @@
+<sect2>
+<title>Contents</title>
+
+<para>The fcron package contains <userinput>fcron, fcrontab,
+fcronsighup</userinput> and <userinput>fcrondyn.</userinput></para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>fcron</title>
+<para>fcron is the scheduling daemon.
+</para></sect3>
+
+<sect3><title>fcrontab</title>
+<para>fcrontab is the program used to install, edit, list and remove the
+tables used by fcron.</para></sect3>
+
+<sect3><title>fcronsighup</title>
+<para>fcronsighup instructs fcron to reread the fcron tables.
+</para></sect3>
+
+<sect3><title>fcrondyn</title>
+<para>fcrondyn is a user tool intended to interact with a running fcron
+daemon.</para></sect3>
+
+</sect2>
+
Index: general/sysutils/fcron/fcron-exp.xml
===================================================================
--- general/sysutils/fcron/fcron-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/fcron/fcron-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>make CC="gcc $CFLAGS":</userinput> This makes fcron
+compile using our CFLAGS for optimizations.</para>
+
+</sect2>
+
Index: general/sysutils/fcron/fcron-inst.xml
===================================================================
--- general/sysutils/fcron/fcron-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/fcron/fcron-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,43 @@
+<sect2>
+<title>Installation of fcron</title>
+
+<para>Fcron uses the cron facility of syslog to log all messages.  Since LFS 
+does not set up this facility in /etc/syslog.conf, it needs to be done prior 
+to installing fcron.  This command will append the necessary line to the 
+current <filename>/etc/syslog.conf</filename>.</para>
+
+<para><screen><userinput>cat &gt;&gt; /etc/syslog.conf &lt;&lt; "EOF"</userinput>
+# Begin fcron addition to /etc/syslog.conf
+
+cron.* -/var/log/cron.log
+
+# End fcron addition
+<userinput>EOF</userinput></screen></para>
+
+<para>The configuration file has been modified, so reloading the sysklogd 
+daemon will activate the changes.</para>
+
+<para><screen><userinput>/etc/rc.d/init.d/sysklogd reload</userinput></screen></para>
+
+<para>Install fcron by running the following commands:</para>
+
+<para><screen><userinput>./configure &amp;&amp;
+make CC="gcc $CFLAGS" &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
+<sect2>
+
+<title>Install fcron without MTA </title>
+
+<para>Fcron does not require a mail transfer agent (MTA) to run, but will 
+use one if it is installed to email you the results of the fcron script.  If 
+you wish to install without a MTA, run the following commands:</para>
+
+<para><screen><userinput>./configure --without-sendmail &amp;&amp;
+make CC="gcc $CFLAGS" &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
Index: general/sysutils/fcron/fcron-intro.xml
===================================================================
--- general/sysutils/fcron/fcron-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/fcron/fcron-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,18 @@
+<sect2>
+<title>Introduction to fcron</title>
+
+<screen>Download location:              <ulink url="&fcron-download;"/>
+Version used:                   &fcron-version;
+Package size:                   &fcron-size;
+Estimated Disk space required:  &fcron-buildsize;</screen>
+
+<para>The fcron package contains the fcron daemon. &quot;It
+is a periodical command scheduler which aims at replacing Vixie
+Cron.&quot; </para>
+
+<screen>fcron requires a running syslog (part of the base LFS system).
+fcron recommends a local mail system (sendmail or <xref
+linkend="postfix"></xref>, for example).
+fcron will utilize PAM if it is installed prior to fcron.</screen>
+
+</sect2>
Index: general/sysutils/fcron/fcron.ent
===================================================================
--- general/sysutils/fcron/fcron.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/fcron/fcron.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<!ENTITY fcron SYSTEM "../fcron.xml">
+<!ENTITY fcron-intro SYSTEM "fcron-intro.xml">
+<!ENTITY fcron-inst SYSTEM "fcron-inst.xml">
+<!ENTITY fcron-exp SYSTEM "fcron-exp.xml">
+<!ENTITY fcron-desc SYSTEM "fcron-desc.xml">
+<!ENTITY fcron-config SYSTEM "fcron-config.xml">
+<!ENTITY fcron-buildsize "2.3 MB">
+<!ENTITY fcron-version "2.9.0">
+<!ENTITY fcron-download "http://fcron.free.fr/fcron-2.9.0.src.tar.gz">
+<!ENTITY fcron-size "324 KB">
Index: general/sysutils/gpm-kernel.xml
===================================================================
--- general/sysutils/gpm-kernel.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,9 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>D</emphasis>evice Drivers ---&gt;
-  <emphasis role='blue'>I</emphasis>nput device support ---&gt;
-    -*-   <emphasis role='blue'>G</emphasis>eneric input layer (needed for keyboard, mouse, ...)          [INPUT]
-    &lt;*/M&gt;   M<emphasis role='blue'>o</emphasis>use interface                                     [INPUT_MOUSEDEV]</screen>
Index: general/sysutils/gpm.xml
===================================================================
--- general/sysutils/gpm.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ general/sysutils/gpm.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,459 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
+<sect1 id="gpm" xreflabel="gpm-&gpm-version;">
+<title>gpm-&gpm-version;</title>
 
-  <!ENTITY gpm-download-http "&sources-anduin-http;/gpm/gpm-&gpm-version;.tar.bz2">
-  <!ENTITY gpm-download-ftp  " ">
-  <!ENTITY gpm-md5sum        "bf84143905a6a903dbd4d4b911a2a2b8">
-  <!ENTITY gpm-size          "820 KB">
-  <!ENTITY gpm-buildsize     "7.4 MB">
-  <!ENTITY gpm-time          "0.1 SBU">
-]>
+<para>Gpm (the general purpose mouse daemon) is a mouse server for
+applications running in the console.  It not only provides cut and paste
+support generally, but its library component is used by various software
+such as links to provide mouse support to the application generally.  It
+is useful on desktops, especially if following (Beyond)LinuxFromScratch
+instructions - it's often much easier (and less error prone) to cut and
+paste between two console windows than to type everything by
+hand!</para>
 
-<sect1 id="gpm" xreflabel="GPM-&gpm-version;">
-  <?dbhtml filename="gpm.html"?>
-
-
-  <title>GPM-&gpm-version;</title>
-
-  <indexterm zone="gpm">
-    <primary sortas="a-GPM">GPM</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GPM</title>
-
-    <para>
-      The <application>GPM</application> (General Purpose Mouse daemon)
-      package contains a mouse server for the console and
-      <command>xterm</command>. It not only provides cut and paste support
-      generally, but its library component is used by various software such as
-      <application>Links</application> to provide mouse support to the
-      application.  It is useful on desktops, especially if following (Beyond)
-      Linux From Scratch instructions; it's often much easier (and less error
-      prone) to cut and paste between two console windows than to type
-      everything by hand!
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gpm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gpm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gpm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gpm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gpm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gpm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/gpm-&gpm-version;-consolidated-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GPM Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="texlive"/> (for documentation)
-    </para>
-  </sect2>
-
-  <sect2 role="kernel" id='gpm-kernel'>
-    <title>Kernel Configuration</title>
-
-     <para>
-      Enable the following option in the kernel configuration and recompile the
-      kernel if necessary:
-     </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="gpm-kernel.xml"/>
-
-     <indexterm zone="gpm gpm-kernel">
-        <primary sortas="d-gpm">gpm</primary>
-     </indexterm>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GPM</title>
-
-    <para>
-      Install <application>GPM</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../gpm-&gpm-version;-consolidated-1.patch                &amp;&amp;
-./autogen.sh                                                    &amp;&amp;
-./configure --prefix=/usr --sysconfdir=/etc ac_cv_path_emacs=no &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If <xref linkend='texlive'/> is installed, build the GPM manual as
-      dvi, ps, and pdf formats:
-    </para>
-
-<screen remap='doc'><userinput>make -C doc gpm.{dvi,ps} &amp;&amp;
-dvipdfm doc/gpm.dvi -o doc/gpm.pdf</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install                                          &amp;&amp;
-
-install-info --dir-file=/usr/share/info/dir           \
-             /usr/share/info/gpm.info                 &amp;&amp;
-
-rm -fv /usr/lib/libgpm.a                              &amp;&amp;
-ln -sfv libgpm.so.2.1.0 /usr/lib/libgpm.so            &amp;&amp;
-install -v -m644 conf/gpm-root.conf /etc              &amp;&amp;
-
-install -v -m755 -d /usr/share/doc/gpm-&gpm-version;/support &amp;&amp;
-install -v -m644    doc/support/*                     \
-                    /usr/share/doc/gpm-&gpm-version;/support &amp;&amp;
-install -v -m644    doc/{FAQ,HACK_GPM,README*}        \
-                    /usr/share/doc/gpm-&gpm-version;</userinput></screen>
-
-    <para>
-      If <xref linkend='texlive'/> is installed and you've built GPM
-      manual as dvi, ps, and pdf formats, install them as the &root; user:
-    </para>
-
-<screen role='root' remap='doc'><userinput>install -vm644 doc/gpm.{dvi,ps,pdf} /usr/share/doc/gpm-&gpm-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>./autogen.sh</command>: This command creates the missing
-      <command>configure</command> script.
-    </para>
-
-    <para>
-      <parameter>ac_cv_path_emacs=no</parameter>: This variable works around
-      an issue causing the package fail to build with
-      <xref linkend='emacs'/> installed.  It also suppresses the
-      installations of some <quote>Emacs support files</quote> shipped with
-      GPM.  These files are quite outdated and they should be superseded
-      with <xref linkend='emacs'/> built-in GPM support.  If you need to use
-      <xref linkend='emacs'/> in Linux console with mouse support, you
-      should install (or reinstall) <xref linkend='emacs'/>
-      <emphasis role='bold'>after</emphasis> GPM.
-    </para>
-
-    <para>
-      <command>install-info ...</command>: This package installs a
-      <filename class="extension">.info</filename> file, but does not update
-      the system <filename>dir</filename> file. This command makes the update.
-    </para>
-
-    <para>
-      <command>ln -v -sfn libgpm.so.2.1.0 /usr/lib/libgpm.so</command>: This
-      command is used to create (or update) the <filename
-      class="extension">.so</filename> symlink to the library.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring GPM</title>
-
-    <sect3 id="gpm-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <indexterm zone="gpm gpm-init">
-        <primary sortas="f-gpm-init">gpm</primary>
-      </indexterm>
-
-      <para revision="sysv">
-        Install the
-        <filename>/etc/rc.d/init.d/gpm</filename> init script included in the
-        <xref linkend="bootscripts"/> package.
-      </para>
-
-      <para revision="systemd">
-        To start the <command>gpm</command> daemon at boot,
-        install the systemd unit from the <xref linkend="systemd-units"/>
-        package by running the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>make install-gpm</userinput></screen>
-
-    </sect3>
-
-    <sect3 id="gpm-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/gpm-root.conf</filename> and
-        <filename>~/.gpm-root</filename>: The default and individual user
-        <command>gpm-root</command> configuration files.
-      </para>
-
-      <para revision="sysv">
-        <filename>/etc/sysconfig/mouse</filename>:
-        This file contains the name of your mouse device and the protocol
-        it uses.  To create this file, run the following as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root" revision="sysv"><userinput>cat &gt; /etc/sysconfig/mouse &lt;&lt; "EOF"
-<literal># Begin /etc/sysconfig/mouse
-
-MDEVICE="<replaceable>&lt;yourdevice&gt;</replaceable>"
-PROTOCOL="<replaceable>&lt;yourprotocol&gt;</replaceable>"
-GPMOPTS="<replaceable>&lt;additional options&gt;</replaceable>"
-
-# End /etc/sysconfig/mouse</literal>
-EOF</userinput></screen>
-
-      <indexterm zone="gpm gpm-config">
-        <primary sortas="e-AA.gpm-root">~/.gpm-root</primary>
-      </indexterm>
-
-      <indexterm zone="gpm gpm-config">
-        <primary sortas="e-etc-gpm-root.conf">/etc/gpm-root.conf</primary>
-      </indexterm>
-
-      <indexterm zone="gpm gpm-config" revision="sysv">
-        <primary sortas="e-etc-sysconfig-mouse">/etc/sysconfig/mouse</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para revision="sysv">
-        Examples of values to set <envar>MDEVICE</envar>,
-        <envar>PROTOCOL</envar>, and <envar>GPMOPTS</envar> to are:
-      </para>
-
-<screen revision="sysv"><literal>MDEVICE="/dev/input/mice"
-PROTOCOL="imps2"
-GPMOPTS=""</literal></screen>
-
-      <para revision="sysv">
-        A list of which protocol values are known can be found by running
-        <command>gpm -m <replaceable>[device]</replaceable> -t -help</command>.
-        The <envar>MDEVICE</envar> setting depends on which type of mouse you
-        have.  For example, <filename>/dev/ttyS0</filename> for a serial mouse
-        (on Windows this is COM1), <filename>/dev/input/mice</filename> is
-        often used for USB mice and <filename>/dev/psaux</filename> for PS2
-        mice. <envar>GPMOPTS</envar> is the 'catch all' for any additional
-        options that are needed for your hardware.
-      </para>
-
-      <para revision="systemd">
-        <application>GPM</application> is by default started with
-        the following parameters:
-        <parameter>-m /dev/input/mice -t imps2</parameter>. If the
-        mentioned parameters don't suit your needs, you can override
-        them by running the following commands as
-        the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="nodump" revision="systemd"><userinput>install -v -dm755 /etc/systemd/system/gpm.service.d &amp;&amp;
-cat &gt; /etc/systemd/system/gpm.service.d/99-user.conf &lt;&lt; EOF
-<literal>[Service]
-ExecStart=/usr/sbin/gpm <replaceable>&lt;list of parameters&gt;</replaceable>
-</literal>EOF</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>disable-paste, display-buttons, display-coords, get-versions, gpm,
-        gpm-root, hltest, mev, and mouse-test</seg>
-        <seg>libgpm.so</seg>
-        <seg>/usr/share/doc/gpm-&gpm-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="disable-paste">
-        <term><command>disable-paste</command></term>
-        <listitem>
-          <para>
-            is a security mechanism used to disable the paste buffer
-          </para>
-          <indexterm zone="gpm disable-paste">
-            <primary sortas="b-disable-paste">disable-paste</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="display-buttons">
-        <term><command>display-buttons</command></term>
-        <listitem>
-          <para>
-            is a simple program that reports the mouse buttons being
-            pressed and released
-          </para>
-          <indexterm zone="gpm display-buttons">
-            <primary sortas="b-display-buttons">display-buttons</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="display-coords">
-        <term><command>display-coords</command></term>
-        <listitem>
-          <para>
-            is a simple program that reports the mouse coordinates
-          </para>
-          <indexterm zone="gpm display-coords">
-            <primary sortas="b-display-coords">display-coords</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="get-versions">
-        <term><command>get-versions</command></term>
-        <listitem>
-          <para>
-            is used to report the <application>GPM</application> library
-            and server versions
-          </para>
-          <indexterm zone="gpm get-versions">
-            <primary sortas="b-get-versions">get-versions</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpm-prog">
-        <term><command>gpm</command></term>
-        <listitem>
-          <para>
-            is a cut and paste utility and mouse server for virtual consoles
-          </para>
-          <indexterm zone="gpm gpm-prog">
-            <primary sortas="b-gpm">gpm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpm-root">
-        <term><command>gpm-root</command></term>
-        <listitem>
-          <para>
-            is a default handler for <command>gpm</command>. It is used to
-            draw menus on the root window
-          </para>
-          <indexterm zone="gpm gpm-root">
-            <primary sortas="b-gpm-root">gpm-root</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hltest">
-        <term><command>hltest</command></term>
-        <listitem>
-          <para>
-            is a simple sample application using the high-level library, meant
-            to be read by programmers trying to use the high-level library
-          </para>
-          <indexterm zone="gpm hltest">
-            <primary sortas="b-hltest">hltest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mev">
-        <term><command>mev</command></term>
-        <listitem>
-          <para>
-            is a program to report mouse events
-          </para>
-          <indexterm zone="gpm mev">
-            <primary sortas="b-mev">mev</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mouse-test">
-        <term><command>mouse-test</command></term>
-        <listitem>
-          <para>
-            is a tool for determining the mouse type and device it's
-            attached to
-          </para>
-          <indexterm zone="gpm mouse-test">
-            <primary sortas="b-mouse-test">mouse-test</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgpm">
-        <term><filename class="libraryfile">libgpm.so</filename></term>
-        <listitem>
-          <para>
-            contains the API functions to access the
-            <application>GPM</application> daemon
-          </para>
-          <indexterm zone="gpm libgpm">
-            <primary sortas="c-libgpm">libgpm.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+&gpm-intro;
+&gpm-inst;
+&gpm-config;
+&gpm-desc;
 
 </sect1>
+
Index: general/sysutils/gpm/gpm-config.xml
===================================================================
--- general/sysutils/gpm/gpm-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/gpm/gpm-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,106 @@
+<sect2>
+<title>Configuring gpm</title>
+
+<sect3><title>gpm init.d script</title>
+<para>The gpm init.d script can be created using the following
+commands:  (This assumes that you have followed the LFS default of
+having your $rc_base set to <filename
+class="directory">/etc/rc.d</filename>)</para>
+<para><screen><userinput>cat &gt; /etc/rc.d/init.d/gpm &lt;&lt; "EOF"</userinput>
+#!/bin/sh
+# Begin $rc_base/init.d/gpm
+
+# Based on sysklogd script from LFS-3.1 and earlier.
+# Rewritten by Gerard Beekmans  - gerard@linuxfromscratch.org
+# GPM specific parts by Mark Hymers - markh@linuxfromscratch.org
+
+source /etc/sysconfig/rc
+source $rc_functions
+
+if [ -f /etc/sysconfig/mouse ]
+	then
+        source /etc/sysconfig/mouse
+fi
+
+if [ -z "$MDEVICE" ] || [ -z "$PROTOCOL" ]
+	then
+	echo "Please create an /etc/sysconfig/mouse file containing"
+	echo "MDEVICE and PROTOCOL values"
+	exit 1;
+fi
+
+case "$1" in
+        start)
+                echo "Starting gpm..."
+                loadproc gpm -m $MDEVICE -t $PROTOCOL
+                ;;
+
+        stop)
+                echo "Stopping gpm..."
+                killproc gpm
+                ;;
+
+        restart)
+                $0 stop
+                sleep 1
+                $0 start
+                ;;
+
+        status)
+                statusproc gpm
+                ;;
+
+        *)
+                echo "Usage: $0 {start|stop|restart|status}"
+                exit 1
+                ;;
+esac
+
+# End $rc_base/init.d/gpm
+<userinput>EOF
+chmod 755 /etc/rc.d/init.d/gpm</userinput></screen></para>
+
+<para>You then need to create symbolic links to this file in the relevant rc.d
+directories.  For example:
+<screen><userinput>cd /etc/rc.d/init.d &amp;&amp;
+ln -sf ../init.d/gpm ../rc0.d/K10gpm &amp;&amp;
+ln -sf ../init.d/gpm ../rc1.d/K10gpm &amp;&amp;
+ln -sf ../init.d/gpm ../rc2.d/K10gpm &amp;&amp;
+ln -sf ../init.d/gpm ../rc3.d/S70gpm &amp;&amp;
+ln -sf ../init.d/gpm ../rc4.d/S70gpm &amp;&amp;
+ln -sf ../init.d/gpm ../rc5.d/S70gpm &amp;&amp;
+ln -sf ../init.d/gpm ../rc6.d/K10gpm</userinput></screen></para></sect3>
+
+<sect3><title>Config files</title>
+<para><userinput>/etc/sysconfig/mouse</userinput>
+This file contains the name of your mouse device and the protocol which
+it uses.  To create this file, run the following:</para>
+
+<para><screen><userinput>cat &gt; /etc/sysconfig/mouse &lt;&lt; "EOF"</userinput> 
+# start /etc/sysconfig/mouse
+MDEVICE=yourdevice
+PROTOCOL=yourprotocol
+# end /etc/sysconfig/mouse
+<userinput>EOF</userinput></screen></para>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para>Examples of values to set MDEVICE and PROTOCOL to are</para>
+
+<para><screen>MDEVICE=/dev/psaux
+PROTOCOL=imps2</screen></para>
+
+<para>A list of which protocol values are known can be found by running
+<userinput>gpm -t -help</userinput>.  Your MDEVICE setting depends on
+which type of mouse you have.  For example,
+<userinput>/dev/ttyS0</userinput> for a serial mouse (on Windows this is
+COM1), <userinput>/dev/input/mice</userinput> is often used for USB mice
+and <userinput>/dev/psaux</userinput> for PS2 mice.  It is normally
+thought not a good idea to link /dev/mouse to the relevant device, but
+instead to reference it directly.</para>
+
+</sect3>
+
+</sect2>
+
Index: general/sysutils/gpm/gpm-desc.xml
===================================================================
--- general/sysutils/gpm/gpm-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/gpm/gpm-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,26 @@
+<sect2>
+<title>Contents</title>
+
+<para>The gpm package contains <userinput>gpm, gpm-root, disable-paste
+and mev</userinput></para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>gpm</title>
+<para>gpm is a cut and paste utility and mouse server for virtual
+consoles</para></sect3>
+
+<sect3><title>gpm-root</title>
+<para>gpm-root is a default handler for gpm.  It is used to draw menus on the
+root window</para></sect3>
+
+<sect3><title>disable-paste</title>
+<para>No description available</para></sect3>
+
+<sect3><title>mev</title>
+<para>mev is a program to report mouse events</para></sect3>
+
+</sect2>
+
Index: general/sysutils/gpm/gpm-inst.xml
===================================================================
--- general/sysutils/gpm/gpm-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/gpm/gpm-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<sect2>
+<title>Installation of gpm</title>
+
+<para>Install gpm by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+</sect2>
+
Index: general/sysutils/gpm/gpm-intro.xml
===================================================================
--- general/sysutils/gpm/gpm-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/gpm/gpm-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,14 @@
+<sect2>
+<title>Introduction to gpm</title>
+
+<screen>Download location:              &gpm-download;
+Version used:                   &gpm-version;
+Package size:                   &gpm-size;
+Estimated Disk space required:  &gpm-buildsize;</screen>
+
+<para>The gpm package contains a mouse server for the console and xterm.
+This is is useful for cutting and pasting text in console mode, and also
+because many console-based programs need it to compile mouse support
+into themselves.</para>
+
+</sect2>
Index: general/sysutils/gpm/gpm.ent
===================================================================
--- general/sysutils/gpm/gpm.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/gpm/gpm.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<!ENTITY gpm SYSTEM "../gpm.xml">
+<!ENTITY gpm-intro SYSTEM "gpm-intro.xml">
+<!ENTITY gpm-inst SYSTEM "gpm-inst.xml">
+<!ENTITY gpm-desc SYSTEM "gpm-desc.xml">
+<!ENTITY gpm-config SYSTEM "gpm-config.xml">
+<!ENTITY gpm-buildsize "3.2 MB">
+<!ENTITY gpm-version "1.20.0">
+<!ENTITY gpm-download "ftp://arcana.linux.it/pub/gpm/gpm-1.20.0.tar.bz2">
+<!ENTITY gpm-size "382 KB">
Index: general/sysutils/hdparm.xml
===================================================================
--- general/sysutils/hdparm.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ general/sysutils/hdparm.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,161 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
+<sect1 id="hdparm" xreflabel="hdparm-&hdparm-version;">
+<?dbhtml filename="hdparm.html" dir="general"?>
+<title>hdparm-&hdparm-version;</title>
 
-  <!ENTITY hdparm-download-http "&sourceforge-dl;/hdparm/hdparm-&hdparm-version;.tar.gz">
-  <!ENTITY hdparm-download-ftp  " ">
-  <!ENTITY hdparm-md5sum        "6d6d039d61ec995b1ec72ddce0b1853b">
-  <!ENTITY hdparm-size          "140 KB">
-  <!ENTITY hdparm-buildsize     "1.0 MB">
-  <!ENTITY hdparm-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="hdparm" xreflabel="Hdparm-&hdparm-version;">
-  <?dbhtml filename="hdparm.html"?>
-
-
-  <title>Hdparm-&hdparm-version;</title>
-
-  <indexterm zone="hdparm">
-    <primary sortas="a-Hdparm">Hdparm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Hdparm</title>
-
-    <para>
-      The <application>Hdparm</application> package contains a utility that
-      is useful for obtaining information about, and controlling ATA/IDE
-      controllers and hard drives. It allows to
-      increase performance and sometimes to increase stability.
-    </para>
-
-    &lfs121_checked;
-
-    <warning>
-      <para>
-        As well as being useful, incorrect usage of
-        <application>Hdparm</application> can destroy your information and in
-        rare cases, drives. Use with caution and make sure you know what you
-        are doing. If in doubt, it is recommended that you leave the default
-        kernel parameters alone.
-      </para>
-    </warning>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&hdparm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&hdparm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &hdparm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &hdparm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &hdparm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &hdparm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Hdparm</title>
-
-    <para>
-      Build <application>Hdparm</application> by running the following
-      command:
-    </para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make binprefix=/usr install</userinput></screen>
-
-<!-- no longer relevant with merged-/usr
-    <note><para>
-      Note that by default, <command>hdparm</command> is installed in
-      <filename class="directory">/sbin</filename> as some systems may require it
-      during the boot process before <filename class="directory">/usr</filename>
-      is mounted.  If you wish to install <command>hdparm</command> under the
-      <filename class="directory">/usr</filename> hierarchy, then replace the above
-      command with the following:
-    </para>
-
-<screen role="nodump"><userinput>make binprefix=/usr install</userinput></screen></note>
--->
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          hdparm
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="hdparm-prog">
-        <term><command>hdparm</command></term>
-        <listitem>
-          <para>
-            provides a command-line interface to various hard disk ioctls
-            supported by the stock Linux ATA/IDE device driver subsystem
-          </para>
-          <indexterm zone="hdparm hdparm-prog">
-            <primary sortas="b-hdparm">hdparm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+&hdparm-intro;
+&hdparm-inst;
+&hdparm-desc;
 
 </sect1>
+
Index: general/sysutils/hdparm/hdparm-desc.xml
===================================================================
--- general/sysutils/hdparm/hdparm-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/hdparm/hdparm-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Contents</title>
+
+<para>The hdparm package contains <userinput>hdparm</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>hdparm</title>
+<para>hdparm provides a command line interface to various hard disk
+ioctls supported by the stock Linux ATA/IDE device driver 
+subsystem.</para></sect3>
+
+</sect2>
+
Index: general/sysutils/hdparm/hdparm-inst.xml
===================================================================
--- general/sysutils/hdparm/hdparm-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/hdparm/hdparm-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,19 @@
+<sect2>
+<title>Installation of hdparm</title>
+
+<para>Install hdparm by running the following commands:</para>
+
+<para><screen><userinput>make &amp;&amp; </userinput>
+<userinput>make install</userinput></screen></para>
+
+<para>Note that by default, hdparm is installed in
+<filename>/sbin</filename> as some systems may require it on bootup
+before <filename>/usr</filename> is mounted.  If you wish to install
+hdparm under the <filename>/usr</filename> hierarchy, then replace the
+above commands with the following:</para>
+
+<para><screen><userinput>make &amp;&amp; </userinput>
+<userinput>make binprefix=/usr install</userinput></screen></para>
+
+</sect2>
+
Index: general/sysutils/hdparm/hdparm-intro.xml
===================================================================
--- general/sysutils/hdparm/hdparm-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/hdparm/hdparm-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,19 @@
+<sect2>
+<title>Introduction to hdparm</title>
+
+<screen>Download location:              &hdparm-download;
+Version used:                   &hdparm-version;
+Package size:                   &hdparm-size;
+Estimated Disk space required:  &hdparm-buildsize;</screen>
+
+<para>The hdparm package contains the hdparm utility.  This is useful
+for controlling ATA/IDE controllers and hard drives both to increase
+performance and sometimes to increase stability.</para>
+
+<para><emphasis>WARNING!</emphasis> As well as being useful, incorrect
+usage of hdparm can destroy your information and in rare cases, drives.
+Use with caution and make sure you know what you are doing.  If in
+doubt, we recommend you leave the default kernel parameters
+alone.</para>
+
+</sect2>
Index: general/sysutils/hdparm/hdparm.ent
===================================================================
--- general/sysutils/hdparm/hdparm.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/hdparm/hdparm.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<!ENTITY hdparm SYSTEM "../hdparm.xml">
+<!ENTITY hdparm-intro SYSTEM "hdparm-intro.xml">
+<!ENTITY hdparm-inst SYSTEM "hdparm-inst.xml">
+<!ENTITY hdparm-desc SYSTEM "hdparm-desc.xml">
+<!ENTITY hdparm-buildsize "257 KB">
+<!ENTITY hdparm-version "5.2">
+<!ENTITY hdparm-download "ftp://ftp.ibiblio.org/pub/Linux/system/hardware/hdparm-5.2.tar.gz">
+<!ENTITY hdparm-size "36 KB">
Index: general/sysutils/hwdata.xml
===================================================================
--- general/sysutils/hwdata.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,111 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 hwdata-download-http "https://github.com/vcrhonek/hwdata/archive/v&hwdata-version;/hwdata-&hwdata-version;.tar.gz">
-  <!ENTITY hwdata-download-ftp  " ">
-  <!ENTITY hwdata-md5sum        "9db68f209f3393aa5bfa3217d7c890c5">
-  <!ENTITY hwdata-size          "2.3 MB">
-  <!ENTITY hwdata-buildsize     "18 MB">
-  <!ENTITY hwdata-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="hwdata" xreflabel="hwdata-&hwdata-version;">
-  <?dbhtml filename="hwdata.html"?>
-
-
-  <title>hwdata-&hwdata-version;</title>
-
-  <indexterm zone="hwdata">
-    <primary sortas="g-hwdata">hwdata</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to hwdata</title>
-
-    <para>
-      The <application>hwdata</application> package contains
-      current PCI and vendor id data.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&hwdata-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&hwdata-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &hwdata-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &hwdata-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &hwdata-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &hwdata-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of hwdata</title>
-
-    <para>
-      Install <application>hwdata</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-blacklist</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>None</seg>
-        <seg>
-          /usr/share/hwdata
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-  </sect2>
-
-</sect1>
Index: general/sysutils/lm_sensors-kernel.xml
===================================================================
--- general/sysutils/lm_sensors-kernel.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>P</emphasis>ower management and ACPI options ---&gt;
-  [*] <emphasis role='blue'>A</emphasis>CPI (Advanced Configuration and Power Interface) Support ---&gt;      [ACPI]
-    &lt; /*/M&gt; <emphasis role='blue'>B</emphasis>attery                                               [ACPI_BATTERY]
-    &lt; /*/M&gt; <emphasis role='blue'>T</emphasis>hermal Zone                                          [ACPI_THERMAL]
-
-<emphasis role='blue'>D</emphasis>evice Drivers ---&gt;
-  N<emphasis role='blue'>V</emphasis>ME Support ---&gt;
-    &lt; /*&gt; N<emphasis role='blue'>V</emphasis>M Express block device                                [BLK_DEV_NVME]
-    # Set [HWMON] to &lt;*&gt; (not &lt;M&gt;!) or it will not show up:
-    [ /*] N<emphasis role='blue'>V</emphasis>Me hardware monitoring                                  [NVME_HWMON]
-  &lt;*/M&gt; H<emphasis role='blue'>a</emphasis>rdware Monitoring support ---&gt;                                 [HWMON]
-    &lt; /*/M&gt; <emphasis role='blue'>A</emphasis>MD Athlon64/FX or Opteron temperature sensor       [SENSORS_K8TEMP]
-    &lt; /*/M&gt; <emphasis role='blue'>A</emphasis>MD Family 10h+ temperature sensor                 [SENSORS_K10TEMP]
-    &lt; /*/M&gt; <emphasis role='blue'>A</emphasis>MD Family 15h processor power                [SENSORS_FAM15H_POWER]
-    &lt; /*/M&gt; <emphasis role='blue'>I</emphasis>ntel Core/Core2/Atom temperature sensor          [SENSORS_CORETEMP]</screen>
Index: general/sysutils/lm_sensors.xml
===================================================================
--- general/sysutils/lm_sensors.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,373 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 lm_sensors-download-http "https://github.com/lm-sensors/lm-sensors/archive/V&lm-sensors-version;/lm-sensors-&lm-sensors-version;.tar.gz">
-  <!ENTITY lm_sensors-download-ftp  " ">
-  <!ENTITY lm_sensors-md5sum        "f60e47b5eb50bbeed48a9f43bb08dd5e">
-  <!ENTITY lm_sensors-size          "268 KB">
-  <!ENTITY lm_sensors-buildsize     "2.6 MB">
-  <!ENTITY lm_sensors-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="lm_sensors" xreflabel="lm-sensors-&lm-sensors-version;">
-  <?dbhtml filename="lm_sensors.html"?>
-
-
-  <title>Lm-sensors-&lm-sensors-version;</title>
-
-  <indexterm zone="lm_sensors">
-    <primary sortas="a-lm_sensors">lm_sensors</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Lm_sensors</title>
-
-    <para>
-      The <application>lm_sensors</application> package provides userspace
-      support for the hardware monitoring drivers in the Linux kernel.
-      This is useful for monitoring the temperature of the CPU and adjusting the
-      performance of some hardware (such as cooling fans).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lm_sensors-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lm_sensors-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lm_sensors-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lm_sensors-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lm_sensors-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lm_sensors-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/lm_sensors-&lm_sensors-version;-upstream_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist> -->
-
-    <bridgehead renderas="sect3">lm_sensors Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="which"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://oss.oetiker.ch/rrdtool/">RRDtool</ulink> (required to
-      build the <command>sensord</command> program) and
-      <ulink role="runtime"
-             url="https://www.nongnu.org/dmidecode/">dmidecode</ulink>
-      (runtime)
-    </para>
-
-  </sect2>
-
-  <sect2 role="kernel" id="lm_sensors-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      The following configuration options attempt to cover the most common
-      hardware monitoring devices in a typical desktop or laptop system.
-      View the help of each (by pressing the <keycap>H</keycap> button
-      with the option focused in the <command>make menuconfig</command>)
-      to know if you need it.  There are many platform-specific hardware
-      monitoring devices so it's impossible to list the configuration for
-      all of them here.  You may investigate the content of
-      <filename class='directory'>/sys/class/hwmon</filename> within a
-      <quote>mainstream</quote> distro running on the system to know which
-      drivers you need.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="lm_sensors-kernel.xml"/>
-
-    <para>
-      Recompile your kernel and reboot into the new kernel.
-    </para>
-
-    <indexterm zone="lm_sensors lm_sensors-kernel">
-      <primary sortas="d-lm_sensors">lm_sensors</primary>
-    </indexterm>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Lm_sensors</title>
-
-    <para>
-      Install <application>Lm_sensors</application> by running the following
-      commands:
-    </para>
-
-<!-- <screen><userinput>patch -Np1 -i ../lm_sensors-&lm_sensors-version;-upstream_fixes-1.patch &amp;&amp; -->
-<screen><userinput>make PREFIX=/usr        \
-     BUILD_STATIC_LIB=0 \
-     MANDIR=/usr/share/man</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make PREFIX=/usr        \
-     BUILD_STATIC_LIB=0 \
-     MANDIR=/usr/share/man install &amp;&amp;
-
-install -v -m755 -d /usr/share/doc/lm_sensors-&lm-sensors-version; &amp;&amp;
-cp -rv              README INSTALL doc/* \
-                    /usr/share/doc/lm_sensors-&lm-sensors-version;</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>BUILD_STATIC_LIB=0</parameter>: This parameter disables
-      compiling and installing the static version of
-      <filename class="libraryfile">libsensors</filename>.
-    </para>
-
-    <para>
-      <option>PROG_EXTRA=sensord</option>: This parameter enables
-      compiling <command>sensord</command>, a daemon that can monitor your
-      system at regular intervals. Compiling <command>sensord</command> requires
-      <ulink url="https://oss.oetiker.ch/rrdtool/">RRDtool</ulink>. Be sure
-      to install RRDtool in <filename class="directory">/usr</filename>
-      by running <command>make prefix=/usr</command> when building it.
-      Otherwise, Lm_sensors will not find it easily.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Lm_sensors</title>
-
-    <sect3 id="lm_sensors-config">
-      <title>Config File</title>
-
-      <para>
-        <filename>/etc/sensors3.conf</filename>
-      </para>
-
-      <indexterm zone="lm_sensors lm_sensors-config">
-        <primary
-        sortas="e-etc-path-Configfilename2">/etc/sensors3.conf</primary>
-      </indexterm>
-
-    </sect3>
-    <!-- Completely outdated.  It only sets a list of kernel modules which
-         should be loaded by lm_sensors.  But today udev will load them
-         once the sensor device is detected by the kernel.
-    <sect3><title>Configuration Information</title>
-
-      <para>
-        To find out what hardware sensors your system has, issue the following
-        command as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>sensors-detect</userinput></screen>
-
-      <para>
-        The appropriate modules should have been loaded and a summary is
-        displayed at the end. Now you know what is needed and you can recompile
-        your kernel to enable just the options you need (i.e., don't enable the
-        modules you cannot use).
-      </para>
-
-    </sect3>
-    -->
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          fancontrol, isadump, isaset, pwmconfig, sensors, sensors-conf-convert,
-          sensors-detect, and optionally, sensord
-        </seg>
-        <seg>
-          libsensors.so
-        </seg>
-        <seg>
-          /etc/sensors.d,
-          /usr/include/sensors and
-          /usr/share/doc/lm_sensors-&lm-sensors-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="fancontrol">
-        <term><command>fancontrol</command></term>
-        <listitem>
-          <para>
-            is a shell script for use with <application>lm_sensors</application>.
-            It reads its configuration from a file<!--what file?-->, then
-            calculates fan speeds from temperatures and sets the corresponding
-            PWM outputs to the computed values
-          </para>
-          <indexterm zone="lm_sensors fancontrol">
-            <primary sortas="b-fancontrol">fancontrol</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="isadump">
-        <term><command>isadump</command></term>
-        <listitem>
-          <para>
-            is a small helper program to examine registers visible through the
-            ISA bus. It is intended to probe any chip that lives on the ISA bus
-            working with an address register and a data register (I2C-like
-            access) or a flat range (of up to 256 bytes)
-          </para>
-          <indexterm zone="lm_sensors isadump">
-            <primary sortas="b-isadump">isadump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="isaset">
-        <term><command>isaset</command></term>
-        <listitem>
-          <para>
-            is a small helper program to set registers visible through the ISA
-            bus
-          </para>
-          <indexterm zone="lm_sensors isaset">
-            <primary sortas="b-isaset">isaset</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pwmconfig">
-        <term><command>pwmconfig</command></term>
-        <listitem>
-          <para>
-            tests the pulse width modulation (PWM) outputs of sensors and
-            configures fancontrol
-          </para>
-          <indexterm zone="lm_sensors pwmconfig">
-            <primary sortas="b-pwmconfig">pwmconfig</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sensors">
-        <term><command>sensors</command></term>
-        <listitem>
-          <para>
-            prints the current readings of all sensor chips
-          </para>
-          <indexterm zone="lm_sensors sensors">
-            <primary sortas="b-sensors">sensors</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sensors-conf-convert">
-        <term><command>sensors-conf-convert</command></term>
-        <listitem>
-          <para>
-            is a <application>Perl</application> script to convert
-            <application>lm-sensors</application> version 2 configuration files
-            to work with version 3
-          </para>
-          <indexterm zone="lm_sensors sensors-conf-convert">
-            <primary sortas="b-sensors-conf-convert">sensors-conf-convert</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sensors-detect">
-        <term><command>sensors-detect</command></term>
-        <listitem>
-          <para>
-            is a <application>Perl</application> script that will walk you
-            through the process of scanning your system for various hardware
-            monitoring chips (sensors) supported by
-            <filename class="libraryfile">libsensors</filename>, or more
-            generally by the <application>lm_sensors</application> tool suite
-          </para>
-          <indexterm zone="lm_sensors sensors-detect">
-            <primary sortas="b-sensors-detect">sensors-detect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sensord">
-        <term><command>sensord</command></term>
-        <listitem>
-          <para>
-            (optional) is a daemon that can be used to periodically log sensor
-            readings
-          </para>
-          <indexterm zone="lm_sensors sensord">
-            <primary sortas="b-sensord">sensord</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libsensors">
-        <term><filename class="libraryfile">libsensors.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>lm_sensors</application> API functions
-          </para>
-          <indexterm zone="lm_sensors libsensors">
-            <primary sortas="c-libsensors">libsensors.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/logrotate.xml
===================================================================
--- general/sysutils/logrotate.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,313 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 logrotate-download-http "https://github.com/logrotate/logrotate/releases/download/&logrotate-version;/logrotate-&logrotate-version;.tar.xz">
-  <!ENTITY logrotate-download-ftp  " ">
-  <!ENTITY logrotate-md5sum        "6c15f45efc3475a576c4f7e6cc481b2c">
-  <!ENTITY logrotate-size          "164.5 KB">
-  <!ENTITY logrotate-buildsize     "2.9 MB (add 38 MB for tests)">
-  <!ENTITY logrotate-time          "less than 0.1 SBU (add 0.2 SBU for tests)">
-]>
-
-<sect1 id="logrotate" xreflabel="logrotate-&logrotate-version;">
-  <?dbhtml filename="logrotate.html"?>
-
-
-  <title>Logrotate-&logrotate-version;</title>
-
-  <indexterm zone="logrotate">
-    <primary sortas="a-logrotate">logrotate</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Logrotate</title>
-
-    <para>
-      The <application>logrotate</application> package allows automatic
-      rotation, compression, removal, and mailing of log files.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&logrotate-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&logrotate-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &logrotate-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &logrotate-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &logrotate-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &logrotate-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Logrotate Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="popt"/>
-    </para>
-
-    <bridgehead renderas="sect4" revision="sysv">Recommended</bridgehead>
-    <para role="recommended" revision="sysv">
-      <xref role="runtime" linkend="fcron"/> (runtime)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      An <xref role="runtime" linkend="server-mail"/> (runtime)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Logrotate</title>
-
-    <para>
-      Install <application>logrotate</application> by running the following
-      command:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>.  One test
-      fails because the very old <command>compress</command> is not
-      present and two tests fail if an MTA is not installed.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Logrotate</title>
-
-    <para>
-      <application>Logrotate</application> needs a configuration file,
-      which must be passed as an argument to the command when executed.  Create
-      the file as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cat &gt; /etc/logrotate.conf &lt;&lt; EOF
-<literal># Begin /etc/logrotate.conf
-
-# Rotate log files weekly
-weekly
-
-# Don't mail logs to anybody
-nomail
-
-# If the log file is empty, it will not be rotated
-notifempty
-
-# Number of backups that will be kept
-# This will keep the 2 newest backups only
-rotate 2
-
-# Create new empty files after rotating old ones
-# This will create empty log files, with owner
-# set to root, group set to sys, and permissions 664
-create 0664 root sys
-
-# Compress the backups with gzip
-compress
-
-# No packages own lastlog or wtmp -- rotate them here
-/var/log/wtmp {
-    monthly
-    create 0664 root utmp
-    rotate 1
-}
-
-/var/log/lastlog {
-    monthly
-    rotate 1
-}
-
-# Some packages drop log rotation info in this directory
-# so we include any file in it.
-include /etc/logrotate.d
-
-# End /etc/logrotate.conf</literal>
-EOF
-
-chmod -v 0644 /etc/logrotate.conf</userinput></screen>
-
-    <para>
-      Now create the <filename class='directory'>/etc/logrotate.d</filename>
-      directory as the  <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>mkdir -p /etc/logrotate.d</userinput></screen>
-
-    <para>
-      At this point additional log rotation commands can be entered, typically
-      in the <filename class='directory'>/etc/logrotate.d</filename> directory.
-      For example:
-    </para>
-
-<screen role="nodump"><userinput>cat &gt; /etc/logrotate.d/sys.log &lt;&lt; EOF
-<literal>/var/log/sys.log {
-   # If the log file is larger than 100kb, rotate it
-   size   100k
-   rotate 5
-   weekly
-   postrotate
-      /bin/killall -HUP syslogd
-   endscript
-}</literal>
-EOF
-
-chmod -v 0644 /etc/logrotate.d/sys.log</userinput></screen>
-
-    <para>
-      You can designate multiple files in one entry:
-    </para>
-
-<screen role="nodump"><userinput>cat &gt; /etc/logrotate.d/example.log &lt;&lt; EOF
-<literal>file1
-file2
-file3 {
-   ...
-   postrotate
-    ...
-   endscript
-}</literal>
-EOF
-
-chmod -v 0644 /etc/logrotate.d/example.log</userinput></screen>
-
-    <para>
-      You can use in the same line the list of files: file1 file2 file3.
-      See the logrotate man page or <ulink
-      url='https://www.techrepublic.com/article/manage-linux-log-files-with-logrotate/'/>
-      for more examples.
-    </para>
-
-    <para>
-      The command <command>logrotate /etc/logrotate.conf</command> can be
-      run manually, however, the command should be run daily.
-      Other useful commands are <command>logrotate -d
-      /etc/logrotate.conf</command> for debugging purposes and
-      <command>logrotate -f /etc/logrotate.conf</command> forcing the
-      logrotate commands to be run immediately. Combining the previous options
-      <option>-df</option>, you can debug the effect of the force command.
-      When debugging, the commands are only simulated and are not actually run.
-      As a result, errors about files not existing will eventually appear because
-      the files are not actually created.
-    </para>
-
-    <para>
-      To run the <command>logrotate</command> command daily,
-      <phrase revision="sysv">if you've installed
-      <xref linkend="fcron"/> and completed the section on periodic jobs,
-      execute</phrase><phrase revision="systemd">execute</phrase> the following
-      commands, as the  <systemitem class="username">root</systemitem> user,
-      to create a <phrase revision="sysv">daily cron job:</phrase>
-      <phrase revision="systemd">systemd timer to run daily at 3:00 A.M.
-     (local time):</phrase>
-    </para>
-
-<screen role="root" revision="sysv"><userinput>cat &gt; /etc/cron.daily/logrotate.sh &lt;&lt; "EOF" &amp;&amp;
-<literal>#!/bin/bash
-/usr/sbin/logrotate /etc/logrotate.conf</literal>
-EOF
-chmod 754 /etc/cron.daily/logrotate.sh</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>cat &gt; /usr/lib/systemd/system/logrotate.service &lt;&lt; "EOF" &amp;&amp;
-<literal>[Unit]
-Description=Runs the logrotate command
-Documentation=man:logrotate(8)
-DefaultDependencies=no
-After=local-fs.target
-Before=shutdown.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/sbin/logrotate /etc/logrotate.conf</literal>
-EOF
-cat &gt; /usr/lib/systemd/system/logrotate.timer &lt;&lt; "EOF" &amp;&amp;
-<literal>[Unit]
-Description=Runs the logrotate command daily at 3:00 AM
-
-[Timer]
-OnCalendar=*-*-* 3:00:00
-Persistent=true
-
-[Install]
-WantedBy=timers.target</literal>
-EOF
-systemctl enable logrotate.timer</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg> logrotate </seg>
-        <seg> None </seg>
-        <seg> None </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="logrotate-prog">
-        <term><command>logrotate</command></term>
-        <listitem>
-          <para>
-            performs the log maintenance functions defined in the
-            configuration files
-          </para>
-          <indexterm zone="logrotate logrotate-prog">
-            <primary sortas="b-logrotate-prog">logrotate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/lsb-tools.xml
===================================================================
--- general/sysutils/lsb-tools.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,184 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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">
-
-  <!ENTITY lsb-tools-download-http "https://github.com/lfs-book/LSB-Tools/releases/download/v&lsb-tools-version;/LSB-Tools-&lsb-tools-version;.tar.gz">
-  <!ENTITY lsb-tools-download-ftp  " ">
-  <!ENTITY lsb-tools-md5sum        "1e6ef8cdfddb55035a6c36757e6313f9">
-  <!ENTITY lsb-tools-size          "20 KB">
-  <!ENTITY lsb-tools-buildsize     "412 KB">
-  <!ENTITY lsb-tools-time          "less than 0.1 SBU">
-
-  %general-entities;
-]>
-
-<sect1 id="lsb-tools" xreflabel="lsb-tools-&lsb-tools-version;">
-  <?dbhtml filename="lsb-tools.html"?>
-
-
-  <title>LSB-Tools-&lsb-tools-version;</title>
-
-  <indexterm zone="lsb-tools">
-    <primary sortas="a-lsb-tools">LSB-Tools</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to LSB-Tools</title>
-
-    <para>
-      The <application>LSB-Tools</application> package includes tools
-      for Linux Standards Base (LSB) conformance.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lsb-tools-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lsb-tools-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lsb-tools-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lsb-tools-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lsb-tools-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lsb-tools-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of LSB-Tools</title>
-
-    <para>
-      Install <application>LSB-Tools</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-<!-- fixed upstream: should be ok for release 0.13+ -->
-    <para>
-      Remove a file that should not be installed as the &root; user:
-    </para>
-
-<screen role="root"><userinput>rm /usr/sbin/lsbinstall</userinput></screen>
-
-    <para revision="systemd">
-      Remove two scripts that serve no purpose on a systemd system:
-    </para>
-
-<screen role="root" revision="systemd"><userinput>rm /usr/sbin/{install,remove}_initd</userinput></screen>
-
-  </sect2>
-
-  <sect2>
-      <title>Configuration Information</title>
-
-      <para>
-        The configuration for this package was done in
-        <ulink url='&lfs-root;/chapter11/theend.html'>LFS</ulink>.
-        The file <filename>/etc/lsb-release</filename> should already exist.
-        Be sure that the DISTRIB_CODENAME entry has been set properly.
-      </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lsb_release <phrase revision="sysv">,
-          install_initd, and
-          remove_initd</phrase>
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          <phrase revision="systemd">/usr/lib/lsb and</phrase>
-          /usr/lib/python&python3-majorver;/site-packages/lsbtools
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lsb_release">
-        <term><command>lsb_release</command></term>
-        <listitem>
-          <para>
-            is a script to give LSB data
-          </para>
-          <indexterm zone="lsb-tools lsb_release">
-            <primary sortas="b-lsb_release">lsb_release</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="install_initd" revision="sysv">
-        <term><command>install_initd</command></term>
-        <listitem>
-          <para>
-            is a script to activate SysV startup scripts
-          </para>
-          <indexterm zone="lsb-tools install_initd">
-            <primary sortas="b-install_initd">install_initd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="remove_initd" revision="sysv">
-        <term><command>remove_initd</command></term>
-        <listitem>
-          <para>
-            is a script to deactivate SysV startup scripts
-          </para>
-          <indexterm zone="lsb-tools remove_initd">
-            <primary sortas="b-remove_initd">remove_initd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/mc.xml
===================================================================
--- general/sysutils/mc.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,268 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 mc-download-http "http://ftp.midnight-commander.org/mc-&mc-version;.tar.xz">
-  <!ENTITY mc-download-ftp  " ">
-  <!ENTITY mc-md5sum        "2c3dd9af66e4cfef5a7a460df1cdf868">
-  <!ENTITY mc-size          "2.3 MB">
-  <!ENTITY mc-buildsize     "71 MB (add 96 MB for tests)">
-  <!ENTITY mc-time          "0.3 SBU (using parallelism=4; add 0.2 SBU for tests)">
-]>
-
-<sect1 id="mc" xreflabel="MC-&mc-version;">
-  <?dbhtml filename="mc.html"?>
-
-
-  <title>MC-&mc-version;</title>
-
-  <indexterm zone="mc">
-    <primary sortas="a-MC">MC</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to MC</title>
-
-    <para>
-      <application>MC</application> (Midnight Commander) is a text-mode
-      full-screen file manager and visual shell. It provides a clear,
-      user-friendly, and somewhat protected interface to a Unix system while
-      making many frequent file operations more efficient and preserving the
-      full power of the command prompt.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&mc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&mc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &mc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &mc-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &mc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &mc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">MC Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="slang"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>,
-      <xref linkend="gpm"/>,
-      <xref linkend="graphviz"/>,
-      <xref linkend="libssh2"/>,
-      <xref linkend="pcre2"/>,
-      <xref linkend="ruby"/>,
-      <!--<xref linkend="samba"/>,-->
-      <xref linkend="unzip"/>,
-      <xref linkend="x-window-system"/>, and
-      <xref linkend="zip"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of MC</title>
-
-    <para>
-      Install <application>MC</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --enable-charset &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--sysconfdir=/etc</parameter>: This switch places the
-      global configuration directory in <filename
-      class="directory">/etc</filename>.
-    </para>
-
-    <para>
-      <parameter>--enable-charset</parameter>: This switch adds support
-      to <command>mcedit</command> for editing files in encodings different
-      from the one implied by the current locale.
-    </para>
-
-    <para>
-      <option>--with-search-engine=pcre2</option>: Use this switch if you would
-      prefer to use <xref linkend="pcre2" role="nodep"/> instead of GLib for
-      the built-in search engine.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring MC</title>
-
-    <sect3 id="mc-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>~/.config/mc/*</filename>
-      </para>
-
-      <indexterm zone="mc mc-config">
-        <primary sortas="e-AA.config/.mc/*">~/.config/.mc/*</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        The <filename class="directory">~/.config/mc</filename> directory and
-        its contents are created when you start <command>mc</command> for the
-        first time. Then you can edit the main <filename>~/.config/mc/ini
-        </filename> configuration file manually or through the <application>
-        MC</application> shell. Consult the <ulink role='man'
-        url='&man;mc.1'>mc(1)</ulink> man page for details.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>mc and the symlinks mcdiff, mcedit and mcview</seg>
-        <seg>None</seg>
-        <seg>/etc/mc and /usr/{libexec,share}/mc</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <!-- This program is installed in /usr/libexec
-      <varlistentry id="conssaver">
-        <term><command>cons.saver</command></term>
-        <listitem>
-          <para>
-            is used internally by <command>mc</command> for saving and
-            restoring the text behind the panels on Linux text console
-          </para>
-          <indexterm zone="mc conssaver">
-            <primary sortas="b-conssaver">cons.saver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      -->
-
-      <varlistentry id="mc-prog">
-        <term><command>mc</command></term>
-        <listitem>
-          <para>
-            is a visual shell
-          </para>
-          <indexterm zone="mc mc-prog">
-            <primary sortas="b-mc">mc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mcdiff">
-        <term><command>mcdiff</command></term>
-        <listitem>
-          <para>
-            is an internal visual diff tool
-          </para>
-          <indexterm zone="mc mcdiff">
-            <primary sortas="b-mcdiff">mcdiff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mcedit">
-        <term><command>mcedit</command></term>
-        <listitem>
-          <para>
-            is an internal file editor
-          </para>
-          <indexterm zone="mc mcedit">
-            <primary sortas="b-mcedit">mcedit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mcview">
-        <term><command>mcview</command></term>
-        <listitem>
-          <para>
-            is an internal file viewer
-          </para>
-          <indexterm zone="mc mcview">
-            <primary sortas="b-mcview">mcview</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/modemmanager.xml
===================================================================
--- general/sysutils/modemmanager.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,260 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 ModemManager-download-http "https://www.freedesktop.org/software/ModemManager/ModemManager-&ModemManager-version;.tar.xz">
-  <!ENTITY ModemManager-download-ftp  " ">
-  <!ENTITY ModemManager-md5sum        "9f014dfc59f1bd8bc230bb2c2974d104">
-  <!ENTITY ModemManager-size          "2.5 MB">
-  <!ENTITY ModemManager-buildsize     "155 MB (with tests)">
-  <!ENTITY ModemManager-time          "0.7 SBU (Using parallelism=4; with tests)">
-]>
-
-<sect1 id="ModemManager" xreflabel="ModemManager-&ModemManager-version;">
-  <?dbhtml filename="ModemManager.html"?>
-
-
-  <title>ModemManager-&ModemManager-version;</title>
-
-  <indexterm zone="ModemManager">
-    <primary sortas="a-ModemManager">ModemManager</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ModemManager</title>
-
-    <para>
-      <application>ModemManager</application> provides a unified high level
-      API for communicating with mobile broadband modems, regardless of the
-      protocol used to communicate with the actual device.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&ModemManager-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&ModemManager-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &ModemManager-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &ModemManager-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &ModemManager-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &ModemManager-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">ModemManager Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libgudev"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <phrase revision="sysv"><xref linkend="elogind"/>,</phrase>
-      &gobject-introspection;,
-      <xref linkend="libmbim"/>,
-      <xref linkend="libqmi"/>,
-      <xref linkend="polkit"/>, and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-    <para condition="html" role="usernotes">Editor Notes:
-      <ulink url="&blfs-wiki;/ModemManager"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ModemManager</title>
-
-    <para>
-      Install <application>ModemManager</application> by running the following
-      commands:
-    </para>
-
-<screen revision="sysv"><userinput>./configure --prefix=/usr                 \
-            --sysconfdir=/etc             \
-            --localstatedir=/var          \
-            --disable-static              \
-            --disable-maintainer-mode     \
-            --with-systemd-journal=no     \
-            --with-systemd-suspend-resume &amp;&amp;
-make</userinput></screen>
-
-<screen revision="systemd"><userinput>./configure --prefix=/usr                 \
-            --sysconfdir=/etc             \
-            --localstatedir=/var          \
-            --disable-static              \
-            --disable-maintainer-mode     \
-            --with-systemd-journal        \
-            --with-systemd-suspend-resume &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-systemd-suspend-resume</parameter>: This
-      switch forces <application>ModemManager</application> to use the
-      <phrase revision="sysv"><application>elogind</application></phrase>
-      <phrase revision="systemd"><application>systemd</application></phrase>
-      power management facilities.
-    </para>
-
-    <para>
-      <phrase revision="systemd"><parameter>--with-systemd-journal</parameter></phrase>
-      <phrase revision="sysv"><parameter>--with-systemd-journal=no</parameter></phrase>
-      : This switch forces <application>ModemManager</application>
-      <phrase revision="sysv">not</phrase> to use the systemd journal for
-      logging.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-  <sect2 role="configuration" revision="systemd">
-    <title>Configuring ModemManager</title>
-
-    <sect3 id="ModemManager-init">
-      <title>Systemd Units</title>
-
-      <para>
-        To start the <command>ModemManager</command> daemon at boot, enable
-        the previously installed systemd unit by running the following command
-        as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-      <indexterm zone="ModemManager ModemManager-init">
-        <primary sortas="f-ModemManager">ModemManager</primary>
-      </indexterm>
-
-<screen role="root"><userinput>systemctl enable ModemManager</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          mmcli and ModemManager
-        </seg>
-        <seg>
-          libmm-glib.so
-        </seg>
-        <seg>
-          /etc/ModemManager,
-          /usr/include/libmm-glib,
-          /usr/include/ModemManager,
-          /usr/lib/ModemManager,
-          /usr/share/ModemManager,
-          /usr/share/gtk-doc/html/libmm-glib (optional), and
-          /usr/share/gtk-doc/html/ModemManager (optional)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mmcli">
-        <term><command>mmcli</command></term>
-        <listitem>
-          <para>
-            is an utility used to control and monitor the
-            <application>ModemManager</application>
-          </para>
-          <indexterm zone="ModemManager mmcli">
-            <primary sortas="b-mmcli">mmcli</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ModemManager-prog">
-        <term><command>ModemManager</command></term>
-        <listitem>
-          <para>
-            is a <application>D-Bus</application> service used
-            to communicate with modems
-          </para>
-          <indexterm zone="ModemManager ModemManager-prog">
-            <primary sortas="b-ModemManager">ModemManager</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmm-glib">
-        <term><filename class="libraryfile">libmm-glib.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for communicating with mobile broadband
-            modems, regardless of the  protocol used to communicate with
-            the actual device
-          </para>
-          <indexterm zone="ModemManager libmm-glib">
-            <primary sortas="c-libmm-glib">libmm-glib.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/notification-daemon.xml
===================================================================
--- general/sysutils/notification-daemon.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,141 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 notification-daemon-download-http
-           "&gnome-download-http;/notification-daemon/&gnome-minor-20;/notification-daemon-&notification-daemon-version;.tar.xz">
-  <!ENTITY notification-daemon-download-ftp  " ">
-  <!ENTITY notification-daemon-md5sum        "2de7f4075352831f1d98d8851b642124">
-  <!ENTITY notification-daemon-size          "336 KB">
-  <!ENTITY notification-daemon-buildsize     "4.1 MB">
-  <!ENTITY notification-daemon-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="notification-daemon" xreflabel="notification-daemon-&notification-daemon-version;">
-  <?dbhtml filename="notification-daemon.html"?>
-
-
-  <title>notification-daemon-&notification-daemon-version;</title>
-
-  <indexterm zone="notification-daemon">
-    <primary sortas="a-notification-daemon">notification-daemon</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Notification Daemon</title>
-
-    <para>
-      The <application>Notification Daemon</application> package contains a daemon
-      that displays passive pop-up notifications.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&notification-daemon-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&notification-daemon-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &notification-daemon-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &notification-daemon-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &notification-daemon-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &notification-daemon-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Notification Daemon Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/> and
-      <xref linkend="libcanberra"/> (Built with <xref linkend="gtk3"/> support).
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Notification Daemon</title>
-
-    <para>
-      Install <application>Notification Daemon</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr     \
-            --sysconfdir=/etc \
-            --disable-static  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      You can test the notification daemon with the command
-      <command>notify-send</command>:
-    </para>
-
-<screen><userinput>pgrep -l notification-da &amp;&amp;
-notify-send -i info Information "Hi ${USER}, This is a Test"</userinput></screen>
-    <para>
-      The command <command>pgrep -l notification-da</command> is added to assure
-      that it is the daemon of this package that is running, not another one,
-      e.g. the daemon from <xref linkend="xfce4-notifyd"/>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          none
-        </seg>
-        <seg>
-          none
-        </seg>
-        <seg>
-          none
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/p7zip.xml
===================================================================
--- general/sysutils/p7zip.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,213 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 p7zip-download-http "https://github.com/p7zip-project/p7zip/archive/v&p7zip-version;/p7zip-&p7zip-version;.tar.gz">
-  <!ENTITY p7zip-download-ftp  " ">
-  <!ENTITY p7zip-md5sum        "00acfd6be87848231722d2d53f89e4a5">
-  <!ENTITY p7zip-size          "6.5 MB">
-  <!ENTITY p7zip-buildsize     "55 MB">
-  <!ENTITY p7zip-time          "2.3 SBU (with tests)">
-]>
-
-<sect1 id="p7zip" xreflabel="p7zip-&p7zip-version;">
-  <?dbhtml filename="p7zip.html"?>
-
-
-  <title>p7zip-&p7zip-version;</title>
-
-  <indexterm zone="p7zip">
-    <primary sortas="a-p7zip">p7zip</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to p7zip</title>
-
-    <para>
-      <application>p7zip</application> is the Unix command-line port of 7-Zip, a
-      file archiver that archives with high compression ratios. It handles 7z,
-      ZIP, GZIP, Brotli,  BZIP2, XZ, TAR, APM, ARJ, CAB, CHM, CPIO, CramFS, DEB,
-      DMG, FAT, HFS, ISO, Lizard, LZ5, LZFSE, LZH, LZMA, LZMA2, MBR, MSI, MSLZ,
-      NSIS, NTFS, RAR, RPM, SquashFS, UDF, VHD, WIM, XAR, Z, and Zstd formats.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&p7zip-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&p7zip-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &p7zip-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &p7zip-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &p7zip-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &p7zip-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!-- Applied in 17.03
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/p7zip-&p7zip-version;-consolidated_fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">p7zip Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://www.wxwidgets.org/">wxWidgets</ulink>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of p7zip</title>
-
-<!-- Applied in 17.03
-    <para>
-      First, update the package for gcc10 and some security issues:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../p7zip-&p7zip-version;-consolidated_fixes-1.patch</userinput></screen>
--->
-
-    <para>
-      First, prevent <application>p7zip</application> from installing
-      compressed manual pages:
-    </para>
-
-<screen><userinput remap="pre">sed '/^gzip/d' -i install.sh</userinput></screen>
-
-    <para>
-      Next, fix a security vulnerability:
-    </para>
-
-<screen><userinput remap="pre">sed -i '160a if(_buffer == nullptr || _size == _pos) return E_FAIL;' CPP/7zip/Common/StreamObjects.cpp</userinput></screen>
-
-    <para>
-      Install <application>p7zip</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>make all3</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<!-- dev note: make DEST_DIR=<DESTDIR> install -->
-
-<screen role="root"><userinput>make DEST_HOME=/usr \
-     DEST_MAN=/usr/share/man \
-     DEST_SHARE_DOC=/usr/share/doc/p7zip-&p7zip-version; install</userinput></screen>
-
-    <note>
-      <para>
-        If using DESTDIR techniques, use DEST_DIR instead.
-      </para>
-    </note>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          7z, 7za, and 7zr
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/p7zip and /usr/share/doc/p7zip-&p7zip-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="Sevenz">
-        <term><command>7z</command></term>
-        <listitem>
-          <para>
-            is a file archiver utility
-          </para>
-          <indexterm zone="p7zip Sevenz">
-            <primary sortas="b-7z">7z</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="Sevenza">
-        <term><command>7za</command></term>
-        <listitem>
-          <para>
-            is a stand-alone executable handling less archive formats than
-            <command>7z</command>
-          </para>
-          <indexterm zone="p7zip Sevenza">
-            <primary sortas="b-7za">7za</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="Sevenzr">
-        <term><command>7zr</command></term>
-        <listitem>
-          <para>
-            is a minimal version of <command>7za</command> that handles only
-            7z archives
-          </para>
-          <indexterm zone="p7zip Sevenzr">
-            <primary sortas="b-7zr">7zr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/pax.xml
===================================================================
--- general/sysutils/pax.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,158 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
-
-  <!-- https does not work for mirbsd site with recent OpenSSL (note: we are
-       using OpenSSL for wget and curl).  Don't change it to https when you
-       see https://www.mirbsd.org/ "works" in a browser.  Seems it uses a
-       too old version of tls. -->
-  <!ENTITY pax-download-http "http://www.mirbsd.org/MirOS/dist/mir/cpio/paxmirabilis-&pax-version;.tgz">
-  <!ENTITY pax-download-ftp  " ">
-  <!ENTITY pax-md5sum        "87a0a3870ec437c41eb1b406334fe2c5">
-  <!ENTITY pax-size          "172 KB">
-  <!ENTITY pax-buildsize     "1.2 MB">
-  <!ENTITY pax-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="pax" xreflabel="Pax-&pax-version;">
-  <?dbhtml filename="pax.html"?>
-
-
-  <title>Pax-&pax-version;</title>
-
-  <indexterm zone="pax">
-    <primary sortas="a-pax">pax</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Pax</title>
-
-    <para>
-      <application>pax</application> is an archiving utility created by POSIX
-      and defined by the POSIX.1-2001 standard. Rather than sort out the
-      incompatible options that have crept up between
-      <application>tar</application> and <application>cpio</application>,
-      along with their implementations across various versions of UNIX, the
-      IEEE designed a new archive utility. The name <quote>pax</quote> is
-      an acronym for portable archive exchange. Furthermore,
-      <quote>pax</quote> means <quote>peace</quote> in Latin, so its name
-      implies that it shall create peace between the
-      <application>tar</application> and <application>cpio</application>
-      format supporters. The command invocation and command structure is
-      somewhat a unification of both <application>tar</application> and
-      <application>cpio</application>.
-    </para>
-    <para>
-      <application>pax</application> has been required to be present in LSB
-      conformant systems since LSB version 3.0.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&pax-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&pax-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &pax-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &pax-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &pax-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &pax-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Pax Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cpio"/></para>
--->
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Pax</title>
-
-    <para>Install pax by running the following commands:.</para>
-
-    <note>
-      <para>This package expands to the directory <emphasis>pax</emphasis>.</para>
-    </note>
-
-<screen><userinput>bash Build.sh</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-    <note>
-      <para>This package also creates hard links from <command>pax</command>
-      to the programs <command>cpio</command> and <command>tar</command> in
-      the build directory.  The LFS editors do not recommend that they be
-      installed as they will overwrite the GNU versions of these programs.</para>
-    </note>
-
-<screen role="root"><userinput>install -v pax /usr/bin &amp;&amp;
-install -v -m644 pax.1 /usr/share/man/man1</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-
-      <seglistitem>
-        <seg>
-          pax
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pax-prog">
-        <term><command>pax</command></term>
-        <listitem>
-          <para>
-            copies files to and from archives in several formats
-          </para>
-          <indexterm zone="pax pax-prog">
-            <primary sortas="b-pax">pax</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/sysutils/pccts.xml
===================================================================
--- general/sysutils/pccts.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/pccts.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect1 id="pccts" xreflabel="pccts-&pccts-version;">
+<?dbhtml filename="pccts.html" dir="general"?>
+<title>pccts-&pccts-version;</title>
+
+&pccts-intro;
+&pccts-inst;
+&pccts-exp;
+&pccts-desc;
+
+</sect1>
+
Index: general/sysutils/pciutils.xml
===================================================================
--- general/sysutils/pciutils.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ general/sysutils/pciutils.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,211 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
+<sect1 id="pciutils" xreflabel="pciutils">
+<title>pciutils</title>
 
-  <!ENTITY pciutils-download-http "https://mj.ucw.cz/download/linux/pci/pciutils-&pciutils-version;.tar.gz">
-  <!ENTITY pciutils-download-ftp  " ">
-  <!ENTITY pciutils-md5sum        "43498696be1ff05c369019296b4dc21d">
-  <!ENTITY pciutils-size          "652.6 KB">
-  <!ENTITY pciutils-buildsize     "5.7 MB">
-  <!ENTITY pciutils-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="pciutils" xreflabel="pciutils-&pciutils-version;">
-  <?dbhtml filename="pciutils.html"?>
-
-
-  <title>pciutils-&pciutils-version;</title>
-
-  <indexterm zone="pciutils">
-    <primary sortas="a-pciutils">pciutils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to PCI Utils</title>
-
-    <para>
-      The <application>PCI Utils</application> package contains
-      a set of programs for listing PCI devices, inspecting
-      their status and setting their configuration registers.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&pciutils-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&pciutils-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &pciutils-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &pciutils-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &pciutils-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &pciutils-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">pciutils Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-       <xref role="runtime" linkend="hwdata"/> (runtime)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of PCI Utils</title>
-
-    <para>
-      Prevent the installation of the <filename>pci.ids</filename> file
-      to avoid a conflict with the <xref linkend='hwdata'/> package:
-    </para>
-
-    <screen><userinput>sed -r '/INSTALL.*(PCI_IDS|update-pciids)/d' \
-    -i Makefile</userinput></screen>
-
-    <para>
-      Install <application>PCI Utils</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>make PREFIX=/usr                \
-     SHAREDIR=/usr/share/hwdata \
-     SHARED=yes</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make PREFIX=/usr                \
-     SHAREDIR=/usr/share/hwdata \
-     SHARED=yes                 \
-     install install-lib        &amp;&amp;
-
-chmod -v 755 /usr/lib/libpci.so</userinput></screen>
-
-    <para>
-      Next, install the <xref linkend='hwdata'/> package for the
-      <filename>pci.ids</filename> file.
-    </para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>SHARED=yes</parameter>: This parameter enables building of
-      the shared library instead of the static one.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          lspci, pcilmr, and setpci
-        </seg>
-        <seg>
-          libpci.so
-        </seg>
-        <seg>
-          /usr/include/pci
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lspci">
-        <term><command>lspci</command></term>
-        <listitem>
-          <para>
-            is a utility for displaying information about all PCI buses
-            in the system and all devices connected to them
-          </para>
-          <indexterm zone="pciutils lspci">
-            <primary sortas="b-lspci">lspci</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pcilmr">
-        <term><command>pcilmr</command></term>
-        <listitem>
-          <para>
-            is a utility for margining PCIe links
-          </para>
-          <indexterm zone="pciutils pcilmr">
-            <primary sortas="b-pcilmr">pcilmr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setpci">
-        <term><command>setpci</command></term>
-        <listitem>
-          <para>
-            is a utility for querying and configuring PCI devices
-          </para>
-          <indexterm zone="pciutils setpci">
-            <primary sortas="b-setpci">setpci</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpci">
-      <term><filename class="libraryfile">libpci.so</filename></term>
-      <listitem>
-        <para>
-          is a library that allows applications to access the PCI
-          subsystem
-        </para>
-        <indexterm zone="pciutils libpci">
-          <primary sortas="c-libpci">libpci.so</primary>
-        </indexterm>
-      </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+<para>TO BE DONE</para>
 
 </sect1>
Index: general/sysutils/pciutils/pciutils.ent
===================================================================
--- general/sysutils/pciutils/pciutils.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/pciutils/pciutils.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY pciutils SYSTEM "../pciutils.xml">
Index: general/sysutils/pkgconfig.xml
===================================================================
--- general/sysutils/pkgconfig.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/pkgconfig.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<sect1 id="pkgconfig" xreflabel="pkgconfig-&pkgconfig-version;">
+<?dbhtml filename="pkgconfig.html" dir="general"?>
+<title>pkgconfig-&pkgconfig-version;</title>
+
+&pkgconfig-intro;
+&pkgconfig-inst;
+&pkgconfig-desc;
+
+</sect1>
+
Index: general/sysutils/pkgconfig/pkgconfig-desc.xml
===================================================================
--- general/sysutils/pkgconfig/pkgconfig-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/pkgconfig/pkgconfig-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,15 @@
+<sect2>
+<title>Contents</title>
+
+<para>The pkgconfig package contains <userinput>pkg-config</userinput></para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>pkg-config</title>
+<para>pkg-config is a function that returns metainformation for the
+specified library.</para></sect3>
+
+</sect2>
+
Index: general/sysutils/pkgconfig/pkgconfig-inst.xml
===================================================================
--- general/sysutils/pkgconfig/pkgconfig-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/pkgconfig/pkgconfig-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of pkgconfig</title>
+
+<para>Install pkgconfig by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
Index: general/sysutils/pkgconfig/pkgconfig-intro.xml
===================================================================
--- general/sysutils/pkgconfig/pkgconfig-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/pkgconfig/pkgconfig-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,13 @@
+<sect2>
+<title>Introduction to pkgconfig</title>
+
+<screen>Download location:              <ulink url="&pkgconfig-download;"/>
+Version used:                   &pkgconfig-version;
+Package size:                   &pkgconfig-size;
+Estimated Disk space required:  &pkgconfig-buildsize;</screen>
+
+<para>The pkgconfig package contains pkg-config. This is useful for
+passing the include path and/or library path to the compiler during the
+make script.</para>
+
+</sect2>
Index: general/sysutils/pkgconfig/pkgconfig.ent
===================================================================
--- general/sysutils/pkgconfig/pkgconfig.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/pkgconfig/pkgconfig.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<!ENTITY pkgconfig SYSTEM "../pkgconfig.xml">
+<!ENTITY pkgconfig-intro SYSTEM "pkgconfig-intro.xml">
+<!ENTITY pkgconfig-inst SYSTEM "pkgconfig-inst.xml">
+<!ENTITY pkgconfig-desc SYSTEM "pkgconfig-desc.xml">
+<!ENTITY pkgconfig-buildsize "5 MB">
+<!ENTITY pkgconfig-version "0.12.0">
+<!ENTITY pkgconfig-download "http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-0.12.0.tar.gz">
+<!ENTITY pkgconfig-size "596 KB">
Index: general/sysutils/pm-utils-kernel.xml
===================================================================
--- general/sysutils/pm-utils-kernel.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,8 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>P</emphasis>ower management and ACPI options ---&gt;
-  [*] <emphasis role='blue'>S</emphasis>uspend to RAM and standby                                       [SUSPEND]
-  [*] H<emphasis role='blue'>i</emphasis>bernation (aka 'suspend to disk')                          [HIBERNATION]</screen>
Index: general/sysutils/pm-utils.xml
===================================================================
--- general/sysutils/pm-utils.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,336 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 pm-utils-download-http "https://pm-utils.freedesktop.org/releases/pm-utils-&pm-utils-version;.tar.gz">
-  <!ENTITY pm-utils-download-ftp  " ">
-  <!ENTITY pm-utils-md5sum        "1742a556089c36c3a89eb1b957da5a60">
-  <!ENTITY pm-utils-size          "204 KB">
-  <!ENTITY pm-utils-buildsize     "1.6 MB">
-  <!ENTITY pm-utils-time          "0.1 SBU">
-]>
-
-<sect1 id="pm-utils" xreflabel="pm-utils-&pm-utils-version;">
-  <?dbhtml filename="pm-utils.html"?>
-
-
-  <title>pm-utils-&pm-utils-version;</title>
-
-  <indexterm zone="pm-utils">
-    <primary sortas="a-pm-utils">pm-utils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Power Management Utilities</title>
-
-    <para>
-      The <application>Power Management Utilities</application> provide
-      simple shell command line tools to suspend and hibernate the computer.
-      They can be used to run user supplied scripts on suspend and resume.
-    </para>
-
-    <note revision='systemd'>
-      <para>
-        On a system using <application>systemd</application> as the init
-        system, <application>systemd</application> already provides this
-        functionality. As a result, this package is probably not needed, and it
-        may conflict with <application>systemd</application>.  Read the
-        documentation for <filename>suspend.target</filename> and
-        <filename>hibernate.target</filename> in the man page
-        <ulink role='man'
-        url='&man;systemd.special.7'>systemd.special(7)</ulink> for more
-        details.
-      </para>
-    </note>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&pm-utils-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&pm-utils-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &pm-utils-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &pm-utils-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &pm-utils-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &pm-utils-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/pm-utils-&pm-utils-version;-bugfixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Power Management Utilities Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="xmlto"/> (to generate man pages)
-    </para>
-
-    <bridgehead renderas="sect4">Optional (runtime)</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="hdparm"/>,
-      <xref role="runtime" linkend="wireless_tools"/>,
-      <ulink role="runtime"
-             url="https://www.kernel.org/pub/software/network/ethtool/">
-        ethtool</ulink>, and
-      <ulink role="runtime"
-             url="https://ftp.debian.org/debian/pool/main/v/vbetool/">
-        vbetool</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="kernel"  id="pm-utils-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-       If needed, enable the following options in the kernel configuration and
-       recompile the kernel:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="pm-utils-kernel.xml"/>
-
-    <para>
-      Suspend to RAM allows the system to enter sleep states in which main
-      memory is powered and thus its contents are preserved. The method cuts
-      power to most parts of the machine aside from the RAM.  Because of the
-      large power savings, it is advisable for laptops to automatically enter
-      this mode when the computer is running on batteries and the lid is closed
-      (or the user is inactive for some time).
-    </para>
-
-    <para>
-      Suspend to disk (Hibernation) saves the machine's state into swap space
-      and completely powers off the machine. When the machine is powered on,
-      the state is restored. Until then, there is zero power consumption.
-      Suspend to RAM and hibernation are normally appropriate for portable
-      devices such as laptops, but can be used on workstations.  The capability
-      is not really appropriate for servers.
-    </para>
-
-    <para>
-      To use hibernation, the kernel parameter
-      resume=/dev/&lt;swap_partition&gt; has to be used on the kernel command
-      line (in grub.cfg).  The swap partition should be at least the size of
-      the physical RAM on the system.
-    </para>
-
-    <indexterm zone="pm-utils pm-utils-kernel">
-      <primary sortas="d-pm-utils">pm-utils</primary>
-    </indexterm>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Power Management Utilities</title>
-
-    <para>
-      First, fix several bugs and a couple of incompatibilities with newer
-      kernels:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../pm-utils-&pm-utils-version;-bugfixes-1.patch</userinput></screen>
-
-    <para>
-      Install <application>Power Management Utilities</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr     \
-            --sysconfdir=/etc \
-            --docdir=/usr/share/doc/pm-utils-&pm-utils-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you don't have <xref linkend="xmlto"/> installed, copy pregenerated
-      man pages, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -m644 man/*.1 /usr/share/man/man1 &amp;&amp;
-install -v -m644 man/*.8 /usr/share/man/man8 &amp;&amp;
-ln -sv pm-action.8 /usr/share/man/man8/pm-suspend.8 &amp;&amp;
-ln -sv pm-action.8 /usr/share/man/man8/pm-hibernate.8 &amp;&amp;
-ln -sv pm-action.8 /usr/share/man/man8/pm-suspend-hybrid.8</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Power Management Utilities</title>
-
-    <para>
-      Suspend or resume functionality can be easily modified by installing files
-      into the <filename class="directory">/etc/pm/sleep.d</filename> directory.
-      These files, known as hooks, are run when the system is put into a sleep
-      state or resumed. Default hooks are located in <filename
-      class="directory">/usr/lib/pm-utils/sleep.d</filename>, and user hooks
-      should be put in <filename class="directory">/etc/pm/sleep.d</filename>.
-      See the <ulink role='man' url='&man;pm-action.8'>pm-action(8)</ulink>
-      man page for more information.
-    </para>
-
-    <para>
-      In order to use hibernation with <application>GRUB</application> and a
-      swap partition, you need to add kernel parameter
-      <literal>resume=<replaceable>swap_partition</replaceable></literal> (e.g.
-      <literal>resume=/dev/sda1</literal>) to the kernel line in the
-      <filename>/boot/grub/grub.cfg</filename> configuration file.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          on_ac_power, pm-hibernate, pm-is-supported, pm-powersave, pm-suspend
-          and pm-suspend-hybrid
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /etc/pm, /usr/lib/pm-utils and
-          /usr/share/doc/pm-utils-&pm-utils-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="on_ac_power">
-        <term><command>on_ac_power</command></term>
-        <listitem>
-          <para>
-            is a script that determines whether the system is running on AC
-            power (rather than a battery)
-          </para>
-          <indexterm zone="pm-utils on_ac_power">
-            <primary sortas="b-on_ac_power">on_ac_power</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pm-hibernate">
-        <term><command>pm-hibernate</command></term>
-        <listitem>
-          <para>
-            is a symlink to pm-action script that puts the computer into
-            hibernate mode (the system is fully powered off and system state is
-            saved to disk)
-          </para>
-          <indexterm zone="pm-utils pm-hibernate">
-            <primary sortas="b-pm-hibernate">pm-hibernate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pm-is-supported">
-        <term><command>pm-is-supported</command></term>
-        <listitem>
-          <para>
-            is a script that checks whether power management features such as
-            suspend and hibernate are supported
-          </para>
-          <indexterm zone="pm-utils pm-is-supported">
-            <primary sortas="b-pm-is-supported">pm-is-supported</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pm-powersave">
-        <term><command>pm-powersave</command></term>
-        <listitem>
-          <para>
-            is a script that puts the computer into powersaving (low power)
-            mode
-          </para>
-          <indexterm zone="pm-utils pm-powersave">
-            <primary sortas="b-pm-powersave">pm-powersave</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pm-suspend">
-        <term><command>pm-suspend</command></term>
-        <listitem>
-          <para>
-            is a symlink to pm-action script that puts the computer into suspend
-            mode (most devices are shut down and system state is saved in RAM)
-          </para>
-          <indexterm zone="pm-utils pm-suspend">
-            <primary sortas="b-pm-suspend">pm-suspend</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pm-suspend-hybrid">
-        <term><command>pm-suspend-hybrid</command></term>
-        <listitem>
-          <para>
-            is a symlink to pm-action script that puts the computer into
-            hybrid-suspend mode (the system does everything it needs to
-            hibernate, but suspends instead of shutting down)
-          </para>
-          <indexterm zone="pm-utils pm-suspend-hybrid">
-            <primary sortas="b-pm-suspend-hybrid">pm-suspend-hybrid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/power-profiles-daemon-kernel.xml
===================================================================
--- general/sysutils/power-profiles-daemon-kernel.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>P</emphasis>ower management and ACPI options ---&gt;
-  <emphasis role='blue'>C</emphasis>PU Frequency scaling ---&gt;
-    -*-   <emphasis role='blue'>C</emphasis>PU Frequency scaling                                       [CPU_FREQ]
-    -*-     '<emphasis role='blue'>p</emphasis>erformance' governor                    [CPU_FREQ_GOV_PERFORMANCE]
-    &lt;*/M&gt;   '<emphasis role='blue'>p</emphasis>owersave' governor                        [CPU_FREQ_GOV_POWERSAVE]
-    # Select if CPU is Intel:
-    [ /*]   <emphasis role='blue'>I</emphasis>ntel P state control                             [X86_INTEL_PSTATE]
-    # Select if CPU is AMD:
-    [ /*]   <emphasis role='blue'>A</emphasis>MD Processor P-State driver                        [X86_AMD_PSTATE]
-
-<emphasis role='blue'>D</emphasis>evice Drivers ---&gt;
-  # Some drivers under this submenu provide "platform profile" support
-  # and power-profiles-daemon can take advantage from platform profiles;
-  # select a driver if suitable for your platform:
-  [ /*] <emphasis role='blue'>X</emphasis>86 Platform Specific Device Drivers ---&gt;         [X86_PLATFORM_DEVICES]</screen>
Index: general/sysutils/power-profiles-daemon.xml
===================================================================
--- general/sysutils/power-profiles-daemon.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,317 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!-- Place this in the packages.ent file
-  <!ENTITY power-profiles-daemon-version "">
-  -->
-
-  <!ENTITY power-profiles-daemon-download-http "https://gitlab.freedesktop.org/upower/power-profiles-daemon/-/archive/&power-profiles-daemon-version;/power-profiles-daemon-&power-profiles-daemon-version;.tar.gz">
-  <!ENTITY power-profiles-daemon-download-ftp  " ">
-  <!ENTITY power-profiles-daemon-md5sum        "0196aae5798263d3d8f33a9280a6cb10">
-  <!ENTITY power-profiles-daemon-size          "76 KB">
-  <!ENTITY power-profiles-daemon-buildsize     "3.2 MB">
-  <!ENTITY power-profiles-daemon-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="power-profiles-daemon" xreflabel="power-profiles-daemon-&power-profiles-daemon-version;">
-  <?dbhtml filename="power-profiles-daemon.html"?>
-
-
-  <title>Power-profiles-daemon-&power-profiles-daemon-version;</title>
-
-  <indexterm zone="power-profiles-daemon">
-    <primary sortas="a-Power-profiles-daemon">power-profiles-daemon</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Power-profiles-daemon</title>
-
-    <para>
-      The <application>Power-profiles-daemon</application> package provides a program 
-      that allows modification of the system power/behavior state. This is used on
-      many laptops and can be used by a Desktop Environment to activate power saving 
-      or performance CPU governors through dbus. On other systems, Power-profiles-daemon
-      can be used as a streamlined way to set the CPU governor in order to increase system
-      performance at the cost of energy usage.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&power-profiles-daemon-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&power-profiles-daemon-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &power-profiles-daemon-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &power-profiles-daemon-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &power-profiles-daemon-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &power-profiles-daemon-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Power-profiles-daemon Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="polkit"/>, 
-      <xref linkend="pygobject3"/>, and
-      <xref linkend="upower"/>, 
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      The rest are for the tests,
-      <xref linkend="python-dbusmock"/>, 
-      <xref linkend="umockdev"/>,
-      <ulink url="https://github.com/PyCQA/isort">isort</ulink>, and
-      <ulink url="https://github.com/PyCQA/mccabe">mccabe</ulink>
-    </para>
-  </sect2>
-
-    <sect2 role="kernel" id="power-profiles-daemon-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration and recompile the
-      kernel if necessary:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="power-profiles-daemon-kernel.xml"/>
-
-    <para>
-      Select the appropriate sub-options that appear when the above options are
-      selected. As much as possible, the layout should be the same as in
-      kernel configuration menus.
-    </para>
-
-    <indexterm zone="power-profiles-daemon power-profiles-daemon-kernel">
-      <primary sortas="d-Power-profiles-daemon">Power-profiles-daemon</primary>
-    </indexterm>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Power-profiles-daemon</title>
-
-    <para>
-      Install <application>Power-profiles-daemon</application> by 
-      running the following commands:
-    </para>
-<screen revision="sysv"><userinput>mkdir build &amp;&amp;
-cd build &amp;&amp;
-
-meson setup                       \
-      --prefix=/usr               \
-      --buildtype=release         \
-      -Dgtk_doc=false             \
-      -Dtests=false               \
-      -Dsystemdsystemunitdir=/tmp \
-      .. &amp;&amp;
-ninja</userinput></screen>
-
-
-<screen revision="systemd"><userinput>mkdir build &amp;&amp;
-cd build &amp;&amp;
-
-meson setup               \
-      --prefix=/usr       \
-      --buildtype=release \
-      -Dgtk_doc=false     \
-      -Dtests=false       \
-      .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      If you have installed the external dependencies, to test the results issue: <command>
-      ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para revision="sysv">
-      Now, clean up an unneeded systemd unit installed into /tmp:
-    </para>
-
-<screen revision="sysv" role="root">
-<userinput>rm -fv /tmp/power-profiles-daemon.service</userinput>
-</screen>
-
-    <para revision="sysv">
-      Create a directory required for persistant power states 
-      after reboot:
-    </para>
-
-<screen revision="sysv" role="root">
-<userinput>install -vdm755 /var/lib/power-profiles-daemon</userinput>
-</screen>
-
-  </sect2>
-
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-Dgtk_doc=false</parameter>: Prevents building the
-      documentation. Remove this if you have <application>GTK-Doc</application>
-      installed and wish to build the documentation.
-    </para>
-
-    <para>
-      <parameter>-Dtests=false</parameter>: Prevents building the
-      tests because they cannot be run within the boundaries of 
-      BLFS.  Remove this if you have installed the external dependencies
-      and wish to run the tests.
-    </para>
-
-    <para revision="sysv">
-      <parameter>-Dsystemdsystemunitdir=/tmp</parameter>: Removes
-      the dependency on <application>systemd</application>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Power-profiles-daemon</title>
-
-    <sect3  id="power-profiles-daemon-init" revision="sysv">
-      <title>Boot Script</title>
-
-      <para>
-        To automatically start the <command>power-profiles-daemon</command> when the
-        system is rebooted, install the
-        <filename>/etc/rc.d/init.d/power-profiles-daemon</filename> bootscript from the
-        <xref linkend="bootscripts" revision="sysv"/> as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-      <indexterm zone="power-profiles-daemon power-profiles-daemon-init">
-        <primary sortas="f-Power-profiles-daemon">power-profiles-daemon</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-power-profiles-daemon</userinput></screen>
-    </sect3>
-
-
-    <sect3 id="power-profiles-daemon-systemd" revision="systemd">
-      <title>Systemd Unit</title>
-
-      <para>
-        To start the power-profiles-daemon on boot, enable the systemd 
-        service that was installed by running the following command as the
-        <systemitem class="username">root</systemitem> user: 
-      </para>
-
-      <screen role="root"><userinput>systemctl enable power-profiles-daemon</userinput></screen>
-    </sect3>
-
-    <sect3>
-      <title>Select a Power Profile</title>
-
-      <para>
-        To list all supported power profiles, issue:
-      </para>
-
-      <screen role="nodump"><userinput>powerprofilesctl</userinput></screen>
-
-      <para>
-        To activate a power profile (for example
-        <replaceable>performance</replaceable>), issue:
-      </para>
-
-      <screen role="nodump"><userinput>powerprofilesctl set <replaceable>performance</replaceable></userinput></screen>
-
-      <para>
-        Some desktop environments (for example GNOME and KDE) also provide
-        a graphical interface to interact with
-        <command>power-profiles-daemon</command> and activate a power
-        profile.
-      </para>
-
-      <para>
-        The activated power profile is automatically stored in
-        <filename>/var/lib/power-profiles-daemon/state.ini</filename> and
-        <command>power-profiles-daemon</command> will read it out and
-        activate it again on the next boot if the
-        <phrase revision='sysv'>bootscript is
-        installed</phrase><phrase revision='systemd'>Systemd
-        unit is enabled</phrase> as above.
-      </para>
-    </sect3>
-
-  </sect2>
-
-
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          powerprofilesctl
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="powerprofilesctl">
-        <term><command>powerprofilesctl</command></term>
-        <listitem>
-          <para>
-            This allows the user to set the power governor of the
-            CPU.
-          </para>
-          <indexterm zone="powerprofilesctl">
-            <primary sortas="b-powerprofilesctl">powerprofilesctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-  </sect2>
-</sect1>
Index: general/sysutils/raptor.xml
===================================================================
--- general/sysutils/raptor.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,196 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 raptor-download-http "https://download.librdf.org/source/raptor2-&raptor-version;.tar.gz">
-  <!ENTITY raptor-download-ftp  " ">
-  <!ENTITY raptor-md5sum        "0a71f13b6eaa0a04bf411083d89d7bc2">
-  <!ENTITY raptor-size          "1.7 MB">
-  <!ENTITY raptor-buildsize     "25 MB (additional 2 MB for the tests)">
-  <!ENTITY raptor-time          "0.1 SBU (additional 0.3 SBU for the tests)">
-]>
-
-<sect1 id="raptor" xreflabel="Raptor-&raptor-version;">
-  <?dbhtml filename="raptor.html"?>
-
-
-  <title>Raptor-&raptor-version;</title>
-
-  <indexterm zone="raptor">
-    <primary sortas="a-Raptor">Raptor</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Raptor</title>
-
-    <para>
-      <application>Raptor</application> is a C library that provides a set of
-      parsers and serializers that generate Resource Description Framework
-      (RDF) triples.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&raptor-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&raptor-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &raptor-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &raptor-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &raptor-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &raptor-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/raptor-&raptor-version;-security_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Raptor Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="curl"/> and
-      <xref linkend="libxslt"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="icu"/> and
-      <ulink url="https://lloyd.github.io/yajl/">libyajl</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Raptor</title>
-
-    <para>
-      First, fix an incompatibility with libxml2-2.11.x:
-    </para>
-
-<screen><userinput remap="pre">sed -i 's/20627/20627 \&amp;\&amp; LIBXML_VERSION &lt; 21100/' src/raptor_libxml.c</userinput></screen>
-
-    <para>
-      Install <application>Raptor</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-      Several of the XML tests may fail.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <option>--with-icu-config=/usr/bin/icu-config</option>: Use
-      this switch if you have installed <xref linkend="icu"/> and wish
-      to build <application>Raptor</application> with its support.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          rapper
-        </seg>
-        <seg>
-          libraptor2.so
-        </seg>
-        <seg>
-          /usr/include/raptor2 and
-          /usr/share/gtk-doc/html/raptor2
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="rapper">
-        <term><command>rapper</command></term>
-        <listitem>
-          <para>
-            is a RDF parsing and serializing utility
-          </para>
-          <indexterm zone="raptor rapper">
-            <primary sortas="b-rapper">rapper</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libraptor2">
-        <term><filename class="libraryfile">libraptor2.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Raptor</application> API functions
-          </para>
-          <indexterm zone="raptor libraptor2">
-            <primary sortas="c-libraptor2">libraptor2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/rasqal.xml
===================================================================
--- general/sysutils/rasqal.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,173 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 rasqal-download-http "https://download.librdf.org/source/rasqal-&rasqal-version;.tar.gz">
-  <!ENTITY rasqal-download-ftp  " ">
-  <!ENTITY rasqal-md5sum        "1f5def51ca0026cd192958ef07228b52">
-  <!ENTITY rasqal-size          "1.6 MB">
-  <!ENTITY rasqal-buildsize     "22 MB (additional 4 MB for the tests)">
-  <!ENTITY rasqal-time          "0.3 SBU (additional 0.7 SBU for the tests)">
-]>
-
-<sect1 id="rasqal" xreflabel="Rasqal-&rasqal-version;">
-  <?dbhtml filename="rasqal.html"?>
-
-
-  <title>Rasqal-&rasqal-version;</title>
-
-  <indexterm zone="rasqal">
-    <primary sortas="a-Rasqal">Rasqal</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Rasqal</title>
-
-    <para>
-      <application>Rasqal</application> is a C library that handles Resource
-      Description Framework (RDF) query language syntaxes, query construction, and
-      execution of queries returning results as bindings, boolean, RDF graphs/triples
-      or syntaxes.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&rasqal-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&rasqal-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &rasqal-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &rasqal-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &rasqal-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &rasqal-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Rasqal Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="raptor"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <!-- <xref linkend="pcre2"/> the next rasqal release will support it -->
-      <xref linkend="libgcrypt"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Rasqal</title>
-
-    <para>
-      Install <application>Rasqal</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          rasqal-config and roqet
-        </seg>
-        <seg>
-          librasqal.so
-        </seg>
-        <seg>
-          /usr/include/rasqal and
-          /usr/share/gtk-doc/html/rasqal
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="rasqal-config">
-        <term><command>rasqal-config</command></term>
-        <listitem>
-          <para>
-            is an utility for retrieving the installation options
-            of <application>Rasqal</application>
-          </para>
-          <indexterm zone="rasqal rasqal-config">
-            <primary sortas="b-rasqal-config">rasqal-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="roqet">
-        <term><command>roqet</command></term>
-        <listitem>
-          <para>
-            is an RDF query utility
-          </para>
-          <indexterm zone="rasqal roqet">
-            <primary sortas="b-roqet">roqet</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/redland.xml
===================================================================
--- general/sysutils/redland.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,183 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 redland-download-http "https://download.librdf.org/source/redland-&redland-version;.tar.gz">
-  <!ENTITY redland-download-ftp  " ">
-  <!ENTITY redland-md5sum        "e5be03eda13ef68aabab6e42aa67715e">
-  <!ENTITY redland-size          "1.6 MB">
-  <!ENTITY redland-buildsize     "18 MB">
-  <!ENTITY redland-time          "0.2 SBU">
-]>
-
-<sect1 id="redland" xreflabel="Redland-&redland-version;">
-  <?dbhtml filename="redland.html"?>
-
-
-  <title>Redland-&redland-version;</title>
-
-  <indexterm zone="redland">
-    <primary sortas="a-Redland">Redland</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Redland</title>
-
-    <para>
-      <application>Redland</application> is a set of free software C libraries
-      that provide support for the Resource Description Framework (RDF).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&redland-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&redland-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &redland-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &redland-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &redland-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &redland-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Redland Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="rasqal"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libiodbc"/>,
-      <xref linkend="sqlite"/>,
-      <xref linkend="mariadb"/> or <ulink url="https://www.mysql.com/">MySQL</ulink>,
-      <xref linkend="postgresql"/>,
-      &berkeley-db;
-      <ulink url="&sourceforge-dl;/virtuoso/">virtuoso</ulink>, and
-      <ulink url="https://sourceforge.net/projects/threestore/">3store</ulink>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Redland</title>
-
-    <para>
-      Install <application>Redland</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>rdfproc, redland-config and redland-db-upgrade</seg>
-        <seg>librdf.so and /usr/lib/redland/librdf_storage_*.so</seg>
-        <seg>/usr/lib/redland, /usr/share/gtk-doc/html/redland and
-        /usr/share/redland</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="rdfproc">
-        <term><command>rdfproc</command></term>
-        <listitem>
-          <para>
-            is the Redland RDF processor utility
-          </para>
-          <indexterm zone="redland rdfproc">
-            <primary sortas="b-rdfproc">rdfproc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="redland-config">
-        <term><command>redland-config</command></term>
-        <listitem>
-          <para>
-            is a script to get information about the installed version
-            of Redland
-          </para>
-          <indexterm zone="redland redland-config">
-            <primary sortas="b-redland-config">redland-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="redland-db-upgrade">
-        <term><command>redland-db-upgrade</command></term>
-        <listitem>
-          <para>
-            upgrades older Redland databases to 0.9.12 format
-          </para>
-          <indexterm zone="redland redland-db-upgrade">
-            <primary sortas="b-redland-db-upgrade">redland-db-upgrade</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/sg3_utils.xml
===================================================================
--- general/sysutils/sg3_utils.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,1146 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 sg3_utils-download-http "https://sg.danny.cz/sg/p/sg3_utils-&sg3_utils-version;.tar.xz">
-  <!ENTITY sg3_utils-download-ftp  " ">
-  <!ENTITY sg3_utils-md5sum        "0024393d2d2942cc081ce613d98db68a">
-  <!ENTITY sg3_utils-size          "1.2 MB">
-  <!ENTITY sg3_utils-buildsize     "27 MB">
-  <!ENTITY sg3_utils-time          "0.2 SBU">
-]>
-
-<sect1 id="sg3_utils" xreflabel="sg3_utils-&sg3_utils-version;">
-  <?dbhtml filename="sg3_utils.html"?>
-
-
-  <title>sg3_utils-&sg3_utils-version;</title>
-
-  <indexterm zone="sg3_utils">
-    <primary sortas="a-sg3_utils">sg3_utils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to sg3_utils</title>
-
-    <para>
-      The <application>sg3_utils</application> package contains low level
-      utilities for devices that use a SCSI command set. Apart from SCSI parallel
-      interface (SPI) devices, the SCSI command set is used by ATAPI devices
-      (CD/DVDs and tapes), USB mass storage devices, Fibre Channel disks, IEEE
-      1394 storage devices (that use the "SBP" protocol), SAS, iSCSI and FCoE
-      devices (amongst others).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&sg3_utils-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&sg3_utils-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &sg3_utils-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &sg3_utils-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &sg3_utils-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &sg3_utils-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!-- No longer needed as 1.44 fixes the sysmacros.h use
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/sg3_utils-&sg3_utils-version;-glibc_2.28-fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of sg3_utils</title>
-
-    <para>
-      Install <application>sg3_utils</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          rescan-scsi-bus.sh, scsi_logging_level, scsi_mandat, scsi_readcap,
-          scsi_ready, scsi_satl, scsi_start, scsi_stop, scsi_temperature,
-          sg_bg_ctl, sg_compare_and_write, sg_copy_results, sg_dd,
-          sg_decode_sense, sg_emc_trespass, sg_format,
-          sg_get_config, sg_get_lba_status, sg_ident, sg_inq, sg_logs, sg_luns,
-          sg_map, sg_map26, sg_modes, sg_opcodes, sg_persist, sg_prevent,
-          sg_raw, sg_rbuf, sg_rdac, sg_read, sg_read_attr, sg_read_block_limits,
-          sg_read_buffer, sg_read_long, sg_readcap, sg_reassign, sg_referrals,
-          sg_rep_pip, sg_rep_zones, sg_requests, sg_reset, sg_reset_wp,
-          sg_rmsn, sg_rtpg, sg_safte, sg_sanitize, sg_sat_identify,
-          sg_sat_phy_event, sg_sat_read_gplog, sg_sat_set_features, sg_scan,
-          sg_seek, sg_senddiag, sg_ses, sg_ses_microcode, sg_start, sg_stpg,
-          sg_stream_ctl, sg_sync, sg_test_rwbuf, sg_timestamp,
-          sg_turs, sg_unmap, sg_verify, sg_vpd, sg_wr_mode, sg_write_buffer,
-          sg_write_long, sg_write_same, sg_write_verify, sg_write_x, sg_xcopy, sg_zone,
-          sginfo, sgm_dd, and sgp_dd
-        </seg>
-        <seg>
-          libsgutils2.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="rescan-scsi-bus.sh">
-        <term><command>rescan-scsi-bus.sh</command></term>
-        <listitem>
-          <para>
-            adds or removes SCSI devices without having to reboot
-          </para>
-          <indexterm zone="sg3_utils rescan-scsi-bus.sh">
-            <primary sortas="b-rescan-scsi-bus.sh">rescan-scsi-bus.sh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="scsi_logging_level">
-        <term><command>scsi_logging_level</command></term>
-        <listitem>
-          <para>
-            accesses Linux SCSI logging level information
-          </para>
-          <indexterm zone="sg3_utils scsi_logging_level">
-            <primary sortas="b-scsi_logging_level">scsi_logging_level</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="scsi_mandat">
-        <term><command>scsi_mandat</command></term>
-        <listitem>
-          <para>
-            checks SCSI device support for mandatory commands
-          </para>
-          <indexterm zone="sg3_utils scsi_mandat">
-            <primary sortas="b-scsi_mandat">scsi_mandat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="scsi_readcap">
-        <term><command>scsi_readcap</command></term>
-        <listitem>
-          <para>
-            does the SCSI READ CAPACITY command on disks
-          </para>
-          <indexterm zone="sg3_utils scsi_readcap">
-            <primary sortas="b-scsi_readcap">scsi_readcap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="scsi_ready">
-        <term><command>scsi_ready</command></term>
-        <listitem>
-          <para>
-            does the SCSI TEST UNIT READY on devices
-          </para>
-          <indexterm zone="sg3_utils scsi_ready">
-            <primary sortas="b-scsi_ready">scsi_ready</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="scsi_satl">
-        <term><command>scsi_satl</command></term>
-        <listitem>
-          <para>
-            checks for SCSI to ATA Translation (SAT) device support
-          </para>
-          <indexterm zone="sg3_utils scsi_satl">
-            <primary sortas="b-scsi_satl">scsi_satl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="scsi_start">
-        <term><command>scsi_start</command></term>
-        <listitem>
-          <para>
-            starts one or more SCSI disks
-          </para>
-          <indexterm zone="sg3_utils scsi_start">
-            <primary sortas="b-scsi_start">scsi_start</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="scsi_stop">
-        <term><command>scsi_stop</command></term>
-        <listitem>
-          <para>
-            stops one or more SCSI disks
-          </para>
-          <indexterm zone="sg3_utils scsi_stop">
-            <primary sortas="b-scsi_stop">scsi_stop</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="scsi_temperature">
-        <term><command>scsi_temperature</command></term>
-        <listitem>
-          <para>
-            fetches the temperature of a SCSI device
-          </para>
-          <indexterm zone="sg3_utils scsi_temperature">
-            <primary sortas="b-scsi_temperature">scsi_temperature</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_bg_ctl">
-        <term><command>sg_bg_ctl</command></term>
-        <listitem>
-          <para>
-            performs a SCSI BACKGROUND CONTROL command on a device to perform
-            "advanced background operations"
-          </para>
-          <indexterm zone="sg3_utils sg_bg_ctl">
-            <primary sortas="b-sg_bg_ctl">sg_bg_ctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_compare_and_write">
-        <term><command>sg_compare_and_write</command></term>
-        <listitem>
-          <para>
-            sends the SCSI COMPARE AND WRITE command to device
-          </para>
-          <indexterm zone="sg3_utils sg_compare_and_write">
-            <primary sortas="b-sg_compare_and_write">sg_compare_and_write</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_copy_results">
-        <term><command>sg_copy_results</command></term>
-        <listitem>
-          <para>
-            sends the SCSI RECEIVE COPY RESULTS command (XCOPY related)
-          </para>
-          <indexterm zone="sg3_utils sg_copy_results">
-            <primary sortas="b-sg_copy_results">sg_copy_results</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_dd">
-        <term><command>sg_dd</command></term>
-        <listitem>
-          <para>
-            copies data to and from files and devices. Specialised for
-            devices that understand the SCSI command set
-          </para>
-          <indexterm zone="sg3_utils sg_dd">
-            <primary sortas="b-sg_dd">sg_dd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_decode_sense">
-        <term><command>sg_decode_sense</command></term>
-        <listitem>
-          <para>
-            takes SCSI sense data in binary or as a sequence
-            of ASCII hexadecimal bytes and decodes it
-          </para>
-          <indexterm zone="sg3_utils sg_decode_sense">
-            <primary sortas="b-sg_decode_sense">sg_decode_sense</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_emc_trespass">
-        <term><command>sg_emc_trespass</command></term>
-        <listitem>
-          <para>
-            changes ownership of a LUN from another Service-Processor to
-            this one
-          </para>
-          <indexterm zone="sg3_utils sg_emc_trespass">
-            <primary sortas="b-sg_emc_trespass">sg_emc_trespass</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_format">
-        <term><command>sg_format</command></term>
-        <listitem>
-          <para>
-            formats or resizes a SCSI disk (perhaps changes its block size)
-          </para>
-          <indexterm zone="sg3_utils sg_format">
-            <primary sortas="b-sg_format">sg_format</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_get_config">
-        <term><command>sg_get_config</command></term>
-        <listitem>
-          <para>
-            sends a SCSI GET CONFIGURATION command (MMC-4 +)
-          </para>
-          <indexterm zone="sg3_utils sg_get_config">
-            <primary sortas="b-sg_get_config">sg_get_config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_get_elem_status">
-        <term><command>sg_get_elem_status</command></term>
-        <listitem>
-          <para>
-            sends a SCSI GET PHYSICAL ELEMENT STATUS command to a device
-          </para>
-          <indexterm zone="sg3_utils sg_get_elem_status">
-            <primary sortas="b-sg_get_elem_status">sg_get_elem_status</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_get_lba_status">
-        <term><command>sg_get_lba_status</command></term>
-        <listitem>
-          <para>
-            sends the SCSI GET LBA STATUS command
-          </para>
-          <indexterm zone="sg3_utils sg_get_lba_status">
-            <primary sortas="b-sg_get_lba_status">sg_get_lba_status</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_ident">
-        <term><command>sg_ident</command></term>
-        <listitem>
-          <para>
-            sends a SCSI REPORT or SET IDENTIFYING INFORMATION command
-          </para>
-          <indexterm zone="sg3_utils sg_ident">
-            <primary sortas="b-sg_ident">sg_ident</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sginfo">
-        <term><command>sginfo</command></term>
-        <listitem>
-          <para>
-            access mode page information for a SCSI (or ATAPI) device
-          </para>
-          <indexterm zone="sg3_utils sginfo">
-            <primary sortas="b-sginfo">sginfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_inq">
-        <term><command>sg_inq</command></term>
-        <listitem>
-          <para>
-            sends a SCSI INQUIRY or ATA IDENTIFY (PACKET) DEVICE command and
-            outputs the response
-          </para>
-          <indexterm zone="sg3_utils sg_inq">
-            <primary sortas="b-sg_inq">sg_inq</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_logs">
-        <term><command>sg_logs</command></term>
-        <listitem>
-          <para>
-            access log pages with SCSI LOG SENSE command
-          </para>
-          <indexterm zone="sg3_utils sg_logs">
-            <primary sortas="b-sg_logs">sg_logs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_luns">
-        <term><command>sg_luns</command></term>
-        <listitem>
-          <para>
-            sends the SCSI REPORT LUNS command
-          </para>
-          <indexterm zone="sg3_utils sg_luns">
-            <primary sortas="b-sg_luns">sg_luns</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_map">
-        <term><command>sg_map</command></term>
-        <listitem>
-          <para>
-            displays mapping between linux sg and other SCSI devices
-          </para>
-          <indexterm zone="sg3_utils sg_map">
-            <primary sortas="b-sg_map">sg_map</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_map26">
-        <term><command>sg_map26</command></term>
-        <listitem>
-          <para>
-            maps a special file to a SCSI generic (sg) device (or vice versa)
-          </para>
-          <indexterm zone="sg3_utils sg_map26">
-            <primary sortas="b-sg_map26">sg_map26</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sgm_dd">
-        <term><command>sgm_dd</command></term>
-        <listitem>
-          <para>
-            copies data to and from files and devices. Specialized for
-            devices that understand the SCSI command set and does memory mapped
-            transfers from sg devices
-          </para>
-          <indexterm zone="sg3_utils sgm_dd">
-            <primary sortas="b-sgm_dd">sgm_dd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_modes">
-        <term><command>sg_modes</command></term>
-        <listitem>
-          <para>
-            reads mode pages with the SCSI MODE SENSE command
-          </para>
-          <indexterm zone="sg3_utils sg_modes">
-            <primary sortas="b-sg_modes">sg_modes</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_opcodes">
-        <term><command>sg_opcodes</command></term>
-        <listitem>
-          <para>
-            reports information on supported SCSI commands or task
-            management functions
-          </para>
-          <indexterm zone="sg3_utils sg_opcodes">
-            <primary sortas="b-sg_opcodes">sg_opcodes</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sgp_dd">
-        <term><command>sgp_dd</command></term>
-        <listitem>
-          <para>
-            copies data to and from files and devices. Specialized for
-            devices that understand the SCSI command set
-          </para>
-          <indexterm zone="sg3_utils sgp_dd">
-            <primary sortas="b-sgp_dd">sgp_dd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_persist">
-        <term><command>sg_persist</command></term>
-        <listitem>
-          <para>
-            sends a SCSI PERSISTENT RESERVE (IN or OUT) command to
-            manipulate registrations and reservations
-          </para>
-          <indexterm zone="sg3_utils sg_persist">
-            <primary sortas="b-sg_persist">sg_persist</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_prevent">
-        <term><command>sg_prevent</command></term>
-        <listitem>
-          <para>
-            sends a SCSI PREVENT ALLOW MEDIUM REMOVAL command
-          </para>
-          <indexterm zone="sg3_utils sg_prevent">
-            <primary sortas="b-sg_prevent">sg_prevent</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_raw">
-        <term><command>sg_raw</command></term>
-        <listitem>
-          <para>
-            sends an arbitrary SCSI command to a device
-          </para>
-          <indexterm zone="sg3_utils sg_raw">
-            <primary sortas="b-sg_raw">sg_raw</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_rbuf">
-        <term><command>sg_rbuf</command></term>
-        <listitem>
-          <para>
-            reads data using the SCSI READ BUFFER command
-          </para>
-          <indexterm zone="sg3_utils sg_rbuf">
-            <primary sortas="b-sg_rbuf">sg_rbuf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_rdac">
-        <term><command>sg_rdac</command></term>
-        <listitem>
-          <para>
-            displays or modifies the RDAC Redundant Controller Page
-          </para>
-          <indexterm zone="sg3_utils sg_rdac">
-            <primary sortas="b-sg_rdac">sg_rdac</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_read">
-        <term><command>sg_read</command></term>
-        <listitem>
-          <para>
-            reads blocks of data continually from the same offset
-          </para>
-          <indexterm zone="sg3_utils sg_read">
-            <primary sortas="b-sg_read">sg_read</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_read_attr">
-        <term><command>sg_read_attr</command></term>
-        <listitem>
-          <para>
-            performs a SCSI READ ATTRIBUTE command on a device
-          </para>
-          <indexterm zone="sg3_utils sg_read_attr">
-            <primary sortas="b-sg_read_attr">sg_read_attr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_read_block_limits">
-        <term><command>sg_read_block_limits</command></term>
-        <listitem>
-          <para>
-            sends a SCSI READ BLOCK LIMITS command
-          </para>
-          <indexterm zone="sg3_utils sg_read_block_limits">
-            <primary sortas="b-sg_read_block_limits">sg_read_block_limits</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_read_buffer">
-        <term><command>sg_read_buffer</command></term>
-        <listitem>
-          <para>
-            sends a SCSI READ BUFFER command
-          </para>
-          <indexterm zone="sg3_utils sg_read_buffer">
-            <primary sortas="b-sg_read_buffer">sg_read_buffer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_readcap">
-        <term><command>sg_readcap</command></term>
-        <listitem>
-          <para>
-            sends a SCSI READ CAPACITY command
-          </para>
-          <indexterm zone="sg3_utils sg_readcap">
-            <primary sortas="b-sg_readcap">sg_readcap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_read_long">
-        <term><command>sg_read_long</command></term>
-        <listitem>
-          <para>
-            sends a SCSI READ LONG command
-          </para>
-          <indexterm zone="sg3_utils sg_read_long">
-            <primary sortas="b-sg_read_long">sg_read_long</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_reassign">
-        <term><command>sg_reassign</command></term>
-        <listitem>
-          <para>
-            sends a SCSI REASSIGN BLOCKS command
-          </para>
-          <indexterm zone="sg3_utils sg_reassign">
-            <primary sortas="b-sg_reassign">sg_reassign</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_referrals">
-        <term><command>sg_referrals</command></term>
-        <listitem>
-          <para>
-            sends a SCSI REPORT REFERRALS command
-          </para>
-          <indexterm zone="sg3_utils sg_referrals">
-            <primary sortas="b-sg_referrals">sg_referrals</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_rep_pip">
-        <term><command>sg_rep_pip</command></term>
-        <listitem>
-          <para>
-            sends a SCSI REPORT PROVISIONING INITIALIZATION PATTERN command
-          </para>
-          <indexterm zone="sg3_utils sg_rep_pip">
-            <primary sortas="b-sg_rep_pip">sg_rep_pip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_rep_zones">
-        <term><command>sg_rep_zones</command></term>
-        <listitem>
-          <para>
-            sends a SCSI REPORT ZONES command
-          </para>
-          <indexterm zone="sg3_utils sg_rep_zones">
-            <primary sortas="b-sg_rep_zones">sg_rep_zones</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_requests">
-        <term><command>sg_requests</command></term>
-        <listitem>
-          <para>
-            sends one or more SCSI REQUEST SENSE commands
-          </para>
-          <indexterm zone="sg3_utils sg_requests">
-            <primary sortas="b-sg_requests">sg_requests</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_reset">
-        <term><command>sg_reset</command></term>
-        <listitem>
-          <para>
-            sends a SCSI device, target, bus or host reset; or checks reset state
-          </para>
-          <indexterm zone="sg3_utils sg_reset">
-            <primary sortas="b-sg_reset">sg_reset</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_reset_wp">
-        <term><command>sg_reset_wp</command></term>
-        <listitem>
-          <para>
-            sends a SCSI RESET WRITE POINTER command
-          </para>
-          <indexterm zone="sg3_utils sg_reset_wp">
-            <primary sortas="b-sg_reset_wp">sg_reset_wp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_rmsn">
-        <term><command>sg_rmsn</command></term>
-        <listitem>
-          <para>
-            sends a SCSI READ MEDIA SERIAL NUMBER command
-          </para>
-          <indexterm zone="sg3_utils sg_rmsn">
-            <primary sortas="b-sg_rmsn">sg_rmsn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_rtpg">
-        <term><command>sg_rtpg</command></term>
-        <listitem>
-          <para>
-            sends a SCSI REPORT TARGET PORT GROUPS command
-          </para>
-          <indexterm zone="sg3_utils sg_rtpg">
-            <primary sortas="b-sg_rtpg">sg_rtpg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_safte">
-        <term><command>sg_safte</command></term>
-        <listitem>
-          <para>
-            fetches status information from a SCSI Accessed Fault-Tolerant
-            Enclosure (SAF-TE) device
-          </para>
-          <indexterm zone="sg3_utils sg_safte">
-            <primary sortas="b-sg_safte">sg_safte</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_sanitize">
-        <term><command>sg_sanitize</command></term>
-        <listitem>
-          <para>
-            sends a SCSI SANITIZE command
-          </para>
-          <indexterm zone="sg3_utils sg_sanitize">
-            <primary sortas="b-sg_sanitize">sg_sanitize</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_sat_identify">
-        <term><command>sg_sat_identify</command></term>
-        <listitem>
-          <para>
-            sends an ATA IDENTIFY (PACKET) DEVICE command via a SCSI to ATA
-            Translation (SAT) layer
-          </para>
-          <indexterm zone="sg3_utils sg_sat_identify">
-            <primary sortas="b-sg_sat_identify">sg_sat_identify</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_sat_phy_event">
-        <term><command>sg_sat_phy_event</command></term>
-        <listitem>
-          <para>
-            sends an ATA READ LOG EXT command via a SAT pass through to
-            fetch log page 11h which contains SATA phy event counters
-          </para>
-          <indexterm zone="sg3_utils sg_sat_phy_event">
-            <primary sortas="b-sg_sat_phy_event">sg_sat_phy_event</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-
-      <varlistentry id="sg_sat_read_gplog">
-        <term><command>sg_sat_read_gplog</command></term>
-        <listitem>
-          <para>
-             sends an ATA READ LOG EXT command via a SCSI to ATA Translation
-             (SAT) layer
-          </para>
-          <indexterm zone="sg3_utils sg_sat_read_gplog">
-            <primary sortas="b-sg_sat_read_gplog">sg_sat_read_gplog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <varlistentry id="sg_sat_set_features">
-        <term><command>sg_sat_set_features</command></term>
-        <listitem>
-          <para>
-            sends an ATA SET FEATURES command via a SCSI to ATA Translation
-            (SAT) layer
-          </para>
-          <indexterm zone="sg3_utils sg_sat_set_features">
-            <primary sortas="b-sg_sat_set_features">sg_sat_set_features</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_scan">
-        <term><command>sg_scan</command></term>
-        <listitem>
-          <para>
-            does a scan of sg devices (or given SCSI/ATAPI/ATA devices) and
-            prints the results
-          </para>
-          <indexterm zone="sg3_utils sg_scan">
-            <primary sortas="b-sg_scan">sg_scan</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_seek">
-        <term><command>sg_seek</command></term>
-        <listitem>
-          <para>
-            performs a SCSI SEEK or PRE-FETCH command on a device and it's cache
-          </para>
-          <indexterm zone="sg3_utils sg_seek">
-            <primary sortas="b-sg_seek">sg_seek</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_senddiag">
-        <term><command>sg_senddiag</command></term>
-        <listitem>
-          <para>
-            performs a SCSI SEND DIAGNOSTIC command
-          </para>
-          <indexterm zone="sg3_utils sg_senddiag">
-            <primary sortas="b-sg_senddiag">sg_senddiag</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_ses">
-        <term><command>sg_ses</command></term>
-        <listitem>
-          <para>
-            sends controls and fetches the current status from a SCSI Enclosure
-            Services (SES) device
-          </para>
-          <indexterm zone="sg3_utils sg_ses">
-            <primary sortas="b-sg_ses">sg_ses</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_ses_microcode">
-        <term><command>sg_ses_microcode</command></term>
-        <listitem>
-          <para>
-            sends microcode to a SCSI enclosure
-          </para>
-          <indexterm zone="sg3_utils sg_ses_microcode">
-            <primary sortas="b-sg_ses_microcode">sg_ses_microcode</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_start">
-        <term><command>sg_start</command></term>
-        <listitem>
-          <para>
-            sends a SCSI START STOP UNIT command to start, stop, load or eject
-            medium
-          </para>
-          <indexterm zone="sg3_utils sg_start">
-            <primary sortas="b-sg_start">sg_start</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_stpg">
-        <term><command>sg_stpg</command></term>
-        <listitem>
-          <para>
-            sends a SCSI SET TARGET PORT GROUPS command
-          </para>
-          <indexterm zone="sg3_utils sg_stpg">
-            <primary sortas="b-sg_stpg">sg_stpg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_stream_ctl">
-        <term><command>sg_stream_ctl</command></term>
-        <listitem>
-          <para>
-            performs a SCSI STREAM CONTROL or GET STREAM STATUS command on a device
-            to open or close an I/O stream
-          </para>
-          <indexterm zone="sg3_utils sg_stream_ctl">
-            <primary sortas="b-sg_stream_ctl">sg_stream_ctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_sync">
-        <term><command>sg_sync</command></term>
-        <listitem>
-          <para>
-            sends a SCSI command to synchronize the cache
-          </para>
-          <indexterm zone="sg3_utils sg_sync">
-            <primary sortas="b-sg_sync">sg_sync</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_test_rwbuf">
-        <term><command>sg_test_rwbuf</command></term>
-        <listitem>
-          <para>
-            tests the SCSI host adapter by issuing write and read operations
-            on a device's buffer and calculating checksums
-          </para>
-          <indexterm zone="sg3_utils sg_test_rwbuf">
-            <primary sortas="b-sg_test_rwbuf">sg_test_rwbuf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_timestamp">
-        <term><command>sg_timestamp</command></term>
-        <listitem>
-          <para>
-            reports or sets the timestamp on a SCSI device
-          </para>
-          <indexterm zone="sg3_utils sg_timestamp">
-            <primary sortas="b-sg_timestamp">sg_timestamp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_turs">
-        <term><command>sg_turs</command></term>
-        <listitem>
-          <para>
-            sends one or more SCSI TEST UNIT READY commands
-          </para>
-          <indexterm zone="sg3_utils sg_turs">
-            <primary sortas="b-sg_turs">sg_turs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_unmap">
-        <term><command>sg_unmap</command></term>
-        <listitem>
-          <para>
-            sends a SCSI UNMAP command
-          </para>
-          <indexterm zone="sg3_utils sg_unmap">
-            <primary sortas="b-sg_unmap">sg_unmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_verify">
-        <term><command>sg_verify</command></term>
-        <listitem>
-          <para>
-            invokes SCSI VERIFY command(s) on a block device
-          </para>
-          <indexterm zone="sg3_utils sg_verify">
-            <primary sortas="b-sg_verify">sg_verify</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_vpd">
-        <term><command>sg_vpd</command></term>
-        <listitem>
-          <para>
-            fetches Vital Product Data (VPD) pages using a SCSI INQUIRY
-            command
-          </para>
-          <indexterm zone="sg3_utils sg_vpd">
-            <primary sortas="b-sg_vpd">sg_vpd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_write_buffer">
-        <term><command>sg_write_buffer</command></term>
-        <listitem>
-          <para>
-            sends a SCSI WRITE BUFFER command
-          </para>
-          <indexterm zone="sg3_utils sg_write_buffer">
-            <primary sortas="b-sg_write_buffer">sg_write_buffer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_write_long">
-        <term><command>sg_write_long</command></term>
-        <listitem>
-          <para>
-            sends a SCSI WRITE LONG command
-          </para>
-          <indexterm zone="sg3_utils sg_write_long">
-            <primary sortas="b-sg_write_long">sg_write_long</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_write_same">
-        <term><command>sg_write_same</command></term>
-        <listitem>
-          <para>
-            sends a SCSI WRITE SAME command
-          </para>
-          <indexterm zone="sg3_utils sg_write_same">
-            <primary sortas="b-sg_write_same">sg_write_same</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_write_verify">
-        <term><command>sg_write_verify</command></term>
-        <listitem>
-          <para>
-            sends a SCSI WRITE AND VERIFY command
-          </para>
-          <indexterm zone="sg3_utils sg_write_verify">
-            <primary sortas="b-sg_write_verify">sg_write_verify</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_write_x">
-        <term><command>sg_write_x</command></term>
-        <listitem>
-          <para>
-            performs SCSI WRITE commands on a device
-          </para>
-          <indexterm zone="sg3_utils sg_write_x">
-            <primary sortas="b-sg_write_x">sg_write_x</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_wr_mode">
-        <term><command>sg_wr_mode</command></term>
-        <listitem>
-          <para>
-            writes mode pages
-          </para>
-          <indexterm zone="sg3_utils sg_wr_mode">
-            <primary sortas="b-sg_wr_mode">sg_wr_mode</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_xcopy">
-        <term><command>sg_xcopy</command></term>
-        <listitem>
-          <para>
-            copies data to and from files and devices
-            using SCSI EXTENDED COPY (XCOPY)
-          </para>
-          <indexterm zone="sg3_utils sg_xcopy">
-            <primary sortas="b-sg_xcopy">sg_xcopy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg_zone">
-        <term><command>sg_zone</command></term>
-        <listitem>
-          <para>
-            performs SCSI ZONE commands on a device, such as OPEN, CLOSE, FINISH
-            or SEQUENTIALIZE
-          </para>
-          <indexterm zone="sg3_utils sg_zone">
-            <primary sortas="b-sg_zone">sg_zone</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libsgutils2">
-        <term><filename class="libraryfile">libsgutils2.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>sg3_utils</application> API functions
-          </para>
-          <indexterm zone="sg3_utils libsgutils2">
-            <primary sortas="c-libsgutils2">libsgutils2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/sysmon-qt.xml
===================================================================
--- general/sysutils/sysmon-qt.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,143 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 sysmon-qt-download-http "https://github.com/lfs-book/sysmon-qt/releases/download/v&sysmon-qt-version;/sysmon-qt-&sysmon-qt-version;.tar.xz">
-  <!ENTITY sysmon-qt-download-ftp  " ">
-  <!ENTITY sysmon-qt-md5sum        "9477952e6918c383cbfee36f710d0a34">
-  <!ENTITY sysmon-qt-size          "76 KB">
-  <!ENTITY sysmon-qt-buildsize     "1.1 MB">
-  <!ENTITY sysmon-qt-time          "0.3 SBU">
-]>
-
-<sect1 id="sysmon-qt" xreflabel="sysmon-qt-&sysmon-qt-version;">
-  <?dbhtml filename="sysmon-qt.html"?>
-
-
-  <title>sysmon-qt-&sysmon-qt-version;</title>
-
-  <indexterm zone="sysmon-qt">
-    <primary sortas="a-sysmon-qt">sysmon-qt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to sysmon-qt</title>
-
-    <para>
-      The <application>sysmon-qt</application> package provides a 
-      program to monitor system values including CPU usage, memory
-      usage, and system temperatures in a compact screen window.
-    </para>
-
-    &lfs121_checked;
-
-    <note>
-      <para>
-        There is also a version of this package, 
-        <application>sysmon-qt-1.1</application>, at the same location as below
-        that is based on &qt5-deps;.  The build instructions are
-        identical to these.  The functionality is the 
-        same and it does not make sense to build both versions.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&sysmon-qt-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&sysmon-qt-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &sysmon-qt-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &sysmon-qt-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &sysmon-qt-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &sysmon-qt-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">sysmon-qt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="qt6"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="lm_sensors"/> (runtime)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of sysmon-qt</title>
-
-    <para>
-      Install <application>sysmon-qt</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>cd src               &amp;&amp;
-qmake6 sysmon-qt.pro &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>cp sysmon-qt                 /usr/bin                 &amp;&amp;
-cp ../data/sysmon-qt.desktop /usr/share/applications/ &amp;&amp;
-cp ../data/sysmon-qt.png     /usr/share/pixmaps/</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          sysmon-qt
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/sysstat.xml
===================================================================
--- general/sysutils/sysstat.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,374 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 sysstat-download-http "https://sysstat.github.io/sysstat-packages/sysstat-&sysstat-version;.tar.xz">
-  <!ENTITY sysstat-download-ftp  " ">
-  <!ENTITY sysstat-md5sum        "c5cac550f88327f0a93b12f6da93a0cb">
-  <!ENTITY sysstat-size          "896 KB">
-  <!ENTITY sysstat-buildsize     "29 MB">
-  <!ENTITY sysstat-time          "0.1 SBU">
-]>
-
-<sect1 id="sysstat" xreflabel="Sysstat-&sysstat-version;">
-  <?dbhtml filename="sysstat.html"?>
-
-
-  <title>Sysstat-&sysstat-version;</title>
-
-  <indexterm zone="sysstat">
-    <primary sortas="a-Sysstat">Sysstat</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Sysstat</title>
-
-    <para>
-      The <application>Sysstat</application> package contains utilities
-      to monitor system performance and usage activity.
-      <application>Sysstat</application> contains the <command>sar</command>
-      utility, common to many commercial Unixes, and tools you can schedule via
-      cron to collect and historize performance and activity data.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&sysstat-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&sysstat-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &sysstat-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &sysstat-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &sysstat-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &sysstat-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Sysstat Dependencies</bridgehead>
-
-    <para role="recommended">
-      There are no build-time requirements for this package; however,
-      it is designed to be controlled by a cron daemon such as
-      <xref linkend="fcron" role="runtime"/>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Sysstat</title>
-
-    <para>
-      Install <application>Sysstat</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>sa_lib_dir=/usr/lib/sa    \
-sa_dir=/var/log/sa        \
-conf_dir=/etc/sysstat     \
-./configure --prefix=/usr \
-            --disable-file-attr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a working test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para revision="systemd">
-      Install the systemd unit by running the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root" revision="systemd"><userinput>install -v -m644 sysstat.service /usr/lib/systemd/system/sysstat.service                      &amp;&amp;
-install -v -m644 cron/sysstat-collect.service /usr/lib/systemd/system/sysstat-collect.service &amp;&amp;
-install -v -m644 cron/sysstat-collect.timer /usr/lib/systemd/system/sysstat-collect.timer     &amp;&amp;
-install -v -m644 cron/sysstat-rotate.service /usr/lib/systemd/system/sysstat-roate.service    &amp;&amp;
-install -v -m644 cron/sysstat-rotate.timer /usr/lib/systemd/system/sysstat-rotate.timer       &amp;&amp;
-install -v -m644 cron/sysstat-summary.service /usr/lib/systemd/system/sysstat-summary.service &amp;&amp;
-install -v -m644 cron/sysstat-summary.timer /usr/lib/systemd/system/sysstat-summary.timer</userinput></screen>
-
-    <para revision="systemd">
-      Fix the systemd unit by running the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root" revision="systemd"><userinput>sed -i "/^Also=/d" /usr/lib/systemd/system/sysstat.service</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <envar>sa_lib_dir</envar>: This environment variable specifies the
-      location of the package-specific library directory.
-    </para>
-
-    <para>
-      <envar>sa_dir</envar>: This environment variable specifies the
-      location of the directory containing the data files.
-    </para>
-
-    <para>
-      <envar>conf_dir</envar>: This environment variable specifies the
-      location of the system configuration directory.
-    </para>
-
-    <para>
-      <parameter>--disable-file-attr</parameter>: Do not set attributes on
-      files being installed. This parameter causes the installation to ignore
-      the man group variable resulting in the man files having
-      <systemitem class="username">root</systemitem>:
-      <systemitem class="groupname">root</systemitem> ownership.
-    </para>
-
-    <note>
-      <para>
-        Run <command>./configure --help</command> to see other influential
-        environment variables you can pass to <command>configure</command>.
-        You may want to use the <envar>history</envar> and
-        <envar>compressafter</envar> variables to customize the amount of data
-        files kept on the system.
-      </para>
-    </note>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Sysstat</title>
-
-    <sect3 id="sysstat-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/sysconfig/sysstat</filename> and
-        <filename>/etc/sysconfig/sysstat.ioconf</filename>
-      </para>
-
-      <indexterm zone="sysstat sysstat-config">
-        <primary sortas="e-etc-sysconfig-sysstat">/etc/sysconfig/sysstat</primary>
-      </indexterm>
-      <indexterm zone="sysstat sysstat-config">
-        <primary sortas="e-etc-sysconfig-sysstat.ioconf">/etc/sysconfig/sysstat.ioconf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-     <title>Cron Information</title>
-
-      <para>
-        To begin gathering <application>Sysstat</application> history
-        information, you must add to, or create a privileged user's crontab.
-        The history data location is
-        <filename class="directory">/var/log/sa</filename>. The user running
-        <application>Sysstat</application> utilities via cron must have write
-        access to this location.
-      </para>
-
-      <para>
-        Below is an example of what to install in the crontab. Adjust the
-        parameters to suit your needs. Use <command>man sa1</command> and
-        <command>man sa2</command> for information about the commands.
-      </para>
-
-<screen><literal># 8am-7pm activity reports every 10 minutes during weekdays
-0 8-18 * * 1-5 /usr/lib/sa/sa1 600 6 &amp;
-
-# 7pm-8am activity reports every hour during weekdays
-0 19-7 * * 1-5 /usr/lib/sa/sa1 &amp;
-
-# Activity reports every hour on Saturday and Sunday
-0 * * * 0,6 /usr/lib/sa/sa1 &amp;
-
-# Daily summary prepared at 19:05
-5 19 * * * /usr/lib/sa/sa2 -A &amp;</literal></screen>
-
-      <para>
-        Ensure you submit the revised crontab to the cron daemon.
-      </para>
-
-    </sect3>
-
-    <sect3 id="sysstat-init">
-      <title>System Startup Information</title>
-
-      <indexterm zone="sysstat sysstat-init">
-        <primary sortas="f-sysstat">sysstat</primary>
-      </indexterm>
-
-      <para revision="sysv">
-        At system startup, a LINUX RESTART message must be
-        inserted in the daily data file to reinitialize the kernel counters.
-        This can be automated by installing the
-        <filename>/etc/rc.d/init.d/sysstat</filename> init script included in
-        the <xref linkend="bootscripts"/> package using the following command
-        as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root" revision="sysv"><userinput>make install-sysstat</userinput></screen>
-
-      <para revision="systemd">
-        At system startup, a LINUX RESTART message must
-        be inserted in the daily data file to reinitialize the kernel counters.
-        This can be automated by enabling the previously installed systemd unit
-        by running the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root" revision="systemd"><userinput>systemctl enable sysstat</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>cifsiostat, iostat, mpstat, pidstat, sadf, sar, and tapestat</seg>
-        <seg>None</seg>
-        <seg>/usr/lib/sa,
-             /usr/share/doc/sysstat-&sysstat-version; and
-             /var/log/sa
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cifsiostat">
-        <term><command>cifsiostat</command></term>
-        <listitem>
-          <para>
-            displays statistics about read and write operations on CIFS
-            filesystems
-          </para>
-          <indexterm zone="sysstat cifsiostat">
-            <primary sortas="b-cifsiostat">cifsiostat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="iostat">
-        <term><command>iostat</command></term>
-        <listitem>
-          <para>
-            reports CPU statistics and input/output
-            statistics for devices and partitions
-          </para>
-          <indexterm zone="sysstat iostat">
-            <primary sortas="b-iostat">iostat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mpstat">
-        <term><command>mpstat</command></term>
-        <listitem>
-          <para>
-            writes activities for each available processor
-          </para>
-          <indexterm zone="sysstat mpstat">
-            <primary sortas="b-mpstat">mpstat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pidstat">
-        <term><command>pidstat</command></term>
-        <listitem>
-          <para>
-            is used for monitoring individual tasks currently being managed
-            by the Linux kernel
-          </para>
-          <indexterm zone="sysstat pidstat">
-            <primary sortas="b-pidstat">pidstat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sadf">
-        <term><command>sadf</command></term>
-        <listitem>
-          <para>
-            is used for displaying the contents of data files created by
-            the <command>sar</command> command. But unlike
-            <command>sar</command>, <command>sadf</command> can write its data
-            in many different formats
-          </para>
-          <indexterm zone="sysstat sadf">
-            <primary sortas="b-sadf">sadf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sar">
-        <term><command>sar</command></term>
-        <listitem>
-          <para>
-            is used for displaying the contents of elected cumulative activity
-            counters in the operating system
-          </para>
-          <indexterm zone="sysstat sar">
-            <primary sortas="b-sar">sar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tapestat">
-        <term><command>tapestat</command></term>
-        <listitem>
-          <para>
-            is used for monitoring the activity of tape drives connected to
-            a system
-          </para>
-          <indexterm zone="sysstat tapestat">
-            <primary sortas="b-tapestat">tapestat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/systemd.xml
===================================================================
--- general/sysutils/systemd.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,489 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 systemd-download-http "https://anduin.linuxfromscratch.org/LFS/systemd-&systemd-version;-&systemd-stable;.tar.xz"> For whenever we move to a stable snapshot for backports -->
-  <!ENTITY systemd-download-http "https://github.com/systemd/systemd/archive/v&systemd-version;/systemd-&systemd-version;.tar.gz">
-  <!ENTITY systemd-download-ftp  " ">
-  <!ENTITY systemd-md5sum        "521cda27409a9edf0370c128fae3e690">
-  <!ENTITY systemd-size          "15 MB">
-  <!ENTITY systemd-buildsize     "198 MB (with tests)">
-  <!ENTITY systemd-time          "3.7 SBU (with tests using 4 cores)">
-
-]>
-
-<sect1 id="systemd" xreflabel="Systemd-&systemd-version;" revision="systemd">
-  <?dbhtml filename="systemd.html"?>
-
-
-  <title>Systemd-&systemd-version;</title>
-  <!-- Whenever we switch back to stable backports, make sure to add the systemd-stable reference back. -->
-
-  <indexterm zone="systemd">
-    <primary sortas="a-systemd">systemd</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to systemd</title>
-
-    <para>
-      While <application>systemd</application> was installed when
-      building LFS, there are many features provided by the package that
-      were not included in the initial installation because
-      <application>Linux-PAM</application> was not yet installed.
-      The <application>systemd</application> package needs to be
-      rebuilt to provide a working <command>systemd-logind</command> service,
-      which provides many additional features for dependent packages.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&systemd-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&systemd-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &systemd-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &systemd-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &systemd-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &systemd-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--  Comment out (instead of remove) in case a patch will be needed.-->
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-         Required patch:
-         <ulink url="&patch-root;/systemd-&systemd-version;-upstream_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">systemd Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-
-    <note>
-      <para>
-        <xref linkend='linux-pam'/> is not strictly required to build
-        <application>systemd</application>, but the main reason to rebuild
-        <application>systemd</application> in BLFS (it's already built in
-        LFS anyway) is for the <command>systemd-logind</command> daemon and
-        the
-        <filename class='libraryfile'>pam_systemd.so</filename> PAM module.
-        <xref linkend='linux-pam'/> is required for them.  All packages in
-        BLFS book with a dependency on <application>systemd</application>
-        expects it has been rebuilt with <xref linkend='linux-pam'/>.
-      </para>
-    </note>
-
-    <para role="recommended">
-      <xref linkend="linux-pam"/> and
-      <xref role="runtime" linkend="polkit"/> (runtime)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="btrfs-progs"/>, <!-- homed may support it, see the C.E.-->
-      <xref linkend="curl"/>,
-      <xref linkend="cryptsetup"/>,
-      <xref linkend="git"/>,
-      <xref linkend="gnutls"/>,
-      <xref linkend="iptables"/>,
-      <xref linkend="libgcrypt"/>,
-      <xref linkend="libidn2"/>,
-      <xref linkend="libpwquality"/>,
-      <xref linkend="libseccomp"/>,
-      <xref linkend="libxkbcommon"/>,
-      <xref linkend="make-ca"/>,
-      <xref linkend="p11-kit"/>,
-      <xref linkend="pcre2"/>,
-      <xref linkend="qemu"/>,
-      <xref linkend="qrencode"/>,
-      <xref linkend="rsync"/>,
-      <xref linkend="sphinx"/>,
-      <xref linkend="valgrind"/>,
-      <xref linkend="zsh"/> (for the zsh completions),
-      <ulink url="https://www.apparmor.net/">AppArmor</ulink>,
-      <ulink url="https://github.com/linux-audit/audit-userspace">audit-userspace</ulink>,
-      <ulink url="https://github.com/scop/bash-completion">bash-completion</ulink>,
-      <ulink url="https://jekyllrb.com/">jekyll</ulink>,
-      <ulink url="https://www.kernel.org/pub/linux/utils/kernel/kexec/">kexec-tools</ulink>,
-      <ulink url="https://github.com/libbpf/libbpf">libbpf</ulink>,
-      <ulink url="https://sourceware.org/elfutils/">libdw</ulink>,
-      <ulink url="https://developers.yubico.com/libfido2/">libfido2</ulink>,
-      <ulink url="https://www.gnu.org/software/libmicrohttpd/">libmicrohttpd</ulink>,
-      <ulink url="https://pypi.org/project/pefile/">pefile</ulink>,
-      <ulink url="https://pypi.org/project/pyelftools/">pyelftools</ulink>,
-      <ulink url="https://sourceforge.net/projects/linuxquota/">quota-tools</ulink>,
-      <ulink url="https://rpm.org/">rpm</ulink>,
-      <ulink url="https://github.com/SELinuxProject/selinux">SELinux</ulink>,
-      <ulink url="https://sourceware.org/systemtap/">systemtap</ulink>,
-      <ulink url="https://tpm2-tss.readthedocs.io/en/latest/">tpm2-tss</ulink>
-      and <ulink url="https://xenproject.org">Xen</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (to rebuild the manual pages)</bridgehead>
-    <para role="optional">
-      <xref linkend="DocBook"/>,
-      <xref linkend="docbook-xsl"/>,
-      <xref linkend="libxslt"/>, and
-      <xref linkend="lxml"/> (to build the index of systemd manual pages)
-    </para>
-
-    <para condition="html" role="usernotes">
-      Editor Notes: <ulink url="&blfs-wiki;/Logind"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of systemd</title>
-
-    <para>
-      Remove two unneeded groups,
-      <systemitem class="groupname">render</systemitem> and
-      <systemitem class="groupname">sgx</systemitem>, from the default udev
-      rules:
-    </para>
-
-<screen><userinput remap="pre">sed -i -e 's/GROUP="render"/GROUP="video"/' \
-       -e 's/GROUP="sgx", //' rules.d/50-udev-default.rules.in</userinput></screen>
-
-    <para>
-      Now fix a security vulnerability in the DNSSEC verification of
-      <command>systemd-resolved</command> and a bug breaking running
-      <command>systemd-analyze verify</command> on an instantiated systemd
-      unit:
-    </para>
-
-    <screen><userinput>patch -Np1 -i ../systemd-&systemd-version;-upstream_fixes-1.patch</userinput></screen>
-
-    <para>
-      Rebuild <application>systemd</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..                \
-      --prefix=/usr           \
-      --buildtype=release     \
-      -Ddefault-dnssec=no     \
-      -Dfirstboot=false       \
-      -Dinstall-tests=false   \
-      -Dldconfig=false        \
-      -Dman=auto              \
-      -Dsysusers=false        \
-      -Drpmmacrosdir=no       \
-      -Dhomed=disabled        \
-      -Duserdb=false          \
-      -Dmode=release          \
-      -Dpam=enabled           \
-      -Dpamconfdir=/etc/pam.d \
-      -Ddev-kvm-mode=0660     \
-      -Dnobody-group=nogroup  \
-      -Dsysupdate=disabled    \
-      -Dukify=disabled        \
-      -Ddocdir=/usr/share/doc/systemd-&systemd-version; &amp;&amp;
-
-ninja</userinput></screen>
-<!-- Regarding homed and userdb, see the note below in Command Explanations-->
-
-    <note>
-      <para>
-        For the best test results, make sure you run the test suite from
-        a system that is booted by the same
-        <application>systemd</application> version you are rebuilding.
-      </para>
-    </note>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-      <!-- test-netlink: https://github.com/systemd/systemd/issues/27969 -->
-      The test named <filename>test-stat-util</filename> and
-      <filename>test-netlink</filename> are known to fail
-      if some kernel features are not enabled.
-      If the test suite is ran as the &root; user, some
-      other tests may fail because they depend on various kernel
-      configuration options.
-    </para>
-
-   <para>
-     Now, as the <systemitem class="username">root</systemitem> user:
-   </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <parameter>-Dpamconfdir=/etc/pam.d</parameter>: Forces the PAM files to
-      be installed in /etc/pam.d rather than /usr/lib/pam.d.
-    </para>
-
-    <para>
-      <parameter>-Duserdb=false</parameter>: Removes a daemon that does not
-      offer any use under a BLFS configuration. If you wish to enable the
-      <application>userdbd</application> daemon, replace "false" with "true"
-      in the above meson command.
-    </para>
-
-    <para>
-      <parameter>-Dhomed=disabled</parameter>: Removes a daemon that does not offer
-      any use under a traditional BLFS configuration, especially using accounts
-      created with useradd. To enable systemd-homed, first ensure that you have
-      <xref linkend="cryptsetup"/> and <xref linkend="libpwquality"/> installed,
-      and then change <quote>disabled</quote> to <quote>enabled</quote>
-      in the above <command>meson setup</command> command.
-    </para>
-
-    <para>
-      <parameter>-Dukify=disabled</parameter>: Removes a script for
-      combining a kernel, an initramfs, and a kernel command line etc.
-      into an UEFI application which can be loaded by the UEFI firmware
-      to start the embedded Linux kernel.  It's not needed for booting a
-      BLFS system with UEFI if following <xref linkend='grub-setup'/>.
-      And, it requires the <application>pefile</application> Python module
-      at runtime, so if it's enabled but <application>pefile</application>
-      is not installed, in the test suite one test for it will fail.  To
-      enable <command>systemd-ukify</command>, install the
-      <application>pefile</application> module and then change
-      <quote>disabled</quote> to <quote>enabled</quote> in the above
-      <command>meson setup</command> command.
-    </para>
-
-    <!-- EDITORS NOTE: Explanation on removing userdbd and homed:
-    In BLFS, we do not fully support disk encryption. We offer instructions for
-    building 'cryptsetup' as a dependency, but we do not offer instructions for
-    actually configuring it. In addition, we generally do not include
-    functionality that could potentially conflict with other packages, or that
-    is not of any use to us (in an enterprise configuration using Thin Clients
-    or laptops with LUKS encryption, it could make sense though, but that isn't
-    the configuration that we natively support).
-
-    A few of the complications of systemd-homed include:
-      - SSH Logins
-      - Disk Space Assignments
-      - UID Assignments (chown() on login)
-      (See https://cfp.all-systems-go.io/media/homed-asg2019.pdf)
-
-    In an article I read when systemd-homed was originally unveiled, I remember
-    reading about systemd-homed causing problems with OpenSSH Private Key Auth
-    because the user would have to login at the console in order to unlock
-    their home directory, thus allowing the private key to be unlocked and
-    processed by OpenSSH. Since BLFS does not fully support encrypted disks,
-    and because systemd-homed is incompatible with our usage of useradd /
-    traditional UNIX users and groups, I advise that we take the following
-    approach to avoid any confusion:
-
-    - Leave the added Short Descriptions for homectl and userdbctl
-    - Add the above command explanations and restore the previous behavior
-
-    Should we decide to enable homed by default anytime in the future,
-    let's move cryptsetup to recommended or required.
-
-    I would be open to discussing this after the next systemd version when
-    systemd-homed has matured a bit more. -renodr -->
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring systemd</title>
-
-    <para>
-      The <filename>/etc/pam.d/system-session</filename> file needs to
-      be modified and a new file needs to be created in order for
-      <command>systemd-logind</command> to work correctly. Run the following
-      commands as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>grep 'pam_systemd' /etc/pam.d/system-session ||
-cat &gt;&gt; /etc/pam.d/system-session &lt;&lt; "EOF"
-<literal># Begin Systemd addition
-
-session  required    pam_loginuid.so
-session  optional    pam_systemd.so
-
-# End Systemd addition</literal>
-EOF
-
-cat &gt; /etc/pam.d/systemd-user &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/systemd-user
-
-account  required    pam_access.so
-account  include     system-account
-
-session  required    pam_env.so
-session  required    pam_limits.so
-session  required    pam_loginuid.so
-session  optional    pam_keyinit.so force revoke
-session  optional    pam_systemd.so
-
-auth     required    pam_deny.so
-password required    pam_deny.so
-
-# End /etc/pam.d/systemd-user</literal>
-EOF</userinput></screen>
-
-    <!-- For some unknown reason if I don't do this, the per-user systemd
-         manager fails to start with "Trying to run as user instance,
-         but $XDG_RUNTIME_DIR is not set."  This command is enough to
-         fix the issue, and it also seems logical to start using the newly
-         rebuilt systemd right away (like "exec bash -&dash;login" in LFS),
-         so just add it.  -->
-    <para>
-      As the &root; user, replace the running <command>systemd</command>
-      manager (the <command>init</command> process) with the
-      <command>systemd</command> executable newly built and installed:
-    </para>
-
-    <screen role='root'><userinput>systemctl daemon-reexec</userinput></screen>
-
-    <important>
-      <para>
-        Now ensure <xref linkend='shadow'/> has been already rebuilt with
-        <xref linkend='linux-pam'/> support first, then logout, and login
-        again.  This ensures the running login session registered with
-        <command>systemd-logind</command> and a per-user systemd instance
-        running for each user owning a login session.  Many BLFS packages
-        listing Systemd as a dependency needs the
-        <command>systemd-logind</command> integration and/or a running
-        per-user systemd instance.
-      </para>
-    </important>
-
-    <warning>
-      <para>
-        If upgrading from a previous version of systemd and an
-        initrd is used for system boot, you should generate a new initrd before
-        rebooting the system.
-      </para>
-    </warning>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-      <para>
-        A list of the installed files, along with their short
-        descriptions can be found at
-        <ulink url="&lfs-root;/chapter08/systemd.html#contents-systemd"/>.
-      </para>
-
-      <para>
-        Listed below are the newly installed programs
-        along with short descriptions.
-      </para>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-
-      <seglistitem>
-        <seg>
-          <!-- maybe userdbd/userdbctl can go in LFS, try at next time -->
-          homectl (optional),
-          systemd-cryptenroll (if <xref linkend="cryptsetup"/> is installed),
-          and userdbctl (optional)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="homectl">
-        <term><command>homectl</command></term>
-        <listitem>
-          <para>
-            is a tool to create, remove, change, or inspect a home directory
-            managed by <command>systemd-homed</command>;  note that it's
-            useless for the classic UNIX users and home directories which
-            we are using in LFS/BLFS book
-          </para>
-          <indexterm zone="systemd homectl">
-            <primary sortas="b-homectl">homectl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="systemd-cryptenroll">
-        <term><command>systemd-cryptenroll</command></term>
-        <listitem>
-          <para>
-            Is used to enroll or remove a system from full disk encryption,
-            as well as set and query private keys and recovery keys
-          </para>
-          <indexterm zone="systemd systemd-cryptenroll">
-            <primary sortas="b-systemd-cryptenroll">systemd-cryptenroll</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="userdbctl">
-        <term><command>userdbctl</command></term>
-        <listitem>
-          <para>
-            inspects users, groups, and group memberships
-          </para>
-          <indexterm zone="systemd userdbctl">
-            <primary sortas="b-userdbctl">userdbctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pam_systemd">
-        <term><filename class="libraryfile">pam_systemd.so</filename></term>
-        <listitem>
-          <para>
-            is a PAM module used to register user sessions with the
-            <application>systemd</application> login manager,
-            <command>systemd-logind</command>
-          </para>
-          <indexterm zone="systemd pam_systemd">
-            <primary sortas="c-pam_systemd">pam_systemd.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/sysutils.xml
===================================================================
--- general/sysutils/sysutils.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ general/sysutils/sysutils.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,73 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
+<chapter id="general-sysutils">
+<?dbhtml filename="sysutils.html" dir="general"?>
+<title>System Utilities</title>
 
-<chapter id="general-sysutils">
-  <?dbhtml filename="sysutils.html"?>
-
-  <title>System Utilities</title>
-
-  <para>
-    This chapter contains mainly hardware utilities. It also contains
-    some applications used by other applications in the book for
-    installation or configuration purposes.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="accountsservice.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="acpid.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="at.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="autofs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bluez.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bubblewrap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="colord.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cpio.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cups-pk-helper.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.xml"/>
-
-  <!-- sysv only -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="elogind.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="blocaled.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fcron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gpm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hdparm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hwdata.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lsb-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lm_sensors.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="logrotate.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mc.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modemmanager.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="notification-daemon.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="p7zip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pax.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pciutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pm-utils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="power-profiles-daemon.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="raptor.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rasqal.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="redland.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sg3_utils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysmon-qt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysstat.xml"/>
-
-  <!-- systemd only -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udisks2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="unrar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="unzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="upower.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="usbutils.xml"/>
-
-  <!-- systemd only -->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="weston.xml"/>-->
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="which.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xdotool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="zip.xml"/>
+&gpm;
+&fcron;
+&hdparm;
+&which;
+&unzip;
+&zip;
+&pccts;
+&pciutils;
+&pkgconfig;
 
 </chapter>
Index: general/sysutils/udisks2.xml
===================================================================
--- general/sysutils/udisks2.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,260 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 udisks2-download-http "https://github.com/storaged-project/udisks/releases/download/udisks-&udisks2-version;/udisks-&udisks2-version;.tar.bz2">
-  <!ENTITY udisks2-download-ftp  " ">
-  <!ENTITY udisks2-md5sum        "613af9bfea52cde74d2ac34d96de544d">
-  <!ENTITY udisks2-size          "1.8 MB">
-  <!ENTITY udisks2-buildsize     "44 MB (with tests)">
-  <!ENTITY udisks2-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="udisks2" xreflabel="UDisks-&udisks2-version;">
-  <?dbhtml filename="udisks2.html"?>
-
-
-  <title>UDisks-&udisks2-version;</title>
-
-  <indexterm zone="udisks2">
-    <primary sortas="a-UDisks2">UDisks2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to UDisks</title>
-
-    <para>
-      The <application>UDisks</application> package provides a daemon,
-      tools and libraries to access and manipulate disks and storage
-      devices.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&udisks2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&udisks2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &udisks2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &udisks2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &udisks2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &udisks2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">UDisks Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libatasmart"/>,
-      <xref linkend="libblockdev"/>,
-      <xref linkend="libgudev"/>,
-      <xref linkend="libxslt"/>, and
-      <xref linkend="polkit"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <phrase revision="systemd"><xref role='runtime' linkend="systemd"/>
-      (runtime)</phrase>
-      <phrase revision="sysv"><xref linkend="elogind"/></phrase>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
-    <para role="optional">
-      &gobject-introspection;
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="dbus-python"/> (for the integration tests),
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="lvm2"/>,
-      <!-- <xref linkend="ntfs-3g"/>, -->
-      <xref linkend="pygobject3"/> (for the integration tests),
-      <ulink url="https://github.com/relan/exfat">exFAT</ulink>, and
-      <ulink url="https://github.com/sahlberg/libiscsi">libiscsi</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional Runtime Dependencies</bridgehead>
-    <para role="runtime">
-      <xref linkend="btrfs-progs"/>,
-      <phrase revision="sysv"><xref linkend="dbus"/>,</phrase>
-      <xref linkend="dosfstools"/>,
-      <xref linkend="gptfdisk"/>,
-      <xref linkend="mdadm"/>, and
-      <xref linkend="xfsprogs"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of UDisks</title>
-
-<!-- Applied upstream in version 2.9.0.
-    <para>
-      First, fix a regression caused by glib-2.64:
-    </para>
-
-<screen><userinput remap="pre">sed -i '/stdout_channel = g/a g_io_channel_set_encoding (job->child_stdout_channel, NULL, NULL);' src/udisksspawnedjob.c &amp;&amp;
-sed -i '/stderr_channel = g/a g_io_channel_set_encoding (job->child_stderr_channel, NULL, NULL);' src/udisksspawnedjob.c</userinput></screen>
--->
-
-    <para>
-      Install <application>UDisks</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr        \
-            --sysconfdir=/etc    \
-            --localstatedir=/var \
-            --disable-static     \
-            --enable-available-modules &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>. A more
-      thorough test can be run with <command>make ci</command>. You must first
-      create the directories
-      <filename class="directory">/var/run/udisks2</filename> and
-      <filename class="directory">/var/lib/udisks2</filename>, and the optional
-      python modules should be present.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-    <para>
-      <parameter>--enable-available-modules</parameter>: This switch enables
-      additional <application>UDisks2</application> functionalities if
-      <xref linkend='libblockdev'/> has been built with optional
-      dependencies.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          udisksctl and umount.udisks2
-        </seg>
-        <seg>
-          libudisks2.so
-        </seg>
-        <seg>
-          /etc/udisks2,
-          /usr/include/udisks2,
-          /usr/libexec/udisks2,
-          /usr/share/gtk-doc/html/udisks2, and
-          /var/lib/udisks2
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="udisksctl">
-        <term><command>udisksctl</command></term>
-        <listitem>
-          <para>
-            is a command-line program used to interact with the
-            <command>udisksd</command> daemon
-          </para>
-          <indexterm zone="udisks2 udisksctl">
-            <primary sortas="b-udisksctl">udisksctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!-- Removed since the user shouldn't use this, and it is in /usr/libexec
-      <varlistentry id="udisksd">
-        <term><command>udisksd</command></term>
-        <listitem>
-          <para>
-            is the <application>UDisks</application> daemon itself.
-          </para>
-          <indexterm zone="udisks2 udisksd">
-            <primary sortas="b-udisksd">udisksd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-      <varlistentry id="umountudisks2">
-        <term><command>umount.udisks2</command></term>
-        <listitem>
-          <para>
-            is a command-line program used to unmount file systems
-            that have been mounted by the
-            <application>UDisks</application> daemon
-          </para>
-          <indexterm zone="udisks2 umountudisks2">
-            <primary sortas="b-umountudisks2">umount.udisks2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libudisks2">
-        <term><filename class="libraryfile">libudisks2.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>UDisks</application> API functions
-          </para>
-          <indexterm zone="udisks2 libudisks2">
-            <primary sortas="c-libudisks2">libudisks2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/unrar.xml
===================================================================
--- general/sysutils/unrar.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 unrar-download-http "https://www.rarlab.com/rar/unrarsrc-&unrar-version;.tar.gz">
-  <!ENTITY unrar-download-ftp  " ">
-  <!ENTITY unrar-md5sum        "596c964288608be4b4b6502e910518d2">
-  <!ENTITY unrar-size          "256 KB">
-  <!ENTITY unrar-buildsize     "2.7 MB">
-  <!ENTITY unrar-time          "0.3 SBU">
-]>
-
-<sect1 id="unrar" xreflabel="UnRar-&unrar-version;">
-  <?dbhtml filename="unrar.html"?>
-
-
-  <title>UnRar-&unrar-version;</title>
-
-  <indexterm zone="unrar">
-    <primary sortas="a-UnRar">UnRar</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to UnRar</title>
-
-    <para>
-      The <application>UnRar</application> package contains a
-      <filename>RAR</filename> extraction utility used for
-      extracting files from <filename>RAR</filename> archives.
-      <filename>RAR</filename> archives are usually created
-      with <application>WinRAR</application>, primarily in a
-      Windows environment.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&unrar-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&unrar-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &unrar-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &unrar-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &unrar-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &unrar-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of UnRar</title>
-
-    <note>
-      <para>
-        This package extracts the tarball to the unversioned
-        directory <filename>unrar</filename> and not the expected directory
-        <filename>unrar-&unrar-version;</filename>.
-      </para>
-    </note>
-
-
-    <para>
-      Install <application>UnRar</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>make -f makefile</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -m755 unrar /usr/bin</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          unrar
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="unrar-prog">
-        <term><command>unrar</command></term>
-        <listitem>
-          <para>
-            uncompresses a <filename>RAR</filename> archive
-          </para>
-          <indexterm zone="unrar unrar-prog">
-            <primary sortas="b-unrar">unrar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/unzip.xml
===================================================================
--- general/sysutils/unzip.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ general/sysutils/unzip.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,334 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
+<sect1 id="unzip" xreflabel="unzip-&unzip-version;">
+<title>unzip-&unzip-version;</title>
 
-  <!ENTITY unzip-download-http "&sourceforge-dl;/infozip/unzip60.tar.gz">
-  <!ENTITY unzip-download-ftp  " ">
-  <!ENTITY unzip-md5sum        "62b490407489521db863b523a7f86375">
-  <!ENTITY unzip-size          "1.3 MB">
-  <!ENTITY unzip-buildsize     "9 MB">
-  <!ENTITY unzip-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="unzip" xreflabel="UnZip-&unzip-version;">
-  <?dbhtml filename="unzip.html"?>
-
-
-  <title>UnZip-&unzip-version;</title>
-
-  <indexterm zone="unzip">
-    <primary sortas="a-UnZip">UnZip</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to UnZip</title>
-
-    <para>
-      The <application>UnZip</application> package contains
-      <filename>ZIP</filename> extraction utilities. These are useful for
-      extracting files from <filename>ZIP</filename> archives.
-      <filename>ZIP</filename> archives are created with
-      <application>PKZIP</application> or <application>Info-ZIP</application>
-      utilities, primarily in a DOS environment.
-    </para>
-
-    &lfs121_checked;
-
-    <caution>
-      <para>
-        The previous version of the <application>UnZip</application>
-        package had some locale related issues. Currently there are no BLFS
-        editors capable of testing these locale issues. Therefore, the
-        locale related information is left on this page, but has not been
-        tested. A more general discussion of these problems can be found in
-        the <xref linkend="locale-assumed-encoding"/> section of the <xref
-        linkend="locale-issues"/> page.
-      </para>
-    </caution>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&unzip-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&unzip-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &unzip-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &unzip-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &unzip-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &unzip-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Required patch: <ulink
-          url="&patch-root;/unzip-&unzip-version;-consolidated_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 id="unzip-locale-issues">
-    <title>UnZip Locale Issues</title>
-
-    <note>
-      <para>
-        Use of <application>UnZip</application> in the
-        <application>JDK</application>, <application>Mozilla</application>,
-        <application>DocBook</application> or any other BLFS package
-        installation is not a problem, as BLFS instructions never use
-        <application>UnZip</application> to extract a file with non-ASCII
-        characters in the file's name.
-      </para>
-    </note>
-
-    <para>
-      These issues are thought to be fixed in the patch. But since none
-      of the editors have data to test this, the following workarounds are
-      retained in case they might still be needed.
-    </para>
-
-    <para>
-      The <application>UnZip</application> package assumes that filenames
-      stored in the ZIP archives created on non-Unix systems are encoded in
-      CP850, and that they should be converted to ISO-8859-1 when writing files
-      onto the filesystem. Such assumptions are not always valid. In fact,
-      inside the ZIP archive, filenames are encoded in the DOS codepage that is
-      in use in the relevant country, and the filenames on disk should be in
-      the locale encoding. In MS Windows, the OemToChar() C function (from
-      <filename>User32.DLL</filename>) does the correct conversion (which is
-      indeed the conversion from CP850 to a superset of ISO-8859-1 if MS
-      Windows is set up to use the US English language), but there is no
-      equivalent in Linux.
-    </para>
-
-    <para>
-      When using <command>unzip</command> to unpack a ZIP archive
-      containing non-ASCII filenames, the filenames are damaged because
-      <command>unzip</command> uses improper conversion when any of its
-      encoding assumptions are incorrect. For example, in the ru_RU.KOI8-R
-      locale, conversion of filenames from CP866 to KOI8-R is required, but
-      conversion from CP850 to ISO-8859-1 is done, which produces filenames
-      consisting of undecipherable characters instead of words (the closest
-      equivalent understandable example for English-only users is rot13). There
-      are several ways around this limitation:
-    </para>
-
-    <para>
-      1) For unpacking ZIP archives with filenames containing non-ASCII
-      characters, use <ulink url="https://www.winzip.com/">WinZip</ulink> while
-      running the <ulink url="https://www.winehq.org/">Wine</ulink> Windows
-      emulator.
-    </para>
-
-    <para>
-      2) Use <command>bsdtar -xf</command> from
-      <xref role="nodep" linkend="libarchive"/> to unpack the ZIP archive.
-      Then fix the damage made to
-      the filenames using the <command>convmv</command> tool
-      (<ulink url="https://j3e.de/linux/convmv/"/>). The following is an example
-      for the zh_CN.UTF-8 locale:
-    </para>
-
-<screen><userinput>convmv -f cp936 -t utf-8 -r --nosmart --notest \
-    <replaceable>&lt;/path/to/unzipped/files&gt;</replaceable></userinput></screen>
-<!--
-    <para>
-      3) Apply the optional
-      <filename>unzip-5.50-alt-iconv-v1.1.patch</filename> patch to
-      <application>UnZip</application>. It will apply with some offsets.
-    </para>
-
-    <para>
-      It allows to specify the assumed filename encoding in the ZIP
-      archive using the <option>-O charset_name</option> option and the
-      on-disk filename encoding using the <option>-I charset_name</option>
-      option. Defaults: the on-disk filename encoding is the locale encoding,
-      the encoding inside the ZIP archive is guessed according to the builtin
-      table based on the locale encoding. For US English users, this still
-      means that unzip converts from CP850 to ISO-8859-1 by default.
-    </para>
-
-    <para>
-      Caveat: this method works only with 8-bit locale encodings, not
-      with UTF-8. Attempting to use a patched <command>unzip</command> in UTF-8
-      locales may result in a segmentation fault and is probably a security
-      risk.
-    </para>
--->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of UnZip</title>
-
-    <para>
-      First apply the patch:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../unzip-&unzip-version;-consolidated_fixes-1.patch</userinput></screen>
-
-    <para>
-      Now compile the package:
-    </para>
-
-<screen><userinput>make -f unix/Makefile generic</userinput></screen>
-
-    <para>
-      The test suite does not work for target <quote>generic</quote>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make prefix=/usr MANDIR=/usr/share/man/man1 \
- -f unix/Makefile install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>make -f unix/Makefile generic</command>:
-      This target begins by running a configure script (unlike the older
-      targets such as linux and linux_noasm) which creates a flags file that
-      is then used in the build. This ensures that the 32-bit x86 build
-      receives the right flags to unzip files which are larger than 2GB
-      when extracted.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>funzip, unzip, unzipfsx, zipgrep, and zipinfo</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="funzip">
-        <term><command>funzip</command></term>
-        <listitem>
-          <para>
-            allows the output of <command>unzip</command> commands to be
-            redirected
-          </para>
-          <indexterm zone="unzip funzip">
-            <primary sortas="b-funzip">funzip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unzip-prog">
-        <term><command>unzip</command></term>
-        <listitem>
-          <para>
-            lists, tests or extracts files from a <filename>ZIP</filename>
-            archive
-          </para>
-          <indexterm zone="unzip unzip-prog">
-            <primary sortas="b-unzip">unzip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unzipfsx">
-        <term><command>unzipfsx</command></term>
-        <listitem>
-          <para>
-            is a self-extracting stub that can be prepended to a
-            <filename>ZIP</filename> archive.  Files in this format allow the
-            recipient to decompress the archive without installing
-            <application>UnZip</application>
-          </para>
-          <indexterm zone="unzip unzipfsx">
-            <primary sortas="b-unzipfsx">unzipfsx</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zipgrep">
-        <term><command>zipgrep</command></term>
-        <listitem>
-          <para>
-            searches files in a <filename>ZIP</filename> archive for
-            lines matching a pattern
-          </para>
-          <indexterm zone="unzip zipgrep">
-            <primary sortas="b-zipgrep">zipgrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zipinfo">
-        <term><command>zipinfo</command></term>
-        <listitem>
-          <para>
-            produces technical information about the files in a
-            <filename>ZIP</filename> archive, including file access permissions,
-            encryption status, type of compression, etc
-          </para>
-          <indexterm zone="unzip zipinfo">
-            <primary sortas="b-zipinfo">zipinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-<!--
-      <varlistentry id="libunzip">
-        <term><filename class='libraryfile'>libunzip.so</filename></term>
-        <listitem>
-          <para>
-            contains the API functions required by the
-            <application>UnZip</application> programs.
-          </para>
-          <indexterm zone="unzip libunzip">
-            <primary sortas="c-libunzip">libunzip.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-    </variablelist>
-
-  </sect2>
+&unzip-intro;
+&unzip-inst;
+&unzip-exp;
+&unzip-desc;
 
 </sect1>
Index: general/sysutils/upower-systemd-kernel.xml
===================================================================
--- general/sysutils/upower-systemd-kernel.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,8 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen revision="systemd"><emphasis role='blue'>G</emphasis>eneral setup ---&gt;
-  -*- N<emphasis role='blue'>a</emphasis>mespaces support ---&gt;                                       [NAMESPACES]
-    [*] <emphasis role='blue'>U</emphasis>ser namespace                                                 [USER_NS]</screen>
Index: general/sysutils/upower.xml
===================================================================
--- general/sysutils/upower.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,290 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 upower-download-http "https://gitlab.freedesktop.org/upower/upower/-/archive/v&upower-version;/upower-v&upower-version;.tar.bz2">
-  <!ENTITY upower-download-ftp  " ">
-  <!ENTITY upower-md5sum        "2399845217a9c6e4510f66033fcd7cf6">
-  <!ENTITY upower-size          "140 KB">
-  <!ENTITY upower-buildsize     "5.5 MB (add 2.6 MB for tests)">
-  <!ENTITY upower-time          "less than 0.1 SBU (add 0.6 SBU for tests)">
-]>
-
-<sect1 id="upower" xreflabel="UPower-&upower-version;">
-  <?dbhtml filename="upower.html"?>
-
-
-  <title>UPower-&upower-version;</title>
-
-  <indexterm zone="upower">
-    <primary sortas="a-UPower">UPower</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to UPower</title>
-
-    <para>
-      The <application>UPower</application> package provides an interface for
-      enumerating power devices, listening to device events and querying history
-      and statistics. Any application or service on the system can access the
-      org.freedesktop.UPower service via the system message bus.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&upower-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&upower-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &upower-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &upower-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &upower-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &upower-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">UPower Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libgudev"/> and
-      <xref linkend="libusb"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
-    <para role="optional">
-      &gobject-introspection;
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="libxslt"/>,
-      <xref linkend="docbook-xsl"/>,
-      <xref linkend="pygobject3"/>,
-      <xref linkend="python-dbusmock"/>,
-      <xref linkend="umockdev"/> (for part of the test suite), and
-      <ulink url="https://libimobiledevice.org/">libimobiledevice</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="kernel" id="upower-kernel" revision="systemd">
-    <!-- With UPower-0.9.11's hardening of the systemd unit file,
-         User Namespace Support (CONFIG_USER_NS) is now required. Without this,
-         you will get "ERROR 213/USER" out of a 'systemctl start upower'. -->
-    <title>Kernel Configuration</title>
-
-    <para>
-      Enable the following options in the kernel configuration and recompile the
-      kernel if necessary:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="upower-systemd-kernel.xml"/>
-
-    <indexterm zone="upower upower-kernel">
-      <primary sortas="d-upower">upower</primary>
-    </indexterm>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of UPower</title>
-
-    <para>
-      Install <application>UPower</application> by running the following
-      commands:
-    </para>
-
-<screen revision="sysv"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..                  \
-      --prefix=/usr             \
-      --buildtype=release       \
-      -Dgtk-doc=false           \
-      -Dman=false               \
-      -Dsystemdsystemunitdir=no \
-      -Dudevrulesdir=/usr/lib/udev/rules.d &amp;&amp;
-ninja</userinput></screen>
-
-<screen revision="systemd"><userinput>mkdir build                         &amp;&amp;
-cd    build                         &amp;&amp;
-meson setup ..            \
-      --prefix=/usr       \
-      --buildtype=release \
-      -Dgtk-doc=false     \
-      -Dman=false         &amp;&amp;
-ninja</userinput></screen>
-
-    <!-- On my system with LANG=zh_CN.UTF-8, one test attempted to compare
-         Chinese error message with English references and failed.
-         LC_ALL=C fixes the problem.  -->
-    <!-- Headphone hotplug (bluetooth and AUX) was tested and seems to work
-         okay even with the test faliures. Maybe it's wants headphones plugged
-         in during the test? Regardless, it can be safely ignored. -->
-    <!-- On a 32-bit machine, the following test failure can be observed:
-         ======================================================================
-         FAIL: test_battery_energy_charge_mixed (__main__.Tests.test_battery_energy_charge_mixed)
-         battery which reports both current charge and energy
-
-         self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Percentage'), 40.0)
-         AssertionError: 40.00000000000001 != 40.0
-
-         This is known upstream as https://gitlab.freedesktop.org/upower/upower/-/issues/251
-         Not sure if this is an actual problem, but it seems to start and work
-         properly -renodr
-
-         test_bluetooth_le_device: upstream MR !207  -xry111 -->
-
-    <!-- On my system all 68 tests passed for v1.90.4.  
-         Did not check on a 32-bit system. - bdubbs -->
-
-    <para>
-      To test the results, issue: <command>LC_ALL=C ninja test</command>.  The
-      test suite should be run from a local GUI session started with
-      dbus-launch. On 32-bit machines, one test will fail due to rounding
-      errors: <filename>Tests.test_battery_energy_charge_mixed</filename>. On
-      some systems, two tests relating to the headphone hotplug feature are
-      known to fail. Those can be safely ignored since the functionality still
-      works.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-Dgtk-doc=false</parameter>: Prevents building the
-      documentation. Remove this if you have <application>GTK-Doc</application>
-      installed and wish to build the documentation.
-    </para>
-
-    <para>
-      <parameter>-Dman=false</parameter>: Prevents building the
-      manual pages. Remove this if you have <xref linkend='libxslt'/> and
-      <xref linkend='docbook-xsl'/> installed and wish to build the manual
-      pages.
-    </para>
-
-    <para revision="sysv">
-      <parameter>-Dsystemdsystemunitdir=no</parameter>: Removes
-      the dependency on <application>systemd</application>.
-    </para>
-
-    <para revision="sysv">
-      <parameter>-Dudevrulesdir=/usr/lib/udev/rules.d</parameter>: Tells
-      the build system where to install <application>udev</application>
-      rules because the information is missing in
-      <filename>/usr/lib/pkgconfig/libudev.pc</filename>
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program<!--
-See below... <phrase revision="systemd">s</phrase>--></segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          upower
-<!-- <phrase revision="systemd"> and upowerd</phrase>
-Upowerd should not be listed, as it is in /usr/libexec, and is not supposed
-to be run by a user. Furthermore, upowerd is also in sysv, and there is no
-reason so single out systemd here. -->
-        </seg>
-        <seg>
-          libupower-glib.so
-        </seg>
-        <seg>
-          /etc/UPower,
-          /usr/include/libupower-glib, and
-          /var/lib/upower
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="upower-prog">
-        <term><command>upower</command></term>
-        <listitem>
-          <para>
-            is the <application>UPower</application> command line tool
-          </para>
-          <indexterm zone="upower upower-prog">
-            <primary sortas="b-upower">upower</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-<!-- See above
-      <varlistentry id="upowerd" revision="systemd">
-        <term><command>upowerd</command></term>
-        <listitem>
-          <para>
-            is the <application>UPower</application> Daemon. It provides the
-            org.freedesktop.UPower service on the system message bus.
-          </para>
-          <indexterm zone="upower upowerd">
-            <primary sortas="b-upowerd">upowerd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
-
-      <varlistentry id="libupower-glib">
-        <term><filename class="libraryfile">libupower-glib.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>UPower</application> API functions
-          </para>
-          <indexterm zone="upower libupower-glib">
-            <primary sortas="c-libupower-glib">libupower-glib.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/usbutils.xml
===================================================================
--- general/sysutils/usbutils.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,224 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 usbutils-download-http "https://kernel.org/pub/linux/utils/usb/usbutils/usbutils-&usbutils-version;.tar.xz">
-  <!ENTITY usbutils-download-ftp  " ">
-  <!ENTITY usbutils-md5sum        "8ff21441faf2e8128e4810b3d6e49059">
-  <!ENTITY usbutils-size          "168 KB">
-  <!ENTITY usbutils-buildsize     "4.4 MB">
-  <!ENTITY usbutils-time          "0.1 SBU">
-]>
-
-<sect1 id="usbutils" xreflabel="usbutils-&usbutils-version;">
-  <?dbhtml filename="usbutils.html"?>
-
-
-  <title>usbutils-&usbutils-version;</title>
-
-  <indexterm zone="usbutils">
-    <primary sortas="a-usbutils">usbutils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to USB Utils</title>
-
-    <para>
-      The <application>USB Utils</application> package contains utilities
-      used to display information about USB buses in the system and the
-      devices connected to them.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&usbutils-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&usbutils-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &usbutils-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &usbutils-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &usbutils-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &usbutils-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/usbutils-&usbutils-version;-lsusb_bugfixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">USB Utils Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libusb"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref role="runtime" linkend="hwdata"/> (runtime)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of USB Utils</title>
-
-    <para>
-      Install <application>USB Utils</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --datadir=/usr/share/hwdata &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      For the <filename>usb.ids</filename> data file, install the
-      <xref linkend='hwdata'/> package.
-    </para>
-
-    <para>
-      The script <command>lsusb.py</command> displays information in a more
-      easily readable form than <command>lsusb</command>. To find the options,
-      use <command>lsusb.py -h</command>. One form of use recommended by the
-      developer is <command>lsusb.py -ciu</command>.
-    </para>
-
-  </sect2>
-<!-- No longer needed
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed ... lsusb.py</command>: Instructs lsusb.py where to search
-      <filename>usb.ids</filename>.
-    </para>
-
-  </sect2>
--->
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lsusb, lsusb.py, usb-devices, and usbhid-dump
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lsusb">
-        <term><command>lsusb</command></term>
-        <listitem>
-          <para>
-            is a utility for displaying information about all USB buses
-            in the system and all devices connected to them, but not in human
-            friendly form
-          </para>
-          <indexterm zone="usbutils lsusb">
-            <primary sortas="b-lsusb">lsusb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lsusb.py">
-        <term><command>lsusb.py</command></term>
-        <listitem>
-          <para>
-            displays information about all USB buses in the system and all
-            devices connected to them in reasonable human friendly form
-          </para>
-          <indexterm zone="usbutils lsusb.py">
-            <primary sortas="b-lsusb.py">lsusb.py</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="usb-devices">
-        <term><command>usb-devices</command></term>
-        <listitem>
-          <para>
-            is a shell script that displays details of USB buses and devices
-            connected to them. It is designed to be used if /proc/bus/usb/devices
-            is not available on your system
-          </para>
-          <indexterm zone="usbutils usb-devices">
-            <primary sortas="b-usb-devices">usb-devices</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="usbhid-dump">
-        <term><command>usbhid-dump</command></term>
-        <listitem>
-          <para>
-            is used to dump report descriptors and streams from HID
-            (human interface device) interfaces of USB devices
-          </para>
-          <indexterm zone="usbutils usbhid-dump">
-            <primary sortas="b-usbhid-dump">usbhid-dump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/which.xml
===================================================================
--- general/sysutils/which.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ general/sysutils/which.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,166 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
+<sect1 id="which" xreflabel="which-&which-version;">
+<?dbhtml filename="which.html" dir="general"?>
+<title>The "which" program / script</title>
 
-<!--  <!ENTITY which-download-http "http://www.xs4all.nl/~carlo17/which/which-&which-version;.tar.gz">-->
+<para>The presence / absence of the which program in the main LFS book
+is probably one of the most contentious issues we have on the mailing
+lists.  It has resulted in at least one flame war in the recent past.
+To hopefully put an end to this once and for all, we here present the
+various options for equipping your system with "which".</para>
 
-  <!ENTITY which-download-http "&gnu-http;/which/which-&which-version;.tar.gz">
-  <!ENTITY which-download-ftp  " ">
-  <!ENTITY which-md5sum        "097ff1a324ae02e0a3b0369f07a7544a">
-  <!ENTITY which-size          "148 KB">
-  <!ENTITY which-buildsize     "1 MB">
-  <!ENTITY which-time          "less than 0.1 SBU">
-]>
+<para>The first option is simply to use a bash alias:</para>
+<screen>alias which='type -p'</screen>
+<para>This command can be put in your
+<filename>~/.bash_profile</filename> or <filename>~/.bashrc</filename>
+file in order to be set up each time you log in (see man bash for more
+information on the bash login files).  This will not always work
+however, for example it will fail when a program needs to use "which"
+but
+doesn't spawn a shell.</para>
 
-<sect1 id="which" xreflabel="Which-&which-version;">
-  <?dbhtml filename="which.html"?>
+<para>The second option is to create a simple script:</para>
+<para><screen><userinput>cat &gt; /usr/bin/which &lt;&lt;
+"EOF"</userinput>
+#!/bin/bash
+type -p "$@"
+<userinput>EOF
+chmod 755 /usr/bin/which
+chown root.root /usr/bin/which</userinput></screen></para>
+<para>This should generally work OK and is probably the easiest solution
+for boxes which don't need a good user environment to work in.</para>
 
+<para>The third option is to install the actual program
+<emphasis>which</emphasis>.</para>
 
-  <title>Which-&which-version; and Alternatives</title>
-
-  <para>
-    The presence or absence of the <command>which</command> program in the
-    main LFS book is probably one of the most contentious issues on the
-    mailing lists. It has resulted in at least one flame war in the past. To
-    hopefully put an end to this once and for all, presented here are two
-    options for equipping your system with <command>which</command>. The
-    question of which <quote><command>which</command></quote> is for you to
-    decide.
-  </para>
-
-  <indexterm zone="which">
-    <primary sortas="a-Which">Which</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GNU Which</title>
-
-    <para>
-      The first option is to install the actual GNU
-      <application>which</application> package.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&which-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&which-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &which-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &which-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &which-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &which-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Which</title>
-
-    <para>
-      Install <application>which</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>which</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="which-prog">
-        <term><command>which</command></term>
-        <listitem>
-          <para>
-            shows the full path of (shell) commands installed in your
-            <envar>PATH</envar>
-          </para>
-          <indexterm zone="which which-prog">
-            <primary sortas="b-which">which</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>The 'which' Script</title>
-
-    <para>
-      The second option (for those who don't want to install the package)
-      is to create a simple script (execute as the
-      <systemitem class="username">root</systemitem> user):
-    </para>
-
-<screen role="root"><userinput>cat &gt; /usr/bin/which &lt;&lt; "EOF"
-<literal>#!/bin/bash
-type -pa "$@" | head -n 1 ; exit ${PIPESTATUS[0]}</literal>
-EOF
-chmod -v 755 /usr/bin/which
-chown -v root:root /usr/bin/which</userinput></screen>
-
-    <para>
-      This should work OK and is probably the easiest solution
-      for most cases, but is not the most comprehensive implementation.
-    </para>
-
-  </sect2>
+&which-intro;
+&which-inst;
+&which-desc;
 
 </sect1>
+
Index: general/sysutils/which/which-desc.xml
===================================================================
--- general/sysutils/which/which-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/which/which-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,14 @@
+<sect2>
+<title>Contents</title>
+
+<para>The which package contains <userinput>which</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>which</title>
+<para>which shows the full path of (shell) commands.</para></sect3>
+
+</sect2>
+
Index: general/sysutils/which/which-inst.xml
===================================================================
--- general/sysutils/which/which-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/which/which-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of which</title>
+
+<para>Install which by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
Index: general/sysutils/which/which-intro.xml
===================================================================
--- general/sysutils/which/which-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/which/which-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<sect2>
+<title>Introduction to which</title>
+
+<screen>Download location:              &which-download;
+Version used:                   &which-version;
+Package size:                   &which-size;
+Estimated Disk space required:  &which-buildsize;</screen>
+
+</sect2>
Index: general/sysutils/which/which.ent
===================================================================
--- general/sysutils/which/which.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/which/which.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<!ENTITY which SYSTEM "../which.xml">
+<!ENTITY which-intro SYSTEM "which-intro.xml">
+<!ENTITY which-inst SYSTEM "which-inst.xml">
+<!ENTITY which-desc SYSTEM "which-desc.xml">
+<!ENTITY which-buildsize "667 KB">
+<!ENTITY which-version "2.13">
+<!ENTITY which-download "ftp://ftp.gnu.org/pub/gnu/which/which-2.13.tar.gz">
+<!ENTITY which-size "104 KB">
Index: general/sysutils/whichtemp.xml
===================================================================
--- general/sysutils/whichtemp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/sysutils/whichtemp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,36 @@
+<sect1 id="ch05-which">
+<?dbhtml filename="which.html" dir="chapter05"?>
+<title>The "which" program / script</title>
+
+<para>The presence / absence of the which program in the main LFS book
+is probably one of the most contentious issues we have on the mailing
+lists.  It has resulted in at least one flame war in the recent past.
+To hopefully put an end to this once and for all, we here present the
+various options for equipping your system with "which".</para>
+
+<para>The first option is simply to use a bash alias:</para>
+<screen>alias which='type -p'</screen>
+<para>This command can be put in your
+<filename>~/.bash_profile</filename> or <filename>~/.bashrc</filename>
+file in order to be set up each time you log in (see man bash for more
+information on the bash login files).  This will not always work
+however, for example it will fail when a program needs to use "which" but 
+doesn't spawn a shell.</para>
+
+<para>The second option is to create a simple script:</para>
+<para><screen><userinput>cat &gt; /usr/bin/which &lt;&lt; "EOF"</userinput>
+#!/bin/bash
+type -p "$@"
+<userinput>EOF
+chmod 755 /usr/bin/which
+chown root.root /usr/bin/which</userinput></screen></para>
+<para>This should generally work OK and is probably the easiest solution
+for boxes which don't need a good user environment to work in.</para>
+
+<para>The third option is to install the actual program
+<emphasis>which</emphasis>.</para>
+
+&which;
+
+</sect1>
+
Index: general/sysutils/xdotool.xml
===================================================================
--- general/sysutils/xdotool.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ 	(revision )
@@ -1,136 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xdotool-download-http "https://github.com/jordansissel/xdotool/releases/download/v&xdotool-version;/xdotool-&xdotool-version;.tar.gz">
-  <!ENTITY xdotool-download-ftp  " ">
-  <!ENTITY xdotool-md5sum        "9fd993a251a7c38b32381503544b0dd7">
-  <!ENTITY xdotool-size          "116 KB">
-  <!ENTITY xdotool-buildsize     "2.1 MB">
-  <!ENTITY xdotool-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="xdotool" xreflabel="xdotool-&xdotool-version;">
-  <?dbhtml filename="xdotool.html"?>
-
-
-  <title>xdotool-&xdotool-version;</title>
-
-  <indexterm zone="xdotool">
-    <primary sortas="a-xdotool">xdotool</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xdotool</title>
-
-    <para>
-      The <application>xdotool</application> package provides the capabilities
-      to simulate keyboard input and mouse activity, move and resize windows,
-      etc. It does this using X11’s XTEST extension and other Xlib functions.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xdotool-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xdotool-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xdotool-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xdotool-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xdotool-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xdotool-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xdotool</title>
-
-    <para>
-      Install <application>xdotool</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>make WITHOUT_RPATH_FIX=1</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make PREFIX=/usr INSTALLMAN=/usr/share/man install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          xdotool
-        </seg>
-        <seg>
-          libxdo.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xdotool-prog">
-        <term><command>xdotool</command></term>
-        <listitem>
-          <para>
-            uncompresses a <filename>RAR</filename> archive
-          </para>
-          <indexterm zone="xdotool xdotool-prog">
-            <primary sortas="b-xdotool">xdotool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
-  </sect2>
-
-</sect1>
Index: general/sysutils/zip.xml
===================================================================
--- general/sysutils/zip.xml	(revision f2964cc5dc709c74cb5887d78069fa1e35457de7)
+++ general/sysutils/zip.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,184 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
+<sect1 id="zip" xreflabel="zip">
+<?dbhtml filename="zip.html" dir="general"?>
+<title>zip</title>
 
-  <!ENTITY zip-download-http "&sourceforge-dl;/infozip/zip30.tar.gz">
-  <!ENTITY zip-download-ftp  " ">
-  <!ENTITY zip-md5sum        "7b74551e63f8ee6aab6fbc86676c0d37">
-  <!ENTITY zip-size          "1.1 MB">
-  <!ENTITY zip-buildsize     "6.4 MB">
-  <!ENTITY zip-time          "0.1 SBU">
-]>
-
-<sect1 id="zip" xreflabel="Zip-&zip-version;">
-  <?dbhtml filename="zip.html"?>
-
-
-  <title>Zip-&zip-version;</title>
-
-  <indexterm zone="zip">
-    <primary sortas="a-Zip">Zip</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Zip</title>
-
-    <para>
-      The <application>Zip</application> package contains
-      <application>Zip</application> utilities. These
-      are useful for compressing files into <filename>ZIP</filename>
-      archives.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&zip-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&zip-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &zip-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &zip-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &zip-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &zip-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Zip</title>
-
-    <para>
-      Install <application>Zip</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>make -f unix/Makefile generic_gcc</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make prefix=/usr MANDIR=/usr/share/man/man1 -f unix/Makefile install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>make prefix=/usr -f unix/Makefile install</command>: This
-      command overrides the <varname>prefix</varname> variable that is set to
-      <filename class='directory'>/usr/local</filename> in the
-      <filename>unix/Makefile</filename>.
-      Alternatives to <parameter>generic_gcc</parameter> can be seen with a
-      <command>make -f unix/Makefile list</command> command.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>zip, zipcloak, zipnote, and zipsplit</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="zip-prog">
-        <term><command>zip</command></term>
-        <listitem>
-          <para>
-            compresses files into a <filename>ZIP</filename> archive
-          </para>
-          <indexterm zone="zip zip-prog">
-            <primary sortas="b-zip">zip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zipcloak">
-        <term><command>zipcloak</command></term>
-        <listitem>
-          <para>
-            is a utility to encrypt and decrypt a <filename>ZIP</filename>
-            archive
-          </para>
-          <indexterm zone="zip zipcloak">
-            <primary sortas="b-zipcloak">zipcloak</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zipnote">
-        <term><command>zipnote</command></term>
-        <listitem>
-          <para>
-            reads or writes comments stored in a <filename>ZIP</filename>
-            file
-          </para>
-          <indexterm zone="zip zipnote">
-            <primary sortas="b-zipnote">zipnote</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zipsplit">
-        <term><command>zipsplit</command></term>
-        <listitem>
-          <para>
-            is a utility to split <filename>ZIP</filename> files into
-            smaller files
-          </para>
-          <indexterm zone="zip zipsplit">
-            <primary sortas="b-zipsplit">zipsplit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+<para>TO BE DONE</para>
 
 </sect1>
