Index: general/genutils/asciidoctor.xml
===================================================================
--- general/genutils/asciidoctor.xml	(revision b9ddb72a0ea90531c3de2532c27ed1660a0f8777)
+++ 	(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 b9ddb72a0ea90531c3de2532c27ed1660a0f8777)
+++ 	(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 b9ddb72a0ea90531c3de2532c27ed1660a0f8777)
+++ 	(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 b9ddb72a0ea90531c3de2532c27ed1660a0f8777)
+++ 	(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 b9ddb72a0ea90531c3de2532c27ed1660a0f8777)
+++ 	(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 b9ddb72a0ea90531c3de2532c27ed1660a0f8777)
+++ 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 b9ddb72a0ea90531c3de2532c27ed1660a0f8777)
+++ 	(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 b9ddb72a0ea90531c3de2532c27ed1660a0f8777)
+++ 	(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 b9ddb72a0ea90531c3de2532c27ed1660a0f8777)
+++ 	(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 b9ddb72a0ea90531c3de2532c27ed1660a0f8777)
+++ 	(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 b9ddb72a0ea90531c3de2532c27ed1660a0f8777)
+++ 	(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 b9ddb72a0ea90531c3de2532c27ed1660a0f8777)
+++ 	(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 b9ddb72a0ea90531c3de2532c27ed1660a0f8777)
+++ 	(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 b9ddb72a0ea90531c3de2532c27ed1660a0f8777)
+++ 	(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 b9ddb72a0ea90531c3de2532c27ed1660a0f8777)
+++ 	(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 b9ddb72a0ea90531c3de2532c27ed1660a0f8777)
+++ 	(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 b9ddb72a0ea90531c3de2532c27ed1660a0f8777)
+++ 	(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 b9ddb72a0ea90531c3de2532c27ed1660a0f8777)
+++ 	(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 b9ddb72a0ea90531c3de2532c27ed1660a0f8777)
+++ 	(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 b9ddb72a0ea90531c3de2532c27ed1660a0f8777)
+++ 	(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 b9ddb72a0ea90531c3de2532c27ed1660a0f8777)
+++ 	(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 b9ddb72a0ea90531c3de2532c27ed1660a0f8777)
+++ 	(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 b9ddb72a0ea90531c3de2532c27ed1660a0f8777)
+++ 	(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 b9ddb72a0ea90531c3de2532c27ed1660a0f8777)
+++ 	(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 b9ddb72a0ea90531c3de2532c27ed1660a0f8777)
+++ 	(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 b9ddb72a0ea90531c3de2532c27ed1660a0f8777)
+++ 	(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>
