Index: pst/printing/cups-browsed.xml
===================================================================
--- pst/printing/cups-browsed.xml	(revision 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 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 5b78d1c8eabf171d779f3aba994ada475027d46e)
+++ 	(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>
