Index: pst/printing/cups-browsed.xml
===================================================================
--- pst/printing/cups-browsed.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(revision )
@@ -1,218 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY cups-browsed-download-http
-  "https://github.com/OpenPrinting/cups-browsed/releases/download/&cups-browsed-version;/cups-browsed-&cups-browsed-version;.tar.xz">
-  <!ENTITY cups-browsed-download-ftp  " ">
-  <!ENTITY cups-browsed-md5sum        "1f8dc0c5a08d8a410df0713c5adbaee9">
-  <!ENTITY cups-browsed-size          "416 KB">
-  <!ENTITY cups-browsed-buildsize     "6.3 MB">
-  <!ENTITY cups-browsed-time          "less than 0.1 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="cups-browsed" xreflabel="cups-browsed-&cups-browsed-version;">
-  <?dbhtml filename="cups-browsed.html"?>
-
-
-  <title>cups-browsed-&cups-browsed-version;</title>
-
-  <indexterm zone="cups-browsed">
-    <primary sortas="a-cups-browsed">cups-browsed</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to cups-browsed</title>
-
-    <para>
-      The <application>cups-browsed</application> daemon is used to
-      browse the network for remote CUPS queues and IPP network printers
-      and automatically create local queues pointing to them.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&cups-browsed-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&cups-browsed-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cups-browsed-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cups-browsed-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &cups-browsed-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &cups-browsed-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">cups-browsed Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="avahi"/>,
-      <xref linkend="libcupsfilters"/> and
-      <xref linkend="libppd"/>
-    </para>
-
-<!-- as of 2.0.0 \-\-disable-avahi is still accepted by configure,
-  but make fails.https://github.com/OpenPrinting/cups-browsed/issues/21
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="avahi"/>
-    </para>-->
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="openldap"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of cups-browsed</title>
-
-    <para>
-      Install <application>cups-browsed</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr                   \
-            --with-cups-rundir=/run/cups    \
-            --without-rcdir                 \
-            --disable-static                \
-            --docdir=/usr/share/doc/cups-browsed-&cups-browsed-version; &amp;&amp;
-make</userinput></screen>
-<!-- Tests seem to hang, not sure why
-    <para>
-      To test the results, issue <command>make check</command>.
-    </para>
-    -->
-    <para>
-      This package does not come with a functional test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para revision="systemd">
-      Install the systemd unit by running the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root" revision="systemd"><userinput>install -v -m644 daemon/cups-browsed.service /lib/systemd/system/cups-browsed.service</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <parameter>--with-cups-rundir=/run/cups</parameter>: Defines the
-      directory containing transient printing data. The default
-      <filename class="directory">/var/run/cups</filename> is obsolete.
-    </para>
-
-    <para>
-      <parameter>--without-rcdir</parameter>: This switch disables
-      installation of the bundled bootscript which is not compatible with BLFS.
-    </para>
-
-  </sect2>
-
-<!-- TODO: Write a bootscript for cups-browsed -->
-
-  <sect2 role="configuration" revision="systemd">
-    <title>Configuring cups-browsed</title>
-
-    <sect3 id="cups-browsed-init">
-      <title>Systemd Unit</title>
-
-      <para>
-        To start the <command>cups-browsed</command> daemon at boot, enable
-        the previously installed systemd unit by running the following command
-        as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-      <indexterm zone="cups-browsed cups-browsed-init">
-        <primary sortas="f-cups-browsed">cups-browsed</primary>
-      </indexterm>
-
-<screen role="root"><userinput>systemctl enable cups-browsed</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>
-          cups-browsed
-        </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="cups-browsed-prog">
-        <term><command>cups-browsed</command></term>
-        <listitem>
-          <para>
-            is a daemon for browsing the Bonjour and CUPS broadcasts of
-            shared, remote CUPS printers
-          </para>
-          <indexterm zone="cups-browsed cups-browsed-prog">
-            <primary sortas="b-cups-browsed">cups-browsed</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: pst/printing/cups-filters.xml
===================================================================
--- pst/printing/cups-filters.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(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 cups-filters-download-http
-  "https://github.com/OpenPrinting/cups-filters/releases/download/&cups-filters-version;/cups-filters-&cups-filters-version;.tar.xz">
-  <!ENTITY cups-filters-download-ftp  " ">
-  <!ENTITY cups-filters-md5sum        "1d9ac8b601ea5e25a42767856a48c4d7">
-  <!ENTITY cups-filters-size          "437 KB">
-  <!ENTITY cups-filters-buildsize     "9.1 MB">
-  <!ENTITY cups-filters-time          "less than 0.1 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="cups-filters" xreflabel="cups-filters-&cups-filters-version;">
-  <?dbhtml filename="cups-filters.html"?>
-
-
-  <title>cups-filters-&cups-filters-version;</title>
-
-  <indexterm zone="cups-filters">
-    <primary sortas="a-cups-filters">cups-filters</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to CUPS Filters</title>
-
-    <para>
-      The <application>CUPS Filters</application> package is only needed
-      to adapt <xref linkend="libcupsfilters"/> and <xref linkend="libppd"/>
-      filter functions for cups-2.x. It should not be needed for cups-3.x.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&cups-filters-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&cups-filters-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cups-filters-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cups-filters-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &cups-filters-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &cups-filters-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">CUPS Filters Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libcupsfilters"/> and
-      <xref linkend="libppd"/>
-    </para>
-<!--
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="avahi"/>
-    </para>
--->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of CUPS Filters</title>
-
-    <para>
-      Install <application>CUPS Filters</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr                   \
-            --disable-static                \
-            --disable-avahi                 \
-            --docdir=/usr/share/doc/cups-filters-&cups-filters-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a functional test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <parameter>--disable-avahi</parameter>: This switch should be
-      given even <application>Avahi</application> is installed. This is needed
-      due to a flaw in the configure script of
-      <application>CUPS Filters</application>, where it will bail out if
-      <application>Avahi</application> is not installed. Note though that Avahi
-      is not used by this package.
-    </para>
-
-    <!--
-    <para>
-      <option>- -enable-ijs</option>: This switch will allow the pdftoijs
-      filter, for sending PDFs to an HP InkJet Server, to be built.
-    </para>
-    -->
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          driverless, driverless-fax, and foomatic-rip
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/cups/{backend,driver,filter},
-          /usr/share/doc/cups-filters-&cups-filters-version;, and
-          /usr/share/ppd/cupsfilters
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="driverless">
-        <term><command>driverless</command></term>
-        <listitem>
-          <para>
-            is a PPD generator utility for driverless printing
-          </para>
-          <indexterm zone="cups-filters driverless">
-            <primary sortas="b-driverless">driverless</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="driverless-fax">
-        <term><command>driverless-fax</command></term>
-        <listitem>
-          <para>
-            is a wrapper to <command>driverless</command> for FAX type devices
-          </para>
-          <indexterm zone="cups-filters driverless-fax">
-            <primary sortas="b-driverless-fax">driverless-fax</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="foomatic-rip">
-        <term><command>foomatic-rip</command></term>
-        <listitem>
-          <para>
-            is a universal print filter/RIP wrapper which can be used as CUPS
-            filter or stand-alone for spooler-less, direct printing
-          </para>
-          <indexterm zone="cups-filters foomatic-rip">
-            <primary sortas="b-foomatic-rip">foomatic-rip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <!--
-      <varlistentry id="libcupsfilters">
-        <term><filename class="libraryfile">libcupsfilters.so</filename></term>
-        <listitem>
-          <para>
-            contains <application>CUPS Filters</application> API functions
-          </para>
-          <indexterm zone="cups-filters libcupsfilters">
-            <primary sortas="c-libcupsfilters">libcupsfilters.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      -->
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: pst/printing/cups.xml
===================================================================
--- pst/printing/cups.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(revision )
@@ -1,792 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY cups-download-http "https://github.com/OpenPrinting/cups/releases/download/v&cups-version;/cups-&cups-version;-source.tar.gz">
-  <!ENTITY cups-download-ftp  " ">
-  <!ENTITY cups-md5sum        "e0a5ddbf53dfad41da26fc1ef60b2256">
-  <!ENTITY cups-size          "7.8 MB">
-  <!ENTITY cups-buildsize     "77 MB (Add 49 MB for tests)">
-  <!ENTITY cups-time          "0.4 SBU (Add 1.0 SBU for tests)">
-]>
-
-<sect1 id="cups" xreflabel="Cups-&cups-version;">
-  <?dbhtml filename="cups.html"?>
-
-
-  <title>Cups-&cups-version;</title>
-
-  <indexterm zone="cups">
-    <primary sortas="a-Cups">Cups</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Cups</title>
-
-    <para>
-      The Common Unix Printing System (CUPS) is a print spooler and
-      associated utilities. It is based on the "Internet Printing
-      Protocol" and provides printing services to most PostScript
-      and raster printers.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&cups-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&cups-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cups-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cups-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &cups-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &cups-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Cups Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gnutls"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="colord"/>,
-      <xref linkend="dbus"/>,
-      <xref linkend="libusb"/>,
-      <xref linkend="linux-pam"/>, and
-      <xref linkend="xdg-utils"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="avahi"/>,
-      <xref linkend="libpaper"/>,
-      <xref linkend="mitkrb"/>,
-      <!--<xref linkend="openjdk"/>, Not found in 2.4.0 -->
-      <xref linkend="php"/>, and
-      <xref linkend="python2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Required (Postinstall)</bridgehead>
-    <para role="required">
-      <xref role="runtime" linkend="cups-filters"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (Postinstall)</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="gutenprint"/> and
-      <ulink role="runtime" url="https://developers.hp.com/hp-linux-imaging-and-printing">hplip</ulink> (HP printers)
-    </para>
-
-  </sect2>
-
-  <sect2 role="kernel" id="cups-kernel">
-    <title>Kernel Configuration</title>
-
-    <note>
-      <para>
-        There used to be a conflict between the <application>Cups</application>
-        <application>libusb</application> backend and the usblp kernel driver.
-        This is no longer the case and cups will work with both of these
-        enabled.
-      </para>
-    </note>
-
-    <para>
-      If you want to use the kernel usblp driver (for example, if you wish to
-      use <application>escputil</application> from <xref
-      linkend="gutenprint"/>) enable the following options in your kernel
-      configuration and recompile the kernel:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="usb-printer-kernel.xml"/>
-
-    <para>
-      If you have a parallel printer, enable the following options in your
-      kernel configuration and recompile the kernel:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="parallel-printer-kernel.xml"/>
-
-    <indexterm zone="cups cups-kernel">
-      <primary sortas="d-cups">cups</primary>
-    </indexterm>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Cups</title>
-
-    <para>
-      You will need to add an <systemitem class="username">lp</systemitem>
-      user, as <application>Cups</application> will create some files owned
-      by this user. (The <systemitem class="username">lp</systemitem> user
-      is the default used by <application>Cups</application>, but may be
-      changed to a different user by passing a parameter to the
-      <command>configure</command> script.) Use the following command as
-      the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>useradd -c "Print Service User" -d /var/spool/cups -g lp -s /bin/false -u 9 lp</userinput></screen>
-
-    <para>
-      You will also need a dedicated group that will contain users allowed to
-      do <application>Cups</application> administrative tasks. Add the group
-      by running the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 19 lpadmin</userinput></screen>
-
-    <para>
-      If you want to add a user to the <application>Cups</application>
-      administrative group, run the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>usermod -a -G lpadmin <replaceable>&lt;username&gt;</replaceable></userinput></screen>
-
-    <para>
-      If you didn't install <xref linkend="xdg-utils"/>, use the following
-      <command>sed</command> to change the default browser that will be used
-      to access the <application>Cups</application> web interface:
-    </para>
-
-<screen><userinput>sed -i 's#@CUPS_HTMLVIEW@#firefox#' desktop/cups.desktop.in</userinput></screen>
-
-    <para>
-      Replace <command>firefox</command> with the web browser of your
-      choice.
-    </para>
-
-    <para>
-      Build <application>Cups</application> by running the following commands:
-    </para>
-
-<screen revision="sysv"><userinput>./configure --libdir=/usr/lib            \
-            --disable-systemd            \
-            --with-rcdir=/tmp/cupsinit   \
-            --with-rundir=/run/cups      \
-            --with-system-groups=lpadmin \
-            --with-docdir=/usr/share/cups/doc-&cups-version; &amp;&amp;
-make</userinput></screen>
-
-<screen revision="systemd"><userinput>./configure --libdir=/usr/lib            \
-            --with-rundir=/run/cups      \
-            --with-system-groups=lpadmin \
-            --with-docdir=/usr/share/cups/doc-&cups-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>LC_ALL=C make -k check</command>. An already
-      active graphical session with bus address is necessary to run the tests.
-      Make sure that there is not other instance of <application>Cups</application>
-      running, otherwise at least 4 tests will fail with "address in use".
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<!-- dev note: make BUILDROOT=<DESTDIR> install -->
-
-<screen role="root"><userinput>make install &amp;&amp;
-ln -svnf ../cups/doc-&cups-version; /usr/share/doc/cups-&cups-version;</userinput></screen>
-
-    <para revision="sysv">
-      Remove the shipped bootscript, which is incompatible with LFS:
-    </para>
-
-<screen role="root" revision="sysv"><userinput>rm -rf /tmp/cupsinit</userinput></screen>
-
-    <para>
-      Create a basic <application>Cups</application> client configuration file
-      by running the following command as the <systemitem
-      class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>echo "ServerName /run/cups/cups.sock" > /etc/cups/client.conf</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-update-icon-cache.xml"/>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para revision="sysv">
-      <parameter>--disable-systemd</parameter>: Systemd is not supported by
-      this version of BLFS.
-    </para>
-
-    <para revision="sysv">
-      <parameter>--with-rcdir=/tmp/cupsinit</parameter>: This switch tells the
-      build process to install the shipped bootscript into <filename
-      class="directory">/tmp</filename> instead of <filename
-      class="directory">/etc/rc.d</filename>.
-    </para>
-
-    <para>
-      <parameter>--with-rundir=/run/cups</parameter>: This switch prevents
-      the package from referring to the deprecated
-      <filename class='directory'>/var/run</filename> directory.
-    </para>
-
-    <para>
-      <parameter>--with-system-groups=lpadmin</parameter>: This switch ensures
-      that only <systemitem class="groupname">lpadmin</systemitem> will be used
-      as the <application>Cups</application> administrative group.
-    </para>
-
-    <para>
-      <option>--disable-libusb</option>: Use this switch if you have installed
-      <xref linkend="libusb"/>, but wish to use the kernel usblp driver.
-    </para>
-
-    <para>
-      <option>--enable-libpaper</option>: Use this switch if you have installed
-      <application>libpaper</application> and wish to use it with
-      <application>Cups</application>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Cups</title>
-
-    <sect3 id="cups-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/cups/*</filename>
-      </para>
-
-      <indexterm zone="cups cups-config">
-        <primary sortas="e-etc-cups">/etc/cups/*</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Normally, printers are set up via a web browser.  The
-        <application>Cups</application> server will normally connect via
-        the url http://localhost:631.  From there printers, print
-        jobs, and the server configuration can be set up and managed.
-        Remote system administration can also be set up.  Configuration
-        can also be done from the command line via the
-        <command>lpadmin</command>, <command>lpoptions</command>,
-        and <command>lpstat</command> commands.
-      </para>
-
-      <para>
-        Configuration of <application>Cups</application> is dependent on
-        the type of printer and can be complex. Generally, PostScript printers
-        are easier. For detailed instructions on configuration and use of
-        <application>Cups</application>, see <ulink
-        url="https://www.cups.org/documentation.html"/>.
-      </para>
-
-      <para>
-        For non-PostScript printers to print with
-        <application>Cups</application>, you need to install <xref
-        linkend="gs"/> to convert PostScript to raster images and a driver
-        (e.g. from <xref linkend="gutenprint"/>) to convert the resulting
-        raster images to a form that the printer understands.  <ulink
-        url="https://wiki.linuxfoundation.org/openprinting/database/foomatic">Foomatic</ulink>
-        drivers use <xref linkend="gs"/> to convert PostScript to a printable
-        form directly, but this is considered suboptimal by
-        <application>Cups</application> developers.
-      </para>
-
-    </sect3>
-
-    <sect3>
-      <title>Linux PAM Configuration</title>
-
-      <para>
-        If <application>CUPS</application> has been built with
-        <application>Linux PAM</application> support, you need to create a
-        <application>PAM</application> configuration file to get it working
-        correctly with BLFS.
-      </para>
-
-      <para>
-        Issue the following command as the <systemitem
-        class="username">root</systemitem> user to create the configuration
-        file for <application>Linux PAM</application>:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/pam.d/cups &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/cups
-
-auth    include system-auth
-account include system-account
-session include system-session
-
-# End /etc/pam.d/cups</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-    <sect3 id="cups-init">
-      <title><phrase revision="sysv">Boot Script</phrase>
-             <phrase revision="systemd">Systemd Unit</phrase></title>
-
-      <para revision="sysv">
-        If you want the <application>Cups</application> print service to start
-        automatically when the system is booted, install the init script
-        included in the <xref linkend="bootscripts"/> package:
-      </para>
-
-      <para revision="systemd">
-        To start the <command>cupsd</command> daemon when something tries to
-        access it, enable the previously installed systemd units by running
-        the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-      <indexterm zone="cups cups-init">
-        <primary sortas="f-cups">cups</primary>
-      </indexterm>
-
-<screen role="root" revision="sysv"><userinput>make install-cups</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>systemctl enable cups</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>
-          cancel, cupsaccept, cups-config, cupsctl, cupsd, cupsdisable,
-          cupsenable, cupsfilter, cupsreject, cupstestppd, ippeveprinter,
-          ippfind, ipptool, lp, lpadmin, lpc, lpinfo, lpmove, lpoptions, lpq,
-          lpr, lprm, lpstat, ppdc, ppdhtml, ppdi, ppdmerge, and ppdpo
-        </seg>
-        <seg>
-          libcupsimage.so
-          and libcups.so
-        </seg>
-        <seg>
-          /etc/cups,
-          /usr/{include,lib,share}/cups,
-          /usr/share/doc/cups-&cups-version;,
-          /run/cups, and
-          /var/{cache,log,spool}/cups
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-     <varlistentry id="cancel-cups">
-        <term><command>cancel</command></term>
-        <listitem>
-          <para>
-            cancels existing print jobs from the print queues
-          </para>
-          <indexterm zone="cups cancel-cups">
-            <primary sortas="b-cancel">cancel</primary>
-          </indexterm>
-        </listitem>
-     </varlistentry>
-
-     <varlistentry id="cupsaccept">
-        <term><command>cupsaccept</command></term>
-        <listitem>
-          <para>
-            accept jobs sent to a destination
-          </para>
-          <indexterm zone="cups cupsaccept">
-            <primary sortas="b-cupsaccept">cupsaccept</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cups-config-prog">
-        <term><command>cups-config</command></term>
-        <listitem>
-          <para>
-            is a <application>Cups</application>
-            program configuration utility
-          </para>
-          <indexterm zone="cups cups-config-prog">
-            <primary sortas="b-cups-config">cups-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cupsctl">
-        <term><command>cupsctl</command></term>
-        <listitem>
-          <para>
-            updates or queries the cupsd.conf file for a server
-          </para>
-          <indexterm zone="cups cupsctl">
-            <primary sortas="b-cupsctl">cupsctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cupsd">
-        <term><command>cupsd</command></term>
-        <listitem>
-          <para>
-            is the scheduler for the Common Unix Printing System
-          </para>
-          <indexterm zone="cups cupsd">
-            <primary sortas="b-cupsd">cupsd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cupsdisable">
-        <term><command>cupsdisable</command></term>
-        <listitem>
-          <para>
-            stop printers and classes
-          </para>
-          <indexterm zone="cups cupsdisable">
-            <primary sortas="b-cupsdisable">cupsdisable</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cupsenable">
-        <term><command>cupsenable</command></term>
-        <listitem>
-          <para>
-            start printers and classes
-          </para>
-          <indexterm zone="cups cupsenable">
-            <primary sortas="b-cupsenable">cupsenable</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cupsfilter">
-        <term><command>cupsfilter</command></term>
-        <listitem>
-          <para>
-            is a front-end to the <application>Cups</application>
-            filter subsystem which allows you to convert a file
-            to a specific format
-          </para>
-          <indexterm zone="cups cupsfilter">
-            <primary sortas="b-cupsfilter">cupsfilter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cupsreject">
-        <term><command>cupsreject</command></term>
-        <listitem>
-          <para>
-            reject jobs sent to a destination
-          </para>
-          <indexterm zone="cups cupsreject">
-            <primary sortas="b-cupsreject">cupsreject</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cupstestppd">
-        <term><command>cupstestppd</command></term>
-        <listitem>
-          <para>
-            tests the conformance of PPD files
-          </para>
-          <indexterm zone="cups cupstestppd">
-            <primary sortas="b-cupstestppd">cupstestppd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ippeveprinter">
-        <term><command>ippeveprinter</command></term>
-        <listitem>
-          <para>
-            is an IPP Everywhere printer for CUPS
-          </para>
-          <indexterm zone="cups ippeveprinter">
-            <primary sortas="b-ippeveprinter">ippeveprinter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ippfind">
-        <term><command>ippfind</command></term>
-        <listitem>
-          <para>
-            finds Internet Printing Protocol printers
-          </para>
-          <indexterm zone="cups ippfind">
-            <primary sortas="b-ippfind">ippfind</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ipptool">
-        <term><command>ipptool</command></term>
-        <listitem>
-          <para>
-            sends IPP requests to the specified URI and tests
-            and/or displays the results
-          </para>
-          <indexterm zone="cups ipptool">
-            <primary sortas="b-ipptool">ipptool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lp-cups">
-        <term><command>lp</command></term>
-        <listitem>
-          <para>
-            submits files for printing or alters a pending job
-          </para>
-          <indexterm zone="cups lp-cups">
-            <primary sortas="b-lp">lp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lpadmin">
-        <term><command>lpadmin</command></term>
-        <listitem>
-          <para>
-            configures printer and class queues provided by
-            <application>Cups</application>
-          </para>
-          <indexterm zone="cups lpadmin">
-            <primary sortas="b-lpadmin">lpadmin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lpc-cups">
-        <term><command>lpc</command></term>
-        <listitem>
-          <para>
-            provides limited control over printer and class queues
-            provided by <application>Cups</application>
-          </para>
-          <indexterm zone="cups lpc-cups">
-            <primary sortas="b-lpc">lpc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lpinfo">
-        <term><command>lpinfo</command></term>
-        <listitem>
-          <para>
-            lists the available devices or drivers known to the
-            <application>Cups</application> server
-          </para>
-          <indexterm zone="cups lpinfo">
-            <primary sortas="b-lpinfo">lpinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lpmove">
-        <term><command>lpmove</command></term>
-        <listitem>
-          <para>
-            moves the specified job to a new destination
-          </para>
-          <indexterm zone="cups lpmove">
-            <primary sortas="b-lpmove">lpmove</primary>
-          </indexterm>
-      </listitem>
-      </varlistentry>
-
-      <varlistentry id="lpoptions">
-        <term><command>lpoptions</command></term>
-        <listitem>
-          <para>
-            displays or sets printer options and defaults
-          </para>
-          <indexterm zone="cups lpoptions">
-            <primary sortas="b-lpoptions">lpoptions</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lpq-cups">
-        <term><command>lpq</command></term>
-        <listitem>
-          <para>
-            shows the current print queue status on the named printer
-          </para>
-          <indexterm zone="cups lpq-cups">
-            <primary sortas="b-lpq">lpq</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lpr-cups">
-        <term><command>lpr</command></term>
-        <listitem>
-          <para>
-            submits files for printing
-          </para>
-          <indexterm zone="cups lpr-cups">
-            <primary sortas="b-lpr">lpr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lprm-cups">
-        <term><command>lprm</command></term>
-        <listitem>
-          <para>
-            cancels print jobs that have been queued for printing
-          </para>
-          <indexterm zone="cups lprm-cups">
-            <primary sortas="b-lprm">lprm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lpstat-cups">
-        <term><command>lpstat</command></term>
-        <listitem>
-          <para>
-            displays status information about the current classes, jobs,
-            and printers
-          </para>
-          <indexterm zone="cups lpstat-cups">
-            <primary sortas="b-lpstat">lpstat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ppdc">
-        <term><command>ppdc</command></term>
-        <listitem>
-          <para>
-            compiles PPDC source files into one or more PPD files
-          </para>
-          <indexterm zone="cups ppdc">
-            <primary sortas="b-ppdc">ppdc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ppdhtml">
-        <term><command>ppdhtml</command></term>
-        <listitem>
-          <para>
-            reads a driver information file and produces a HTML summary
-            page that lists all of the drivers in a file and the
-            supported options
-          </para>
-          <indexterm zone="cups ppdhtml">
-            <primary sortas="b-ppdhtml">ppdhtml</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ppdi">
-        <term><command>ppdi</command></term>
-        <listitem>
-          <para>
-            imports one or more PPD files into a PPD compiler source file
-          </para>
-          <indexterm zone="cups ppdi">
-            <primary sortas="b-ppdi">ppdi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ppdmerge">
-        <term><command>ppdmerge</command></term>
-        <listitem>
-          <para>
-            merges two or more PPD files into a single, multi-language
-            PPD file
-          </para>
-          <indexterm zone="cups ppdmerge">
-            <primary sortas="b-ppdmerge">ppdmerge</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ppdpo">
-        <term><command>ppdpo</command></term>
-        <listitem>
-          <para>
-            extracts UI strings from PPDC source files and
-            updates either a GNU gettext or Mac OS X strings
-            format message catalog source file for translation
-          </para>
-          <indexterm zone="cups ppdpo">
-            <primary sortas="b-ppdpo">ppdpo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcups">
-        <term><filename class="libraryfile">libcups.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Cups</application> API functions
-          </para>
-          <indexterm zone="cups libcups">
-            <primary sortas="c-libcups">libcups.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: pst/printing/gs.xml
===================================================================
--- pst/printing/gs.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(revision )
@@ -1,396 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!--  When updating, ensure gs-packver is updated in packages.ent -->
-
-  <!ENTITY gs-download-http
-  "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs&gs-packver;/ghostscript-&gs-dl-version;.tar.xz">
-  <!ENTITY gs-download-ftp  " ">
-  <!ENTITY gs-md5sum        "44e8ae7e2ce5bb0e5e2ba1134b51d043">
-  <!ENTITY gs-size          "65 MB">
-  <!ENTITY gs-buildsize     "383 MB (with fonts and libgs.so)">
-  <!ENTITY gs-time          "1.4 SBU (Using parallelism=4; with libgs.so)">
-
-  <!ENTITY gs-standard-fonts-download
-  "&sourceforge-dl;/gs-fonts/ghostscript-fonts-std-8.11.tar.gz">
-  <!ENTITY gs-standard-fonts-md5sum   "6865682b095f8c4500c54b285ff05ef6">
-  <!ENTITY gs-standard-fonts-size     "3.7 MB">
-
-  <!ENTITY gs-other-fonts-download
-  "&sourceforge-dl;/gs-fonts/gnu-gs-fonts-other-6.0.tar.gz">
-  <!ENTITY gs-other-fonts-md5sum      "33457d3f37de7ef03d2eea05a9e6aa4f">
-  <!ENTITY gs-other-fonts-size        "796 KB">
-]>
-
-<sect1 id="gs" xreflabel="ghostscript-&gs-version;">
-  <?dbhtml filename="gs.html"?>
-
-
-  <title>ghostscript-&gs-version;</title>
-
-  <indexterm zone="gs">
-    <primary sortas="a-Ghostscript">Ghostscript</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Ghostscript</title>
-
-    <para>
-      <application>Ghostscript</application> is a versatile processor
-      for PostScript data with the ability to render PostScript to different
-      targets. It is a mandatory part of the cups printing stack.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gs-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gs-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gs-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gs-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gs-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gs-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <!-- devs: do not comment out the bridgehead, unless you comment
-         out all the additional downloads (including font files)
-         Commenting this out since it's no longer needed, but keeping it for the
-         inevitable next time that we need a patch for this package.-->
-<!--
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/ghostscript-&gs-version;-upstream_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <para>
-      If you wish, you can download additional fonts.
-    </para>
-
-    <itemizedlist spacing="compact">
-      <title>Standard Fonts</title>
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gs-standard-fonts-download;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gs-standard-fonts-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gs-standard-fonts-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <itemizedlist spacing="compact">
-      <title>Other Fonts</title>
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gs-other-fonts-download;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gs-other-fonts-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gs-other-fonts-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Ghostscript Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="cups"/> (required for building the <quote>cups</quote>
-      device backend, which is needed by
-      <application>cups-filters</application>),
-      <xref linkend="fontconfig"/> (required, if you are installing any
-      suggested font),
-      <xref linkend="freetype2"/>,
-      <xref linkend="lcms2"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libtiff"/>, and
-      <xref linkend="openjpeg2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cairo"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="libidn"/>,
-      <xref linkend="libpaper"/>,
-      <xref linkend="libwebp"/>, and
-      <xref linkend="x-window-system"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Ghostscript</title>
-
-    <note>
-      <para>
-        The <application>Ghostscript</application> build system is not
-        user-friendly. In order to use system copies of various graphics
-        libraries, you must do it using unconventional methods.
-      </para>
-    </note>
-
-    <para>
-      <application>Ghostscript</application> includes (old) copies of
-      several libraries. Some of these seem to have been patched to fix known
-      vulnerabilities, but others of these copies are less-well maintained.
-      To ensure that any future fixes are applied throughout the whole system,
-      it is recommended that you first install the released versions of these
-      libraries and then configure <application>Ghostscript</application>
-      to link to them.
-    </para>
-
-    <para>
-      If you have installed the recommended dependencies on your system,
-      remove the copies of
-      <application>freetype</application>, <application>lcms2</application>,
-      <application>libjpeg</application>, <application>libpng</application>,
-      and <application>openjpeg</application>:
-    </para>
-
-<screen><userinput>rm -rf freetype lcms2mt jpeg libpng openjpeg</userinput></screen>
-
-<!--
-    <para>
-      Apply an upstream fix to prevent a build problem.
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../ghostscript-&gs-version;-upstream_fix-1.patch</userinput></screen>
--->
-    <para>
-      Compile <application>Ghostscript</application>:
-    </para>
-
-<screen><userinput>rm -rf zlib &amp;&amp;
-
-./configure --prefix=/usr           \
-            --disable-compile-inits \
-            --with-system-libtiff   &amp;&amp;
-make</userinput></screen>
-
-    <note>
-      <para>
-        The shared library depends on <xref linkend="gtk3"/>. It is only used by
-        external programs like <xref linkend="asymptote"/>, <xref
-        linkend="dvisvgm"/>, and <xref linkend="imagemagick"/>.
-      </para>
-    </note>
-
-    <para>
-      To compile the shared library
-      <filename class="libraryfile">libgs.so</filename>, run the following
-      additional command as an unprivileged user:
-    </para>
-
-<screen><userinput>make so</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.  A set of example files
-      may be used for testing, but it is only possible after installation
-      of the package.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you want the shared library too:
-    </para>
-
-<screen role="root"><userinput>make soinstall &amp;&amp;
-install -v -m644 base/*.h /usr/include/ghostscript &amp;&amp;
-ln -sfvn ghostscript /usr/include/ps</userinput></screen>
-
-    <para>
-      Now make the documentation accessible from a standard place:
-    </para>
-<!-- Starting with 9.23, the install does not seem to copy the examples any more -->
-
-<screen role="root"><userinput>mv -v /usr/share/doc/ghostscript/&gs-version; /usr/share/doc/ghostscript-&gs-version;  &amp;&amp;
-cp -r examples/ -T /usr/share/ghostscript/&gs-version;/</userinput></screen>
-
-    <para>
-      If you have downloaded the fonts, unpack them to
-      <filename class="directory">/usr/share/ghostscript</filename> and ensure
-      the ownership of the files are
-      <systemitem class="username">root</systemitem>:
-      <systemitem class="groupname">root</systemitem>.
-    </para>
-
-<screen role="root"><userinput>tar -xvf ../ghostscript-fonts-std-8.11.tar.gz -C /usr/share/ghostscript --no-same-owner &amp;&amp;
-tar -xvf ../gnu-gs-fonts-other-6.0.tar.gz     -C /usr/share/ghostscript --no-same-owner &amp;&amp;
-fc-cache -v /usr/share/ghostscript/fonts/</userinput></screen>
-
-    <para>
-      You can now test the rendering of various postscript and pdf files from the
-      <filename class="directory">/usr/share/ghostscript/&gs-version;/examples
-      </filename>. To do this, run the following command (in a X Windows display):
-    </para>
-
-<screen remap="test"><userinput>gs -q -dBATCH /usr/share/ghostscript/&gs-version;/examples/tiger.eps</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>rm -rf zlib </command>: <application>zlib</application>
-      was installed as part of LFS.
-    </para>
-
-    <para>
-      <parameter>--disable-compile-inits</parameter>: This option makes
-      <command>gs</command> and <filename>libgs.so</filename> slightly smaller.
-    </para>
-
-    <para>
-      <parameter>--with-system-libtiff</parameter>: Remove this option if
-      you've not installed <xref linkend="libtiff"/>.
-    </para>
-
-    <para>
-      <command>install -v -m644 base/*.h... </command>: Some packages
-      (<application>ImageMagick</application> is one) need the
-      <application>Ghostscript</application> interface headers in place to link
-      to the shared library. These commands install the headers.
-    </para>
-
-    <para>
-      <command>ln -sfvn ghostscript /usr/include/ps</command>: Some packages
-      expect to find the interface headers in an alternate location.
-    </para>
-
-    <para>
-        <command>mv -v /usr/share/doc/ghostscript/&gs-version;
-        /usr/share/doc/ghostscript-&gs-version;</command>: This moves the
-        documentation where it is expected to be found.
-    </para>
-
-    <para>
-      <option>--disable-cups</option>: this option will save a tiny amount of
-      space by not linking <command>gs</command> and <filename>libgs.so</filename>
-      to the <xref linkend="cups"/> libraries if you have installed those.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          dvipdf, eps2eps, gs, gsbj, gsc (from soinstall), gsdj,
-          gsdj500, gslj, gslp, gsnd, gsx (from soinstall), lprsetup.sh,
-          pdf2dsc, pdf2ps, pf2afm, pfbtopfa, pphs, printafm, ps2ascii,
-          ps2epsi, ps2pdf, ps2pdf12, ps2pdf13, ps2pdf14, ps2pdfwr,
-          ps2ps, ps2ps2, and unix-lpr.sh
-          <!-- I don't see bdftops,fixmswrd.pl or pv.sh on my builds [ I don't
-          have any bdf tools from xorg ] but they are still referenced in
-          base/unixinst.mak -->
-        </seg>
-        <seg>libgs.so</seg>
-        <seg>
-          /usr/include/ghostscript,
-          /usr/share/ghostscript, and
-          /usr/share/doc/ghostscript-&gs-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gplgs-prog">
-        <term><command>gs</command></term>
-        <listitem>
-          <para>
-            is an interpreter for Adobe Systems' PostScript(tm) and Portable
-            Document Format (PDF)
-          </para>
-          <indexterm zone="gs gplgs-prog">
-            <primary sortas="b-gs">gs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgs.so">
-        <term><filename class="libraryfile">libgs.so</filename></term>
-        <listitem>
-          <para>
-            provides <application>Ghostscript</application> functionality to
-            other programs, such as <application>GSView</application>,
-            <application>ImageMagick</application>, and
-            <application>libspectre</application>
-          </para>
-          <indexterm zone="gs libgs.so">
-            <primary sortas="c-libgs.so">libgs.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-   </variablelist>
-
-   <para>
-     <application>Ghostscript</application> provides many different
-     scripts used to convert PostScript, PDF, and other formats. Please refer to
-     the HTML documentation or the man pages for information about the
-     capabilities provided.
-    </para>
-  </sect2>
-
-</sect1>
Index: pst/printing/gutenprint.xml
===================================================================
--- pst/printing/gutenprint.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(revision )
@@ -1,340 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gutenprint-download-http "&sourceforge-dl;/gimp-print/gutenprint-&gutenprint-version;.tar.xz">
-  <!ENTITY gutenprint-download-ftp  " ">
-  <!ENTITY gutenprint-md5sum        "dc208cfb873f13a93439185c15aa6f81">
-  <!ENTITY gutenprint-size          "5.1 MB">
-  <!ENTITY gutenprint-buildsize     "59 MB (without tests)">
-  <!ENTITY gutenprint-time          "0.4 SBU (without tests)">
-  <!-- Tests add 75 SBU and 13GB to the equation - updated info in the tests below -->
-]>
-
-<sect1 id="gutenprint" xreflabel="Gutenprint-&gutenprint-version;">
-  <?dbhtml filename="gutenprint.html"?>
-
-
-  <title>Gutenprint-&gutenprint-version;</title>
-
-  <indexterm zone="gutenprint">
-    <primary sortas="a-Gutenprint">Gutenprint</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gutenprint</title>
-
-    <para>
-      The <application>Gutenprint</application> (formerly
-      <application>Gimp-Print</application>) package contains high
-      quality drivers for many brands and models of printers for use with
-      <xref linkend="cups"/>
-      and the
-      <application>GIMP-2.0</application>. See a list of supported printers at
-      <ulink url="https://gutenprint.sourceforge.net/p_Supported_Printers.php"/>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gutenprint-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gutenprint-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gutenprint-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gutenprint-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gutenprint-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gutenprint-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gutenprint Dependencies</bridgehead>
-
-    <!-- recommend cups since we describe how to use it, and the gimp
-    so that we can use gutenprint's driver to print photos there -->
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="cups"/> and
-      <xref linkend="gimp"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (at runtime)</bridgehead>
-    <para role="recommended">
-      Two families of DyeSub photo printers each require another library at
-      runtime. Unless you have one of these devices you will not want these
-      libraries.
-    </para>
-
-    <para role="recommended">
-      For the Sinfonia S6145 and the Ciaat Brava 21, <ulink
-      url="https://git.shaftnet.org/gitea/slp/selphy_print/src/branch/master/lib6145">libS6145ImageReProcess</ulink>,
-      see <ulink role="nodep"
-      url="https://www.peachyphotos.com/blog/posts/201601301524-sinfonia-chc-s6145-cs2-and-ciaat-brava-21-revited/">Peachy
-      Photos (Sinfonia)</ulink> for instructions on how to build and test this.
-    </para>
-
-    <para role="recommended">
-      For the Mitsubishi D70 family and the similar Kodak 305, <ulink
-	  url="https://git.shaftnet.org/gitea/slp/selphy_print/src/branch/master/lib70x">libMitsuD70ImageReProcess</ulink>,
-      see <ulink role="nodep"
-      url="https://www.peachyphotos.com/blog/posts/201610061508-mitsubishi-cp-d70-family-working/">Peachy
-      Photos (Mitsubishi CP-D70)</ulink> for instructions on how to build and
-      test this.
-    </para>
-
-    <bridgehead renderas="sect4">Optional (to Regenerate Documentation)</bridgehead>
-    <para role="optional">
-      <xref linkend="imagemagick"/>,
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>),
-      <xref linkend="doxygen"/>, and
-      <xref linkend="docbook-utils"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="kernel" id="gutenprint-escputil">
-    <title>Kernel Configuration</title>
-
-    <para>
-      If you intend to use <application>escputil</application> with a USB-connected
-      Epson Stylus printer for commands such as <command>--ink-level</command>
-      which need to access the raw device, you must enable the kernel's usblp
-      driver. Enable the following options in your kernel configuration and
-      recompile the kernel:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="usb-printer-kernel.xml"/>
-
-    <indexterm zone="gutenprint escputil">
-      <primary sortas="d-escputil">escputil for usb printers</primary>
-    </indexterm>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gutenprint</title>
-
-    <para>
-      Install <application>Gutenprint</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>sed -i 's|$(PACKAGE)/doc|doc/$(PACKAGE)-$(VERSION)|' \
-       {,doc/,doc/developer/}Makefile.in &amp;&amp;
-
-./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <!-- this is supposed to discourage you from running the tests if you upgrade
-    the package - but the tests in 5.2.12 have changed and I thought I read they
-    were more parallel -->
-    <para>
-      To test the results, issue: <command>make check</command>.  The tests
-      take a very long time and use a lot of disk space.  When last tested
-      (version 5.2.15 in June 2019) this needed 75 SBU and 13.5 GB
-      to complete the tests (one test, rastertogutenprint failed because the
-      CUPS ppds are for a previous version. Maybe genppds should be run before
-      the tests). Note that the tests used only one CPU.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -m755 -d /usr/share/doc/gutenprint-&gutenprint-version;/api/gutenprint{,ui2} &amp;&amp;
-install -v -m644    doc/gutenprint/html/* \
-                    /usr/share/doc/gutenprint-&gutenprint-version;/api/gutenprint &amp;&amp;
-install -v -m644    doc/gutenprintui2/html/* \
-                    /usr/share/doc/gutenprint-&gutenprint-version;/api/gutenprintui2</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i '...' ...Makefile.in</command>: This
-      command is used so that the package documentation is installed in the
-      conventional <filename class='directory'>/usr/share/doc</filename>
-      directory structure instead of
-      <filename class='directory'>/usr/share/gutenprint/doc</filename>.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Gutenprint</title>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        For <application>CUPS</application> to see newly installed print
-        drivers, it has to be restarted (as the <systemitem
-        class="username">root</systemitem> user):
-      </para>
-
-<screen role="root" revision="sysv"><userinput>/etc/rc.d/init.d/cups restart</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>systemctl restart cups</userinput></screen>
-
-      <!-- <para>
-        This command may take a long time (up to 10 minutes)
-        to complete. Don't panic while <application>CUPS</application>
-        is rescanning the list of PPD files. The long delay will happen
-        only once.
-      </para> -->
-
-      <para>
-        Then point your web browser to <ulink url="http://localhost:631/"/>
-        to add a new printer to <application>CUPS</application>.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          cups-calibrate, cups-genppd.5.2, cups-genppdupdate, escputil,
-          and testpattern
-        </seg>
-        <seg>
-          libgutenprint.so, libgutenprintui2.so and optionally, various
-          <application>CUPS</application> filters and backend drivers under
-          /usr/lib/gutenprint/5.2/modules/
-        </seg>
-        <seg>
-          /usr/{include,lib,share}/gutenprint,
-          /usr/include/gutenprintui2 and
-          /usr/share/doc/gutenprint-&gutenprint-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cups-calibrate">
-        <term><command>cups-calibrate</command></term>
-        <listitem>
-          <para>
-            calibrates the color output of printers using the
-            <application>Gutenprint</application>,
-            <application>CUPS</application> or
-            <application>ESP Print Pro</application> drivers
-          </para>
-          <indexterm zone="gutenprint cups-calibrate">
-            <primary sortas="b-cups-calibrate">cups-calibrate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cups-genppd.5.2">
-        <term><command>cups-genppd.5.2</command></term>
-        <listitem>
-          <para>
-            generates Gutenprint PPD files for use with CUPS
-          </para>
-          <indexterm zone="gutenprint cups-genppd.5.2">
-            <primary sortas="b-cups-genppd.5.2">cups-genppd.5.2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cups-genppdupdate">
-        <term><command>cups-genppdupdate</command></term>
-        <listitem>
-          <para>
-            regenerates the Gutenprint PPD files in use by CUPS
-          </para>
-          <indexterm zone="gutenprint cups-genppdupdate">
-            <primary sortas="b-cups-genppdupdate">cups-genppdupdate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="escputil">
-        <term><command>escputil</command></term>
-        <listitem>
-          <para>
-            is a command line utility to perform various maintenance
-            tasks on Epson Stylus inkjet printers
-          </para>
-          <indexterm zone="gutenprint escputil">
-            <primary sortas="b-escputil">escputil</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      <!-- With 5.2.15, even with IJS installed, this program no longer exists.
-      cups-filters-1.25.0 dropped support for IJS filters entirely. -->
-      <!--
-      <varlistentry id="ijsgutenprint.5.2">
-        <term><command>ijsgutenprint.5.2</command></term>
-        <listitem>
-          <para>
-            is a Ghostscript driver for HP InkJet and LaserJet printers.
-          </para>
-          <indexterm zone="gutenprint ijsgutenprint.5.2">
-            <primary sortas="b-ijsgutenprint.5.2">ijsgutenprint.5.2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      -->
-
-     <varlistentry id="testpattern">
-        <term><command>testpattern</command></term>
-        <listitem>
-          <para>
-            is a test program to learn how to use libgutenprint
-          </para>
-          <indexterm zone="gutenprint testpattern">
-            <primary sortas="b-testpattern">testpattern</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-   </variablelist>
-
-  </sect2>
-
-</sect1>
Index: pst/printing/libcupsfilters.xml
===================================================================
--- pst/printing/libcupsfilters.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(revision )
@@ -1,220 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY libcupsfilters-download-http
-  "https://github.com/OpenPrinting/libcupsfilters/releases/download/&libcupsfilters-version;/libcupsfilters-&libcupsfilters-version;.tar.xz">
-  <!ENTITY libcupsfilters-download-ftp  " ">
-  <!ENTITY libcupsfilters-md5sum        "267e569145bd20615fa18ae65ea6f870">
-  <!ENTITY libcupsfilters-size          "1.2 MB">
-  <!ENTITY libcupsfilters-buildsize     "38 MB (with tests)">
-  <!ENTITY libcupsfilters-time          "0.1 SBU (Using parallelism=4; with tests)">
-]>
-
-<sect1 id="libcupsfilters" xreflabel="libcupsfilters-&libcupsfilters-version;">
-  <?dbhtml filename="libcupsfilters.html"?>
-
-
-  <title>libcupsfilters-&libcupsfilters-version;</title>
-
-  <indexterm zone="libcupsfilters">
-    <primary sortas="a-libcupsfilters">libcupsfilters</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libcupsfilters</title>
-
-    <para>
-      The <application>libcupsfilters</application> library contains
-      filter functions for the data format conversion tasks needed in
-      Printer Applications. It also contains several API functions for
-      developing printer drivers/Printer Applications.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libcupsfilters-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libcupsfilters-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libcupsfilters-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libcupsfilters-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libcupsfilters-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libcupsfilters-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-    <!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/libcupsfilters-&libcupsfilters-version;-security_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-    -->
-    <bridgehead renderas="sect3">libcupsfilters Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cups"/>,
-      <xref linkend="glib2"/>,
-      <xref linkend="gs"/> or <xref linkend="mupdf"/>,
-      <xref linkend="lcms2"/>,
-      <xref linkend="poppler"/>, and
-      <xref linkend="qpdf"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="dejavu-fonts"/> (the build fails if they are not
-      installed, although they are only required for the tests),
-      <xref linkend="libexif"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libpng"/>, and
-      <xref linkend="libtiff"/>
-    </para>
-    <!--
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="avahi"/> (required to build the DNSSD backend of the
-      <command>cups-browsed</command> daemon, which is needed for operating
-      some network printers),
-      <xref linkend="openldap"/>,
-      <xref linkend="php"/> (use of this might be broken),
-      <ulink url="https://liblouis.github.io/downloads/">Liblouis (Braille)</ulink>, and
-      <ulink url="https://liblouis.github.io/downloads/">Liblouisutdml (Braille)</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional printer drivers (runtime)</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="gutenprint"/> (for supported printers),
-      or other printer drivers, such as <ulink role="runtime"
-      url="https://sourceforge.net/projects/hplip/files/hplip/">hplip</ulink>
-    </para>
-    -->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libcupsfilters</title>
-
-    <!--
-    <para>
-      First, fix a security vulnerability that can allow for remote code
-      execution with the 'beh' printer backend:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../libcupsfilters-&libcupsfilters-version;-security_fix-1.patch</userinput></screen>
--->
-    <para>
-      Install <application>libcupsfilters</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr                   \
-            --disable-static                \
-            --docdir=/usr/share/doc/libcupsfilters-&libcupsfilters-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue <command>make check</command>. DejaVu fonts
-      are needed for the tests.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <option>--with-test-font-path=<replaceable>VALUE</replaceable></option>:
-      If you wish to run the tests, but
-      you do not have the default
-      <filename>/usr/share/fonts/dejavu/DejaVuSans.ttf</filename> use this
-      switch to specify where <filename>DejaVuSans.ttf</filename> (or perhaps
-      some other text TTF font - untested) is located.
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libcupsfilters.so
-        </seg>
-        <seg>
-          /usr/include/cupsfilters,
-          /usr/share/cups/{banners,charsets,data}, and
-          /usr/share/doc/libcupsfilters-&libcupsfilters-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libcupsfilters-lib">
-        <term><filename class="libraryfile">libcupsfilters.so</filename></term>
-        <listitem>
-          <para>
-            contains CUPS filters API functions
-          </para>
-          <indexterm zone="libcupsfilters libcupsfilters-lib">
-            <primary sortas="c-libcupsfilters">libcupsfilters.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: pst/printing/libppd.xml
===================================================================
--- pst/printing/libppd.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(revision )
@@ -1,242 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY libppd-download-http
-  "https://github.com/OpenPrinting/libppd/releases/download/&libppd-version;/libppd-&libppd-version;.tar.xz">
-  <!ENTITY libppd-download-ftp  " ">
-  <!ENTITY libppd-md5sum        "ab889cbcdaa23689d9a425769f208da9">
-  <!ENTITY libppd-size          "567 KB">
-  <!ENTITY libppd-buildsize     "13 MB (with tests)">
-  <!ENTITY libppd-time          "less than 0.1 SBU (Using parallelism=4; with tests)">
-]>
-
-<sect1 id="libppd" xreflabel="libppd-&libppd-version;">
-  <?dbhtml filename="libppd.html"?>
-
-
-  <title>libppd-&libppd-version;</title>
-
-  <indexterm zone="libppd">
-    <primary sortas="a-libppd">libppd</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libppd</title>
-
-    <para>
-      The <application>libppd</application> library contains
-      functions for handling legacy printers using PPD description files.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libppd-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libppd-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libppd-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libppd-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libppd-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libppd-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libppd Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libcupsfilters"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libppd</title>
-
-    <para>
-      Install <application>libppd</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr                   \
-            --disable-static                \
-            --with-cups-rundir=/run/cups    \
-            --enable-ppdc-utils             \
-            --docdir=/usr/share/doc/libppd-&libppd-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <parameter>--with-cups-rundir=/run/cups</parameter>:
-      Defines the directory containing transient printing data. The default
-      <filename class="directory">/var/run/cups</filename> is obsolete.
-    </para>
-
-    <para>
-      <parameter>--enable-ppdc-utils</parameter>:
-      Allows building utilities to manipulate <emphasis>.ppd</emphasis> files.
-      <!-- This is not required until cups v3 is out, since those utilities
-      are also installed by cups v2. But since cups v3 should be out before
-      our next release, I put it here. Pierre -->
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          ppdc,
-          ppdhtml,
-          ppdi,
-          ppdmerge, and
-          ppdo
-        </seg>
-        <seg>
-          libppd.so
-        </seg>
-        <seg>
-          /usr/include/ppd,
-          /usr/share/ppdc, and
-          /usr/share/doc/libppd-&libppd-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libppd-ppdc">
-        <term><command>ppdc</command></term>
-        <listitem>
-          <para>
-            compiles PPDC source files into one or more PPD files
-          </para>
-          <indexterm zone="libppd libppd-ppdc">
-            <primary sortas="b-ppdc">ppdc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libppd-ppdhtml">
-        <term><command>ppdhtml</command></term>
-        <listitem>
-          <para>
-            reads a driver information file and produces a HTML summary
-            page that lists all of the drivers in a file and the
-            supported options
-          </para>
-          <indexterm zone="libppd libppd-ppdhtml">
-            <primary sortas="b-ppdhtml">ppdhtml</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libppd-ppdi">
-        <term><command>ppdi</command></term>
-        <listitem>
-          <para>
-            imports one or more PPD files into a PPD compiler source file
-          </para>
-          <indexterm zone="libppd libppd-ppdi">
-            <primary sortas="b-ppdi">ppdi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libppd-ppdmerge">
-        <term><command>ppdmerge</command></term>
-        <listitem>
-          <para>
-            merges two or more PPD files into a single, multi-language
-            PPD file
-          </para>
-          <indexterm zone="libppd libppd-ppdmerge">
-            <primary sortas="b-ppdmerge">ppdmerge</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libppd-ppdpo">
-        <term><command>ppdpo</command></term>
-        <listitem>
-          <para>
-            extracts UI strings from PPDC source files and
-            updates either a GNU gettext or Mac OS X strings
-            format message catalog source file for translation
-          </para>
-          <indexterm zone="libppd libppd-ppdpo">
-            <primary sortas="b-ppdpo">ppdpo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libppd-lib">
-        <term><filename class="libraryfile">libppd.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for manipulating <emphasis>.ppd</emphasis>
-            files
-          </para>
-          <indexterm zone="libppd libppd-lib">
-            <primary sortas="c-libppd">libppd.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: pst/printing/parallel-printer-kernel.xml
===================================================================
--- pst/printing/parallel-printer-kernel.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>D</emphasis>evice Drivers ---&gt;
-  &lt;*/M&gt; <emphasis role='blue'>P</emphasis>arallel port support ---&gt;                                     [PARPORT]
-    &lt;*/M&gt; <emphasis role='blue'>P</emphasis>C-style hardware                                         [PARPORT_PC]
-  <emphasis role='blue'>C</emphasis>haracter devices ---&gt;
-    &lt;*/M&gt; <emphasis role='blue'>P</emphasis>arallel printer support                                     [PRINTER]</screen>
Index: pst/printing/printing.xml
===================================================================
--- pst/printing/printing.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ pst/printing/printing.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,27 +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="pst-printing">
+<?dbhtml filename="printing.html" dir="pst"?>
+<title>Printing</title>
 
-<chapter id="pst-printing">
-  <?dbhtml filename="printing.html"?>
-
-  <title>Printing</title>
-
-  <para>
-    This chapter contains spooling printer management systems and
-    ghostscript applications to render PostScript for display on terminals
-    or paper.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cups.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cups-browsed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cups-filters.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gutenprint.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcupsfilters.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libppd.xml"/>
+<para>Placeholder for ghostscript, lprng and cups</para>
 
 </chapter>
Index: pst/printing/usb-printer-kernel.xml
===================================================================
--- pst/printing/usb-printer-kernel.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(revision )
@@ -1,8 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>D</emphasis>evice Drivers ---&gt;
-  [*] <emphasis role='blue'>U</emphasis>SB support ---&gt;                                             [USB_SUPPORT]
-    &lt;*/M&gt; <emphasis role='blue'>U</emphasis>SB Printer support                                      [USB_PRINTER]</screen>
Index: pst/ps/enscript.xml
===================================================================
--- pst/ps/enscript.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(revision )
@@ -1,281 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!-- Keeping this URL as this is the actual maintainer's site
-  <!ENTITY enscript-download-http "http://www.iki.fi/mtr/genscript/enscript-&enscript-version;.tar.gz">
-  -->
-
-  <!ENTITY enscript-download-http "&gnu-http;/enscript/enscript-&enscript-version;.tar.gz">
-  <!ENTITY enscript-download-ftp  " ">
-  <!ENTITY enscript-md5sum        "3acc242b829adacabcaf28533f049afd">
-  <!ENTITY enscript-size          "1.3 MB">
-  <!ENTITY enscript-buildsize     "14 MB">
-  <!ENTITY enscript-time          "0.1 SBU">
-]>
-
-<sect1 id="enscript" xreflabel="Enscript-&enscript-version;">
-  <?dbhtml filename="enscript.html"?>
-
-
-  <title>Enscript-&enscript-version;</title>
-
-  <indexterm zone="enscript">
-    <primary sortas="a-Enscript">Enscript</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Enscript</title>
-
-    <para>
-      <application>Enscript</application> converts ASCII text files
-      to PostScript, HTML, RTF, ANSI and overstrikes.
-    </para>
-
-    &lfs121_checked;
-
-    <caution>
-      <para>
-        <application>Enscript</application> cannot convert UTF-8 encoded
-        text to PostScript. The issue is discussed in detail in the
-        <xref linkend="locale-not-valid-option"/> section of the
-        <xref linkend="locale-issues"/> page.
-        The solution is to use <xref linkend="paps"/>, instead of
-        <application>Enscript</application>, for converting
-        UTF-8 encoded text to PostScript.
-      </para>
-    </caution>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&enscript-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&enscript-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &enscript-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &enscript-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &enscript-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &enscript-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <!-- <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch: <ulink url=
-            "&patch-root;/enscript-&enscript-version;-security_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist> -->
-
-    <bridgehead renderas="sect3">Enscript Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Enscript</title>
-
-    <para>
-      Install <application>Enscript</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr              \
-            --sysconfdir=/etc/enscript \
-            --localstatedir=/var       \
-            --with-media=Letter &amp;&amp;
-make &amp;&amp;
-
-pushd docs &amp;&amp;
-  makeinfo --plaintext -o enscript.txt enscript.texi &amp;&amp;
-popd</userinput></screen>
-
-    <para>
-      If you have <xref linkend="texlive"/> installed, you can create
-      Postscript and PDF documentation by issuing (does not support parallel
-      make):
-    </para>
-
-<screen remap="doc"><userinput>make -j1 -C docs ps pdf</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-
-install -v -m755 -d /usr/share/doc/enscript-&enscript-version; &amp;&amp;
-install -v -m644    README* *.txt docs/*.txt \
-                    /usr/share/doc/enscript-&enscript-version;</userinput></screen>
-
-    <para>
-      If you built Postscript and PDF documentation, install it
-      using the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -v -m644 docs/*.{dvi,pdf,ps} \
-                 /usr/share/doc/enscript-&enscript-version;</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--sysconfdir=/etc/enscript</parameter>: This switch puts
-      configuration data in <filename class="directory">/etc/enscript</filename>
-      instead of <filename class="directory">/usr/etc</filename>.
-    </para>
-
-    <para>
-      <parameter>--localstatedir=/var</parameter>: This switch sets the
-      directory for runtime data to <filename class="directory">/var</filename>
-      instead of <filename class="directory">/usr/var</filename>.
-    </para>
-
-    <para>
-      <parameter>--with-media=Letter</parameter>: This switch sets the
-      medium format to letter size instead of the A4 default.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>diffpp, enscript, mkafmmap, over, sliceprint,
-        and states</seg>
-        <seg>None</seg>
-        <seg>/etc/enscript, /usr/share/doc/enscript-&enscript-version;, and
-        /usr/share/enscript</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="diffpp">
-        <term><command>diffpp</command></term>
-        <listitem>
-          <para>
-            converts <command>diff</command> output files to a format
-            suitable to be printed with <command>enscript</command>
-          </para>
-          <indexterm zone="enscript diffpp">
-            <primary sortas="b-diffpp">diffpp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="enscript-prog">
-        <term><command>enscript</command></term>
-        <listitem>
-          <para>
-            is a filter, used primarily by printing scripts, that
-            converts ASCII text files to PostScript, HTML, RTF, ANSI and
-            overstrikes
-          </para>
-          <indexterm zone="enscript enscript-prog">
-            <primary sortas="b-enscript">enscript</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkafmmap">
-        <term><command>mkafmmap</command></term>
-        <listitem>
-          <para>
-            creates a font map from a given file
-          </para>
-          <indexterm zone="enscript mkafmmap">
-            <primary sortas="b-mkafmmap">mkafmmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="over">
-        <term><command>over</command></term>
-        <listitem>
-          <para>
-            is a script which calls <command>enscript</command> and
-            passes the correct parameters to create overstriked fonts
-          </para>
-          <indexterm zone="enscript over">
-            <primary sortas="b-over">over</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sliceprint">
-        <term><command>sliceprint</command></term>
-        <listitem>
-          <para>
-            slices documents with long lines
-          </para>
-          <indexterm zone="enscript sliceprint">
-            <primary sortas="b-sliceprint">sliceprint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="states">
-        <term><command>states</command></term>
-        <listitem>
-          <para>
-            is an <command>awk</command>-like text processing tool
-            with some state machine extensions. It is designed for program
-            source code highlighting and for similar tasks where state
-            information helps input processing
-          </para>
-          <indexterm zone="enscript states">
-            <primary sortas="b-states">states</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: pst/ps/epdfview.xml
===================================================================
--- pst/ps/epdfview.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(revision )
@@ -1,207 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY epdfview-download-http "&sources-anduin-http;/epdfview-gtk3/epdfview-&epdfview-version;.tar.xz">
-  <!ENTITY epdfview-download-ftp  " ">
-  <!ENTITY epdfview-md5sum        "d222a3dc26c2faf6f862018bb478fb36">
-  <!ENTITY epdfview-size          "184 KB">
-  <!ENTITY epdfview-buildsize     "3.5 MB">
-  <!ENTITY epdfview-time          "less than 0.1 SBU (using parallelism=4)">
-]>
-
-<sect1 id="epdfview" xreflabel="epdfview-&epdfview-version;">
-  <?dbhtml filename="epdfview.html"?>
-
-
-  <title>ePDFView-&epdfview-version;</title>
-
-  <indexterm zone="epdfview">
-    <primary sortas="a-epdfview">epdfview</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ePDFView-gtk3</title>
-
-    <para>
-      <application>ePDFView-gtk3</application> is a fork of the old
-      <application>ePDFView</application> program. Although the github repository
-      <ulink url="https://github.com/Flow-It/epdfview_old.git"/>  names it as
-      'old', it is the gtk3 fork. It is a lightweight replacement for
-      <application>Evince</application> as it does not rely upon
-      <application>GNOME</application> libraries and is more capable than
-      <application>MuPDF</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&epdfview-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&epdfview-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &epdfview-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &epdfview-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &epdfview-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &epdfview-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">ePDFView Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/> and
-      <xref linkend="poppler"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="Recommended">
-      <xref linkend="cups"/> (to access print queues),
-      <xref linkend="desktop-file-utils"/>, and
-      <xref linkend="hicolor-icon-theme"/> (both for the icons this installs)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      The home page of the project's repository mentions that there are optional
-      dependencies, which are enabled by switches. These are for building the
-      documentation and running the test suite,
-      <xref linkend="doxygen"/> and
-      <ulink url='https://freedesktop.org/wiki/Software/cppunit/'>Cppunit</ulink>.
-      Note that <application>doxygen</application> only installs a skeletal
-      page about itself, which contains no package documentation, and the test
-      code does not compile with recent versions of C++.
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ePDFView-gtk3</title>
-
-    <para>
-      Install <application>ePDFView-gtk3</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr          \
-            --buildtype=release    \
-            -Denable-printing=true \
-            ..                     &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package does not come with a buildable test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/update-icons-and-desktop.xml"/>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-    <para>
-      <command>-Denable-printing=true</command>: builds the code to link to the
-      <application>cups</application> print queue(s). Omit this if you have not
-      installed <application>cups</application>.
-    </para>
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring ePDFView-gtk3</title>
-
-      <para>
-        ePDFView-gtk3 has several keyboard hotkeys for optional features. Most
-        of them are 'off' by default, including the toolbar, and if it has been
-        closed with the menu disabled, the program can start with all options
-        not being visible until the relevant function keys are pressed.
-        <itemizedlist>
-          <listitem>
-            <para>[F6] - toggle toolbar</para>
-          </listitem>
-          <listitem>
-            <para>[F7] - toggle menu</para>
-          </listitem>
-          <listitem>
-            <para>[F8] - toggle invert-colors</para>
-          </listitem>
-          <listitem>
-            <para>[F9] - toggle show-index</para>
-          </listitem>
-          <listitem>
-            <para>[F11] - toggle fullscreen</para>
-          </listitem>
-        </itemizedlist>
-      </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>epdfview</seg>
-        <seg>None</seg>
-        <seg>/usr/share/epdfview</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="epdfview-prog">
-        <term><command>epdfview</command></term>
-        <listitem>
-          <para>
-            is a <application>Gtk+-3</application> program for viewing PDF
-            documents
-          </para>
-          <indexterm zone="epdfview epdfview-prog">
-            <primary sortas="b-epdfview">epdfview</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: pst/ps/fop.xml
===================================================================
--- pst/ps/fop.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(revision )
@@ -1,454 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY fop-download-http "https://archive.apache.org/dist/xmlgraphics/fop/source/fop-&fop-version;-src.tar.gz">
-  <!ENTITY fop-download-ftp  " ">
-  <!ENTITY fop-md5sum        "f7537ca7f2e16971fa99c8bb0dad62c7">
-  <!ENTITY fop-size          "20 MB">
-  <!ENTITY fop-buildsize     "333 MB (including files downloaded to the user directory)">
-  <!ENTITY fop-time          "0.9 SBU">
-<!--
-  <!ENTITY pdfbox-version    "2.0.27">
-  <!ENTITY pdfbox-download   "https://archive.apache.org/dist/pdfbox/&pdfbox-version;/pdfbox-&pdfbox-version;.jar">
-  <!ENTITY pdfbox-md5sum     "ddd46402b1692eed9e5c73b4a94c45d8">
-  <!ENTITY pdfbox-size       "2.7 MB">
-
-  <!ENTITY fontbox-download  "https://archive.apache.org/dist/pdfbox/&pdfbox-version;/fontbox-&pdfbox-version;.jar">
-  <!ENTITY fontbox-md5sum    "587744efe2a82d3584c2f3969fa4dca0">
-  <!ENTITY fontbox-size      "1.5 MB">
--->
-  <!ENTITY maven-major        "3">
-  <!ENTITY maven-version      "3.9.4">
-  <!ENTITY maven-download     "https://archive.apache.org/dist/maven/maven-&maven-major;/&maven-version;/binaries/apache-maven-&maven-version;-bin.tar.gz">
-  <!ENTITY maven-md5sum       "0698a533397eda60cbebcc0fb68ae842">
-  <!ENTITY maven-size         "9.0 MB (additionally, about 90 MB are downloaded to the building user's directory)">
-
-  <!ENTITY offo-download     "&sourceforge-dl;/offo/2.2/offo-hyphenation.zip">
-  <!ENTITY offo-md5sum       "bf9c09bf05108ef9661b8f08d91c2336">
-  <!ENTITY offo-size         "862 KB">
-]>
-
-<sect1 id="fop" xreflabel="fop-&fop-version;">
-  <?dbhtml filename="fop.html"?>
-
-
-  <title>fop-&fop-version;</title>
-
-  <indexterm zone="fop">
-    <primary sortas="a-fop">fop</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to fop</title>
-
-    <para>
-      The <application>FOP</application> (Formatting Objects Processor)
-      package contains a print formatter driven by XSL formatting objects
-      (XSL-FO). It is a <application>Java</application> application that reads
-      a formatting object tree and renders the resulting pages to a specified
-      output. Output formats currently supported include PDF, PCL, PostScript,
-      SVG, XML (area tree representation), print, AWT, MIF and ASCII text. The
-      primary output target is PDF.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&fop-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&fop-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &fop-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &fop-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &fop-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &fop-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <title>Required Additional Downloads:</title>
-<!--
-      <listitem>
-        <para>
-          PDFBox:
-          <simplelist>
-            <member><ulink url="&pdfbox-download;"/></member>
-            <member>&pdfbox-md5sum;</member>
-            <member>&pdfbox-size;</member>
-          </simplelist>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          PDFBox Fonts:
-          <simplelist>
-            <member><ulink url="&fontbox-download;"/></member>
-            <member>&fontbox-md5sum;</member>
-            <member>&fontbox-size;</member>
-          </simplelist>
-        </para>
-      </listitem>
--->
-      <listitem>
-        <para>
-          Maven build system:
-          <simplelist>
-            <member><ulink url="&maven-download;"/></member>
-            <member>&maven-md5sum;</member>
-            <member>&maven-size;</member>
-          </simplelist>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <itemizedlist spacing="compact">
-      <title>Recommended packages</title>
-      <listitem>
-        <para>
-          Objects for Formatting Objects (OFFO) hyphenation patterns:
-          <simplelist>
-            <member><ulink url="&offo-download;"/></member>
-            <member>&offo-md5sum;</member>
-            <member>&offo-size;</member>
-          </simplelist>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">fop Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="apache-ant"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="x-window-system"/> (to run tests),
-      <ulink url="https://jai-tools.blogspot.com/">JAI Image I/O Tools</ulink>, and
-      <ulink url="https://jeuclid.sourceforge.net/">JEuclid</ulink>
-<!-- [pierre 2017-04-29] Note to devs: there are a lot of bundled dependencies.
-     Some were listed here, but not all. I am not sure it is possible to
-     use system ones. So, I have removed them, and kept only those which
-     are not bundled. -->
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of fop</title>
-
-    <para>
-      Ensure <envar>$JAVA_HOME</envar> is set correctly before beginning
-      the build. To build the <application>JIMI SDK</application> and/or
-      <application>XMLUnit</application> extension classes, ensure the
-      corresponding <filename class='extension'>.jar</filename> files can be
-      found via the <envar>CLASSPATH</envar> environment variable.
-    </para>
-
-    <sect3>
-      <title>Installing OFFO Hyphenation Patterns</title>
-
-      <para>
-        Copy the XML hyphenation patterns into the fop source tree by running
-        the following commands:
-      </para>
-
-<screen><userinput>unzip ../offo-hyphenation.zip &amp;&amp;
-cp offo-hyphenation/hyph/* fop/hyph &amp;&amp;
-rm -rf offo-hyphenation</userinput></screen>
-
-    </sect3>
-
-    <sect3>
-      <title>Installing a temporary Maven binary</title>
-
-      <para>
-        Starting with fop-2.5, the Maven build system is required. We use
-        the binary provided by apache, that we install in a temporary location:
-      </para>
-
-<screen><userinput>tar -xf ../apache-maven-&maven-version;-bin.tar.gz -C /tmp</userinput></screen>
-
-    </sect3>
-
-    <sect3>
-      <title>Installing fop Components</title>
-
-      <para>
-        The <command>javadoc</command> command that ships with OpenJDK 10 and
-        later has
-        become much stricter than previous versions regarding conformance of
-        the Javadoc comments in source code to HTML. The FOP documentation does
-        not meet those standards, so the conformance checks have to be
-        disabled. This can be done with the following command:
-      </para>
-
-<screen><userinput>sed -i '\@&lt;/javad@i\
-&lt;arg value="-Xdoclint:none"/&gt;\
-&lt;arg value="--allow-script-in-comments"/&gt;\
-&lt;arg value="--ignore-source-errors"/&gt;' \
-    fop/build.xml</userinput></screen>
-
-<!--
-      <para>
-        The <filename>build.xml</filename> file calls for an old version of
-        <application>PDFBox</application> components that are no longer
-        available. Copy the updated PDFBox components into the source tree:
-      </para>
-
-<screen><userinput>cp ../{pdf,font}box-&pdfbox-version;.jar fop/lib</userinput></screen>
--->
-      <para>
-        Compile <application>fop</application> by running the following
-        commands:
-      </para>
-
-<screen><userinput>cd fop &amp;&amp;
-
-LC_ALL=en_US.UTF-8                     \
-PATH=$PATH:/tmp/apache-maven-&maven-version;/bin \
-ant all javadocs &amp;&amp;
-
-mv build/javadocs .</userinput></screen>
-
-      <para>
-        This package comes with a test suite, but the java infrastructure
-        installed in this book does not allow running it.
-      </para>
-
-      <para>
-        Now, install <application>Fop</application> as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>install -v -d -m755 -o root -g root          /opt/fop-&fop-version; &amp;&amp;
-cp -vR build conf examples fop* javadocs lib /opt/fop-&fop-version; &amp;&amp;
-chmod a+x /opt/fop-&fop-version;/fop                                &amp;&amp;
-ln -v -sfn fop-&fop-version; /opt/fop</userinput></screen>
-
-      <para>
-        The last thing to do is to clean what we have done:
-      </para>
-
-<screen><userinput>rm -rf /tmp/apache-maven-&maven-version;</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i ... build.xml</command>: This adds three switches to the
-      <command>javadoc</command> command, preventing some errors from occurring
-      when building the documentation.
-    </para>
-
-    <para>
-      <command>export LC_ALL=en_US.UTF-8</command>: the compiler fails if using
-      an ASCII locale.
-    </para>
-
-    <para>
-      <command>ant <option>target</option></command>: This reads the file
-      <filename>build.xml</filename> and builds the target: <option>compile
-      </option> compiles the java sources, <option>jar-main</option> generates
-      jar archives, <option>jar-hyphenation</option> generates the hyphenation
-      patterns for FOP, <option>junit</option> runs the
-      <application>junit</application> tests, and <option>javadocs</option>
-      builds the documentation. The <option>all</option> target runs all of the
-      above.
-    </para>
-
-    <para>
-      <command>ln -v -sf fop-&fop-version; /opt/fop</command>: This is
-      optional and creates a convenience symlink so that
-      <envar>$FOP_HOME</envar> doesn't have to be changed each time there's a
-      package version change.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring fop</title>
-
-    <sect3 id="fop-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>~/.foprc</filename>
-      </para>
-
-      <indexterm zone="fop fop-config">
-        <primary sortas="e-AA.foprc">~/.foprc</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        Using <application>fop</application> to process some large FO's
-        (including the FO derived from the BLFS XML sources), can lead to
-        memory errors. Unless you add a parameter to the
-        <command>java</command> command used in the <command>fop</command>
-        script you may receive messages similar to the one shown below:
-      </para>
-
-      <para>
-        <computeroutput>
-          Exception in thread "main" java.lang.OutOfMemoryError: Java heap
-          space
-        </computeroutput>
-      </para>
-
-      <para>
-        To avoid errors like this, you need to pass an extra parameter to
-        the <command>java</command> command used in the <command>fop</command>
-        script. This can be accomplished by creating a
-        <filename>~/.foprc</filename> (which is sourced by the
-        <command>fop</command> script) and adding the parameter to the
-        <envar>FOP_OPTS</envar> environment variable.
-      </para>
-
-      <para>
-        The <command>fop</command> script looks for a
-        <envar>FOP_HOME</envar> environment variable to locate the
-        <application>fop</application> class libraries. You can create this
-        variable using the <filename>~/.foprc</filename> file as well. Create
-        a <filename>~/.foprc</filename> file using the following commands:
-      </para>
-
-<screen><userinput>cat &gt; ~/.foprc &lt;&lt; "EOF"
-<literal>FOP_OPTS="-Xmx<replaceable>&lt;RAM_Installed&gt;</replaceable>m"
-FOP_HOME="/opt/fop"</literal>
-EOF</userinput></screen>
-
-      <para>
-        Replace <replaceable>&lt;RAM_Installed&gt;</replaceable> with a
-        number representing the amount of RAM installed in your computer (in
-        megabytes). An example would be
-        <userinput>FOP_OPTS="-Xmx768m"</userinput>.
-        <!--  the URL is broken
-        For more information about
-        memory issues running <application>fop</application>, see
-        <ulink url="http://xml.apache.org/fop/running.html#memory"/>.
-        -->
-      </para>
-
-      <para>
-        To include the <command>fop</command> script in your path,
-        update the system-wide profile with the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/fop.sh &lt;&lt; "EOF"
-<literal># Begin /etc/profile.d/fop.sh
-
-pathappend /opt/fop
-
-# End /etc/profile.d/fop.sh</literal>
-EOF</userinput></screen>
-
-      <note>
-        <para>
-          Running <command>fop</command> can be somewhat verbose.
-          The default logging level can be changed from INFO to any of
-          FINEST, FINER, FINE, CONFIG, INFO, WARNING, SEVERE, ALL, or OFF.
-          To do this, edit
-          <filename>$JAVA_HOME/jre/lib/logging.properties</filename> and change
-          the entries for <option>.level</option> and
-          <option>java.util.logging.ConsoleHandler.level</option> to
-          the desired value.
-        </para>
-      </note>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>fop</seg>
-        <seg>fop.jar and numerous support library classes located in
-        <filename class="directory">/opt/fop/{build,lib}</filename>; JAI
-        components include libmlib_jai.so, jai_codec.jar, jai_core.jar, and
-        mlibwrapper_jai.jar</seg>
-        <seg>/opt/fop-&fop-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="fop-prog">
-        <term><command>fop</command></term>
-        <listitem>
-          <para>
-            is a wrapper script to the <command>java</command> command
-            which sets up the <application>fop</application>
-            environment and passes the required parameters
-          </para>
-          <indexterm zone="fop fop-prog">
-            <primary sortas="b-fop">fop</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fop.jar">
-        <term><filename class="libraryfile">fop.jar</filename></term>
-        <listitem>
-          <para>
-            contains all the <application>fop</application>
-            <application>Java</application> classes
-          </para>
-          <indexterm zone="fop fop.jar">
-            <primary sortas="c-fop.jar">fop.jar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: pst/ps/mupdf.xml
===================================================================
--- pst/ps/mupdf.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(revision )
@@ -1,293 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-<!--Using archive URL, because when a new version is released, older and new
-can be found there, no need to change directory -->
-  <!ENTITY mupdf-download-http "https://www.mupdf.com/downloads/archive/mupdf-&mupdf-version;-source.tar.gz">
-  <!ENTITY mupdf-download-ftp  " ">
-  <!ENTITY mupdf-md5sum        "ff320ad9eb4296f0ec48ce6c90307a52">
-  <!ENTITY mupdf-size          "52.7 MB">
-  <!ENTITY mupdf-buildsize     "252 MB">
-  <!ENTITY mupdf-time          "0.2 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="mupdf" xreflabel="mupdf-&mupdf-version;">
-  <?dbhtml filename="mupdf.html"?>
-
-
-  <title>MuPDF-&mupdf-version;</title>
-
-  <indexterm zone="mupdf">
-    <primary sortas="a-mupdf">mupdf</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to MuPDF</title>
-
-    <para>
-      <application>MuPDF</application> is a lightweight PDF and XPS viewer.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&mupdf-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&mupdf-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &mupdf-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &mupdf-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &mupdf-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &mupdf-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Required Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch: <ulink
-          url="&patch-root;/mupdf-&mupdf-version;-security_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">MuPDF Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glu"/> and <!-- previously recommended via system freeglut -->
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <!--<xref linkend="freeglut"/>, use of the bundled glut is preferred -->
-      <xref linkend="harfbuzz"/>,
-      <!-- This no-longer gets linked in with our system libs patch
-      <xref linkend="lcms2"/>, -->
-      <xref linkend="libjpeg"/>,
-      <xref linkend="openjpeg2"/>, and
-      <xref linkend="curl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="xdg-utils"/> (runtime),
-      <ulink url="https://jbig2dec.com">jbig2dec</ulink>, and
-      <ulink url="https://mujs.com/">MuJS</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Required (runtime)</bridgehead>
-    <para role="required">
-      <xref role="runtime" linkend="x-window-system"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of MuPDF</title>
-<!--
-    <para>First, fix the Makefile to link properly with the shared library:</para>
-
-<screen><userinput>sed -i '/MU.*_EXE. :/{
-        s/\(.(MUPDF_LIB)\)\(.*\)$/\2 | \1/
-        N
-        s/$/ -lmupdf -L$(OUT)/
-        }' Makefile</userinput></screen>
--->
-    <para>
-      Install <application>MuPDF</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>cat &gt; user.make &lt;&lt; EOF &amp;&amp;
-USE_SYSTEM_FREETYPE := yes
-USE_SYSTEM_HARFBUZZ := yes
-USE_SYSTEM_JBIG2DEC := no
-USE_SYSTEM_JPEGXR := no # not used without HAVE_JPEGXR
-USE_SYSTEM_LCMS2 := no # need lcms2-art fork
-USE_SYSTEM_LIBJPEG := yes
-USE_SYSTEM_MUJS := no # build needs source anyway
-USE_SYSTEM_OPENJPEG := yes
-USE_SYSTEM_ZLIB := yes
-USE_SYSTEM_GLUT := no # need freeglut2-art fork
-USE_SYSTEM_CURL := yes
-USE_SYSTEM_GUMBO := no
-EOF
-
-export XCFLAGS=-fPIC                      &amp;&amp;
-make build=release shared=yes verbose=yes &amp;&amp;
-unset XCFLAGS</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make prefix=/usr                        \
-     shared=yes                         \
-     docdir=/usr/share/doc/mupdf-&mupdf-version; \
-     install                            &amp;&amp;
-
-ln -sfv libmupdf.so.24.1 /usr/lib/libmupdf.so   &amp;&amp;
-ln -sfv libmupdf.so.24.1 /usr/lib/libmupdf.so.1 &amp;&amp;
-chmod 755 /usr/lib/libmupdf.so.24.1             &amp;&amp;
-
-ln -sfv mupdf-x11 /usr/bin/mupdf</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>ln -sfv mupdf-x11 /usr/bin/mupdf </command>:
-      This symbolic link chooses between <command>mupdf-gl</command>
-      and <command>mupdf-x11</command> when running <command>mupdf</command>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          mupdf (symlink),
-          mupdf-gl,
-          mupdf-x11,
-          mupdf-x11-curl,
-          muraster, and
-          mutool
-        </seg>
-        <seg>
-          libmupdf.so
-        </seg>
-        <seg>
-          /usr/include/mupdf,
-          /usr/share/doc/mupdf-&mupdf-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mupdf-prog">
-        <term><command>mupdf</command></term>
-        <listitem>
-          <para>
-            is a program for viewing PDF, XPS, EPUB, and CBZ documents,
-            and various image formats such as PNG, JPEG, GIFF, and TIFF
-          </para>
-          <indexterm zone="mupdf mupdf-prog">
-            <primary sortas="b-mupdf">mupdf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mupdf-gl">
-        <term><command>mupdf-gl</command></term>
-        <listitem>
-          <para>
-            same as <command>mupdf</command>, using an opengl renderer
-          </para>
-          <indexterm zone="mupdf mupdf-gl">
-            <primary sortas="b-mupdf-gl">mupdf-gl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mupdf-x11">
-        <term><command>mupdf-x11</command></term>
-        <listitem>
-          <para>
-            same as <command>mupdf</command>, using an X Window renderer
-          </para>
-          <indexterm zone="mupdf mupdf-x11">
-            <primary sortas="b-mupdf-x11">mupdf-x11</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="muraster">
-        <term><command>muraster</command></term>
-        <listitem>
-          <para>
-            is a program used to perform rasterization tasks with PDF
-            documents
-          </para>
-          <indexterm zone="mupdf muraster">
-            <primary sortas="b-muraster">muraster</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mutool">
-        <term><command>mutool</command></term>
-        <listitem>
-          <para>
-            is a program to perform various operations on PDF files, such
-            as merging and cleaning PDF documents
-          </para>
-          <indexterm zone="mupdf mutool">
-            <primary sortas="b-mutool">mutool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmupdf">
-        <term><filename class="libraryfile">libmupdf.so</filename></term>
-        <listitem>
-          <para>
-            contains the mupdf API functions
-          </para>
-          <indexterm zone="mupdf libmupdf">
-            <primary sortas="c-libmupdf">libmupdf.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: pst/ps/paps.xml
===================================================================
--- pst/ps/paps.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(revision )
@@ -1,149 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY paps-download-http "https://github.com/dov/paps/releases/download/v&paps-version;/paps-&paps-version;.tar.gz">
-  <!ENTITY paps-download-ftp  " ">
-  <!ENTITY paps-md5sum        "6bd661b8fd224adc3343a91e6521a4f2">
-  <!ENTITY paps-size          "220 KB">
-  <!ENTITY paps-buildsize     "4.0 MB">
-  <!ENTITY paps-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="paps" xreflabel="paps-&paps-version;">
-  <?dbhtml filename="paps.html"?>
-
-
-  <title>paps-&paps-version;</title>
-
-  <indexterm zone="paps">
-    <primary sortas="a-paps">paps</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to paps</title>
-
-    <para>
-      <application>paps</application> is a text to PostScript converter that
-      works through <application>Pango</application>. Its input is a UTF-8
-      encoded text file and it outputs vectorized PostScript. It may be used
-      for printing any complex script supported by
-      <application>Pango</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&paps-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&paps-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &paps-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &paps-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &paps-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &paps-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">paps Dependencies</bridgehead>
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="fmt"/> and
-      <xref linkend="pango"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of paps</title>
-
-    <para>
-      Install <application>paps</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-Werror \
-            --mandir=/usr/share/man &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>paps</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="paps-prog">
-        <term><command>paps</command></term>
-        <listitem>
-          <para>
-            is a text to PostScript converter that supports UTF-8
-            character encoding
-          </para>
-          <indexterm zone="paps paps-prog">
-            <primary sortas="b-paps">paps</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: pst/ps/ps.xml
===================================================================
--- pst/ps/ps.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(revision )
@@ -1,27 +1,0 @@
-<?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="pst-ps">
-  <?dbhtml filename="ps.html"?>
-
-  <title>PostScript</title>
-
-  <para>
-    This chapter includes applications that create, manipulate or view
-    PostScript files and create or view Portable Document Format
-    PDF files.
-  </para>
-
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="a2ps.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="enscript.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="psutils.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="epdfview.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fop.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mupdf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="paps.xml"/>
-
-</chapter>
Index: pst/pst.ent
===================================================================
--- pst/pst.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ pst/pst.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<!ENTITY pst SYSTEM "pst.xml">
+
+<!-- Printing -->
+<!ENTITY pst-printing SYSTEM "printing/printing.xml">
+
+<!-- Scanning -->
+<!ENTITY pst-scanning SYSTEM "scanning/scanning.xml">
+
+<!-- Typesetting -->
+<!ENTITY pst-typesetting SYSTEM "typesetting/typesetting.xml">
Index: pst/pst.xml
===================================================================
--- pst/pst.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ pst/pst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,20 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE part PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
+<part id="pst" xreflabel="pst">
+<?dbhtml filename="pst.html" dir="pst"?>
+<title>Printing, Scanning and Typesetting</title>
 
-<part id="pst" xreflabel="Printing, Scanning and Typesetting">
-  <?dbhtml filename="pst.html" dir="pst"?>
-
-  <title>Printing, Scanning and Typesetting</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="printing/printing.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="scanning/scanning.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sgml/sgml.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xml/xml.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ps/ps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="typesetting/typesetting.xml"/>
+&pst-printing;
+&pst-scanning;
+&pst-typesetting;
 
 </part>
Index: pst/scanning/sane.xml
===================================================================
--- pst/scanning/sane.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(revision )
@@ -1,671 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY sane-be-download-http "&sources-anduin-http;/sane/sane-backends-&sane-version;.tar.gz">
-  <!ENTITY sane-be-download-ftp  " ">
-  <!ENTITY sane-be-md5sum        "302159419ed1ee216c6e1edbe97c2a8c">
-  <!ENTITY sane-be-size          "6.9 MB">
-  <!ENTITY sane-be-buildsize     "311 MB (with tests)">
-  <!ENTITY sane-be-time          "0.7 SBU (Using parallelism=4; with tests)">
-
-<!--
-  <!ENTITY sane-fe-download-http "&sources-anduin-http;/sane/sane-frontends-&sane-fe-version;.tar.gz">
-  <!ENTITY sane-fe-download-ftp  " ">
-  <!ENTITY sane-fe-md5sum        "c63bf7b0bb5f530cf3c08715db721cd3">
-  <!ENTITY sane-fe-size          "231 KB">
-  <!ENTITY sane-fe-buildsize     "3.0 MB">
-  <!ENTITY sane-fe-time          "less than 0.1 SBU">
--->
-]>
-
-<sect1 id="sane" xreflabel="SANE-&sane-version;">
-  <?dbhtml filename="sane.html"?>
-
-
-  <title>SANE-&sane-version;</title>
-
-  <indexterm zone="sane">
-    <primary sortas="a-SANE">SANE</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to SANE</title>
-
-    <para>
-      <application>SANE</application> is short for Scanner Access Now Easy.
-      Scanner access, however, is far from easy, since every vendor has their
-      own protocols. The only known protocol that should bring some unity into
-      this chaos is the TWAIN interface, but this is too imprecise to allow a
-      stable scanning framework. Therefore, <application>SANE</application>
-      comes with its own protocol, and the vendor drivers can't be used.
-    </para>
-
-    <para>
-      <application>SANE</application> is split into back ends and front ends.
-      The back ends are drivers for the supported scanners and cameras. The
-      front ends are user interfaces to access the backends.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Back Ends Package Information</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&sane-be-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&sane-be-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &sane-be-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &sane-be-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &sane-be-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &sane-be-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads (Front Ends)</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&sane-fe-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&sane-fe-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &sane-fe-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &sane-fe-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &sane-fe-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &sane-fe-time;
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <note>
-      <para>
-        The upstream location for this file is at
-        <ulink url="https://gitlab.com/sane-project"/> but
-        the file URL uses an embedded md5sum.  For convenience,
-        the package has been copied to the location above.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">SANE Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional (Back Ends)</bridgehead>
-    <para role="optional">
-      <xref linkend="avahi"/>,
-      <xref linkend="cups"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libtiff"/>,
-      <xref linkend="libusb"/>,
-      <xref linkend="v4l-utils"/>,
-      <ulink url="http://www.net-snmp.org/">Net-SNMP</ulink>,
-      <ulink url="http://cyberelk.net/tim/libieee1284/">libieee1284</ulink>,
-      <ulink url="http://www.gphoto.org/">libgphoto2</ulink>, and
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
-    </para>
-
-<!--
-    <bridgehead renderas="sect4">Optional (Front Ends)</bridgehead>
-    <para role="optional">
-      <xref linkend="x-window-system"/>,
-      <xref linkend="gtk2"/>, and
-      <xref linkend="gimp"/>
-    </para>
--->
-
-  </sect2>
-
-  <sect2 role="kernel" id='sane-kernel'>
-    <title>Kernel Configuration, Drivers and Additional Packages</title>
-
-    <indexterm zone="sane sane-kernel">
-      <primary sortas="d-Scanning-devices">Scanning devices</primary>
-    </indexterm>
-
-    <para>
-      To access your scanner, you will probably need the related kernel
-      drivers and/or additional support packages. A SCSI scanner will need SCSI
-      drivers, a parallel port scanner needs parallel port support (you should
-      use enhanced EPP modes) and perhaps <ulink
-      url="http://cyberelk.net/tim/libieee1284/">libieee1284</ulink>, and a USB
-      scanner will need the <xref linkend="libusb"/> package. For HP devices,
-      you may need <ulink
-      url="https://sourceforge.net/projects/hplip/files/hplip/">hplip</ulink>.
-      Ensure you have the necessary drivers properly configured to access
-      the devices.
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of SANE</title>
-
-    <sect3>
-      <title>Installation of SANE Back Ends</title>
-
-      <para>
-        The <application>SANE</application> daemon should run with its own
-        group.  Create this group by issuing the following command as the
-        &root; user:
-      </para>
-
-<screen role="root"><userinput>groupadd -g 70 scanner</userinput></screen>
-
-      <note>
-        <para>
-          <command>configure</command> assumes that the user building
-          <application>SANE</application>-backends is a member of the
-          <systemitem class="groupname">scanner</systemitem> group for testing
-          the existence of this group. As a result, the user building the
-          package needs to be added to the
-          <systemitem class="groupname">scanner</systemitem> group. Add the
-          user to the <systemitem class="groupname">scanner</systemitem> group
-          by issuing the following command as the &root; user:
-        </para>
-
-<screen role="root"><userinput>usermod -G scanner -a <replaceable>username</replaceable></userinput></screen>
-
-        <para>
-          After adding the <systemitem class="groupname">scanner</systemitem>
-          group as above, you will need to log out and back in to activate it.
-        </para>
-
-      </note>
-
-      <para>
-        For a USB scanner, if you are linking to <xref linkend="libusb"/>,
-        include the configure switch --enable-libusb_1_0. Install
-        <application>SANE</application>-backends by running the following
-        commands:
-      </para>
-
-<screen><userinput>sg scanner -c "                                 \
-PYTHON=python3 ./configure --prefix=/usr        \
-                           --sysconfdir=/etc    \
-                           --localstatedir=/var \
-                           --with-lockdir=/run/lock \
-                           --docdir=/usr/share/doc/sane-backends-&sane-version;" &amp;&amp;
-make</userinput></screen>
-
-      <para>
-        To test the results, issue: <command>make check</command>.
-      </para>
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>make install                                         &amp;&amp;
-install -m 644 -v tools/udev/libsane.rules           \
-                  /etc/udev/rules.d/65-scanner.rules &amp;&amp;
-mkdir -p          /run/lock/sane &amp;&amp;
-chgrp -v scanner  /run/lock/sane</userinput></screen>
-
-      <para>
-        With the scanner on, run <command>scanimage -L</command> and the
-        name and location of the device should appear. Of course, you need the
-        device drivers configured, in order to run this test.
-      </para>
-
-    </sect3>
-
-<!--
-    <sect3>
-      <title>Installation of SANE Front Ends</title>
-
-      <para>
-        The <application>SANE</application>-frontends package
-        includes the graphical frontends <command>xscanimage</command> and
-        <command>xcam</command>, and a command-line frontend
-        <command>scanadf</command>. You don't need this package if you intend
-        to use one of the more advanced graphical frontends like
-        <xref linkend="xsane"/>. For a list of frontend packages, see
-        <ulink url="http://www.sane-project.org/sane-frontends.html"/>.
-      </para>
-
-      <para>
-        To install <application>SANE</application>-frontends,
-        use the following commands:
-      </para>
-
-<screen><userinput>tar -xf ../sane-frontends-&sane-fe-version;.tar.gz &amp;&amp;
-cd sane-frontends-&sane-fe-version;                &amp;&amp;
-
-sed -i -e "/SANE_CAP_ALWAYS_SETTABLE/d" src/gtkglue.c &amp;&amp;
-./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 -v -m644 doc/sane.png xscanimage-icon-48x48-2.png \
-    /usr/share/sane</userinput></screen>
-
-      <para>
-        If <application>GIMP</application> was linked into the build and
-        you wish <application>GIMP</application> to use
-        <command>xscanimage</command> as a scanning plugin, issue the following
-        command as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>ln -v -s ../../../../bin/xscanimage /usr/lib/gimp/2.0/plug-ins</userinput></screen>
-
-      <note>
-        <para>
-          If the plugin <command>xscanimage</command> is disabled in
-          <application>GIMP</application>'s menu, in order to enable it,
-          "create" a blank image using the menu or Ctrl-N. After that, it is
-          enabled.
-        </para>
-      </note>
-
-    </sect3>
--->
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sg scanner -c "..."</command>: runs the command between double
-      quotes with principal group <systemitem
-      class="groupname">scanner</systemitem>. This may be needed if the user
-      has been newly added to group scanner, and has not logged out and in.
-    </para>
-
-    <para>
-      <parameter>PYTHON=python3</parameter>: This switch forces the build
-      system to use Python 3 instead of Python 2.
-    </para>
-
-    <para>
-      <parameter>--sysconfdir=/etc</parameter>: This switch installs the
-      configuration files in <filename class="directory">/etc/sane.d</filename>
-      instead of <filename class="directory">/usr/etc/sane.d</filename>.
-    </para>
-
-<!-- This option doesn't exist anymore as of 1.2.1, and the udev rule
-     references the usage of 'scanner' everywhere.
-    <para>
-      <parameter>- -with-group=scanner</parameter>: This parameter causes
-      the directory created for the locking files to be group owned by the
-      <systemitem class="groupname">scanner</systemitem> group instead of the
-      default <systemitem class="groupname">uucp</systemitem> group.
-    </para>
--->
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring SANE</title>
-
-    <sect3 id="sane-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/sane.d/*.conf</filename>
-      </para>
-
-      <indexterm zone="sane sane-config">
-        <primary sortas="e-etc-sane.d-conf">/etc/sane.d/*.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <sect4>
-        <title>Backend Configuration</title>
-
-        <para>
-          The backend configuration files are located in
-          <filename class='directory'>/etc/sane.d</filename>. Information
-          for configuring the various backends can be found by using the man(5)
-          page for the desired backend. Run
-          <command>
-            man sane-<replaceable>&lt;backend&gt;</replaceable></command>,
-          substituting the desired backend.
-        </para>
-
-        <para>
-          Add any users that will use a scanner to the <systemitem
-          class="groupname">scanner</systemitem> group.
-        </para>
-
-        <para>
-          If you want to access a network scanner, include two lines in
-          <filename>net.conf</filename>, as the &root; user (make sure to
-          replace &lt;server_ip&gt; by the actual value):
-        </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/sane.d/net.conf &lt;&lt; "EOF"
-<literal>connect_timeout = 60
-&lt;server_ip&gt;</literal>
-EOF</userinput></screen>
-
-        <para>
-          On the server side, include the client ip in the access list of
-          <filename>/etc/sane.d/saned.conf</filename>, restart the
-          <command>saned</command> daemon, and make sure the firewall, if any,
-          is open to the client.
-        </para>
-
-      </sect4>
-
-<!--
-      <sect4>
-        <title>Frontend Configuration</title>
-        <para>
-          If you use a desktop environment like <application>GNOME</application>
-          or <application>KDE</application> you may wish to create a
-          <filename>xscanimage.desktop</filename> file so that
-          <application>xscanimage</application> appears in the panel's menus.
-          Create the desktop file using the following commands as the &root; user:
-        </para>
-
-<screen role="root"><userinput>mkdir -pv /usr/share/{applications,pixmaps}               &amp;&amp;
-
-cat &gt; /usr/share/applications/xscanimage.desktop &lt;&lt; "EOF" &amp;&amp;
-<literal>[Desktop Entry]
-Encoding=UTF-8
-Name=XScanImage - Scanning
-Comment=Acquire images from a scanner
-Exec=xscanimage
-Icon=xscanimage
-Terminal=false
-Type=Application
-Categories=Application;Graphics</literal>
-EOF
-
-ln -svf ../sane/xscanimage-icon-48x48-2.png /usr/share/pixmaps/xscanimage.png</userinput></screen>
-
-      </sect4>
--->
-      <sect4>
-        <title>General Information</title>
-
-        <para>
-          For general information about configuring and using
-          <application>SANE</application>, see <command>man sane</command>.
-          For information about USB scanning devices,
-          run <command>man sane-usb</command>. For information about SCSI
-          devices, run <command>man sane-scsi</command>.
-        </para>
-
-      </sect4>
-
-      <sect4>
-        <title>Configuration and setup of the 'saned' daemon</title>
-
-        <para>
-          The <command>saned</command> daemon is not meant to be used for
-          untrusted clients. You should provide <xref linkend="fw-firewall"/>
-          protection to ensure only trusted clients access the daemon. Due to
-          the complex security requirements to ensure only trusted clients
-          access the daemon, BLFS does not provide
-          instructions to configure the <command>saned</command> daemon.
-          Some good (but outdated)
-          information for setting up and securing the <command>saned</command>
-          daemon can be found at
-          <ulink url="https://penguin-breeder.org/sane/saned/"/>.
-        </para>
-
-      </sect4>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>gamma4scanimage,
-        sane-config,
-        saned,
-        sane-find-scanner,
-        scanimage, and
-        umax_pp</seg>
-        <seg>libsane.so and numerous scanner backend modules</seg>
-        <seg>/etc/sane.d,
-        /usr/{include,lib,share}/sane,
-        and /usr/share/doc/sane-&sane-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-<!--
-    <bridgehead renderas="sect4">Front Ends:</bridgehead>
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>scanadf,
-        xcam, and
-        xscanimage</seg>
-        <seg><application>GIMP</application> plugin embedded in
-        <command>xscanimage</command></seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
--->
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gamma4scanimage">
-        <term><command>gamma4scanimage</command></term>
-        <listitem>
-          <para>
-            creates a gamma table in the format expected by
-            <command>scanimage</command>
-          </para>
-          <indexterm zone="sane gamma4scanimage">
-            <primary sortas="b-gamma4scanimage">gamma4scanimage</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sane-config-prog">
-        <term><command>sane-config</command></term>
-        <listitem>
-          <para>
-            is a tool used to determine the compiler and linker
-            flags that should be used to compile and link
-            <application>SANE</application>
-          </para>
-          <indexterm zone="sane sane-config-prog">
-            <primary sortas="b-sane-config">sane-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="saned">
-        <term><command>saned</command></term>
-        <listitem>
-          <para>
-            is the <application>SANE</application> daemon that
-            allows remote clients to access image acquisition devices
-            available on the local host
-          </para>
-          <indexterm zone="sane saned">
-            <primary sortas="b-saned">saned</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sane-find-scanner">
-        <term><command>sane-find-scanner</command></term>
-        <listitem>
-          <para>
-            is a command-line tool to find SCSI and
-            USB scanners and determine their device files. Its primary
-            purpose is to make sure that scanners can be detected by
-            <application>SANE</application> backends
-          </para>
-          <indexterm zone="sane sane-find-scanner">
-            <primary sortas="b-sane-find-scanner">sane-find-scanner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!--
-      <varlistentry id="scanadf">
-        <term><command>scanadf</command></term>
-        <listitem>
-          <para>
-            is a command-line interface to control image acquisition
-            devices which are equipped with an automatic document feeder (ADF)
-          </para>
-          <indexterm zone="sane scanadf">
-            <primary sortas="b-scanadf">scanadf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-
-      <varlistentry id="scanimage">
-        <term><command>scanimage</command></term>
-        <listitem>
-          <para>
-            is a command line interface for scanning from image acquisition
-            devices such as flatbed scanners or cameras. It is also used to
-            list the available backend devices
-          </para>
-          <indexterm zone="sane scanimage">
-            <primary sortas="b-scanimage">scanimage</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="umax_pp">
-        <term><command>umax_pp</command></term>
-        <listitem>
-          <para>
-            is a tool used to read information from UMAX parallel port
-            scanners. It can also be used for performing diagnostics on these
-            scanners
-          </para>
-          <indexterm zone="sane umax_pp">
-            <primary sortas="b-umax_pp">umax_pp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!--
-      <varlistentry id="xcam">
-        <term><command>xcam</command></term>
-        <listitem>
-          <para>
-            is a graphical camera front end for
-            <application>SANE</application>
-          </para>
-          <indexterm zone="sane xcam">
-            <primary sortas="b-xcam">xcam</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xscanimage">
-        <term><command>xscanimage</command></term>
-        <listitem>
-          <para>
-            is a graphical user interface for scanning
-          </para>
-          <indexterm zone="sane xscanimage">
-            <primary sortas="b-xscanimage">xscanimage</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-      <varlistentry id="libsane">
-        <term><filename class="libraryfile">libsane.so</filename></term>
-        <listitem>
-          <para>
-            is the application programming interface that is used to
-            communicate between frontends and backends
-          </para>
-          <indexterm zone="sane libsane">
-            <primary sortas="c-libsane">libsane.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libsane-module">
-        <term><filename class="libraryfile">libsane-*.so</filename></term>
-        <listitem>
-          <para>
-            modules are backend scanning library plugins used to interface
-            with scanning devices. See
-            <ulink url="http://www.sane-project.org/sane-supported-devices.html"/>
-            for a list of supported backends
-          </para>
-          <indexterm zone="sane libsane-module">
-            <primary sortas="c-libsane-module">libsane-*.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: pst/scanning/scanning.xml
===================================================================
--- pst/scanning/scanning.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ pst/scanning/scanning.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,23 +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="pst-scanning">
+<?dbhtml filename="scanning.html" dir="pst"?>
+<title>Scanning</title>
 
-<chapter id="pst-scanning">
-  <?dbhtml filename="scanning.html"?>
-
-  <title>Scanning</title>
-
-  <para>
-    This chapter contains scanning applications which allow you to
-    convert printed documents into formatted documents readable by other
-    applications.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sane.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="simple-scan.xml"/>
-  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xsane.xml"/>-->
+<para>Placeholder for sane and xsane.</para>
 
 </chapter>
Index: pst/scanning/simple-scan.xml
===================================================================
--- pst/scanning/simple-scan.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(revision )
@@ -1,163 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY simple-scan-download-http "&gnome-download-http;/simple-scan/&gnome-46;/simple-scan-&simple-scan-version;.tar.xz">
-  <!ENTITY simple-scan-download-ftp  " ">
-  <!ENTITY simple-scan-md5sum        "5ae9ca4d4c59520736c11a2eb427502d">
-  <!ENTITY simple-scan-size          "1.1 MB">
-  <!ENTITY simple-scan-buildsize     "27 MB">
-  <!ENTITY simple-scan-time          "0.1 SBU">
-]>
-
-<sect1 id="simple-scan" xreflabel="Simple-scan-&simple-scan-version;">
-  <?dbhtml filename="simple-scan.html"?>
-
-  <title>Simple-scan-&simple-scan-version;</title>
-
-  <indexterm zone="simple-scan">
-    <primary sortas="a-simple-scan">Simple-scan</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Simple-scan</title>
-
-    <para>
-      The <application>Simple-scan</application> package contains a modern
-      document scanning application. It captures images using SANE, and
-      supports the latest color management and graphics standards.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&simple-scan-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&simple-scan-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &simple-scan-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &simple-scan-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &simple-scan-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &simple-scan-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Simple-scan Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="colord"/>,
-      <xref linkend="itstool"/>,
-      <xref linkend="libgusb"/>,
-      <xref linkend="libadwaita1"/>,
-      <xref linkend="libwebp"/>, and
-      <xref linkend="sane"/> (backends)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Simple-scan</title>
-
-    <para>
-      Install <application>Simple-scan</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 &amp;&amp;
-gtk-update-icon-cache -qtf /usr/share/icons/hicolor</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <command>gtk-update-icon-cache [...]</command>: This command updates the
-      system-wide GTK+ icon cache since Simple-scan's build system does not
-      update it to account for the icons that it installs.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          simple-scan
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/help/*/simple-scan
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="simple-scan-prog">
-        <term><command>simple-scan</command></term>
-        <listitem>
-          <para>
-            is a modern document scanning application
-          </para>
-          <indexterm zone="simple-scan simple-scan-prog">
-            <primary sortas="b-simple-scan">simple-scan</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: pst/sgml/docbook-3.1-dtd.xml
===================================================================
--- pst/sgml/docbook-3.1-dtd.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(revision )
@@ -1,232 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY sgml-dtd-3-download-http "https://www.docbook.org/sgml/&docbook-3.1-dtd-version;/docbk31.zip">
-  <!ENTITY sgml-dtd-3-download-ftp  " ">
-  <!ENTITY sgml-dtd-3-md5sum        "432749c0c806dbae81c8bcb70da3b5d3">
-  <!ENTITY sgml-dtd-3-size          "55 KB">
-  <!ENTITY sgml-dtd-3-buildsize     "676 KB">
-  <!ENTITY sgml-dtd-3-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="sgml-dtd-3" xreflabel="docbook-&docbook-3.1-dtd-version;-dtd">
-  <?dbhtml filename="docbook-3.1-dtd.html"?>
-
-
-  <title>docbook-&docbook-3.1-dtd-version;-dtd</title>
-
-  <indexterm zone="sgml-dtd-3">
-    <primary sortas="a-DocBook-SGML-DTD-&docbook-3.1-dtd-version;">DocBook SGML
-    DTD-&docbook-3.1-dtd-version;</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to DocBook-3.1 SGML DTD</title>
-
-    <para>
-      The <application>DocBook SGML DTD</application> package contains
-      document type definitions for verification of SGML data files against
-      the DocBook rule set. These are useful for structuring books and software
-      documentation to a standard allowing you to utilize transformations
-      already written for that standard.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&sgml-dtd-3-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&sgml-dtd-3-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &sgml-dtd-3-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &sgml-dtd-3-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &sgml-dtd-3-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &sgml-dtd-3-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">DocBook-3.1 SGML DTD Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="sgml-common"/> and
-      <xref linkend="unzip"/> (or <xref role='nodep' linkend='libarchive'/>)
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of DocBook-3.1 SGML DTD</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/use-unzip.xml"/>
-
-    <para>
-      Install <application>DocBook-3.1 SGML DTD</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>sed -i -e '/ISO 8879/d' \
-       -e 's|DTDDECL "-//OASIS//DTD DocBook V&docbook-3.1-dtd-version;//EN"|SGMLDECL|g' \
-       docbook.cat</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -d -m755 /usr/share/sgml/docbook/sgml-dtd-&docbook-3.1-dtd-version; &amp;&amp;
-chown -R root:root . &amp;&amp;
-install -v docbook.cat /usr/share/sgml/docbook/sgml-dtd-&docbook-3.1-dtd-version;/catalog &amp;&amp;
-cp -v -af *.dtd *.mod *.dcl /usr/share/sgml/docbook/sgml-dtd-&docbook-3.1-dtd-version; &amp;&amp;
-
-install-catalog --add /etc/sgml/sgml-docbook-dtd-&docbook-3.1-dtd-version;.cat \
-    /usr/share/sgml/docbook/sgml-dtd-&docbook-3.1-dtd-version;/catalog &amp;&amp;
-
-install-catalog --add /etc/sgml/sgml-docbook-dtd-&docbook-3.1-dtd-version;.cat \
-    /etc/sgml/sgml-docbook.cat</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i -e '/ISO 8879/d' docbook.cat</command>: This command
-      removes the ENT definitions from the catalog file.
-    </para>
-
-    <para>
-      <command>sed -i -e 's|DTDDECL
-      "-//OASIS//DTD Docbook V&docbook-3.1-dtd-version;//EN"|SGMLDECL|g'
-      docbook.cat</command>: This command replaces the DTDDECL catalog entry,
-      which is not supported by Linux SGML tools, with the SGMLDECL catalog
-      entry.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring DocBook-3.1 SGML DTD</title>
-
-    <sect3 id="sgml-dtd-3-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/sgml/catalog</filename>
-      </para>
-
-      <indexterm zone="sgml-dtd-3 sgml-dtd-3-config">
-        <primary sortas="e-etc-sgml-catalog">/etc/sgml/catalog</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        The above installation script updates the catalog.
-      </para>
-
-      <para>
-        Using only the most current 3.x version of <application>DocBook
-        SGML DTD</application> requires the following (perform as the
-        <systemitem class="username">root</systemitem> user):
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /usr/share/sgml/docbook/sgml-dtd-&docbook-3.1-dtd-version;/catalog &lt;&lt; "EOF"
-<literal>  -- Begin Single Major Version catalog changes --
-
-PUBLIC "-//Davenport//DTD DocBook V3.0//EN" "docbook.dtd"
-
-  -- End Single Major Version catalog changes --</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Files</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>None</seg>
-        <seg>SGML DTD and MOD files</seg>
-        <seg>/usr/share/sgml/docbook/sgml-dtd-&docbook-3.1-dtd-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="SGML-DTD-files">
-        <term><filename>SGML DTD files</filename></term>
-        <listitem>
-          <para>
-            contains a document type definition which defines the element
-            types and the attribute lists that can be used in the corresponding
-            SGML files
-          </para>
-          <indexterm zone="sgml-dtd-3 SGML-DTD-files">
-            <primary sortas="g-SGML-DTD-files">SGML DTD files</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="SGML-MOD-files">
-        <term><filename>SGML MOD files</filename></term>
-        <listitem>
-          <para>
-            contains components of the document type definition that are
-            sourced into the <filename>DTD</filename> files
-          </para>
-          <indexterm zone="sgml-dtd-3 SGML-MOD-files">
-            <primary sortas="g-SGML-MOD-files">SGML MOD files</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: pst/sgml/docbook-4.5-dtd.xml
===================================================================
--- pst/sgml/docbook-4.5-dtd.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(revision )
@@ -1,228 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY sgml-dtd-download-http "https://www.docbook.org/sgml/&docbook-4.5-dtd-version;/docbook-&docbook-4.5-dtd-version;.zip">
-  <!ENTITY sgml-dtd-download-ftp  " ">
-  <!ENTITY sgml-dtd-md5sum        "07c581f4bbcba6d3aac85360a19f95f7">
-  <!ENTITY sgml-dtd-size          "70 KB">
-  <!ENTITY sgml-dtd-buildsize     "784 KB">
-  <!ENTITY sgml-dtd-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="sgml-dtd" xreflabel="docbook-&docbook-4.5-dtd-version;-dtd">
-  <?dbhtml filename="docbook-4.5-dtd.html"?>
-
-
-  <title>docbook-&docbook-4.5-dtd-version;-dtd</title>
-
-  <indexterm zone="sgml-dtd">
-    <primary sortas="a-DocBook-SGML-DTD-&docbook-4.5-dtd-version;">DocBook SGML
-    DTD-&docbook-4.5-dtd-version;</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to DocBook-4.5 SGML DTD</title>
-
-    <para>
-      The <application>DocBook-4.5 SGML DTD</application> package contains
-      document type definitions for verification of SGML data files against the
-      DocBook rule set. These are useful for structuring books and software
-      documentation to a standard allowing you to utilize transformations
-      already written for that standard.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&sgml-dtd-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&sgml-dtd-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &sgml-dtd-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &sgml-dtd-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &sgml-dtd-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &sgml-dtd-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">DocBook-4.5 SGML DTD Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="sgml-common"/> and
-      <xref linkend="unzip"/> (or <xref role='nodep' linkend='libarchive'/>)
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of DocBook-4.5 SGML DTD</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/use-unzip.xml"/>
-
-    <para>
-      Install <application>DocBook-4.5 SGML DTD</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>sed -i -e '/ISO 8879/d' \
-       -e '/gml/d' docbook.cat</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -d /usr/share/sgml/docbook/sgml-dtd-&docbook-4.5-dtd-version; &amp;&amp;
-chown -R root:root . &amp;&amp;
-
-install -v docbook.cat /usr/share/sgml/docbook/sgml-dtd-&docbook-4.5-dtd-version;/catalog &amp;&amp;
-cp -v -af *.dtd *.mod *.dcl /usr/share/sgml/docbook/sgml-dtd-&docbook-4.5-dtd-version; &amp;&amp;
-
-install-catalog --add /etc/sgml/sgml-docbook-dtd-&docbook-4.5-dtd-version;.cat \
-    /usr/share/sgml/docbook/sgml-dtd-&docbook-4.5-dtd-version;/catalog &amp;&amp;
-
-install-catalog --add /etc/sgml/sgml-docbook-dtd-&docbook-4.5-dtd-version;.cat \
-    /etc/sgml/sgml-docbook.cat</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i -e '/ISO 8879/d' -e '/gml/d' docbook.cat</command>:
-      This command removes the ENT definitions from the catalog file.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring DocBook-4.5 SGML DTD</title>
-
-    <sect3 id="sgml-dtd-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/sgml/catalog</filename>
-      </para>
-
-      <indexterm zone="sgml-dtd sgml-dtd-config">
-        <primary sortas="e-etc-sgml-catalog">/etc/sgml/catalog</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        The above installation script updates the catalog.
-      </para>
-
-      <para>
-        Using only the most current 4.x version of <application>DocBook
-        SGML DTD</application> requires the following (perform as the
-        <systemitem class="username">root</systemitem> user):
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /usr/share/sgml/docbook/sgml-dtd-&docbook-4.5-dtd-version;/catalog &lt;&lt; "EOF"
-<literal>  -- Begin Single Major Version catalog changes --
-
-PUBLIC "-//OASIS//DTD DocBook V4.4//EN" "docbook.dtd"
-PUBLIC "-//OASIS//DTD DocBook V4.3//EN" "docbook.dtd"
-PUBLIC "-//OASIS//DTD DocBook V4.2//EN" "docbook.dtd"
-PUBLIC "-//OASIS//DTD DocBook V4.1//EN" "docbook.dtd"
-PUBLIC "-//OASIS//DTD DocBook V4.0//EN" "docbook.dtd"
-
-  -- End Single Major Version catalog changes --</literal>
-EOF</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Files</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>None</seg>
-        <seg>SGML DTD and MOD files</seg>
-        <seg>/usr/share/sgml/docbook/sgml-dtd-&docbook-4.5-dtd-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="SGML-DTD-files-4">
-        <term><filename>SGML DTD files</filename></term>
-        <listitem>
-          <para>
-            contains a document type definition which defines the element
-            types and the attribute lists that can be used in the corresponding
-            SGML files
-          </para>
-          <indexterm zone="sgml-dtd SGML-DTD-files-4">
-            <primary sortas="g-SGML-DTD-files">SGML DTD files</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="SGML-MOD-files-4">
-        <term><filename>SGML MOD files</filename></term>
-        <listitem>
-          <para>
-            contains components of the document type definition that are
-            sourced into the <filename>DTD</filename> files
-          </para>
-          <indexterm zone="sgml-dtd SGML-MOD-files-4">
-            <primary sortas="g-SGML-MOD-files">SGML MOD files</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: pst/sgml/docbook-dsssl.xml
===================================================================
--- pst/sgml/docbook-dsssl.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(revision )
@@ -1,261 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY docbook-dsssl-download-http "&sourceforge-dl;/docbook/docbook-dsssl-&docbook-dsssl-version;.tar.bz2">
-  <!ENTITY docbook-dsssl-download-ftp  "">
-  <!ENTITY docbook-dsssl-md5sum        "bc192d23266b9a664ca0aba4a7794c7c">
-  <!ENTITY docbook-dsssl-size          "277 KB">
-  <!ENTITY docbook-dsssl-buildsize     "14 MB">
-  <!ENTITY docbook-dsssl-time          "less than 0.1 SBU">
-
-  <!ENTITY docbook-dsssl-doc-download-http "&sourceforge-dl;/docbook/docbook-dsssl-doc-&docbook-dsssl-version;.tar.bz2">
-  <!ENTITY docbook-dsssl-doc-md5sum        "9a7b809a21ab7d2749bb328334c380f2">
-  <!ENTITY docbook-dsssl-doc-size          "142 KB">
-]>
-
-<sect1 id="docbook-dsssl"
-xreflabel="docbook-dsssl-&docbook-dsssl-version;">
-  <?dbhtml filename="docbook-dsssl.html"?>
-
-
-  <title>docbook-dsssl-&docbook-dsssl-version;</title>
-
-  <indexterm zone="docbook-dsssl">
-    <primary sortas="a-DocBook-DSSSL-Stylesheets">DocBook DSSSL
-    Stylesheets</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to DocBook DSSSL Stylesheets</title>
-
-    <para>
-      The <application>DocBook DSSSL Stylesheets</application> package
-      contains DSSSL stylesheets. These are used by
-      <application>OpenJade</application> or other tools to transform SGML
-      and XML DocBook files.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&docbook-dsssl-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&docbook-dsssl-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &docbook-dsssl-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &docbook-dsssl-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &docbook-dsssl-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &docbook-dsssl-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <title>Documentation and test data</title>
-
-      <listitem>
-        <para>
-          Download (HTTP):
-          <ulink url="&docbook-dsssl-doc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &docbook-dsssl-doc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &docbook-dsssl-doc-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">DocBook DSSSL Stylesheets
-    Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="sgml-common"/>
-    </para>
-
-    <bridgehead renderas="sect4">Required (to Test the DocBook SGML
-      Toolchain)</bridgehead>
-    <para role="required">
-      <xref linkend="sgml-dtd-3"/>,
-      <xref linkend="sgml-dtd"/>,
-      <xref linkend="opensp"/>, and
-      <xref linkend="openjade"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of DocBook DSSSL Stylesheets</title>
-
-    <para>
-      If you downloaded the documentation, run:
-    </para>
-
-<screen><userinput>tar -xf ../docbook-dsssl-doc-1.79.tar.bz2 --strip-components=1</userinput></screen>
-
-    <para>
-      Install <application>DocBook DSSSL Stylesheets</application> by running
-      the following commands as the <systemitem
-      class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -m755 bin/collateindex.pl /usr/bin                      &amp;&amp;
-install -v -m644 bin/collateindex.pl.1 /usr/share/man/man1         &amp;&amp;
-install -v -d -m755 /usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version; &amp;&amp;
-cp -v -R * /usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;          &amp;&amp;
-
-install-catalog --add /etc/sgml/dsssl-docbook-stylesheets.cat \
-    /usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;/catalog         &amp;&amp;
-
-install-catalog --add /etc/sgml/dsssl-docbook-stylesheets.cat \
-    /usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;/common/catalog  &amp;&amp;
-
-install-catalog --add /etc/sgml/sgml-docbook.cat              \
-    /etc/sgml/dsssl-docbook-stylesheets.cat</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      The above commands create an installation script for this package.
-    </para>
-
-  </sect2>
-
-  <sect2 role="testing">
-    <title>Testing the DocBook SGML Toolchain (Optional)</title>
-
-    <para>
-      The following commands will perform the necessary tests to confirm
-      that your installed DocBook SGML toolchain will produce desired results.
-      You must have the <xref linkend="sgml-dtd-3"/>,
-      <xref linkend="sgml-dtd"/>, <xref linkend="opensp"/>,
-      and <xref linkend="openjade"/> packages installed,
-      and perform the tests as the
-      <systemitem class="username">root</systemitem> user.
-    </para>
-
-    <para>
-      All tests will be performed from the <filename class='directory'>
-      /usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;/doc/testdata
-      </filename>
-      directory as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cd /usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;/doc/testdata</userinput></screen>
-
-    <para>
-      The first test should produce no output to stdout (your screen) and
-      create a file named <filename>jtest.rtf</filename> in the current
-      directory:
-    </para>
-
-<screen role="root"><userinput>openjade -t rtf -d jtest.dsl jtest.sgm</userinput></screen>
-
-    <para>
-      The next test should return only the following line to stdout:
-      <computeroutput>onsgmls:I: "OpenSP" version "&opensp-version;"</computeroutput>
-    </para>
-
-<screen role="root"><userinput>onsgmls -sv test.sgm</userinput></screen>
-
-    <para>
-      The next test should produce no output to stdout and create a file
-      named <filename>test.rtf</filename> in the current directory:
-    </para>
-
-<screen role="root"><userinput>openjade -t rtf \
-    -d /usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;/print/docbook.dsl \
-    test.sgm</userinput></screen>
-
-    <para>
-      The last test should produce no output to stdout and create a file
-      named <filename>c1.htm</filename> in the current directory:
-    </para>
-
-<screen role="root"><userinput>openjade -t sgml \
-    -d /usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;/html/docbook.dsl \
-    test.sgm</userinput></screen>
-
-    <para>
-      Finally, clean up:
-    </para>
-
-<screen role="root"><userinput>rm jtest.rtf test.rtf c1.htm</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Files</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>collateindex.pl</seg>
-        <seg>None</seg>
-        <seg>DSSSL stylesheets</seg>
-        <seg>/usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="collateindex.pl">
-        <term><command>collateindex.pl</command></term>
-        <listitem>
-          <para>
-            is a <application>Perl</application> script that creates a
-            DocBook index from raw index data
-          </para>
-          <indexterm zone="docbook-dsssl collateindex.pl">
-            <primary sortas="b-collateindex.pl">collateindex.pl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: pst/sgml/docbook-utils.xml
===================================================================
--- pst/sgml/docbook-utils.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(revision )
@@ -1,263 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY docbook-utils-download-http "https://sourceware.org/ftp/docbook-tools/new-trials/SOURCES/docbook-utils-&docbook-utils-version;.tar.gz">
-  <!ENTITY docbook-utils-download-ftp  " ">
-  <!ENTITY docbook-utils-md5sum        "6b41b18c365c01f225bc417cf632d81c">
-  <!ENTITY docbook-utils-size          "124 KB">
-  <!ENTITY docbook-utils-buildsize     "1.44 MB">
-  <!ENTITY docbook-utils-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="docbook-utils" xreflabel="DocBook-utils-&docbook-utils-version;">
-  <?dbhtml filename="docbook-utils.html"?>
-
-
-  <title>DocBook-utils-&docbook-utils-version;</title>
-
-  <indexterm zone="docbook-utils">
-    <primary sortas="a-DocBook-utils">DocBook-utils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to DocBook-utils</title>
-
-    <para>
-      The <application>DocBook-utils</application> package is a collection
-      of utility scripts used to convert and analyze SGML documents in general,
-      and DocBook files in particular. The scripts are used to convert from
-      DocBook or other SGML formats into <quote>classical</quote> file formats
-      like HTML, man, info, RTF and many more. There's also a utility to compare
-      two SGML files and only display the differences in markup. This is useful
-      for comparing documents prepared for different languages.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&docbook-utils-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&docbook-utils-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &docbook-utils-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &docbook-utils-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &docbook-utils-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &docbook-utils-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Required patch: <ulink url=
-           "&patch-root;/docbook-utils-&docbook-utils-version;-grep_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">DocBook-utils Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="openjade"/>,
-      <xref linkend="docbook-dsssl"/>, and
-      <xref linkend="sgml-dtd-3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (Runtime Dependencies Only)</bridgehead>
-    <para role="recommended">
-      <xref role="runtime" linkend="perl-sgmlspm"/> (for conversion to man and
-      texinfo), and
-      <xref role="runtime" linkend="lynx"/> or
-      <xref role="nodep" linkend="Links"/> or
-      <ulink role="runtime" url="&w3m-url;">W3m</ulink>
-      (for conversion to ASCII text)
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of DocBook-utils</title>
-
-    <para>
-      Install <application>DocBook-utils</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../docbook-utils-&docbook-utils-version;-grep_fix-1.patch &amp;&amp;
-sed -i 's:/html::' doc/HTML/Makefile.in                &amp;&amp;
-
-./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 docdir=/usr/share/doc install</userinput></screen>
-
-    <para>
-      Many packages use an alternate name for the
-      <application>DocBook-utils</application> scripts. If you wish to create
-      these alternate names, use the following command as
-      the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>for doctype in html ps dvi man pdf rtf tex texi txt
-do
-    ln -svf docbook2$doctype /usr/bin/db2$doctype
-done</userinput></screen>
-
-    <note>
-      <para>
-        The <command>jw</command> script uses the <command>which</command>
-        command to locate required utilities. You must install
-        <xref linkend="which"/> before attempting to use any of the
-        <application>DocBook-utils</application> programs.
-      </para>
-    </note>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>patch -Np1 -i ../docbook-utils-&docbook-utils-version;-grep_fix-1.patch</command>:
-      This patch corrects the syntax in the jw (Jade Wrapper) script which is
-      at the heart of much db2* processing, so that the current version of
-      <application>grep</application> will not reject it.
-    </para>
-
-    <para>
-      <command>sed -i 's:/html::' doc/HTML/Makefile.in</command>:
-      This command changes the installation directory of the HTML documents.
-    </para>
-
-    <para>
-      <parameter>docdir=/usr/share/doc</parameter>: This option is placed on the
-      <command>make install</command> line because it is not
-      recognized by <command>configure</command>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-      <segtitle>Installed Symlinks</segtitle>
-
-      <seglistitem>
-        <seg>docbook2dvi, docbook2html, docbook2man, docbook2pdf, docbook2ps,
-        docbook2rtf, docbook2tex, docbook2texi, docbook2txt, jw, and
-        sgmldiff</seg>
-        <seg>None</seg>
-        <seg>/usr/share/doc/docbook-utils-&docbook-utils-version; and
-        /usr/share/sgml/docbook/utils-&docbook-utils-version;</seg>
-        <seg>db2dvi, db2html, db2man, db2pdf, db2ps, db2rtf, db2tex, db2texi,
-        and db2txt</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="docbook2">
-        <term><command>docbook2*</command></term>
-        <listitem>
-          <para>
-            are simple one-line wrapper scripts to <command>jw</command>.
-            They are provided as easy-to-remember names used to convert
-            DocBook or other SGML files to the respective format
-          </para>
-          <indexterm zone="docbook-utils docbook2">
-            <primary sortas="b-docbook2-star">docbook2*</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="db2">
-        <term><command>db2*</command></term>
-        <listitem>
-          <para>
-            are symlinks pointing at the respectively named
-            <command>docbook2*</command> commands, created to satisfy some
-            program's use of these names
-          </para>
-          <indexterm zone="docbook-utils db2">
-            <primary sortas="b-db2-star">db2*</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jw">
-        <term><command>jw</command></term>
-        <listitem>
-          <para>
-            is a script used to convert DocBook or other SGML files to various
-            output formats. It hides most of
-            <application>OpenJade</application>'s complexity and adds
-            comfortable features
-          </para>
-          <indexterm zone="docbook-utils jw">
-            <primary sortas="b-jw">jw</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sgmldiff">
-        <term><command>sgmldiff</command></term>
-        <listitem>
-          <para>
-            is used to compare two SGML files and only return the differences
-            in the markup. This is especially useful to compare files that
-            should be identical except for language differences in the content
-          </para>
-          <indexterm zone="docbook-utils sgmldiff">
-            <primary sortas="b-sgmldiff">sgmldiff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: pst/sgml/openjade.xml
===================================================================
--- pst/sgml/openjade.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(revision )
@@ -1,274 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY openjade-download-http "&sourceforge-dl;/openjade/openjade-&openjade-version;.tar.gz">
-  <!ENTITY openjade-download-ftp  " ">
-  <!ENTITY openjade-md5sum        "7df692e3186109cc00db6825b777201e">
-  <!ENTITY openjade-size          "880 KB">
-  <!ENTITY openjade-buildsize     "19.2 MB">
-  <!ENTITY openjade-time          "0.7 SBU">
-]>
-
-<sect1 id="openjade" xreflabel="OpenJade-&openjade-version;">
-  <?dbhtml filename="openjade.html"?>
-
-
-  <title>OpenJade-&openjade-version;</title>
-
-  <indexterm zone="openjade">
-    <primary sortas="a-OpenJade">OpenJade</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to OpenJade</title>
-
-    <para>
-      The <application>OpenJade</application> package contains a
-      DSSSL engine. This is useful for SGML and XML transformations into
-      RTF, TeX, SGML and XML.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&openjade-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&openjade-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &openjade-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &openjade-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &openjade-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &openjade-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Download</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Required patch: <ulink
-            url="&patch-root;/openjade-&openjade-version;-upstream-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">OpenJade Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="opensp"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of OpenJade</title>
-
-    <para>
-      First fix problems when building with newer compilers:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../openjade-&openjade-version;-upstream-1.patch</userinput></screen>
-
-    <para>
-      Now fix a compilation problem with perl-5.16 and later:
-    </para>
-
-<screen><userinput>sed -i -e '/getopts/{N;s#&amp;G#g#;s#do .getopts.pl.;##;}' \
-       -e '/use POSIX/ause Getopt::Std;' msggen.pl</userinput></screen>
-
-    <para>
-      Install <application>OpenJade</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>export CXXFLAGS="${CXXFLAGS:--O2 -g} -fno-lifetime-dse"            &amp;&amp;
-./configure --prefix=/usr                                \
-            --mandir=/usr/share/man                      \
-            --enable-http                                \
-            --disable-static                             \
-            --enable-default-catalog=/etc/sgml/catalog   \
-            --enable-default-search-path=/usr/share/sgml \
-            --datadir=/usr/share/sgml/openjade-&openjade-version;   &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<!-- Be careful of spacing here -->
-<screen role="root"><userinput>make install                                                   &amp;&amp;
-make install-man                                               &amp;&amp;
-ln -v -sf openjade /usr/bin/jade                               &amp;&amp;
-ln -v -sf libogrove.so /usr/lib/libgrove.so                    &amp;&amp;
-ln -v -sf libospgrove.so /usr/lib/libspgrove.so                &amp;&amp;
-ln -v -sf libostyle.so /usr/lib/libstyle.so                    &amp;&amp;
-
-install -v -m644 dsssl/catalog /usr/share/sgml/openjade-&openjade-version;/ &amp;&amp;
-
-install -v -m644 dsssl/*.{dtd,dsl,sgm}              \
-    /usr/share/sgml/openjade-&openjade-version;                             &amp;&amp;
-
-install-catalog --add /etc/sgml/openjade-&openjade-version;.cat  \
-    /usr/share/sgml/openjade-&openjade-version;/catalog                     &amp;&amp;
-
-install-catalog --add /etc/sgml/sgml-docbook.cat    \
-    /etc/sgml/openjade-&openjade-version;.cat</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>export CXXFLAGS=...</command>: This command prevents
-      segmentation faults when the package is compiled with
-      <application>gcc-6.1</application>.
-    </para>
-
-    <para>
-      <command>make install-man</command>: This command installs the
-      <command>openjade</command> man page.
-    </para>
-
-    <para>
-      <parameter>--disable-static</parameter>: This switch prevents
-      the building of the static library.
-    </para>
-
-    <para>
-      <parameter>--enable-http</parameter>: This switch adds support
-      for HTTP.
-    </para>
-
-    <para>
-      <parameter>--enable-default-catalog=/etc/sgml/catalog</parameter>: This
-      switch sets the path to the centralized catalog.
-    </para>
-
-    <para>
-      <parameter>--enable-default-search-path</parameter>: This switch
-      sets the default value of <envar>SGML_SEARCH_PATH</envar>.
-    </para>
-
-    <para>
-      <parameter>
-        --datadir=/usr/share/sgml/openjade-&openjade-version;</parameter>:
-      This switch puts data files in
-      <filename>/usr/share/sgml/openjade-&openjade-version;</filename> instead
-      of <filename class="directory">/usr/share</filename>.
-    </para>
-
-    <para>
-      <command>ln -v -sf ...</command>: These commands create the
-      <application>Jade</application> equivalents of
-      <application>OpenJade</application> executables and libraries.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring OpenJade</title>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        As the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>echo "SYSTEM \"http://www.oasis-open.org/docbook/xml/&docbook-4.5-dtd-version;/docbookx.dtd\" \
-    \"/usr/share/xml/docbook/xml-dtd-&docbook-4.5-dtd-version;/docbookx.dtd\"" &gt;&gt; \
-    /usr/share/sgml/openjade-&openjade-version;/catalog</userinput></screen>
-
-      <para>
-        This configuration is only necessary if you intend to use
-        <application>OpenJade</application> to process the BLFS XML files
-        through DSSSL Stylesheets.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>openjade and the <application>Jade</application> equivalent symlink,
-        jade</seg>
-        <seg>libogrove.so, libospgrove.so, libostyle.so, and the
-        <application>Jade</application> equivalent symlinks: libgrove.so,
-        libspgrove.so, and libstyle.so</seg>
-        <seg>/usr/share/sgml/openjade-&openjade-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="openjade-prog">
-        <term><command>openjade</command></term>
-        <listitem>
-          <para>
-            is a DSSSL engine used for transformations
-          </para>
-          <indexterm zone="openjade openjade-prog">
-            <primary sortas="b-openjade">openjade</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jade">
-        <term><command>jade</command></term>
-        <listitem>
-          <para>
-            is a symlink to <command>openjade</command>
-          </para>
-          <indexterm zone="openjade jade">
-            <primary sortas="b-jade">jade</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: pst/sgml/opensp.xml
===================================================================
--- pst/sgml/opensp.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(revision )
@@ -1,402 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY opensp-download-http "&sourceforge-dl;/openjade/OpenSP-&opensp-version;.tar.gz">
-  <!ENTITY opensp-download-ftp  " ">
-  <!ENTITY opensp-md5sum        "670b223c5d12cee40c9137be86b6c39b">
-  <!ENTITY opensp-size          "1.5 MB">
-  <!ENTITY opensp-buildsize     "32 MB">
-  <!ENTITY opensp-time          "1.0 SBU">
-]>
-
-<sect1 id="opensp" xreflabel="OpenSP-&opensp-version;">
-  <?dbhtml filename="opensp.html"?>
-
-
-  <title>OpenSP-&opensp-version;</title>
-
-  <indexterm zone="opensp">
-    <primary sortas="a-OpenSP">OpenSP</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to OpenSP</title>
-
-    <para>
-      The <application>OpenSP</application> package contains a
-      <application>C++</application> library for using SGML/XML files.
-      This is useful for validating, parsing and manipulating SGML and XML
-      documents.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&opensp-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&opensp-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &opensp-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &opensp-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &opensp-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &opensp-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">OpenSP Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="sgml-common"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libnsl"/> and
-      <xref linkend="xmlto"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of OpenSP</title>
-
-    <para>
-      Install <application>OpenSP</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i 's/32,/253,/' lib/Syntax.cxx &amp;&amp;
-sed -i 's/LITLEN          240 /LITLEN          8092/' \
-    unicode/{gensyntax.pl,unicode.syn} &amp;&amp;
-
-./configure --prefix=/usr                              \
-            --disable-static                           \
-            --disable-doc-build                        \
-            --enable-default-catalog=/etc/sgml/catalog \
-            --enable-http                              \
-            --enable-default-search-path=/usr/share/sgml &amp;&amp;
-
-make pkgdatadir=/usr/share/sgml/OpenSP-&opensp-version;</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>. As many as
-      nine of the 23 tests may fail. Do not be alarmed.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make pkgdatadir=/usr/share/sgml/OpenSP-&opensp-version; \
-     docdir=/usr/share/doc/OpenSP-&opensp-version;      \
-     install &amp;&amp;
-
-ln -v -sf onsgmls   /usr/bin/nsgmls   &amp;&amp;
-ln -v -sf osgmlnorm /usr/bin/sgmlnorm &amp;&amp;
-ln -v -sf ospam     /usr/bin/spam     &amp;&amp;
-ln -v -sf ospcat    /usr/bin/spcat    &amp;&amp;
-ln -v -sf ospent    /usr/bin/spent    &amp;&amp;
-ln -v -sf osx       /usr/bin/sx       &amp;&amp;
-ln -v -sf osx       /usr/bin/sgml2xml &amp;&amp;
-ln -v -sf libosp.so /usr/lib/libsp.so</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i 's/32,/253,/...unicode.syn}</command>:
-      These seds prevent some annoying messages that may otherwise appear
-      while running <command>openjade</command>.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <parameter>--enable-http</parameter>: This switch adds support
-      for HTTP.
-    </para>
-
-    <para>
-      <parameter>--disable-doc-build</parameter>: This switch prevents the
-      <command>configure</command> script checking if you have
-      <application>xmlto</application> installed. If you have
-      <application>xmlto</application>, you can remove this option.
-    </para>
-
-    <para>
-      <parameter>--enable-default-catalog=/etc/sgml/catalog</parameter>:
-      This switch sets the path to the centralized catalog.
-    </para>
-
-    <para>
-      <parameter>--enable-default-search-path</parameter>: This switch
-      sets the default value of <envar>SGML_SEARCH_PATH</envar>.
-    </para>
-
-    <para>
-      <option>--enable-xml-messages</option>: This switch adds
-      support for XML Formatted Messages.
-    </para>
-
-    <para>
-      <command>
-        make pkgdatadir=/usr/share/sgml/OpenSP-&opensp-version;
-      </command>: This sets the
-      pkgdatadir variable in the <filename>Makefile</filename> from
-      <filename class="directory">/usr/share/OpenSP</filename> to <filename
-      class="directory">/usr/share/sgml/OpenSP-&opensp-version;</filename>.
-    </para>
-
-    <para>
-      <command>ln -v -sf ...</command>: These commands create the
-      <application>SP</application> equivalents of
-      <application>OpenSP</application> executables and libraries.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>onsgmls, osgmlnorm, ospam, ospcat, ospent, osx, and the
-        <application>SP</application> equivalent symlinks: nsgmls, sgml2xml,
-        sgmlnorm, spam, spcat, spent, and sx</seg>
-        <seg>libosp.so and the <application>SP</application> equivalent symlink:
-        libsp.so</seg>
-        <seg>/usr/include/OpenSP, /usr/share/doc/OpenSP, and
-        /usr/share/sgml/OpenSP-&opensp-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="onsgmls">
-        <term><command>onsgmls</command></term>
-        <listitem>
-          <para>
-            is used to process SGML files
-          </para>
-          <indexterm zone="opensp onsgmls">
-            <primary sortas="b-onsgmls">onsgmls</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="osgmlnorm">
-        <term><command>osgmlnorm</command></term>
-        <listitem>
-          <para>
-            prints on the standard output a normalized document instance for
-            the SGML document contained in the concatenation of the entities
-            with system identifiers .nf and .fi
-          </para>
-          <indexterm zone="opensp osgmlnorm">
-            <primary sortas="b-osgmlnorm">osgmlnorm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ospam">
-        <term><command>ospam</command></term>
-        <listitem>
-          <para>
-            is a markup stream editor
-          </para>
-          <indexterm zone="opensp ospam">
-            <primary sortas="b-ospam">ospam</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ospcat">
-        <term><command>ospcat</command></term>
-        <listitem>
-          <para>
-            prints effective system identifiers found in the catalogs
-          </para>
-          <indexterm zone="opensp ospcat">
-            <primary sortas="b-ospcat">ospcat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ospent">
-        <term><command>ospent</command></term>
-        <listitem>
-          <para>
-            provides access to <application>OpenSP</application>'s
-            entity manager
-          </para>
-          <indexterm zone="opensp ospent">
-            <primary sortas="b-ospent">ospent</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="osx">
-        <term><command>osx</command></term>
-        <listitem>
-          <para>
-            is an SGML normalizer or used to convert
-            SGML files to XML files
-          </para>
-          <indexterm zone="opensp osx">
-            <primary sortas="b-osx">osx</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nsgmls">
-        <term><command>nsgmls</command></term>
-        <listitem>
-          <para>
-            is a symlink to <command>onsgmls</command>
-          </para>
-          <indexterm zone="opensp nsgmls">
-            <primary sortas="b-nsgmls">nsgmls</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sgml2xml">
-        <term><command>sgml2xml</command></term>
-        <listitem>
-          <para>
-            is a symlink to <command>osx</command>
-          </para>
-          <indexterm zone="opensp sgml2xml">
-            <primary sortas="b-sgml2xml">sgml2xml</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sgmlnorm">
-        <term><command>sgmlnorm</command></term>
-        <listitem>
-          <para>
-            is a symlink to <command>osgmlnorm</command>
-          </para>
-          <indexterm zone="opensp sgmlnorm">
-            <primary sortas="b-sgmlnorm">sgmlnorm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spam">
-        <term><command>spam</command></term>
-        <listitem>
-          <para>
-            is a symlink to <command>ospam</command>
-          </para>
-          <indexterm zone="opensp spam">
-            <primary sortas="b-spam">spam</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spcat">
-        <term><command>spcat</command></term>
-        <listitem>
-          <para>
-            is a symlink to <command>ospcat</command>
-          </para>
-          <indexterm zone="opensp spcat">
-            <primary sortas="b-spcat">spcat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spent">
-        <term><command>spent</command></term>
-        <listitem>
-          <para>
-            is a symlink to <command>ospent</command>
-          </para>
-          <indexterm zone="opensp spent">
-            <primary sortas="b-spent">spent</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sx">
-        <term><command>sx</command></term>
-        <listitem>
-          <para>
-            is a symlink to <command>osx</command>
-          </para>
-          <indexterm zone="opensp sx">
-            <primary sortas="b-sx">sx</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libosp">
-        <term><filename class="libraryfile">libosp.so</filename></term>
-        <listitem>
-          <para>
-            contains functions required by the
-            <application>OpenSP</application> programs to parse, validate and
-            manipulate SGML and XML files
-          </para>
-          <indexterm zone="opensp libosp">
-            <primary sortas="c-libosp">libosp.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libsp">
-        <term><filename class="libraryfile">libsp.so</filename></term>
-        <listitem>
-          <para>
-            is a symlink to
-            <filename class="libraryfile">libosp.so</filename>
-          </para>
-          <indexterm zone="opensp libsp">
-            <primary sortas="c-libsp">libsp.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: pst/sgml/sgml-common.xml
===================================================================
--- pst/sgml/sgml-common.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(revision )
@@ -1,251 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY sgml-common-download-http "https://sourceware.org/ftp/docbook-tools/new-trials/SOURCES/sgml-common-&sgml-common-version;.tgz">
-  <!ENTITY sgml-common-download-ftp  " ">
-  <!ENTITY sgml-common-md5sum        "103c9828f24820df86e55e7862e28974">
-  <!ENTITY sgml-common-size          "75 KB">
-  <!ENTITY sgml-common-buildsize     "1.5 MB">
-  <!ENTITY sgml-common-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="sgml-common" xreflabel="sgml-common-&sgml-common-version;">
-  <?dbhtml filename="sgml-common.html"?>
-
-
-  <title>sgml-common-&sgml-common-version;</title>
-
-  <indexterm zone="sgml-common">
-    <primary sortas="a-SGML-Common">SGML Common</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to SGML Common</title>
-
-    <para>
-      The <application>SGML Common</application> package contains
-      <command>install-catalog</command>. This is useful for creating and
-      maintaining centralized SGML catalogs.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&sgml-common-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&sgml-common-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &sgml-common-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &sgml-common-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &sgml-common-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &sgml-common-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Required patch: <ulink url=
-            "&patch-root;/sgml-common-&sgml-common-version;-manpage-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of SGML Common</title>
-
-    <para>
-      Instead of the normal convention of including the autotools files
-      in the package, the maintainers included symlinks to the files in
-      <filename class="directory">/usr/share/automake</filename>. For previous
-      versions of <application>Automake</application> this convention is
-      correct, but recent versions of <application>Automake</application>
-      install the internal files in version specific directories. This causes
-      the <command>configure</command> script to abort. To fix this error, the
-      autotools are regenerated. Since the included
-      <filename>Makefile.am</filename> file uses a syntax not supported by
-      current versions of <application>Automake</application>, a patch is
-      required to fix the syntax.
-    </para>
-
-<screen><userinput>patch -Np1 -i ../sgml-common-0.6.3-manpage-1.patch &amp;&amp;
-autoreconf -f -i</userinput></screen>
-
-    <para>
-      Install <application>SGML Common</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make docdir=/usr/share/doc install &amp;&amp;
-
-install-catalog --add /etc/sgml/sgml-ent.cat \
-    /usr/share/sgml/sgml-iso-entities-8879.1986/catalog &amp;&amp;
-
-install-catalog --add /etc/sgml/sgml-docbook.cat \
-    /etc/sgml/sgml-ent.cat</userinput></screen>
-
-    <tip>
-      <title>Update Hint</title>
-
-      <para>
-        Remove the above catalog items prior to upgrading (as the
-        <systemitem class='username'>root</systemitem> user) with:
-      </para>
-
-<screen role="nodump"><userinput>install-catalog --remove /etc/sgml/sgml-ent.cat \
-    /usr/share/sgml/sgml-iso-entities-8879.1986/catalog &amp;&amp;
-
-install-catalog --remove /etc/sgml/sgml-docbook.cat \
-    /etc/sgml/sgml-ent.cat</userinput></screen>
-
-    </tip>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring SGML Common</title>
-
-    <sect3 id="sgml-common-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/sgml/sgml.conf</filename>
-      </para>
-
-      <indexterm zone="sgml-common sgml-common-config">
-        <primary sortas="e-etc-sgml-sgml.conf">/etc/sgml/sgml.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        No change in this file is necessary.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Files</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>install-catalog and sgmlwhich</seg>
-        <seg>None</seg>
-        <seg>SGML and XML DocBook entity files</seg>
-        <seg>/etc/sgml, /usr/share/doc/sgml-common-&sgml-common-version;, and
-        /usr/share/sgml</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="install-catalog">
-        <term><command>install-catalog</command></term>
-        <listitem>
-          <para>
-            creates a centralized catalog that maintains references to
-            catalogs scattered throughout the
-            <filename class="directory">/usr/share/sgml</filename> directory
-          tree
-          </para>
-          <indexterm zone="sgml-common install-catalog">
-            <primary sortas="b-install-catalog">install-catalog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sgmlwhich">
-        <term><command>sgmlwhich</command></term>
-        <listitem>
-          <para>
-            prints to standard output the name of the main configuration file
-          </para>
-          <indexterm zone="sgml-common sgmlwhich">
-            <primary sortas="b-sgmlwhich">sgmlwhich</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="SGML-entities">
-        <term><filename>SGML entities files</filename></term>
-        <listitem>
-          <para>
-            contains the basic character entities defined with SDATA entries
-          </para>
-          <indexterm zone="sgml-common SGML-entities">
-            <primary sortas="g-SGML-ENT-files">SGML entity files</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="XML-entities">
-        <term><filename>XML entities files</filename></term>
-        <listitem>
-          <para>
-            contains the basic character entities defined by a hexadecimal
-            representation of the Unicode character number
-          </para>
-          <indexterm zone="sgml-common XML-entities">
-            <primary sortas="g-XML-ENT-files">XML entity files</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: pst/sgml/sgml.xml
===================================================================
--- pst/sgml/sgml.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(revision )
@@ -1,27 +1,0 @@
-<?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="pst-sgml">
-  <?dbhtml filename="sgml.html"?>
-
-  <title>Standard Generalized Markup Language (SGML)</title>
-
-  <para>
-    This chapter contains DocBook SGML document type definitions (DTDs),
-    DocBook DSSSL Stylesheets and DocBook tools to validate, transform, format
-    and publish DocBook documents.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sgml-common.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="docbook-3.1-dtd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="docbook-4.5-dtd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="opensp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openjade.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="docbook-dsssl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="docbook-utils.xml"/>
-
-</chapter>
Index: pst/typesetting/asymptote.xml
===================================================================
--- pst/typesetting/asymptote.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(revision )
@@ -1,301 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY asymptote-download-http "&sourceforge-dl;/asymptote/asymptote-&asymptote-version;.src.tgz">
-  <!ENTITY asymptote-download-ftp  " ">
-  <!ENTITY asymptote-md5sum        "905c100fc40b4af24ebf7398b8cce2b7">
-  <!ENTITY asymptote-size          "14 MB">
-  <!-- for asymptote-2.88 on top of TL2024, 75 MB for programis
-       the docs overwrite texmf-dist (5.2 MB) -->
-  <!ENTITY asymptote-buildsize     "202 MB (50 MB installed after overwriting files in $TEXLIVE_PREFIX/texmf-dist/, with all the dependencies which are in BLFS)">
-  <!ENTITY asymptote-time          "0.9 SBU (using parallelism=4)">
-]>
-
-<sect1 id="asymptote" xreflabel="asymptote-&asymptote-version;">
-  <?dbhtml filename="asymptote.html"?>
-
-
-  <title>asymptote-&asymptote-version;</title>
-
-  <indexterm zone="asymptote">
-    <primary sortas="a-asymptote">asymptote</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to asymptote</title>
-
-    <para>
-      <application>Asymptote</application> is a powerful descriptive vector
-      graphics language that provides a natural coordinate-based framework for
-      technical drawing. Labels and equations can be typeset with LaTeX.  As
-      well as EPS, PDF and PNG output it can produce WebGL 3D HTML rendering
-      and (using <application>dvisvgm</application>) SVG output.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&asymptote-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&asymptote-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &asymptote-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &asymptote-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &asymptote-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &asymptote-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--<bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/asymptote-&asymptote-version;-build_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>-->
-
-    <bridgehead renderas="sect3">asymptote Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gs"/> and
-      <xref linkend="texlive"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="curl"/>,
-      <xref linkend="freeglut"/>,
-      <xref linkend="gc"/>,
-      <xref linkend="glew"/>,
-      <xref linkend="glm"/> and
-      <xref linkend="libtirpc"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended at runtime</bridgehead>
-    <para role="recommended">
-      <xref role="runtime" linkend="dvisvgm"/> to allow svg output
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="fftw"/>,
-      <xref linkend="gsl"/>,
-      <xref linkend="libsigsegv"/>,
-      both <xref linkend="boost"/> and
-      <ulink url="https://github.com/Tencent/rapidjson/releases/">rapidjson</ulink>
-      to use
-      <ulink url="https://microsoft.github.io/language-server-protocol/implementors/tools/">LSP</ulink>
-      which can be used with
-      <ulink url="https://asymptote.sourceforge.io/doc/Language-server-protocol.html#index-LSP/">emacs</ulink>,
-      and <ulink url="https://eigen.tuxfamily.org/">eigen</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (at runtime)</bridgehead>
-    <para role="optional">
-      <xref linkend="imagemagick"/> to convert output to other formats such as
-      JPEG or to create animated GIFs,
-      <!-- dependency is in GUI/xasy.py -->
-      <ulink url="https://pypi.org/project/PyQt5/">PyQt5</ulink> (not tested,
-      has a build dependency of &qt5-deps;) to use xasy.
-    </para>
-
-    <para condition="html" role="usernotes">
-      Editor Notes: <ulink url="&blfs-wiki;/asymptote"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of asymptote</title>
-
-    <note>
-      <!-- This is specifically about my cylinder test - it has been
-       broken twice, one time the fix involved changing the script,
-       the second was blamed on the low-end hardware (radeon 3400G).
-       I don't understand the commands of asy so I will not
-       spend time bisecting it.  Ken -->
-      <para>
-        Certain 3D PDF scripts may not work when invoked from pdflatex
-        on some zen+ amdgpu APU machines.
-      </para>
-    </note>
-
-<!-- Editors: for testing this, the minimal latex functionality is
- covered by the cylinder and triangle tests in
- https://www.linuxfromscratch.org/~ken/tex-testfiles/latex-test-20240320.tar.xz
- but the more interesting stuff (WebM html, svg, png, pdf) is tested in
- https://www.linuxfromscratch.org/~ken/asy-nontex-testfiles/asy-test-20200809.tar.xz
--->
-<!--<para>
-      First apply a patch to fix building without the Language Server Protocol :
-    </para>
-
-<screen><userinput>patch -Np1 -i ../asymptote-&asymptote-version;-build_fix-1.patch</userinput></screen>-->
-
-    <para>
-      Install <application>asymptote</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>export TEXARCH=$(uname -m | sed -e 's/i.86/i386/' -e 's/$/-linux/') &amp;&amp;
-
-./configure --prefix=$TEXLIVE_PREFIX                          \
-            --bindir=$TEXLIVE_PREFIX/bin/$TEXARCH             \
-            --datarootdir=$TEXLIVE_PREFIX/texmf-dist          \
-            --infodir=$TEXLIVE_PREFIX/texmf-dist/doc/info     \
-            --libdir=$TEXLIVE_PREFIX/texmf-dist               \
-            --mandir=$TEXLIVE_PREFIX/texmf-dist/doc/man       \
-            --disable-lsp                                     \
-            --enable-gc=system                                \
-            --with-latex=$TEXLIVE_PREFIX/texmf-dist/tex/latex \
-            --with-context=$TEXLIVE_PREFIX/texmf-dist/tex/context/third &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../xincludes/tex-prefix.xml"/>
-
-    <para>
-      <parameter>--libdir=$TEXLIVE_PREFIX/texmf-dist</parameter>:
-      This parameter ensures that the <filename
-      class="directory">asymptote</filename> directory will similarly
-      overwrite any files installed by install-tl-unx.
-    </para>
-
-     <para>
-       <parameter>--disable-lsp</parameter>: The Language Server Protocol is
-       enabled by default, with several third-party sources included, but it
-       does not build unless boost and repidjson have been installed.
-     </para>
-
-    <para>
-      <parameter>--enable-gc=system</parameter>: this ensures that the system
-      version of <filename class="libraryfile">libgc.so</filename> will be used
-      instead of the version shipped with this package.
-    </para>
-
-    <para>
-      <parameter>--with-latex=</parameter>
-      <parameter>--with-context=</parameter>: These switches
-      ensure that style files and a tex file will be installed into the
-      <application>texlive</application> directories instead of creating a
-      <filename class="directory">texmf-local</filename> directory for them.
-    </para>
-
-    <!-- commenting for now: 2.44 installs asymptote.info in both places
-     so the old version no longer remains
-
-    <para>
-      <command>rm -fv /opt/texlive/.../asymptote.info</command>:
-      This deletes the file installed by <application>texlive</application>.
-      Exceptionally, asymptote will create an <filename
-      class="directory">asymptote/</filename> subdirectory for its own
-      <filename>asymptote.info</filename> even though a possibly older
-      version from <xref linkend="texlive"/> is in the main
-      <application>texlive</application>
-      <filename class="directory">info/</filename> directory. Both the
-      new version and the existing <filename>asy-faq.info</filename>
-      <emphasis>will</emphasis> be found by <command>info</command>.
-    </para>-->
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          asy, xasy
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          $TEXLIVE_PREFIX/texmf-dist/asymptote,
-          $TEXLIVE_PREFIX/doc/asymptote,
-          $TEXLIVE_PREFIX/info/asymptote
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="asy">
-        <term><command>asy</command></term>
-        <listitem>
-          <para>
-            is a vector graphics program
-          </para>
-          <indexterm zone="asymptote asy">
-            <primary sortas="b-asy">asy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xasy">
-        <term><command>xasy</command></term>
-        <listitem>
-          <para>
-            is a Python3 script providing a Qt5 GUI for asy
-          </para>
-          <indexterm zone="asymptote xasy">
-            <primary sortas="b-xasy">xasy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: pst/typesetting/biber.xml
===================================================================
--- pst/typesetting/biber.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(revision )
@@ -1,358 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-<!--
-  When a proper url is not evident, github will download with
-  https://github.com/ <path> /archive/<version>/<name>-<version>.tar.<compression>
-
-  <!ENTITY biber-download-http "https://github.com/plk/biber/archive/v&biber-version;.tar.gz">
--->
-  <!ENTITY biber-download-http "https://github.com/plk/biber/archive/v&biber-version;/biber-&biber-version;.tar.gz">
-  <!ENTITY biber-download-ftp  " ">
-  <!ENTITY biber-md5sum        "a7f400cdac3a3d9d9ab13ca053eb6791">
-  <!ENTITY biber-size          "1.6 MB">
-  <!-- Buildsize includes the installed biblatex, except that what matters is
-    the difference from the files shipped by texlive, so usually the addition is
-    minimal. Copy full texmf to somewhere for working, measure with du -shm,
-    then install biblatex over the top of it and remeasure.
-    For 3.16, texmf grew by 3MB -->
-  <!ENTITY biber-buildsize     "15 MB (installs 1.6MB of perl modules)"> <!-- only include biblatex size if texmf grows -->
-  <!ENTITY biber-time          "0.4 SBU including tests">
-
-  <!-- FIXME - ok to comment biblatex when version for a new year matches
-   what is in texmf-dist. For new version, reinstate to avoid runtime error.
-   The texmf version is at 'revision=' in texmf/doc/latex/biblatex/biblatex.tex -->
-  <!-- Check path.  Directory might not be &biblatex-version; if a suffixed update -->
- 
-  <!ENTITY biblatex-download-http   "https://sourceforge.net/projects/biblatex/files/biblatex-&biblatex-version;/biblatex-&biblatex-version;.tds.tgz">
-  <!ENTITY biblatex-download-ftp    "">
-  <!ENTITY biblatex-md5sum          "6c4117fd06e12854495a3777523d5372">
-  <!ENTITY biblatex-size            "19 MB">
-  <!-- this usually overwrites files in texmf-dist¸use du -sm to measure
-      before and after - 'buildsize' might easily be unchanged, or add to biber above -->
-  <!-- Unchanged for 3.20, it overwrote everything from 3.19 and rounded to same size -->
-]>
-
-<sect1 id="biber" xreflabel="biber-&biber-version;">
-  <?dbhtml filename="biber.html"?>
-
-
-  <title>biber-&biber-version;</title>
-
-  <indexterm zone="biber">
-    <primary sortas="a-biber">Biber</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to biber</title>
-
-    <para>
-      Biber is a BibTeX replacement for users of biblatex, written in
-      <application>Perl</application>, with full Unicode support.
-    </para>
-
-    &lfs121_checked;
-
-    <!-- note for editors: FIXME please test this by using the latest
-         version of the latex-test tarball from
-         https://www.linuxfromscratch.org/~ken/tex-testfiles/
-         using ./configure (to create the Makefile) and then making the
-         following targets:
-         biblatex-unibiber and biblatex-biber (these just use pdflatex
-         and biber, biblatex-unibiber is more important, it uses UTF-8)
-         bibxelatex (uses xelatex and biber, needs TTF or OTF fonts and
-         in particular coverage of simplified Chinese and Japanese, and
-         optionally Korean - installed fonts for CJK can be specified to
-         configure if they are not found)
-         remote1 and remote2 (pdflatex and biber, for use with manually
-         installed perl modules, i.e. without Mozilla::CA, to prove that
-         remote references work).
-         In all cases the output PDF should include references at the
-         end, the Makefile does not check that for the remote tests.
-         The biblatex-biber test only uses latex, trad markup, and
-         biber, biblatex.
- -->
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&biber-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&biber-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &biber-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &biber-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &biber-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &biber-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <note>
-
-      <para>
-        The <application>biber</application> source tarball shown above
-        downloads with the correct name, biber-&biber-version;.tar.gz,
-        if using a browser such as Firefox. If you prefer to use a command line
-        program such as wget, you normally would obtain
-        v&biber-version;.tar.gz. To obtain this package with the proper
-        filename, run:
-
-<screen><userinput>wget -c &biber-download-http; \
-     -O biber-&biber-version;.tar.gz</userinput></screen>.
-      </para>
-
-      <para>
-        If you have updated to a new release of texlive-source, biber and its
-        perl dependencies are still present in <filename
-        class="directory">/usr</filename> and do not need to be rebuilt.
-        However, biblatex installs in <filename
-        class="directory">/opt/texlive/&texlive-year;</filename> and does
-        need to be reinstalled.
-      </para>
-
-      <para>
-        If you installed the above dependencies using the BLFS instructions
-        for each of them, <command>perl ./Build.PL</command> will complain
-        that Mozilla::CA is not installed, but that is not needed unless
-        CPAN was used to install the modules. BLFS patches LWP::Protocol::https
-        to use the system certificates, Mozilla::CA uses old certificates.
-      </para>
-
-<!--  <para> ##commented as a reminder that sooner or later it will need a
-        newer version than our current or last but one release ##
-        This version of biber requires <application>perl-5.30</application>
-        or later.  If you are still using the 8.4 version of BLFS you may
-        wish to build the 2.13 version: see the 8.4 book noting that
-        biblatex-3.13 has been replaced by biblatex-3.13a upstream.
-      </para>-->
-    </note>
-
-    <!-- TexLive 2024 shipped biblatex-3.19.  Uncomment if a newer
-         biber requires a newer biblatex.  -->
-
-  <!-- FIXME - ok to comment biblatex when version for a new year matches
-   what is in texmf-dist. For new version, reinstate to avoid runtime error.-->
-    <bridgehead renderas="sect3">Required Additional Download</bridgehead>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&biblatex-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &biblatex-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &biblatex-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Biber Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <!-- KFM: the order listed in Build.PL is not alphabetical -->
-      <xref linkend="perl-autovivification"/>
-      <xref linkend="perl-business-isbn"/>
-      <xref linkend="perl-business-ismn"/>
-      <xref linkend="perl-business-issn"/>
-      <xref linkend="perl-class-accessor"/>
-      <xref linkend="perl-data-compare"/>
-      <xref linkend="perl-data-dump"/>
-      <xref linkend="perl-data-uniqid"/>
-      <xref linkend="perl-datetime-calendar-julian"/>
-      <xref linkend="perl-datetime-format-builder"/>
-      <xref linkend="perl-encode-eucjpascii"/>
-      <xref linkend="perl-encode-hanextra"/>
-      <xref linkend="perl-encode-jis2k"/>
-      <xref linkend="perl-file-slurper"/>
-      <xref linkend="perl-io-string"/>
-      <!-- IPC::Cmd is a part of core perl -->
-      <xref linkend="perl-ipc-run3"/>
-      <xref linkend="perl-lingua-translit"/>
-      <xref linkend="perl-list-allutils"/>
-      <xref linkend="perl-list-moreutils"/>
-      <!-- perl-list-moreutils-xs is a dep of perl-list-moreutils -->
-      <xref linkend="perl-log-log4perl"/>
-      <xref linkend="perl-lwp-protocol-https"/>
-      <!-- LWP::Simple dep for this protocol is part of perl-libwww-perl,
-      that is pulled in by perl-lwp-protocol-https and that pulls in
-      perl-uri. Biber lists LWP::UserAgent as a dep, again it is part
-      of perl-libwww-perl. -->
-      <xref linkend="perl-module-build"/>
-      <xref linkend="perl-parse-recdescent"/>
-      <xref linkend="perl-perlio-utf8_strict"/>
-      <!-- Mozilla::CA should not be needed when using system certificates -->
-      <xref linkend="perl-regexp-common"/>
-      <xref linkend="perl-sort-key"/>
-      <xref linkend="perl-text-bibtex"/>
-      <xref linkend="perl-text-csv"/>
-      <!-- perl-text-csv_xs is a recommended dependency for perl-text-csv -->
-      <xref linkend="perl-text-roman"/>
-      <!-- Unicode-Collate usually needs to be latest when biber is released,
-        core perl is usually older. To read the core version, look at
-        /usr/lib/perl5/5.xx.y/x86_64-linux-thread-multi/Unicode/Collate.pm -->
-      <xref linkend="perl-unicode-collate"/>
-      <!-- Unicode::GCstring is part of Unicode::LineBreak -->
-      <xref linkend="perl-unicode-linebreak"/>
-      <!-- Unicode::Normalize is part of core perl, found in
-        /usr/lib/perl5/5.xx.y/x86_64-linux-thread-multi/Unicode/Normalize.pm -->
-      <!-- perl-xml-libxml is a dependency of perl-xml-libxml-simple -->
-      <xref linkend="perl-xml-libxml-simple"/>
-      <xref linkend="perl-xml-libxslt"/>
-      <xref linkend="perl-xml-writer"/>
-      <!-- untarring biblatex requires that the texmf directories already exist -->
-      <!--
-      <xref linkend="texlive"/>
-      (or <xref linkend="tl-installer"/>, but for that you can use
-       <command>tlmgr update</command>)
-      -->
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (required for the test suite)</bridgehead>
-    <para role="recommended">
-      <xref linkend="perl-file-which"/> and
-      <xref linkend="perl-test-differences"/>
-    </para>
-
-    <note>
-      <para>
-        It is possible to install all missing dependencies automatically. You
-        must first install <xref linkend="perl-module-build"/> using <xref
-        linkend="perl-auto-install"/>. Then run <command>perl
-        ./Build.PL</command> and when it prompts you, become the &root; user
-        and run <command>./Build installdeps</command> - this will use CPAN
-        and as noted above it will use Mozilla::CA instead of using system
-        certificates.
-      </para>
-    </note>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Biber</title>
-
-    <!-- https://github.com/plk/biber/commit/d9e9617 -->
-    <!--
-    <para>
-      Fix an issue building this package with Perl 5.36 or later:
-    </para>
-
-<screen><userinput remap="pre">sed 's/undef$/&amp;;/' -i lib/Biber/Section.pm</userinput></screen>
--->
-    <para>
-      Install <application>Biber</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>perl ./Build.PL &amp;&amp;
-./Build</userinput></screen>
-
-    <para>
-      To test the results, enter: <command>./Build test</command>
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-<!--
-<screen role="root"><userinput>tar -xf ../biblatex-&biblatex-version;.tds.tgz -C /opt/texlive/&texlive-year;/texmf-dist &amp;&amp;
-texhash &amp;&amp;
--->
-<screen role="root"><userinput>./Build install</userinput></screen>
-<!-- Editor note: As for any ./Build type perl module, use destdir=
-     after the command for DESTDIR. -->
-
-<!--<para>
-      The corresponding version of <application>biblatex</application> is
-      a separate project.  The tarball is pre-packaged for untarring
-      into the <filename class="directory">texmf-dist</filename>
-      directory. Install it as the &root; user:
-    </para>
-
-<screen role="root"><userinput>tar -C $TEXLIVE_PREFIX/texmf-dist -xf ../biblatex-&biblatex-version;.tds.tgz</userinput></screen>-->
-
-  </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>tar -xf biblatex-&biblatex-version;.tds.tar.gz -C
-      /opt/texlive/&texlive-year;/texmf-dist</command>:
-      this installs the new <application>biblatex</application> files over those
-      installed by <application>texlive</application>.
-    </para>
-
-    <para>
-      <command>texhash</command> : this updates the file hash tables (otherwise
-      known as the file name database).
-    </para>
-
-  </sect2>
--->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>biber</seg>
-        <seg>None</seg>
-        <seg>/usr/lib/perl5/site_perl/5.*{,/&lt;arch&gt;-linux/auto}/Biber</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="biber-prog">
-        <term><command>biber</command></term>
-        <listitem>
-          <para>
-            is used for producing bibliographies in LaTeX documents
-          </para>
-          <indexterm zone="biber biber-prog">
-            <primary sortas="b-biber">biber</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: pst/typesetting/dvisvgm.xml
===================================================================
--- pst/typesetting/dvisvgm.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(revision )
@@ -1,223 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!-- This can be accessed via https://dvisvgm.de/Downloads/
-       NOT via the tags at github - those use autogen.sh -->
-  <!ENTITY dvisvgm-download-http "https://github.com/mgieseki/dvisvgm/releases/download/&dvisvgm-version;/dvisvgm-&dvisvgm-version;.tar.gz">
-  <!ENTITY dvisvgm-download-ftp  " ">
-  <!ENTITY dvisvgm-md5sum        "bd2f4e747f1d090ae623e6ebd7c6a5e8">
-  <!ENTITY dvisvgm-size          "2.8 MB">
-  <!-- for dvisvgm-3.22 on top of TL2023, 7 MB for program,
-       a few KB for bigger dvisvgm.1 and the PDF man page was not updated.
-       For a DESTDIR this would be 313 MB and 45 MB. -->
-  <!ENTITY dvisvgm-buildsize     "268 MB (net 7 MB installed after overwriting files in $TEXLIVE_PREFIX/texmf-dist/, add 948 MB for the tests)">
-  <!ENTITY dvisvgm-time          "0.8 SBU (add 0.5 SBU for the tests, both using parallelism=4)">
-]>
-
-<sect1 id="dvisvgm" xreflabel="dvisvgm-&dvisvgm-version;">
-  <?dbhtml filename="dvisvgm.html"?>
-
-
-  <title>dvisvgm-&dvisvgm-version;</title>
-
-  <indexterm zone="dvisvgm">
-    <primary sortas="a-dvisvgm">dvisvgm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to dvisvgm</title>
-
-    <para>
-      The <application>dvisvgm</application> package converts DVI, EPS and
-      PDF files to SVG format.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&dvisvgm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&dvisvgm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &dvisvgm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &dvisvgm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &dvisvgm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &dvisvgm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">dvisvgm Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <!-- EDITORS: the docs say it needs clipper, but it uses an internal
-       modified version and cannot be built with system clipper -->
-      <xref linkend="brotli"/>,
-      <xref linkend="gs"/>,
-      <xref linkend="potrace"/>, and
-      <xref linkend="texlive"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="woff2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="asciidoc"/> with
-      <xref linkend="xmlto"/> and
-      <xref linkend="libxslt"/> (see command explanations),
-      <ulink url="https://dblatex.sourceforge.net/">dblatex</ulink> (with the above) and
-      <!-- version checked for dvisvgm-2.9, 0.7.3 is mentioned in the
-           news and is the latest version at 2020-03-21
-           maybe change to 'a recent version' if that releases faster -->
-      <ulink url="https://github.com/Cyan4973/xxHash/releases/latest">xxHash</ulink>
-      (the current version is included in the tarball)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of dvisvgm</title>
-
-<!-- Editors: This is in the book for svg output from asymptote. tested in
- https://www.linuxfromscratch.org/~ken/asy-nontex-testfiles/asy-test-20200123.tar.xz
- Can also be tested with texlive including tikz
- https://www.linuxfromscratch.org/~ken/tex-testfiles/ https://www.linuxfromscratch.org/~ken/
- Or, use use it to convert first or specified page(s) of a PDF to SVG - see the man page
--->
-
-   <!-- symlink for kpathsea moved to texlive so that if it already exists for
-   evince from a previous year it will be recreated -->
-
-    <para>
-      The test suite assumes that a modern version of <application>Python</application>
-      has been installed as plain <command>python</command>. Changing this to use
-      <command>python3</command> requires a sed to one <filename>Makefile.in</filename>
-      file.
-    </para>
-
-    <para>
-      Install <application>dvisvgm</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i 's/python/&amp;3/' tests/Makefile.in         &amp;&amp;
-./configure                                     \
-    --bindir=$TEXLIVE_PREFIX/bin/${TEXARCH}     \
-    --mandir=$TEXLIVE_PREFIX/texmf-dist/doc/man \
-    --with-kpathsea=$TEXLIVE_PREFIX             &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>
-
-<!-- This is now done in Texlive
-    <para>
-      <command>ln -svf $TEXLIVE_PREFIX/lib/libkpathsea.so /usr/lib</command>:
-      Without this, the program will not link correctly,
-    </para>
--->
-<!-- The autoreconf command is not used above anymore.
-    <para>
-      <command>autoreconf -fiv</command>: The versions of
-      <application>autoconf</application> and <application>automake</application>
-      used when this package was created are older than the current versions in
-      LFS. That causes 'make' to fail when it reaches the 'tests' subdirectory
-      unless autoreconf is forced to install missing (i.e. newer) auxiliary
-      files.
-    </para>
--->
-
-    <!-- EDITORS: the doc target to rebuild the manpage (make man) is not
-      recognised unless invoked from the doc directory (unlike make pdf which
-      can be invoked from top-level but needs dblatex), and I see no utility
-      in explaining how to regenerate it. ken -->
-    <para>
-      <parameter>--with-kpathsea=$TEXLIVE_PREFIX</parameter>: This allows
-      the build system to find the headers for <filename
-      class="libraryfile">kpathsea</filename>
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          dvisvgm
-        </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="dvisvgm-prog">
-        <term><command>dvisvgm</command></term>
-        <listitem>
-          <para>
-            converts DVI, EPS and PDF files to the SVG format
-          </para>
-          <indexterm zone="dvisvgm dvisvgm-prog">
-            <primary sortas="b-dvisvgm">dvisvgm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: pst/typesetting/tex-path.xml
===================================================================
--- pst/typesetting/tex-path.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(revision )
@@ -1,94 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="tex-path" xreflabel="Setting the PATH for TeX Live">
-  <?dbhtml filename="tex-path.html"?>
-
-
-  <title>Setting the PATH for TeX Live</title>
-
-  <para>
-    Upstream prefers to install in <filename
-    class="directory">/usr/local</filename> but the BLFS editors regard that as
-    inconvenient, and think using <filename
-    class="directory">/opt/texlive</filename> is more appropriate. Originally
-    BLFS used a full binary install to bootstrap the source install, so the
-    same prefix is used for both.
-  </para>
-
-  <para>
-    Before starting to build TeX Live, set up your PATH so
-    that the system can properly find the files.  If you set up your login
-    scripts as recommended in <xref linkend='postlfs-config-profile'/>, update
-    the needed paths by creating the
-    <filename>texlive.sh</filename> script. The programs are always
-    installed in an &lt;ARCH&gt;-linux subdirectory and on 32-bit x86 this is
-    always i386-linux. For x86_64 and i?86 we can generate this as $TEXARCH:
-  </para>
-
-  <note>
-    <para>
-      If upgrading from a previous year's version, you should manually
-      edit <filename>texlive.sh</filename> to ensure that the version for
-      the year you wish to use is the only TeX present (some people need to
-      keep multiple years available to ensure there are no regressions in
-      their documents).
-    </para>
-  </note>
-
-<!-- EOF should NOT be in double quotes, we want it to evaluate $TEXARCH -->
-<!-- this is also in texlive.xml -->
-   <para>Now, create the texlive.sh script as the &root; user:</para>
-
-<screen role="root"><userinput>TEXARCH=$(uname -m | sed -e 's/i.86/i386/' -e 's/$/-linux/')
-
-cat &gt; /etc/profile.d/texlive.sh &lt;&lt; EOF
-<literal># Begin texlive setup
-TEXLIVE_PREFIX=/opt/texlive/&texlive-year;
-export TEXLIVE_PREFIX
-
-pathappend \$TEXLIVE_PREFIX/texmf-dist/doc/info INFOPATH
-pathappend \$TEXLIVE_PREFIX/bin/$TEXARCH
-
-TEXMFCNF=\$TEXLIVE_PREFIX/texmf-dist/web2c
-export TEXMFCNF
-
-# End texlive setup</literal>
-EOF
-
-unset TEXARCH</userinput></screen>
-
-  <note>
-    <para>
-      The standard INFOPATH path are specified above to
-      ensure they are included.  If they are already set in the boot script
-      procedure, the pathappend function will ensure duplicates are
-      removed, so including them here will do no harm.
-    </para>
-  </note>
-
-  <note>
-    <para>
-      The backslashes before the dollar signs in the script above are to
-      facilitate a copy/paste operation. The backslashes should not
-      appear in the actual script.
-    </para>
-  </note>
-
-  <para>
-    The new paths can be immediately activated by running:
-  </para>
-
-<screen><userinput>source /etc/profile</userinput></screen>
-
-  <para>
-    You should now proceed either to <xref linkend="tl-installer"/> for
-    a binary installation of texlive, or to <xref linkend="texlive"/> to begin
-    installing from source.
-  </para>
-
-</sect1>
Index: pst/typesetting/texlive.xml
===================================================================
--- pst/typesetting/texlive.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(revision )
@@ -1,591 +1,0 @@
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!-- utah -->
-  <!ENTITY texlive-download-http "https://ftp.math.utah.edu/pub/tex/historic/systems/texlive/&texlive-year;/texlive-&texlive-version;-source.tar.xz">
-  <!ENTITY texlive-download-ftp  " ">
-  <!ENTITY texlive-md5sum        "1da2f08e3ba4a3708870dd088c1d6823">
-  <!ENTITY texlive-size          "67 MB">
-
-  <!ENTITY texlive-buildsize      "9.1 GB including the additional download and the tests, 8.3 GB installed">
-  <!ENTITY texlive-time           "4.6 SBU including the additional download and the tests, building with parallelism=4">
-
-  <!-- utah -->
-  <!ENTITY texlive-texmf-download-http "https://ftp.math.utah.edu/pub/tex/historic/systems/texlive/&texlive-year;/texlive-&texlive-version;-texmf.tar.xz">
-  <!ENTITY texlive-texmf-download-ftp  " ">
-  <!ENTITY texlive-texmf-md5sum        "e67ce334dd0fddda5f4a87b4fcaaf48f">
-  <!ENTITY texlive-texmf-size          "4.0 GB">
-
-  <!ENTITY texlive-extra-download-http "https://ftp.tu-chemnitz.de/pub/tug/historic/systems/texlive/&texlive-year;/texlive-&texlive-version;-extra.tar.xz">
-  <!ENTITY texlive-extra-download-ftp  " ">
-  <!ENTITY texlive-extra-md5sum        "1bd045bd1673ce61bde590c10b86c6cc">
-  <!ENTITY texlive-extra-size          "1.9 MB">
-
-<!-- The following commit will change future installs so that the scripts in
-texmf-dist linked from bin/ are copied instead of symlinks.
-
-commit 0c9707142465610f0e22745a22bf8c71850cef49
-Author: Karl Berry <karl@freefriends.org>
-Date:   Tue Mar 19 22:03:22 2024 +0000
-
-    (%opts): create the generically-named output files as copies by default.
-    (@cmdline_options): allow -no-copy.
-    (help): document.
-    
-    
-    git-svn-id: svn://tug.org/texlive/trunk@70707 c570f23f-e606-0410-a88d-b1316a301751
-
-That was done to simplify the process (windows has always used copy) and will likely
-make the installed sizes somewhat bigger.
-
-There is an option \-\-no-copy for updmap.pl, unclear if that can be used here,
-and it might have been removed by next year. -->
-]>
-
-
-<sect1 id="texlive" xreflabel="texlive-&texlive-version;">
-  <?dbhtml filename="texlive.html"?>
-
-
-  <title>texlive-&texlive-version;-source</title>
-
-  <indexterm zone="texlive">
-    <primary sortas="a-texlive">texlive</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to TeX Live from source</title>
-
-    <note>
-      <para>
-        According to <ulink url="https://www.tug.org/historic/"/> the master
-        site in France only supports ftp and rsync. Now that ftp is generally
-        deprecated, that page has links to mirrors, some of which support https,
-        e.g. in Utah and Chemnitz as well as in China. If you prefer to use a
-        different mirror from the example links here, you will need to navigate
-        to systems/historic/texlive/&texlive-year; or systems/texlive/&texlive-year;
-        as the case may be.
-        <!-- the chinese mirros do not use a 'historic' subdirectory. -->
-      </para>
-    </note>
-
-    <para>
-      Most of TeX Live can be built from source without a pre-existing
-      installation, but <application>xindy</application> (for indexing) needs
-      working versions of <command>latex</command> and
-      <command>pdflatex</command> when configure is run, and the test suite
-      and install for <command>asy</command> (for vector graphics) will fail
-      if TeX has not already been installed. Additionally,
-      <application>biber</application> is not provided within the
-      <application>texlive</application> source and the version of
-      <application>dvisvgm</application> in the
-      <application>texlive</application> tree cannot be built
-      if shared system libraries are used.
-    </para>
-
-      <para>
-      </para>
-    <para>
-      All of those packages are dealt with on their own pages and can be
-      built after installing this package. If you have not already done so, you
-      should start at <xref linkend="tex-path"/> so that the final commands to
-      initialize the new installation will be found.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&texlive-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&texlive-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &texlive-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &texlive-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &texlive-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &texlive-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Required Additional Downloads</bridgehead>
-
-      <para>
-        Much of the texlive environment (including scripts, documentation,
-        fonts, and various other files) is not part of the source tarball.
-        You must download it separately. This will give you all of the
-        additional files which are provided by a full install of the binary
-        version, there is no realistic way to restrict which parts get
-        installed.
-      </para>
-
-      <para>
-        Because of the size of this package, it is unlikely to be mirrored by
-        BLFS mirrors.  In case of difficulty, go to http://www.ctan.org/mirrors/
-        to find a more-accessible mirror.
-      </para>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&texlive-texmf-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&texlive-texmf-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &texlive-texmf-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &texlive-texmf-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-      <para>
-        The tlpdb database is shipped as a separate tarball. The
-        <command>texdoc</command> program needs a cache file derived
-        from this (and will create the cache on its first run).
-      </para>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&texlive-extra-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&texlive-extra-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &texlive-extra-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &texlive-extra-size;
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          Required patch: <ulink url=
-          "&patch-root;/texlive-&texlive-version;-source-upstream_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">TeX Live from source Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="x-window-system"/>
-    </para>
-
-    <!-- text for recommended libraries -->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../xincludes/texrecommendlibs.xml"/>
-
-<!-- the following ensures jhalfs will set paths before running texlive -->
-
-    <para role="recommended">
-      Furthermore, the instructions below assume you are using the layout
-      described in <xref linkend="tex-path"/>.
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <!-- text for optional deps -->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../xincludes/texoptional.xml"/>
-
-    <bridgehead renderas="sect4">Runtime dependencies</bridgehead>
-    <!-- text for runtime deps, shared with tl-installer -->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../xincludes/texruntime.xml"/>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of TeX Live</title>
-
-    <para>
-      Install TeX Live by running the following commands:
-    </para>
-
-    <caution>
-      <para>
-        If you wish to upgrade to current <application>texlive</application>
-        on an older system where extra packages (<application>asymptote</application>,
-        <!-- Ken: comment biber - usually a new texyear has brought a new version
-        but not so far for 2024. Looking at what it installs it is only perl
-        modules and their man pages so those ought to still exist after the
-        previous year's texlive has been removed.
-        <application>biber</application>, -->
-                                          <application>dvisvgm</application>, or
-        <application>xindy</application>) have been installed, you will need to
-        reinstall those as well as fixing up your <literal>PATH</literal> for
-        <literal>$TEXLIVE_PREFIX</literal>.
-      </para>
-    </caution>
-
-    <note>
-      <para>
-        A successful install requires some texlive
-        commands to be run as the root user, so we will export the TEXARCH
-        variable to let <systemitem class="username">root</systemitem> use it.
-      </para>
-    </note>
-
-    <para>
-      Now, as a normal user:
-    </para>
-
-<!-- if a patch for the source is needed, this should go between the export
-	ande configure. But keeping it there as a commented line adds too much vertical space.
-    patch -Np1 -i ../texlive-&texlive-version;-source-security_fix-1.patch &amp;&amp;-->
-<screen><userinput>export TEXARCH=$(uname -m | sed -e 's/i.86/i386/' -e 's/$/-linux/') &amp;&amp;
-
-patch -Np1 -i ../texlive-&texlive-version;-source-upstream_fixes-1.patch &amp;&amp;
-
-mkdir texlive-build &amp;&amp;
-cd    texlive-build &amp;&amp;
-
-../configure -C                                   \
-    --prefix=$TEXLIVE_PREFIX                      \
-    --bindir=$TEXLIVE_PREFIX/bin/$TEXARCH         \
-    --datarootdir=$TEXLIVE_PREFIX                 \
-    --includedir=$TEXLIVE_PREFIX/include          \
-    --infodir=$TEXLIVE_PREFIX/texmf-dist/doc/info \
-    --libdir=$TEXLIVE_PREFIX/lib                  \
-    --mandir=$TEXLIVE_PREFIX/texmf-dist/doc/man   \
-    --disable-native-texlive-build                \
-    --disable-static --enable-shared              \
-    --disable-dvisvgm                             \
-    --with-system-cairo                           \
-    --with-system-fontconfig                      \
-    --with-system-freetype2                       \
-    --with-system-gmp                             \
-    --with-system-graphite2                       \
-    --with-system-harfbuzz                        \
-    --with-system-icu                             \
-    --with-system-libgs                           \
-    --with-system-libpaper                        \
-    --with-system-libpng                          \
-    --with-system-mpfr                            \
-    --with-system-pixman                          \
-    --with-system-zlib                            \
-    --with-banner-add=" - BLFS" &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make -k check</command>.
-      <!-- https://github.com/rrthomas/libpaper/issues/43 -->
-      One test <filename>psutils.test</filename> is known to fail if
-      using system libpaper because TeX Live includes old versions of both
-      <application>psutils</application> and <application>libpaper</application>
-      which result in a difference in the final decimal places of the psresize
-      test. The <application>libpaper</application> developer does not think
-      this is significant.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<!-- Editors, you can run 'make texlinks' in a DESTDIR by passing
-DESTDIR=some/where -->
-<screen role="root"><userinput>make install-strip &amp;&amp;
-make texlinks      &amp;&amp;
-mkdir -pv                                $TEXLIVE_PREFIX/tlpkg/TeXLive/ &amp;&amp;
-install -v -m644 ../texk/tests/TeXLive/* $TEXLIVE_PREFIX/tlpkg/TeXLive/ &amp;&amp;
-tar -xf ../../texlive-&texlive-version;-extra.tar.xz -C $TEXLIVE_PREFIX/tlpkg --strip-components=2</userinput></screen>
-
-    <note>
-      <para>
-        Only run <command>make texlinks</command> once. If it is rerun,
-        it can change all the program symlinks so that they point to
-        themselves and are useless.
-      </para>
-    </note>
-
-    <para>
-      Now install the additional files as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<!-- if texmf does not need to be patched, remove &amp;&amp; from first line,
- close userinput, screen, comment pushd, patch, popd -->
-<screen role="root"><userinput>tar -xf ../../texlive-&texmf-version;-texmf.tar.xz -C $TEXLIVE_PREFIX --strip-components=1</userinput></screen>
-
-    <para>
-      Still as the <systemitem class="username">root</systemitem> user,
-      initialize the new system (the command <command>fmtutil-sys
-      --all</command> will produce
-      a <emphasis>lot</emphasis> of output):
-    </para>
-
-<!-- Editors, fmtutil-sys can apparently only be run on
-a real install, as root.  But mktexlsr can be run in a DESTDIR with
-cd /YOUR/TEXMF/ROOT ; ls -LAR ./ >ls-R -->
-
-<screen role="root"><userinput>mktexlsr &amp;&amp;
-fmtutil-sys --all</userinput></screen>
-
-    <para>
-      To allow <xref linkend="evince"/> or <xref linkend="dvisvgm"/> to
-      link to <filename class="libraryfile">libkpathsea.so</filename>,
-      as the &root; user (re)create a symlink from
-      <filename class="directory">/usr/lib</filename>:
-    </para>
-
-<screen role="root"><userinput>ln -svf $TEXLIVE_PREFIX/lib/libkpathsea.so{,.6} /usr/lib</userinput></screen>
-
-    <note>
-      <para>
-        TeX Live does not include the source for ConTeXt, only the items that
-        are at CTAN. Trying to build ConTeXt purely from source on a  BLFS
-        TeX Live system is a niche usage and looks as if it will be more trouble
-        than it is worth.
-      </para>
-
-      <para>
-        If you wish to use ConTeXt with <command>luametatex</command> (most of
-        the old MKII and MKIV code was removed from TeX Live 2023 by the ConTeXt
-        developer), starting with the binary (only installing ConTeXt, 753 MB in
-        March 2024) would probably be the easiest way to bootstrap it. The source
-        for <command>luametatex</command> can be pulled with git from <ulink
-        url="https://github.com/contextgarden/luametatex/tags">github
-        luametatex</ulink>, compiled with meson and ninja, and installed by
-        copying to the correct program directory. This should avoid having to
-        fix all the symlinks etc and also avoid including the many unrelated
-        <!-- trying to use a filename tag here is rejected within para ?? -->
-        parts of texmf-dist.
-        See comments 1 to 5 of
-        <ulink url="&blfs-ticket-root;17823">#17823</ulink>.
-      </para>
-    </note>
-
-    <para>
-      You can now proceed to <xref linkend="asymptote"/>,
-      <xref linkend="biber"/>, <xref linkend="dvisvgm"/> and / or <xref
-      linkend="xindy"/> if you wish to install them.
-    </para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>-C</command>: create config.cache, this saves significant
-      time in a parallel build.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../xincludes/tex-prefix.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../xincludes/tex-lib.xml"/>
-
-    <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/tex-shared.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/tex-system.xml"/>
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/tex-xpdf.xml"/>-->
-
-    <para>
-      <parameter>--disable-dvisvgm</parameter>: As noted above, the shipped version
-      of dvisvgm, which has modified configuration files, cannot be built with
-      shared system libraries.
-    </para>
-
-    <para>
-      <command>make texlinks</command> : this runs the texlinks.sh script
-      to create symbolic links from formats to engines.  In
-      practice, several of the targets such as <command>xetex</command> are now
-      separate binaries and for these it will report "file already exists".
-    </para>
-
-    <para>
-      <command>tar -xf texlive-&texmf-version;-texmf.tar.xz -C $TEXLIVE_PREFIX --strip-components=1</command>:
-      the tarball contains the files for the texmf-dist directory, and because
-      of its size we do not want to waste time and space untarring it and then
-      copying the files.
-    </para>
-
-    <para>
-      <command>install -v -m644 ../texk/tests/TeXLive/*
-      $TEXLIVE_PREFIX/tlpkg/TeXLive/</command>: This puts the perl
-      modules <filename>TLConfig.pm</filename> and <filename>TLUtils.pm</filename>
-      into the directory where the binary installer puts them - it is at the
-      start of the perl @INC@ PATH within texlive when installed using the above
-      configure switches. Without these modules, texlive is unusable.
-    </para>
-
-    <para>
-      <command>mktexlsr</command>: Create an <filename>ls-R</filename> file
-      which lists what was installed - this is used by kpathsea to find files.
-    </para>
-
-    <para>
-      <command>fmtutil-sys --all</command>: This initializes the TeX formats,
-      Metafont bases and Metapost mems.
-    </para>
-
-    <para>
-      <option>--without-x</option>: use this if you do not have Xorg installed.
-    </para>
-
-    <para>
-      There are many other '--disable' or '--without' options. Some of them such
-      as <option>--without-texinfo</option> are accepted but no longer do anything,
-      others will prevent a program being built - but the far greater amount of
-      space used for the related items in texmf means there is no obvious benefit
-      from disabling a few of the programs.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>Over 300 binaries and symlinks to scripts</seg>
-        <seg>libkpathsea.so,
-             libptexenc.so,
-             libsynctex.so,
-             libtexlua52.so,
-             libtexluajit.so
-        </seg>
-        <seg>$TEXLIVE_PREFIX/bin,
-             $TEXLIVE_PREFIX/include,
-             $TEXLIVE_PREFIX/lib,
-             $TEXLIVE_PREFIX/texmf-dist
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="texlive-programs">
-        <term><command>TeX&nbsp;programs</command></term>
-        <listitem>
-          <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-          href="../../xincludes/texprogs.xml"/>
-          <indexterm zone="texlive texlive-programs">
-            <primary sortas="b-texlive-programs">TeX Live programs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libkpathsea">
-        <term><filename class="libraryfile">libkpathsea.so</filename></term>
-        <listitem>
-          <para>
-            (kpathsearch) exists to look up a file in a list of directories
-            and is used by <command>kpsewhich</command>
-          </para>
-          <indexterm zone="texlive libkpathsea">
-            <primary sortas="c-libkpathsea">libkpathsea.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libptexenc">
-        <term><filename class="libraryfile">libptexenc.so</filename></term>
-        <listitem>
-          <para>
-            is a library for Japanese pTeX (publishing TeX)
-          </para>
-          <indexterm zone="texlive libptexenc">
-            <primary sortas="c-libptexenc">libptexenc.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libsynctex">
-        <term><filename class="libraryfile">libsynctex.so</filename></term>
-        <listitem>
-          <para>
-            is the SyncTeX (Synchronize TeXnology) parser library
-          </para>
-          <indexterm zone="texlive libsynctex">
-            <primary sortas="c-libsynctex">libsynctex.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtexlua52">
-        <term><filename class="libraryfile">libtexlua52.so</filename></term>
-        <listitem>
-          <para>
-            provides Lua 5.2, modified for use with LuaTeX
-          </para>
-          <indexterm zone="texlive libtexlua52">
-            <primary sortas="c-libtexlua52">libtexlua52.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtexluajit">
-        <term><filename class="libraryfile">libtexluajit.so</filename></term>
-        <listitem>
-          <para>
-            provides LuaJIT, modified for use with LuaJITTeX
-          </para>
-          <indexterm zone="texlive libtexluajit">
-            <primary sortas="c-libtexluajit">libtexluajit.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: pst/typesetting/tl-installer.xml
===================================================================
--- pst/typesetting/tl-installer.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(revision )
@@ -1,340 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY tl-installer-download-http   "https://mirror.ctan.org/systems/texlive/tlnet/install-tl-unx.tar.gz">
-
-  <!ENTITY tl-installer-download-ftp    " ">
-  <!ENTITY tl-installer-md5sum          "cec36f23d7d4e1a4a2a90f77bad8e667">
-  <!ENTITY tl-installer-date             "20230313"> <!-- in the directory name -->
-  <!ENTITY tl-installer-size            "5.5 MB">
-  <!ENTITY tl-installer-buildsize        "85 MB for plain TeX, typically 2 to 4 MB for latex and later engines, 8.6 GB if everything is included">
-  <!ENTITY tl-installer-time            "varies, depending on network speed and traffic">
-<!-- The following commit will change future installs so that the scripts in
-texmf-dist linked from bin/ are copied instead of symlinks.
-
-commit 0c9707142465610f0e22745a22bf8c71850cef49
-Author: Karl Berry <karl@freefriends.org>
-Date:   Tue Mar 19 22:03:22 2024 +0000
-
-    (%opts): create the generically-named output files as copies by default.
-    (@cmdline_options): allow -no-copy.
-    (help): document.
-    
-    
-    git-svn-id: svn://tug.org/texlive/trunk@70707 c570f23f-e606-0410-a88d-b1316a301751
-
-That was done to simplify the process (windows has always used copy) and will likely
-make the installed sizes somewhat bigger.
-
-There is an option \-\-no-copy for updmap.pl, unclear if that can be used here,
-and it might have been removed by next year. -->
-]>
-
-<sect1 id="tl-installer" xreflabel="install-tl-unx">
-  <?dbhtml filename="tl-installer.html"?>
-
-
-  <title>install-tl-unx</title>
-
-  <indexterm zone="tl-installer">
-    <primary sortas="a-install-tl-unx">install-tl-unx</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to TeX Live and its installer</title>
-
-    <para>
-      The <application>TeX Live</application> package is a comprehensive
-      TeX document production system.  It includes TeX, LaTeX2e, LuaLaTeX,
-      Metafont, MetaPost, BibTeX and many other programs; an extensive
-      collection of macros, fonts and documentation; and support for
-      typesetting in many different scripts from around the world.
-    </para>
-
-    <para>
-      This page is for people who wish to use the binary installer to
-      provide the programs, the scripts, and a lot of supporting files and
-      documentation.  The installer is updated frequently, so any published
-      md5sum will soon be out of date.  Newer versions of the
-      installer are expected to work with these instructions, for so long as
-      they install to a
-      <filename class="directory">&texlive-year;/</filename> directory.
-    </para>
-
-    <para>
-      There are two reasons why you may wish to install the binaries in BLFS:
-      either you need a smaller install (e.g. at a minimum plain TeX without
-      LaTeX, ConTeXt, etc), or you wish to use <command>tlmgr</command> to
-      get updates whilst this version is supported (typically, until March of
-      the year after it was released). For the latter, you might prefer to
-      install in your <filename class="directory">/home</filename> directory
-      as an unprivileged user, and to then make corresponding changes to the
-      PATH in your <filename>~/.bashrc</filename> or equivalent.
-    </para>
-
-    <note>
-      <para>
-        If you wish to use ConTeXt with <command>luametatex</command> (most of
-        the old MKII and MKIV code was removed from TeX Live 2023 by the ConTeXt
-        developer), using the binary is probably the easiest option. The source
-        no-longer ships with TeX Live and is poorly adapted to building with
-        systems except those running Mac and Windows. See comments 1 to 5 of
-        <ulink url="&blfs-ticket-root;17823">#17823</ulink>.
-      </para>
-    </note>
-
-    <!-- editors: latex-test-20240320.tar.xz at ~/ken/tex-testfiles and the
-    ABOUT.pdf now deal with specifying which collections are needed when using
-    binary texlive. Please do not sign off this package without at least
-    testing asy to ensure that the symlinks are as needed. Please also be aware
-    that removing a collection might leave huge backups in tlpkg/backups -->
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&tl-installer-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&tl-installer-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <!--Download MD5 sum: &tl-installer-md5sum; (for &tl-installer-date;)-->
-          Download MD5 sum: Varies frequently
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &tl-installer-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &tl-installer-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &tl-installer-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gnupg2"/> (to validate both the initial downloads, and also
-      any updates you might later make using <command>tlmgr</command>.)
-      <xref linkend="perl-libwww-perl"/> (to use a single connection to the server,
-      which will reduce its load and speed things up.)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (at runtime)</bridgehead>
-    <para role="recommended">
-      The binaries are mostly linked to included static libraries or
-      general (LFS) system libraries, but a few of the programs
-      and several scripts will fail if the following packages are not present:
-    </para>
-    <para role="recommended">
-      <xref role="runtime" linkend="gs"/> is dynamically loaded by
-      the external application <ulink url="https://dvisvgm.de/">dvisvgm</ulink>,
-      which is used by <application>asy</application> when that creates SVG
-      files.
-    </para>
-    <para role="recommended">
-      <xref role="runtime" linkend="xorg7-lib"/> and
-      <xref role="runtime" linkend="libxcb"/> are needed for inimf, mf,
-      pdfclose, pdfopen and xdvi-xaw. But if you are using asy, or using a
-      <application>TeX</application> engine to create a PDF file, you will
-      need <xref role="runtime" linkend="x-window-system"/> (for PDF files,
-      this is to support a PDF viewer of your choice, for example
-       <xref role="nodep" linkend="epdfview"/>).
-    </para>
-<!-- seems to not be needed in 2021
-    <para role="recommended">
-      the optional non-wide-character ncurses library (for "some binary-only
-      application") from the bottom of the <application>Ncurses</application>
-      page in LFS is needed
-      for xindy.run which is used by <application>xindy</application>
-    </para> -->
-    <para role="recommended">
-      The binary version of <application>asy</application> needs
-      <xref linkend="freeglut"/>.
-    </para>
-    <para> <!-- needed, but cannot recommend :-) -->
-      The binary version of asy is linked to libGLX.so.0 from
-      <ulink url="https://gitlab.freedesktop.org/glvnd/libglvnd/">libglvnd</ulink>,
-      but installing that will break future updates of BLFS packages such as
-      <xref linkend="mesa"/>. Work around that by creating a symlink as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-    <screen role="nodump"><userinput>ln -sv libGL.so.1 /usr/lib/libGLX.so.0</userinput></screen>
-    <para role="recommended">
-    The binary versions of <application>biber</application> and
-    <application>xindy</application> are linked to <filename
-    class='libraryfile'>libcrypt.so.1</filename> from old versions
-    of <application>glibc</application>. To use these two applications, follow the
-    Note about binary-only applications in <application>libxcrypt</application> in
-    LFS to install the ABI version 1 crypt library.
-    </para>
-    <note>
-      <para>
-        As always with contributed binary software, it is possible that the
-        required dependencies may change when the installer is updated. In
-        particular, these dependencies have only been checked on x86_64.
-      </para>
-    </note>
-    <!-- text for runtime deps, shared with texlive -->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../xincludes/texruntime.xml"/>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Binary Installation of TeX Live</title>
-
-    <para>
-      The <application>TeX Live</application> set of programs with its
-      supporting documents, fonts, and utilities is very large.  The upstream
-      maintainers recommend placing all files in a single directory structure.
-      BLFS recommends <filename class='directory'>/opt/texlive</filename>.
-    </para>
-
-    <note>
-     <para>
-       If you have chosen to install the binary as a normal user, the directory
-       for the prefix needs to be writable by that user.  The
-       <systemitem class="username">root</systemitem> user can chown
-       <filename class="directory">/opt/texlive/2024</filename> to that
-       user before the user starts the install.<!-- Problem was reported on
-       texlive list, at least ls-R was involved and maybe other files,
-       suggestion was to remove, chown prefix, reinstall. --> If any later
-       change in that directory is made by the <systemitem
-       class="username">root</systemitem> user <emphasis>that will change the
-       ownership</emphasis> which breaks usage by normal users.
-     </para>
-    </note>
-
-    <para>
-      As with any other package, unpack the installer and change into its
-      directory, <filename class='directory'>
-        install-tl-&lt;CCYYMMDD&gt;</filename>.
-      This directory name changes when the installer is updated, so replace
-      &lt;CCYYMMDD&gt; by the correct directory name.
-    </para>
-
-    <note>
-      <para>
-        The distribution binaries installed below may use static linking
-        for general linux system libraries.  Additional libraries or
-        interpreters as specified in the dependencies section do not need to
-        be present during the install, but the programs that need them will
-        not run until their specific dependencies have been installed.
-      </para>
-
-    <!-- please keep something like this in the future -->
-      <para>
-        With all contributed binary software, there may be a mismatch between
-        the builder's toolchain and your hardware.  In most of TeX this will
-        probably not matter, but in uncommon corner cases you might hit
-        problems. For example, if your x86_64 processor does not support 3dnowext or
-        3dnow, the 2014-06-28 binary failed in conTeXt when running LuaTeX,
-        although lualatex worked, as did the i686 binaries on the same
-        machine. In such cases, the easiest solution is to install texlive
-        from source. Similarly, the x86_64 binary version of
-        <command>asy</command> runs very slowly when creating 3-D diagrams.
-      </para>
-    </note>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>TEXLIVE_INSTALL_PREFIX=/opt/texlive ./install-tl</userinput></screen>
-
-    <para>
-      This command is interactive and allows selection or modification of
-      platform, packages, directories, and other options. The full installation
-      scheme will require about 4.9 gigabytes of disk space. The time to
-      complete the download will depend on your internet connection speed
-      and the number of packages selected.
-    </para>
-
-    <para>
-      It has been established by Debian that the <command>python</command>
-      scripts in <filename class="directory">latex-make</filename> will work
-      with <command>python3</command>, so update them to invoke that by running
-      the following command as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>for F in /opt/texlive/&texlive-year;/texmf-dist/scripts/latex-make/*.py ; do
-  test -f $F &amp;&amp; sed -i 's%/usr/bin/env python%/usr/bin/python3%' $F || true
-done
-</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>test -f $F &amp;&amp; sed ...</command>: in a small install these
-      files might not be present, so test if they exist and if not return 'true'
-      to avoid any error if this command has been copied into one of your own install scripts.
-    </para>
-
-    <para>
-      <option>./install-tl --location
-      http://mirror.aut.ac.nz/CTAN/systems/texlive/tlnet/</option>: use a
-      variation of this if you wish to use a different mirror, for example, because
-      you are in New Zealand but the installer chooses to use an Australian
-      mirror. The list of mirrors is at
-      <ulink url='https://ctan.org/mirrors/'/>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>Over 300 binaries and symlinks to scripts</seg>
-        <seg>None</seg>
-        <seg>/opt/texlive</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="tl-installer-programs">
-        <term><command>TeX&nbsp;programs</command></term>
-        <listitem>
-          <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-          href="../../xincludes/texprogs.xml"/>
-          <indexterm zone="tl-installer tl-installer-programs">
-            <primary sortas="b-tl-installer-programs">TeX Live programs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: pst/typesetting/typesetting.xml
===================================================================
--- pst/typesetting/typesetting.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ pst/typesetting/typesetting.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,82 +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="pst-typesetting">
+<?dbhtml filename="typesetting.html" dir="pst"?>
+<title>Typesetting</title>
 
-<chapter id="pst-typesetting">
-  <?dbhtml filename="typesetting.html"?>
-
-  <title>Typesetting</title>
-
-  <para>
-    This chapter includes <application>texlive</application> applications that
-    create output equivalent to typesetting.
-  </para>
-
-  <para>
-    There are two alternative routes through this chapter:
-  </para>
-
-  <para>
-    Some people may wish to use the binary installer, either because of the
-    complexity of installing all of <application>texlive</application> from
-    source, or because they only want a part of the package, or perhaps because
-    they wish to get updates as soon as those are available (the source is only
-    updated annually, but the binaries and associated tex and sty files are
-    updated for approximately 10 months). These people should begin at <xref
-    linkend="tex-path"/> and then follow the <xref linkend="tl-installer"/>
-    instructions. After installing, they can run <command>tlmgr</command> to
-    update their system.
-  </para>
-
-  <para>
-    Most people reading BLFS will wish to build from source. BLFS used to
-    start by installing <application>install-tl-unx</application> and then
-    use that to bootstrap the build.  Nowadays, we build almost the whole
-    of <application>texlive</application> <emphasis>without</emphasis> a
-    binary install, by adding the separately-packaged texmf files into this
-    build.  For this, begin at <xref linkend="tex-path"/> then go to <xref
-    linkend="texlive"/> which will install most of
-    <application>texlive</application>, together with <emphasis>all</emphasis>
-    of the supporting files. This almost-complete install can then be used
-    to build the remaining parts of <application>texlive</application>:
-    <xref linkend="asymptote"/>, <xref linkend="biber"/> and <xref
-    linkend="xindy"/>.
-  </para>
-
-  <para>
-    Because the texmf files (including documentation, fonts, scripts and
-    supporting files) are all in one tarball, it is not practical to limit what
-    gets extracted in a sensible way  (you could exclude one or other of the
-    typesetting engines, not its many supporting files) when building from
-    source in this manner.
-  </para>
-
-  <para>
-    In either case, BLFS installs into
-    <filename class="directory">/opt/texlive/&texlive-year;</filename>.
-  </para>
-
-  <para>
-    Also, please note that texlive is released annually, and updating from the
-    previous year to the current year is no longer supported. If for some
-    reason you wish to keep versions for multiple years, for most things
-    you can mount the old or new system at /opt/texlive and fix up your
-    PATH as necessary. However doing that will not preserve any changes in
-    <filename class="directory">texmf-local</filename> and if you build
-    from source and try to run a newer version of
-    <application>biber</application> with an older version of
-    <application>biblatex</application> it is unlikely to work.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tex-path.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tl-installer.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texlive.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="asymptote.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="biber.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dvisvgm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xindy.xml"/>
+<para>Placeholder for a2ps, openjade, tex and latex.</para>
 
 </chapter>
Index: pst/typesetting/xindy.xml
===================================================================
--- pst/typesetting/xindy.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(revision )
@@ -1,246 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY xindy-download-http "https://tug.ctan.org/support/xindy/base/xindy-&xindy-version;.tar.gz">
-  <!ENTITY xindy-download-ftp  " ">
-  <!ENTITY xindy-md5sum        "221acfeeb0f6f8388f89a59c56491041">
-  <!ENTITY xindy-size          "506 KB">
-  <!ENTITY xindy-buildsize     "15 MB">
-  <!ENTITY xindy-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="xindy" xreflabel="xindy-&xindy-version;">
-  <?dbhtml filename="xindy.html"?>
-
-
-  <title>xindy-&xindy-version;</title>
-
-  <indexterm zone="xindy">
-    <primary sortas="a-xindy">xindy</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xindy</title>
-
-    <para>
-      <!-- LaTeX for the system, but just latex for the command -->
-      <application>Xindy</application> is an index processor that can be used
-      to generate book-like indexes for arbitrary document-preparation systems.
-      This includes systems such as TeX and LaTeX, the roff-family, and
-      SGML/XML-based systems (e.g., HTML) that process some kind of text and
-      generate indexing information.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xindy-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xindy-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xindy-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xindy-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xindy-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xindy-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Required Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch: <ulink
-          url="&patch-root;/xindy-&xindy-version;-upstream_fixes-2.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xindy Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="clisp"/> and
-      <xref linkend="texlive"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xindy</title>
-
-    <para>
-      Install <application>xindy</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>export TEXARCH=$(uname -m | sed -e 's/i.86/i386/' -e 's/$/-linux/') &amp;&amp;
-
-sed -i "s/ grep -v '^;'/ awk NF/" make-rules/inputenc/Makefile.in &amp;&amp;
-
-sed -i 's%\(indexentry\)%\1\\%' make-rules/inputenc/make-inp-rules.pl &amp;&amp;
-
-patch -Np1 -i ../xindy-&xindy-version;-upstream_fixes-2.patch &amp;&amp;
-
-./configure --prefix=$TEXLIVE_PREFIX              \
-            --bindir=$TEXLIVE_PREFIX/bin/$TEXARCH \
-            --datarootdir=$TEXLIVE_PREFIX         \
-            --includedir=/usr/include             \
-            --libdir=$TEXLIVE_PREFIX/texmf-dist   \
-            --mandir=$TEXLIVE_PREFIX/texmf-dist/doc/man &amp;&amp;
-
-make LC_ALL=POSIX</userinput></screen>
-
-    <para>
-      This package does not have a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i "s/ grep -v '^;'/ awk NF/" ...</command>: The build
-      sorts files in latin{1..3} encodings to create latin.xdy, and unicode
-      versions of these to create utf8.xdy after using
-      <command>grep -v '^;'</command> to remove blank lines. With
-      <application>grep-2.23</application> any data not in the expected
-      encoding is treated as binary, resulting in a useless file. This
-      command uses an alternative way of removing blank lines.
-    </para>
-
-    <para>
-      <command>sed -i 's%\(indexentry\)%\1\\%' ...</command>: A regexp
-      contains <literal>indexentry{</literal> - perl has warned about the
-      unescaped left brace for some time and now treats it as illegal.
-      Change it to <literal>indexentry\{</literal>, doubling the backslash
-      for <command>sed</command>.
-    </para>
-
-    <para>
-      <command>patch -Np1 -i ../xindy-&xindy-version;-upstream_fixes-2.patch</command>:
-      <application>Xindy</application> is now maintained at CTAN. This patch
-      updates the source with some of the changes made there (but ignoring
-      changes which were only made to allow for spaces in pathnames and some trivial
-      recent changes).
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-     href="../../xincludes/tex-prefix.xml"/>
-
-    <para>
-      <parameter>--includedir=/usr/include</parameter>:
-      This parameter ensures that the <filename>kpathsea</filename>
-      headers from <xref linkend="texlive"/> will be found.
-    </para>
-
-    <para>
-      <command>make LC_ALL=POSIX</command>: with the current version of
-      <application>coreutils</application> it is essential to build
-      <application>xindy</application> in the POSIX (or C) locale because in a
-      UTF-8 locale the file <filename>latin.xdy</filename> will contain only a
-      heading and then a line '<literal>Binary file (standard input)
-      matches</literal>' instead of the many lines of
-      <application>lisp</application> merge-rule commands it ought to contain.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          tex2xindy, texindy, xindy
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          $TEXLIVE_PREFIX/texmf-dist/xindy
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="tex2xindy">
-        <term><command>tex2xindy</command></term>
-        <listitem>
-          <para>
-            transforms a LaTeX index file into a xindy raw index file
-          </para>
-          <indexterm zone="xindy tex2xindy">
-            <primary sortas="b-tex2xindy">tex2xindy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="texindy">
-        <term><command>texindy</command></term>
-        <listitem>
-          <para>
-            is a wrapper for xindy that turns on many LaTeX conventions by default
-          </para>
-          <indexterm zone="xindy texindy">
-            <primary sortas="b-texindy">texindy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xindy-prog">
-        <term><command>xindy</command></term>
-        <listitem>
-          <para>
-            creates a sorted and tagged index from a raw LaTeX index
-          </para>
-          <indexterm zone="xindy xindy">
-            <primary sortas="b-xindy">xindy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: pst/xml/docbook-45-xml.xml
===================================================================
--- pst/xml/docbook-45-xml.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(revision )
@@ -1,322 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY DocBook-download-http "https://www.docbook.org/xml/&docBook-45-xml-version;/docbook-xml-&docBook-45-xml-version;.zip">
-  <!ENTITY DocBook-download-ftp  " ">
-  <!ENTITY DocBook-md5sum        "03083e288e87a7e829e437358da7ef9e">
-  <!ENTITY DocBook-size          "96 KB">
-  <!ENTITY DocBook-buildsize     "1.2 MB">
-  <!ENTITY DocBook-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="DocBook" xreflabel="docbook-xml-&docBook-45-xml-version;">
-  <?dbhtml filename="docbook.html"?>
-
-
-  <title>docbook-xml-&docBook-45-xml-version;</title>
-
-  <indexterm zone="DocBook">
-    <primary sortas="a-DocBook-XML-DTD">DocBook XML DTD</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to DocBook-4.5 XML DTD</title>
-
-    <para>
-      The <application>DocBook-4.5 XML DTD</application>-&docBook-45-xml-version;
-      package contains document type definitions for verification of XML data
-      files against the DocBook rule set. These are useful for structuring
-      books and software documentation to a standard allowing you to utilize
-      transformations already written for that standard.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&DocBook-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&DocBook-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &DocBook-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &DocBook-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &DocBook-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &DocBook-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">DocBook-4.5 XML DTD Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libxml2"/>,
-      <xref linkend="sgml-common"/>, and
-      <xref linkend="unzip"/> (or <xref role='nodep' linkend='libarchive'/>)
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of DocBook-4.5 XML DTD</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/use-unzip.xml"/>
-
-    <para>
-      Install <application>DocBook XML DTD</application> by running the
-      following commands as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>install -v -d -m755 /usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version; &amp;&amp;
-install -v -d -m755 /etc/xml &amp;&amp;
-cp -v -af --no-preserve=ownership docbook.cat *.dtd ent/ *.mod \
-    /usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;</userinput></screen>
-
-    <para>
-      Create (or update) and populate the <filename>/etc/xml/docbook</filename>
-      catalog file by running the following
-      commands as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><?dbfo keep-together="auto"?><userinput>if [ ! -e /etc/xml/docbook ]; then
-    xmlcatalog --noout --create /etc/xml/docbook
-fi &amp;&amp;
-xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML V&docBook-45-xml-version;//EN" \
-    "http://www.oasis-open.org/docbook/xml/&docBook-45-xml-version;/docbookx.dtd" \
-    /etc/xml/docbook &amp;&amp;
-xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML CALS Table Model V&docBook-45-xml-version;//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;/calstblx.dtd" \
-    /etc/xml/docbook &amp;&amp;
-xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;/soextblx.dtd" \
-    /etc/xml/docbook &amp;&amp;
-xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML Information Pool V&docBook-45-xml-version;//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;/dbpoolx.mod" \
-    /etc/xml/docbook &amp;&amp;
-xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V&docBook-45-xml-version;//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;/dbhierx.mod" \
-    /etc/xml/docbook &amp;&amp;
-xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML HTML Tables V&docBook-45-xml-version;//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;/htmltblx.mod" \
-    /etc/xml/docbook &amp;&amp;
-xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Notations V&docBook-45-xml-version;//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;/dbnotnx.mod" \
-    /etc/xml/docbook &amp;&amp;
-xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Character Entities V&docBook-45-xml-version;//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;/dbcentx.mod" \
-    /etc/xml/docbook &amp;&amp;
-xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Additional General Entities V&docBook-45-xml-version;//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;/dbgenent.mod" \
-    /etc/xml/docbook &amp;&amp;
-xmlcatalog --noout --add "rewriteSystem" \
-    "http://www.oasis-open.org/docbook/xml/&docBook-45-xml-version;" \
-    "file:///usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;" \
-    /etc/xml/docbook &amp;&amp;
-xmlcatalog --noout --add "rewriteURI" \
-    "http://www.oasis-open.org/docbook/xml/&docBook-45-xml-version;" \
-    "file:///usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;" \
-    /etc/xml/docbook</userinput></screen>
-
-    <para>
-      Create (or update) and populate the
-      <filename>/etc/xml/catalog</filename> catalog file by running the
-      following commands as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>if [ ! -e /etc/xml/catalog ]; then
-    xmlcatalog --noout --create /etc/xml/catalog
-fi &amp;&amp;
-xmlcatalog --noout --add "delegatePublic" \
-    "-//OASIS//ENTITIES DocBook XML" \
-    "file:///etc/xml/docbook" \
-    /etc/xml/catalog &amp;&amp;
-xmlcatalog --noout --add "delegatePublic" \
-    "-//OASIS//DTD DocBook XML" \
-    "file:///etc/xml/docbook" \
-    /etc/xml/catalog &amp;&amp;
-xmlcatalog --noout --add "delegateSystem" \
-    "http://www.oasis-open.org/docbook/" \
-    "file:///etc/xml/docbook" \
-    /etc/xml/catalog &amp;&amp;
-xmlcatalog --noout --add "delegateURI" \
-    "http://www.oasis-open.org/docbook/" \
-    "file:///etc/xml/docbook" \
-    /etc/xml/catalog</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring DocBook-4.5 XML DTD</title>
-
-    <sect3 id="docbook-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/xml/catalog</filename> and
-        <filename>/etc/xml/docbook</filename>
-      </para>
-
-      <indexterm zone="DocBook docbook-config">
-        <primary sortas="e-etc-xml-docbook">/etc/xml/docbook</primary>
-      </indexterm>
-
-      <indexterm zone="DocBook docbook-config">
-        <primary sortas="e-etc-xml-catalog">/etc/xml/catalog</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <caution>
-        <para>
-          Various BLFS packages request
-          <application>DocBook XML DTD</application> version 4.x before
-          V&docBook-45-xml-version;, so the following step must be done for
-          those packages to be built successfully.
-        </para>
-      </caution>
-
-      <para>
-        The above installation creates the files and updates the catalogs.
-        In order to utilize <application>DocBook XML DTD</application>
-        V&docBook-45-xml-version; when any version 4.x is requested in the System
-        Identifier, you need to add additional statements to the catalog
-        files. If you have any of the <application>DocBook XML
-        DTD</application>'s referenced below already installed on your
-        system, remove those entries from the <command>for</command> command
-        below (issue the commands as the <systemitem
-        class="username">root</systemitem> user):
-      </para>
-
-<screen role="root"><userinput>for DTDVERSION in 4.1.2 4.2 4.3 4.4
-do
-  xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML V$DTDVERSION//EN" \
-    "http://www.oasis-open.org/docbook/xml/$DTDVERSION/docbookx.dtd" \
-    /etc/xml/docbook
-  xmlcatalog --noout --add "rewriteSystem" \
-    "http://www.oasis-open.org/docbook/xml/$DTDVERSION" \
-    "file:///usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;" \
-    /etc/xml/docbook
-  xmlcatalog --noout --add "rewriteURI" \
-    "http://www.oasis-open.org/docbook/xml/$DTDVERSION" \
-    "file:///usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;" \
-    /etc/xml/docbook
-  xmlcatalog --noout --add "delegateSystem" \
-    "http://www.oasis-open.org/docbook/xml/$DTDVERSION/" \
-    "file:///etc/xml/docbook" \
-    /etc/xml/catalog
-  xmlcatalog --noout --add "delegateURI" \
-    "http://www.oasis-open.org/docbook/xml/$DTDVERSION/" \
-    "file:///etc/xml/docbook" \
-    /etc/xml/catalog
-done</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Files</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>None</seg>
-        <seg>DTD, MOD and ENT files</seg>
-        <seg>/etc/xml and /usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="DTD-files">
-        <term><filename>DTD files</filename></term>
-        <listitem>
-          <para>
-            contain a document type definition which defines the element
-            types and the attribute lists that can be used in the corresponding
-            <filename>XML</filename> files
-          </para>
-          <indexterm zone="DocBook DTD-files">
-            <primary sortas="g-XML-DTD-files">XML DTD Files</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="MOD-files">
-        <term><filename>MOD files</filename></term>
-        <listitem>
-          <para>
-            contain components of the document type definition that
-            are sourced into the <filename>DTD</filename> files
-          </para>
-          <indexterm zone="DocBook MOD-files">
-            <primary sortas="g-XML-MOD-files">XML MOD files</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ENT-files">
-        <term><filename>ENT files</filename></term>
-        <listitem>
-          <para>
-            contain lists of named character entities allowed in HTML
-          </para>
-          <indexterm zone="DocBook ENT-files">
-            <primary sortas="g-XML-ENT-files">XML entity files</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: pst/xml/docbook-xsl.xml
===================================================================
--- pst/xml/docbook-xsl.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(revision )
@@ -1,340 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY path "https://github.com/docbook/xslt10-stylesheets/releases/download/release">
-
-  <!ENTITY docbook-xsl-download-http "&path;/&docbook-xsl-version;/docbook-xsl-nons-&docbook-xsl-version;.tar.bz2">
-  <!ENTITY docbook-xsl-download-ftp  " ">
-  <!ENTITY docbook-xsl-md5sum        "2666d1488d6ced1551d15f31d7ed8c38">
-  <!ENTITY docbook-xsl-size          "22 MB">
-  <!ENTITY docbook-xsl-buildsize     "58 MB (includes installing optional documentation)">
-  <!ENTITY docbook-xsl-time          "less than 0.1 SBU">
-
-  <!ENTITY docbook-xsl-doc-download  "&path;/&docbook-xsl-version;/docbook-xsl-doc-&docbook-xsl-version;.tar.bz2">
-  <!ENTITY docbook-xsl-doc-md5sum    "62375ca864fc198cb2b17d98209d0b8c">
-  <!ENTITY docbook-xsl-doc-size      "522 KB">
-]>
-
-<sect1 id="docbook-xsl"
-xreflabel="docbook-xsl-nons-&docbook-xsl-version;">
-  <?dbhtml filename="docbook-xsl.html"?>
-
-
-  <title>docbook-xsl-nons-&docbook-xsl-version;</title>
-
-  <indexterm zone="docbook-xsl">
-    <primary sortas="a-DocBook-XSL-Stylesheets">DocBook XSL
-    Stylesheets</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to DocBook XSL Stylesheets</title>
-
-    <para>
-      The <application>DocBook XSL Stylesheets</application>
-      package contains XSL stylesheets. These are useful for
-      performing transformations on XML DocBook files.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&docbook-xsl-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&docbook-xsl-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &docbook-xsl-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &docbook-xsl-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &docbook-xsl-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &docbook-xsl-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Required patch: <ulink url=
-            "&patch-root;/docbook-xsl-nons-&docbook-xsl-version;-stack_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <itemizedlist spacing="compact">
-      <title>Optional documentation</title>
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&docbook-xsl-doc-download;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &docbook-xsl-doc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &docbook-xsl-doc-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">DocBook XSL Stylesheets Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended (at runtime)</bridgehead>
-    <para role="recommended">
-      <xref role="runtime" linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (all used at runtime)</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="apache-ant"/>
-         (to produce <quote>webhelp</quote> documents),
-      <xref role="runtime"  linkend="libxslt"/>
-         (or any other XSLT processor), to process
-          Docbook documents,
-      <xref role="runtime" linkend="ruby"/>
-         (to utilize the <quote>epub</quote> stylesheets),
-      <xref role="runtime" linkend="zip"/>
-         (to produce <quote>epub3</quote> documents), and
-      <ulink url="https://sourceforge.net/projects/saxon/files/saxon6/">
-        Saxon6
-      </ulink> and
-      <ulink url="http://xerces.apache.org/xerces2-j/">Xerces2 Java</ulink>
-         (used with <xref role="runtime" linkend="apache-ant"/>
-          to produce <quote>webhelp</quote> documents)
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of DocBook XSL Stylesheets</title>
-
-    <para>
-      First, fix a problem that causes stack overflows when doing recursion:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../docbook-xsl-nons-&docbook-xsl-version;-stack_fix-1.patch</userinput></screen>
-
-    <para>
-      If you downloaded the optional documentation tarball, unpack it
-      with the following command:
-    </para>
-
-<screen><userinput>tar -xf ../docbook-xsl-doc-&docbook-xsl-version;.tar.bz2 --strip-components=1</userinput></screen>
-
-    <para>
-      BLFS does not install the required packages to run the test suite
-      and provide meaningful results.
-    </para>
-
-    <para>
-      Install <application>DocBook XSL Stylesheets</application>
-      by running the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -m755 -d /usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version; &amp;&amp;
-
-cp -v -R VERSION assembly common eclipse epub epub3 extensions fo        \
-         highlighting html htmlhelp images javahelp lib manpages params  \
-         profiling roundtrip slides template tests tools webhelp website \
-         xhtml xhtml-1_1 xhtml5                                          \
-    /usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version; &amp;&amp;
-
-ln -s VERSION /usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version;/VERSION.xsl &amp;&amp;
-
-install -v -m644 -D README \
-                    /usr/share/doc/docbook-xsl-nons-&docbook-xsl-version;/README.txt &amp;&amp;
-install -v -m644    RELEASE-NOTES* NEWS* \
-                    /usr/share/doc/docbook-xsl-nons-&docbook-xsl-version;</userinput></screen>
-
-    <para>
-      If you downloaded the optional documentation tarball, install the
-      documentation by issuing the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cp -v -R doc/* /usr/share/doc/docbook-xsl-nons-&docbook-xsl-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring DocBook XSL Stylesheets</title>
-
-    <sect3 id="docbook-xsl-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/xml/catalog</filename>
-      </para>
-
-      <indexterm zone="docbook-xsl docbook-xsl-config">
-        <primary sortas="e-etc-xml-catalog">/etc/xml/catalog</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <note>
-        <para>
-          If you are installing the current version of docbook-xsl-nons
-          over a previous version of docbook-xsl, then remove the old
-          rewrite entries in the catalog as the <systemitem
-          class="username">root</systemitem> user:
-        </para>
-
-<screen role="nodump"><userinput>sed -i '/rewrite/d' /etc/xml/catalog</userinput></screen>
-      </note>
-
-      <para>
-        Create (or append) and populate the XML catalog file using the
-        following commands as the <systemitem
-        class="username">root</systemitem> user (both <emphasis>http</emphasis>
-        and <emphasis>https</emphasis> forms are used because upstream
-        have had both in their documentation):
-      </para>
-
-<screen role="root"><userinput>if [ ! -d /etc/xml ]; then install -v -m755 -d /etc/xml; fi &amp;&amp;
-if [ ! -f /etc/xml/catalog ]; then
-    xmlcatalog --noout --create /etc/xml/catalog
-fi &amp;&amp;
-
-xmlcatalog --noout --add "rewriteSystem" \
-           "http://cdn.docbook.org/release/xsl-nons/&docbook-xsl-version;" \
-           "/usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version;" \
-    /etc/xml/catalog &amp;&amp;
-
-xmlcatalog --noout --add "rewriteSystem" \
-           "https://cdn.docbook.org/release/xsl-nons/&docbook-xsl-version;" \
-           "/usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version;" \
-    /etc/xml/catalog &amp;&amp;
-
-xmlcatalog --noout --add "rewriteURI" \
-           "http://cdn.docbook.org/release/xsl-nons/&docbook-xsl-version;" \
-           "/usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version;" \
-    /etc/xml/catalog &amp;&amp;
-
-xmlcatalog --noout --add "rewriteURI" \
-           "https://cdn.docbook.org/release/xsl-nons/&docbook-xsl-version;" \
-           "/usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version;" \
-    /etc/xml/catalog &amp;&amp;
-
-xmlcatalog --noout --add "rewriteSystem" \
-           "http://cdn.docbook.org/release/xsl-nons/current" \
-           "/usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version;" \
-    /etc/xml/catalog &amp;&amp;
-
-xmlcatalog --noout --add "rewriteSystem" \
-           "https://cdn.docbook.org/release/xsl-nons/current" \
-           "/usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version;" \
-    /etc/xml/catalog &amp;&amp;
-
-xmlcatalog --noout --add "rewriteURI" \
-           "http://cdn.docbook.org/release/xsl-nons/current" \
-           "/usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version;" \
-    /etc/xml/catalog &amp;&amp;
-
-xmlcatalog --noout --add "rewriteURI" \
-           "https://cdn.docbook.org/release/xsl-nons/current" \
-           "/usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version;" \
-    /etc/xml/catalog &amp;&amp;
-
-xmlcatalog --noout --add "rewriteSystem" \
-           "http://docbook.sourceforge.net/release/xsl/current" \
-           "/usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version;" \
-    /etc/xml/catalog &amp;&amp;
-
-xmlcatalog --noout --add "rewriteURI" \
-           "http://docbook.sourceforge.net/release/xsl/current" \
-           "/usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version;" \
-    /etc/xml/catalog</userinput></screen>
-
-      <para>
-        Occasionally, you may find the need to install other versions of the
-        XSL stylesheets as some projects reference a specific version. One
-        example is BLFS-6.0, which required the 1.67.2 version. In these
-        instances you should install any other required version in its own
-        versioned directory and create catalog entries as follows (substitute
-        the desired version number for
-        <replaceable>&lt;version&gt;</replaceable>):
-      </para>
-
-<screen role="nodump"><userinput>xmlcatalog --noout --add "rewriteSystem" \
-           "http://docbook.sourceforge.net/release/xsl/<replaceable>&lt;version&gt;</replaceable>" \
-           "/usr/share/xml/docbook/xsl-stylesheets-<replaceable>&lt;version&gt;</replaceable>" \
-    /etc/xml/catalog &amp;&amp;
-
-xmlcatalog --noout --add "rewriteURI" \
-           "http://docbook.sourceforge.net/release/xsl/<replaceable>&lt;version&gt;</replaceable>" \
-           "/usr/share/xml/docbook/xsl-stylesheets-<replaceable>&lt;version&gt;</replaceable>" \
-    /etc/xml/catalog</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Files</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>/usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version;/*/*.xsl</seg>
-        <seg>/usr/share/xml/docbook/xsl-stylesheets-nons-&docbook-xsl-version; and
-        /usr/share/doc/docbook-xsl-nons-&docbook-xsl-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xsl-stylesheets">
-        <term><filename>XSL Stylesheets</filename></term>
-        <listitem>
-          <para>
-            are used for performing transformations on XML files
-          </para>
-          <indexterm zone="docbook-xsl xsl-stylesheets">
-            <primary sortas="g-XSL-Stylesheets">XSL Stylesheets</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: pst/xml/docbook5.xml
===================================================================
--- pst/xml/docbook5.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(revision )
@@ -1,404 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY docbook5-download-http "https://docbook.org/xml/5.0/docbook-5.0.zip">
-  <!ENTITY docbook5-download-ftp  " ">
-  <!ENTITY docbook5-md5sum        "2411c19ed4fb141f3fa3d389fae40736">
-  <!ENTITY docbook5-size          "820 KB">
-  <!ENTITY docbook5-buildsize     "6.2 MB">
-  <!ENTITY docbook5-time          "0.1 SBU">
-]>
-
-<sect1 id="docbook5" xreflabel="docbook-xml-5.0">
-  <?dbhtml filename="docbook5.html"?>
-
-
-  <title>docbook-xml-5.0</title>
-
-  <indexterm zone="docbook5">
-    <primary sortas="a-DocBook5-XML-DTD">DocBook XML DTD and Schemas 5.0</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to DocBook XML DTD and Schemas 5.0</title>
-
-    <para>
-      The <application>DocBook XML DTD and Schemas</application>-5.0 package
-      contains document type definitions and schemas for verification of XML
-      data files against the DocBook rule set. These are useful for structuring
-      books and software documentation to a standard allowing you to utilize
-      transformations already written for that standard. In addition to
-      providing a DTD, version 5 introduced the RelaxNG schema and Schematron
-      rules, and is incompatible with previous versions of DocBook XML.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&docbook5-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&docbook5-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &docbook5-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &docbook5-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &docbook5-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &docbook5-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">DocBook XML DTD and Schemas 5.0 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libxml2"/>,
-      <xref linkend="sgml-common"/>, and
-      <xref linkend="unzip"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of DocBook XML DTD and Schemas 5.0</title>
-
-    <para>
-      Install <application>DocBook XML DTD and Schemas</application>
-      by running the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -vdm755 /usr/share/xml/docbook/schema/{dtd,rng,sch,xsd}/5.0 &amp;&amp;
-install -vm644  dtd/* /usr/share/xml/docbook/schema/dtd/5.0         &amp;&amp;
-install -vm644  rng/* /usr/share/xml/docbook/schema/rng/5.0         &amp;&amp;
-install -vm644  sch/* /usr/share/xml/docbook/schema/sch/5.0         &amp;&amp;
-install -vm644  xsd/* /usr/share/xml/docbook/schema/xsd/5.0</userinput></screen>
-
-    <para>
-      Create (or update) and populate the
-      <filename>/etc/xml/docbook-5.0</filename> catalog file by running the
-      following commands as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><?dbfo keep-together="auto"?><userinput>if [ ! -e /etc/xml/docbook-5.0 ]; then
-    xmlcatalog --noout --create /etc/xml/docbook-5.0
-fi &amp;&amp;
-
-xmlcatalog --noout --add "public" \
-  "-//OASIS//DTD DocBook XML 5.0//EN" \
-  "file:///usr/share/xml/docbook/schema/dtd/5.0/docbook.dtd" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-xmlcatalog --noout --add "system" \
-  "http://www.oasis-open.org/docbook/xml/5.0/dtd/docbook.dtd" \
-  "file:///usr/share/xml/docbook/schema/dtd/5.0/docbook.dtd" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-xmlcatalog --noout --add "system" \
-  "http://docbook.org/xml/5.0/dtd/docbook.dtd" \
-  "file:///usr/share/xml/docbook/schema/dtd/5.0/docbook.dtd" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.0/rng/docbook.rng" \
-  "file:///usr/share/xml/docbook/schema/rng/5.0/docbook.rng" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.0/rng/docbook.rng" \
-  "file:///usr/share/xml/docbook/schema/rng/5.0/docbook.rng" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.0/rng/docbookxi.rng" \
-  "file:///usr/share/xml/docbook/schema/rng/5.0/docbookxi.rng" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.0/rng/docbookxi.rng" \
-  "file:///usr/share/xml/docbook/schema/rng/5.0/docbookxi.rng" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.0/rnc/docbook.rnc" \
-  "file:///usr/share/xml/docbook/schema/rng/5.0/docbook.rnc" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.0/rng/docbook.rnc" \
-  "file:///usr/share/xml/docbook/schema/rng/5.0/docbook.rnc" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.0/rnc/docbookxi.rnc" \
-  "file:///usr/share/xml/docbook/schema/rng/5.0/docbookxi.rnc" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.0/rng/docbookxi.rnc" \
-  "file:///usr/share/xml/docbook/schema/rng/5.0/docbookxi.rnc" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.0/xsd/docbook.xsd" \
-  "file:///usr/share/xml/docbook/schema/xsd/5.0/docbook.xsd" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.0/xsd/docbook.xsd" \
-  "file:///usr/share/xml/docbook/schema/xsd/5.0/docbook.xsd" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.0/xsd/docbookxi.xsd" \
-  "file:///usr/share/xml/docbook/schema/xsd/5.0/docbookxi.xsd" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.0/xsd/docbookxi.xsd" \
-  "file:///usr/share/xml/docbook/schema/xsd/5.0/docbookxi.xsd" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.0/xsd/xi.xsd" \
-  "file:///usr/share/xml/docbook/schema/xsd/5.0/xi.xsd" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.0/xsd/xi.xsd" \
-  "file:///usr/share/xml/docbook/schema/xsd/5.0/xi.xsd" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.0/xsd/xlink.xsd" \
-  "file:///usr/share/xml/docbook/schema/xsd/5.0/xlink.xsd" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.0/xsd/xlink.xsd" \
-  "file:///usr/share/xml/docbook/schema/xsd/5.0/xlink.xsd" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.0/xsd/xml.xsd" \
-  "file:///usr/share/xml/docbook/schema/xsd/5.0/xml.xsd" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.0/xsd/xml.xsd" \
-  "file:///usr/share/xml/docbook/schema/xsd/5.0/xml.xsd" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.0/sch/docbook.sch" \
-  "file:///usr/share/xml/docbook/schema/sch/5.0/docbook.sch" \
-  /etc/xml/docbook-5.0 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.0/sch/docbook.sch" \
-  "file:///usr/share/xml/docbook/schema/sch/5.0/docbook.sch" \
-  /etc/xml/docbook-5.0</userinput></screen>
-
-
-    <para>
-      While again as the <systemitem class="username">root</systemitem> user,
-      create the individual catalogs:
-    </para>
-
-<screen role="root"><userinput>xmlcatalog --noout --create /usr/share/xml/docbook/schema/dtd/5.0/catalog.xml &amp;&amp;
-
-xmlcatalog --noout --add "public" \
-  "-//OASIS//DTD DocBook XML 5.0//EN" \
-  "docbook.dtd" /usr/share/xml/docbook/schema/dtd/5.0/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "system" \
-  "http://www.oasis-open.org/docbook/xml/5.0/dtd/docbook.dtd" \
-  "docbook.dtd" /usr/share/xml/docbook/schema/dtd/5.0/catalog.xml &amp;&amp;
-
-xmlcatalog --noout --create /usr/share/xml/docbook/schema/rng/5.0/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.0/rng/docbook.rng" \
-  "docbook.rng" /usr/share/xml/docbook/schema/rng/5.0/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.0/rng/docbook.rng" \
-  "docbook.rng" /usr/share/xml/docbook/schema/rng/5.0/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.0/rng/docbookxi.rng" \
-  "docbookxi.rng" /usr/share/xml/docbook/schema/rng/5.0/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.0/rng/docbookxi.rng" \
-  "docbookxi.rng" /usr/share/xml/docbook/schema/rng/5.0/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.0/rng/docbook.rnc" \
-  "docbook.rnc" /usr/share/xml/docbook/schema/rng/5.0/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.0/rng/docbook.rnc" \
-  "docbook.rnc" /usr/share/xml/docbook/schema/rng/5.0/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.0/rng/docbookxi.rnc" \
-  "docbookxi.rnc" /usr/share/xml/docbook/schema/rng/5.0/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.0/rng/docbookxi.rnc" \
-  "docbookxi.rnc" /usr/share/xml/docbook/schema/rng/5.0/catalog.xml &amp;&amp;
-
-xmlcatalog --noout --create /usr/share/xml/docbook/schema/sch/5.0/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.0/sch/docbook.sch" \
-  "docbook.sch" /usr/share/xml/docbook/schema/sch/5.0/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.0/sch/docbook.sch" \
-  "docbook.sch" /usr/share/xml/docbook/schema/sch/5.0/catalog.xml &amp;&amp;
-
-xmlcatalog --noout --create /usr/share/xml/docbook/schema/xsd/5.0/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.0/xsd/docbook.xsd" \
-  "docbook.xsd" /usr/share/xml/docbook/schema/xsd/5.0/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.0/xsd/docbook.xsd" \
-  "docbook.xsd" /usr/share/xml/docbook/schema/xsd/5.0/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.0/xsd/docbookxi.xsd" \
-  "docbookxi.xsd" /usr/share/xml/docbook/schema/xsd/5.0/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.0/xsd/docbookxi.xsd" \
-  "docbookxi.xsd" /usr/share/xml/docbook/schema/xsd/5.0/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.0/xsd/xlink.xsd" \
-  "xlink.xsd" /usr/share/xml/docbook/schema/xsd/5.0/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-   "http://www.oasis-open.org/docbook/xml/5.0/xsd/xlink.xsd" \
-   "xlink.xsd" /usr/share/xml/docbook/schema/xsd/5.0/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-   "http://docbook.org/xml/5.0/xsd/xml.xsd" \
-   "xml.xsd" /usr/share/xml/docbook/schema/xsd/5.0/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-   "http://www.oasis-open.org/docbook/xml/5.0/xsd/xml.xsd" \
-   "xml.xsd" /usr/share/xml/docbook/schema/xsd/5.0/catalog.xml</userinput></screen>
-
-    <para>
-      Create (or update) and populate the system XML catalog
-      (<filename>/etc/xml/catalog</filename>) by running the
-      following commands as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>if [ ! -e /etc/xml/catalog ]; then
-    xmlcatalog --noout --create /etc/xml/catalog
-fi &amp;&amp;
-xmlcatalog --noout --add "delegatePublic" \
-  "-//OASIS//DTD DocBook XML 5.0//EN" \
-  "file:///usr/share/xml/docbook/schema/dtd/5.0/catalog.xml" \
-  /etc/xml/catalog &amp;&amp;
-xmlcatalog --noout --add "delegateSystem" \
-  "http://docbook.org/xml/5.0/dtd/" \
-  "file:///usr/share/xml/docbook/schema/dtd/5.0/catalog.xml" \
-  /etc/xml/catalog &amp;&amp;
-xmlcatalog --noout --add "delegateURI" \
-  "http://docbook.org/xml/5.0/dtd/" \
-  "file:///usr/share/xml/docbook/schema/dtd/5.0/catalog.xml" \
-  /etc/xml/catalog &amp;&amp;
-xmlcatalog --noout --add "delegateURI" \
-  "http://docbook.org/xml/5.0/rng/"  \
-  "file:///usr/share/xml/docbook/schema/rng/5.0/catalog.xml" \
-  /etc/xml/catalog &amp;&amp;
-xmlcatalog --noout --add "delegateURI" \
-  "http://docbook.org/xml/5.0/sch/"  \
-  "file:///usr/share/xml/docbook/schema/sch/5.0/catalog.xml" \
-  /etc/xml/catalog &amp;&amp;
-xmlcatalog --noout --add "delegateURI" \
-  "http://docbook.org/xml/5.0/xsd/"  \
-  "file:///usr/share/xml/docbook/schema/xsd/5.0/catalog.xml" \
-  /etc/xml/catalog</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring DocBook XML DTD and Schemas 5.0</title>
-
-    <sect3 id="docbook5-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/xml/catalog</filename> and
-        <filename>/etc/xml/docbook-5.0</filename>
-      </para>
-
-      <indexterm zone="docbook5 docbook-config">
-        <primary sortas="e-etc-xml-docbook5">/etc/xml/docbook-5.0</primary>
-      </indexterm>
-
-      <indexterm zone="docbook5 docbook-config">
-        <primary sortas="e-etc-xml-catalog5">/etc/xml/catalog</primary>
-      </indexterm>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Files</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>DTD, RNC, RNG, SCH and XSD files</seg>
-        <seg>/etc/xml and /usr/share/xml/docbook/schema/{dtd,rng,sch,xsd}/5.0</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="DTD5-files">
-        <term><filename>DTD files</filename></term>
-        <listitem>
-          <para>
-            contain the DocBook 5.0 document type definitions which define the
-            element types and the attribute lists that can be used in the
-            corresponding <filename>XML</filename> files
-          </para>
-          <indexterm zone="docbook5 DTD5-files">
-            <primary sortas="g-XML-DTD-files">XML DTD Files</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="Schema5-files">
-        <term><filename>RNC, RNG, and SCH files</filename></term>
-        <listitem>
-          <para>
-            contain the Docbook 5.0 RelaxNG, RelaxNG Compact, and Schematron
-            schema definitions
-          </para>
-          <indexterm zone="docbook5 Schema5-files">
-            <primary sortas="g-XML-Schema-files">XML Schema files</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="XSD5-files">
-        <term><filename>XSD files</filename></term>
-        <listitem>
-          <para>
-            files contain DocBook-5.0 Schematron rules
-          </para>
-          <indexterm zone="docbook5 XSD5-files">
-            <primary sortas="g-XML-XSD5-files">XML Schematron rules</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: pst/xml/docbook51.xml
===================================================================
--- pst/xml/docbook51.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(revision )
@@ -1,321 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY docbook51-download-http "https://docbook.org/xml/5.1/docbook-v5.1-os.zip">
-  <!ENTITY docbook51-download-ftp  " ">
-  <!ENTITY docbook51-md5sum        "d8bea8ddfc5743578a31cb18f9ae1f5a">
-  <!ENTITY docbook51-size          "752 KB">
-  <!ENTITY docbook51-buildsize     "8.5 MB">
-  <!ENTITY docbook51-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="docbook51" xreflabel="docbook-xml-5.1">
-  <?dbhtml filename="docbook51.html"?>
-
-
-  <title>docbook-xml-5.1</title>
-
-  <indexterm zone="docbook51">
-    <primary sortas="a-DocBook51-XML-DTD">DocBook XML Schemas 5.1</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to DocBook XML Schemas 5.1</title>
-
-    <para>
-      The <application>DocBook XML Schemas</application>-5.1 package
-      contains schema files and Schematron rules for verification of XML data
-      files against the DocBook rule set. These are useful for structuring books
-      and software documentation to a standard allowing you to utilize
-      transformations already written for that standard.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&docbook51-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&docbook51-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &docbook51-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &docbook51-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &docbook51-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &docbook51-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">DocBook XML Schemas 5.1 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libxml2"/>,
-      <xref linkend="sgml-common"/>, and
-      <xref linkend="unzip"/> (or <xref role='nodep' linkend='libarchive'/>)
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of DocBook XML Schemas 5.1</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/use-unzip.xml"/>
-
-    <para>
-      Install <application>DocBook XML Schemas</application>
-      by running the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -vdm755 /usr/share/xml/docbook/schema/{rng,sch}/5.1         &amp;&amp;
-install -m644   schemas/rng/* /usr/share/xml/docbook/schema/rng/5.1 &amp;&amp;
-install -m644   schemas/sch/* /usr/share/xml/docbook/schema/sch/5.1 &amp;&amp;
-install -m755   tools/db4-entities.pl /usr/bin                      &amp;&amp;
-install -vdm755 /usr/share/xml/docbook/stylesheet/docbook5          &amp;&amp;
-install -m644   tools/db4-upgrade.xsl \
-                /usr/share/xml/docbook/stylesheet/docbook5</userinput></screen>
-
-    <para>
-      Create (or update) and populate the
-      <filename>/etc/xml/docbook-5.1</filename> catalog file by running the
-      following commands as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><?dbfo keep-together="auto"?><userinput>if [ ! -e /etc/xml/docbook-5.1 ]; then
-  xmlcatalog --noout --create /etc/xml/docbook-5.1
-fi &amp;&amp;
-
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.1/rng/docbook.rng" \
-  "file:///usr/share/xml/docbook/schema/rng/5.1/docbook.rng" \
-  /etc/xml/docbook-5.1 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.1/rng/docbook.rng" \
-  "file:///usr/share/xml/docbook/schema/rng/5.1/docbook.rng" \
-  /etc/xml/docbook-5.1 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.1/rng/docbookxi.rng" \
-  "file:///usr/share/xml/docbook/schema/rng/5.1/docbookxi.rng" \
-  /etc/xml/docbook-5.1 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.1/rng/docbookxi.rng" \
-  "file:///usr/share/xml/docbook/schema/rng/5.1/docbookxi.rng" \
-  /etc/xml/docbook-5.1 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.1/rnc/docbook.rnc" \
-  "file:///usr/share/xml/docbook/schema/rng/5.1/docbook.rnc" \
-  /etc/xml/docbook-5.1 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.1/rng/docbook.rnc" \
-  "file:///usr/share/xml/docbook/schema/rng/5.1/docbook.rnc" \
-  /etc/xml/docbook-5.1 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.1/rnc/docbookxi.rnc" \
-  "file:///usr/share/xml/docbook/schema/rng/5.1/docbookxi.rnc" \
-  /etc/xml/docbook-5.1 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.1/rng/docbookxi.rnc" \
-  "file:///usr/share/xml/docbook/schema/rng/5.1/docbookxi.rnc" \
-  /etc/xml/docbook-5.1 &amp;&amp;
-
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.1/sch/docbook.sch" \
-  "file:///usr/share/xml/docbook/schema/sch/5.1/docbook.sch" \
-  /etc/xml/docbook-5.1 &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.1/sch/docbook.sch" \
-  "file:///usr/share/xml/docbook/schema/sch/5.1/docbook.sch" \
-  /etc/xml/docbook-5.1</userinput></screen>
-
-
-    <para>
-      While again as the <systemitem class="username">root</systemitem> user,
-      create the individual catalogs:
-    </para>
-
-<screen role="root"><userinput>xmlcatalog --noout --create /usr/share/xml/docbook/schema/rng/5.1/catalog.xml &amp;&amp;
-
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.1/schemas/rng/docbook.schemas/rng" \
-  "docbook.schemas/rng" /usr/share/xml/docbook/schema/rng/5.1/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.1/schemas/rng/docbook.schemas/rng" \
-  "docbook.schemas/rng" /usr/share/xml/docbook/schema/rng/5.1/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.1/schemas/rng/docbookxi.schemas/rng" \
-  "docbookxi.schemas/rng" /usr/share/xml/docbook/schema/rng/5.1/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.1/schemas/rng/docbookxi.schemas/rng" \
-  "docbookxi.schemas/rng" /usr/share/xml/docbook/schema/rng/5.1/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.1/schemas/rng/docbook.rnc" \
-  "docbook.rnc" /usr/share/xml/docbook/schema/rng/5.1/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.1/schemas/rng/docbook.rnc" \
-  "docbook.rnc" /usr/share/xml/docbook/schema/rng/5.1/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.1/schemas/rng/docbookxi.rnc" \
-  "docbookxi.rnc" /usr/share/xml/docbook/schema/rng/5.1/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.1/schemas/rng/docbookxi.rnc" \
-  "docbookxi.rnc" /usr/share/xml/docbook/schema/rng/5.1/catalog.xml
-xmlcatalog --noout --create /usr/share/xml/docbook/schema/sch/5.1/catalog.xml &amp;&amp;
-
-xmlcatalog --noout --add "uri" \
-  "http://docbook.org/xml/5.1/schemas/sch/docbook.schemas/sch" \
-  "docbook.schemas/sch" /usr/share/xml/docbook/schema/sch/5.1/catalog.xml &amp;&amp;
-xmlcatalog --noout --add "uri" \
-  "http://www.oasis-open.org/docbook/xml/5.1/schemas/sch/docbook.schemas/sch" \
-  "docbook.schemas/sch" /usr/share/xml/docbook/schema/sch/5.1/catalog.xml</userinput></screen>
-
-    <para>
-      Create (or update) and populate the system XML catalog
-      (<filename>/etc/xml/catalog</filename>) by running the
-      following commands as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>if [ ! -e /etc/xml/catalog ]; then
-  xmlcatalog --noout --create /etc/xml/catalog
-fi &amp;&amp;
-xmlcatalog --noout --add "delegatePublic" \
-  "-//OASIS//DTD DocBook XML 5.1//EN" \
-  "file:///usr/share/xml/docbook/schema/dtd/5.1/catalog.xml" \
-  /etc/xml/catalog &amp;&amp;
-xmlcatalog --noout --add "delegateSystem" \
-  "http://docbook.org/xml/5.1/dtd/" \
-  "file:///usr/share/xml/docbook/schema/dtd/5.1/catalog.xml" \
-  /etc/xml/catalog &amp;&amp;
-xmlcatalog --noout --add "delegateURI" \
-  "http://docbook.org/xml/5.1/dtd/" \
-  "file:///usr/share/xml/docbook/schema/dtd/5.1/catalog.xml" \
-  /etc/xml/catalog &amp;&amp;
-xmlcatalog --noout --add "delegateURI" \
-  "http://docbook.org/xml/5.1/rng/"  \
-  "file:///usr/share/xml/docbook/schema/rng/5.1/catalog.xml" \
-  /etc/xml/catalog &amp;&amp;
-xmlcatalog --noout --add "delegateURI" \
-  "http://docbook.org/xml/5.1/sch/"  \
-  "file:///usr/share/xml/docbook/schema/sch/5.1/catalog.xml" \
-  /etc/xml/catalog &amp;&amp;
-xmlcatalog --noout --add "delegateURI" \
-  "http://docbook.org/xml/5.1/xsd/"  \
-  "file:///usr/share/xml/docbook/schema/xsd/5.1/catalog.xml" \
-  /etc/xml/catalog</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring DocBook XML Schemas 5.1</title>
-
-    <sect3 id="docbook51-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/xml/catalog</filename> and
-        <filename>/etc/xml/docbook-5.1</filename>
-      </para>
-
-      <indexterm zone="docbook51 docbook-config">
-        <primary sortas="e-etc-xml-docbook51">/etc/xml/docbook-5.1</primary>
-      </indexterm>
-
-      <indexterm zone="docbook51 docbook-config">
-        <primary sortas="e-etc-xml-catalog51">/etc/xml/catalog</primary>
-      </indexterm>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Files</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>db4-entities.pl</seg>
-        <seg>RNC, RNG, SCH, and XSL files</seg>
-        <seg>/etc/xml, /usr/share/xml/docbook/stylesheets, and
-        /usr/share/xml/docbook/schema/{rng,sch}/5.1</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="db4-entries-pl">
-        <term><filename>db4-entities.pl</filename></term>
-        <listitem>
-          <para>
-            is a script to convert DocBook 4.x files to DocBook 5.1
-          </para>
-          <indexterm zone="docbook51 db4-entries-pl">
-            <primary sortas="b-db4-entries-pl">db4-entities.pl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="Schema51-files">
-        <term><filename>RNC, RNG, and SCH files</filename></term>
-        <listitem>
-          <para>
-            contain the Docbook 5.1 RelaxNG, RelaxNG Compact, and Schematron
-            schema definitions
-          </para>
-          <indexterm zone="docbook51 Schema51-files">
-            <primary sortas="g-XML-Schema-files">XML Schema files</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="db4-upgrade-xsl">
-        <term><filename>db4-upgrade.xsl</filename></term>
-        <listitem>
-          <para>
-            is an XSL stylesheet to assist in conversion from DocBook 4.x files
-            to DocBook 5.1
-          </para>
-          <indexterm zone="docbook51 db4-upgrade-xsl">
-            <primary sortas="g-XSL-Stylesheets">XSL Stylesheets</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: pst/xml/itstool.xml
===================================================================
--- pst/xml/itstool.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(revision )
@@ -1,158 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY itstool-download-http "https://files.itstool.org/itstool/itstool-&itstool-version;.tar.bz2">
-  <!ENTITY itstool-download-ftp  " ">
-  <!ENTITY itstool-md5sum        "267a3bdc72a2d8abb1b824f2ea32ee9b">
-  <!ENTITY itstool-size          "104 KB">
-  <!ENTITY itstool-buildsize     "688 KB">
-  <!ENTITY itstool-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="itstool" xreflabel="itstool-&itstool-version;">
-  <?dbhtml filename="itstool.html"?>
-
-
-  <title>itstool-&itstool-version;</title>
-
-  <indexterm zone="itstool">
-    <primary sortas="a-itstool">itstool</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to itstool</title>
-
-    <para>
-      <application>Itstool</application> extracts messages from XML files
-      and outputs PO template files, then merges translations from MO files
-      to create translated XML files. It determines what to translate and how to
-       chunk it into messages using the W3C Internationalization Tag Set (ITS).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&itstool-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&itstool-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &itstool-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &itstool-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &itstool-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &itstool-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Itstool Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="DocBook"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of itstool</title>
-
-    <para>
-      First, fix some compatibility problems with Python-3.12:
-    </para>
-
-<screen><userinput remap="pre">sed -i 's/re.sub(/re.sub(r/'         itstool.in &amp;&amp;
-sed -i 's/re.compile(/re.compile(r/' itstool.in</userinput></screen>
-
-    <para>
-      Install <application>itstool</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>PYTHON=/usr/bin/python3 ./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-<!--
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
--->
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          itstool
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/itstool
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="itstool-prog">
-        <term><command>itstool</command></term>
-        <listitem>
-          <para>
-            is used to create translated XML files
-          </para>
-          <indexterm zone="itstool itstool-prog">
-            <primary sortas="b-itstool">itstool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: pst/xml/xml.xml
===================================================================
--- pst/xml/xml.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<?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="pst-xml">
-  <?dbhtml filename="xml.html"?>
-
-  <title>Extensible Markup Language (XML)</title>
-
-  <para>
-    This chapter contains the DocBook XML document type definition
-    (DTD) and DocBook Stylesheets which are used to validate, transform,
-    format and publish DocBook documents.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="docbook-45-xml.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="docbook5.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="docbook51.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="docbook-xsl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="itstool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xmlto.xml"/>
-
-</chapter>
Index: pst/xml/xmlto.xml
===================================================================
--- pst/xml/xmlto.xml	(revision f22a3179a47ab172ccd08c46a7af18ff0435ffbc)
+++ 	(revision )
@@ -1,194 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY xmlto-download-http "https://releases.pagure.org/xmlto/xmlto-&xmlto-version;.tar.bz2">
-  <!ENTITY xmlto-download-ftp  " ">
-  <!ENTITY xmlto-md5sum        "93bab48d446c826399d130d959fe676f">
-  <!ENTITY xmlto-size          "128 KB">
-  <!ENTITY xmlto-buildsize     "1.5 MB (with tests)">
-  <!ENTITY xmlto-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="xmlto" xreflabel="xmlto-&xmlto-version;">
-  <?dbhtml filename="xmlto.html"?>
-
-
-  <title>xmlto-&xmlto-version;</title>
-
-  <indexterm zone="xmlto">
-    <primary sortas="a-xmlto">xmlto</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xmlto</title>
-
-    <para>
-      The <application>xmlto</application> package is a front-end to a XSL
-      toolchain. It chooses an appropriate stylesheet for the conversion you
-      want and applies it using an external XSLT processor. It also performs
-      any necessary post-processing.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xmlto-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xmlto-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xmlto-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xmlto-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xmlto-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xmlto-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">xmlto Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="DocBook"/>,
-      <xref linkend="docbook-xsl"/>, and
-      <xref linkend="libxslt"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (for DVI, PDF, and postscript
-    backend post-processing)</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="fop"/>,
-<!--    <ulink url="https://dblatex.sourceforge.net/">dblatex</ulink>, and -->
-      <ulink url="https://sourceforge.net/projects/dblatex/files/dblatex/">dblatex</ulink>, and
-      <ulink url="https://www.garshol.priv.no/download/xmltools/prod/PassiveTeX.html">
-      PassiveTeX</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (for text backend
-    post-processing)</bridgehead>
-    <para role="optional">
-      One of
-      <xref role="runtime" linkend="Links"/>,
-      <xref role="runtime" linkend="lynx"/>,
-      <ulink url="&w3m-url;">W3m</ulink>, or
-      <ulink url="&elinks-url;">ELinks</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">Editor Notes:
-    <ulink url="&blfs-wiki;/xmlto"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xmlto</title>
-
-    <para>
-      Install <application>xmlto</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>LINKS="/usr/bin/links" \
-./configure --prefix=/usr &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <envar>LINKS="/usr/bin/links"</envar>: This environment variable fixes a
-      bug causing <command>xmlto</command> to think that
-      <command>links</command> command is the same as
-      <command>elinks</command>. Setting this variable does not cause problems
-      if <xref linkend="links"/> is not installed, unless
-      you have <ulink url="http://elinks.or.cz/">ELinks</ulink> installed, and
-      wish to use it for text backend post-processing, in which case,
-      remove it.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>xmlif and xmlto</seg>
-        <seg>None</seg>
-        <seg>/usr/share/xmlto</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xmlif">
-        <term><command>xmlif</command></term>
-        <listitem>
-          <para>
-            is a conditional processing instructions for XML
-          </para>
-          <indexterm zone="xmlto xmlif">
-            <primary sortas="b-xmlif">xmlif</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xmlto-prog">
-        <term><command>xmlto</command></term>
-        <listitem>
-          <para>
-            applies an XSL stylesheet to an XML document
-          </para>
-          <indexterm zone="xmlto xmlto-prog">
-            <primary sortas="b-xmlto">xmlto</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
