Index: pst/printing/cups-filters-systemd.xml
===================================================================
--- pst/printing/cups-filters-systemd.xml	(revision 0afe13f2de4279dfa82218b39e493ff9c075aa90)
+++ pst/printing/cups-filters-systemd.xml	(revision 0afe13f2de4279dfa82218b39e493ff9c075aa90)
@@ -0,0 +1,271 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY cups-filters-download-http
+           "http://www.openprinting.org/download/cups-filters/cups-filters-&cups-filters-version;.tar.xz">
+  <!ENTITY cups-filters-download-ftp  " ">
+  <!ENTITY cups-filters-md5sum        "f16a422bf3135e90b83f969c13a259cf">
+  <!ENTITY cups-filters-size          "1.3 MB">
+  <!ENTITY cups-filters-buildsize     "33 MB (additional 2 MB for the tests)">
+  <!ENTITY cups-filters-time          "0.4 SBU">
+]>
+
+<sect1 id="cups-filters" xreflabel="cups-filters-&cups-filters-version;">
+  <?dbhtml filename="cups-filters.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <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 contains backends,
+      filters and other software that was once part of the core
+      <application>CUPS</application> distribution but is no longer
+      maintained by Apple Inc.
+    </para>
+
+    &lfs76_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="cups"/>,
+      <xref linkend="glib2"/>,
+      <xref linkend="ijs"/>,
+      <xref linkend="lcms2"/>,
+      <xref linkend="poppler"/> and
+      <xref linkend="qpdf"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="libjpeg"/>,
+      <xref linkend="libpng"/> and
+      <xref linkend="libtiff"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="avahi"/>,
+      <xref linkend="php"/> (use of this might be broken) and
+      <ulink url="http://www.adobe.com/products/reader">acroread</ulink>
+    </para>
+
+    <bridgehead renderas="sect4">Required (Runtime)</bridgehead>
+    <para role="required runtime">
+      <xref linkend="gs"/> (Needed for PostScript printers), or
+      <xref linkend="gutenprint"/> (for supported printers),
+      or other printer drivers
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/cups-filters"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of CUPS Filters</title>
+
+    <para>
+      First, fix the systemd unit file to work with
+      <application>CUPS</application> 2.0 and later:
+    </para>
+
+<screen><userinput>sed -i "s:cups.service:org.cups.cupsd.service:g" utils/cups-browsed.service</userinput></screen>
+
+    <para>
+      Install <application>CUPS Filters</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr                               \
+            --sysconfdir=/etc                           \
+            --localstatedir=/var                        \
+            --docdir=/usr/share/doc/cups-filters-&cups-filters-version; \
+            --without-rcdir                             \
+            --with-gs-path=/usr/bin/gs                  \
+            --with-pdftops-path=/usr/bin/gs             \
+            --disable-static                            &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check 2&gt;&amp;1 &gt;testlog</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+    <para>
+      Install the systemd unit by running the following command as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>install -v -m644 utils/cups-browsed.service /lib/systemd/system/cups-browsed.service</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>--without-rcdir</parameter>: This switch disables
+      installation of the bundled bootscript which is not compatible
+      with BLFS.
+    </para>
+
+    <para>
+      <parameter>--with-gs-path=/usr/bin/gs</parameter>: This switch
+      defines the path to the <application>GhostScript</application>
+      binary in case <xref linkend="gs"/> is not installed at build time.
+    </para>
+
+    <para>
+      <parameter>--with-pdftops-path=/usr/bin/gs</parameter>: This switch
+      defines the path to the <application>GhostScript</application>
+      binary in case <xref linkend="gs"/> is not installed at build time.
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+    <para>
+      <command>make check 2&gt;&amp;1 &gt;testlog</command>: the testsuite
+      dumps a stream of bytes into the input buffer after it finishes. Sending
+      the output to a file keeps the history usable, but some debug information
+      will still appear on the screen.
+    </para>
+
+    <para>
+      <option>--with-test-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="configuration">
+    <title>Configuring Cups Filters</title>
+
+    <sect3 id="cups-filters-init">
+      <title>Systemd Units</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-filters cups-filters-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>
+          ttfread and cups-browsed
+        </seg>
+        <seg>
+          libcupsfilters.so and libfontembed.so
+        </seg>
+        <seg>
+          /usr/include/cupsfilters,
+          /usr/include/fontembed,
+          /usr/lib/cups/backend,
+          /usr/lib/cups/filter,
+          /usr/share/cups/banners,
+          /usr/share/cups/charsets,
+          /usr/share/cups/data,
+          /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="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-filters.xml
===================================================================
--- pst/printing/cups-filters.xml	(revision 3503806d30492fc287a63f5725a25dbbb82cd4cc)
+++ 	(revision )
@@ -1,237 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY cups-filters-download-http
-  "http://www.openprinting.org/download/cups-filters/cups-filters-&cups-filters-version;.tar.xz">
-  <!ENTITY cups-filters-download-ftp  " ">
-  <!ENTITY cups-filters-md5sum        "f16a422bf3135e90b83f969c13a259cf">
-  <!ENTITY cups-filters-size          "1.3 MB">
-  <!ENTITY cups-filters-buildsize     "33 MB (additional 2 MB for the tests)">
-  <!ENTITY cups-filters-time          "0.4 SBU">
-]>
-
-<sect1 id="cups-filters" xreflabel="cups-filters-&cups-filters-version;">
-  <?dbhtml filename="cups-filters.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <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 contains backends,
-      filters and other software that was once part of the core
-      <application>CUPS</application> distribution but is no longer
-      maintained by Apple Inc.
-    </para>
-
-    &lfs76_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="cups"/>,
-      <xref linkend="glib2"/>,
-      <xref linkend="ijs"/>,
-      <xref linkend="lcms2"/>,
-      <xref linkend="poppler"/> and
-      <xref linkend="qpdf"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libpng"/> and
-      <xref linkend="libtiff"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="avahi"/>,
-      <xref linkend="php"/> (use of this might be broken) and
-      <ulink url="http://www.adobe.com/products/reader">acroread</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Required (Runtime)</bridgehead>
-    <para role="required runtime">
-      <xref linkend="gs"/> (Needed for PostScript printers), or
-      <xref linkend="gutenprint"/> (for supported printers),
-      or other printer drivers
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/cups-filters"/>
-    </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                               \
-            --sysconfdir=/etc                           \
-            --localstatedir=/var                        \
-            --docdir=/usr/share/doc/cups-filters-&cups-filters-version; \
-            --without-rcdir                             \
-            --with-gs-path=/usr/bin/gs                  \
-            --with-pdftops-path=/usr/bin/gs             \
-            --disable-static                            &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check 2&gt;&amp;1 &gt;testlog</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--without-rcdir</parameter>: This switch disables
-      installation of the bundled bootscript which is not compatible
-      with BLFS.
-    </para>
-
-    <para>
-      <parameter>--with-gs-path=/usr/bin/gs</parameter>: This switch
-      defines the path to the <application>GhostScript</application>
-      binary in case <xref linkend="gs"/> is not installed at build time.
-    </para>
-
-    <para>
-      <parameter>--with-pdftops-path=/usr/bin/gs</parameter>: This switch
-      defines the path to the <application>GhostScript</application>
-      binary in case <xref linkend="gs"/> is not installed at build time.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <command>make check 2&gt;&amp;1 &gt;testlog</command>: the testsuite
-      dumps a stream of bytes into the input buffer after it finishes. Sending
-      the output to a file keeps the history usable, but some debug information
-      will still appear on the screen.
-    </para>
-
-    <para>
-      <option>--with-test-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>
-
-<!-- TODO: Write a bootscript for cups-browsed -->
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          ttfread and cups-browsed
-        </seg>
-        <seg>
-          libcupsfilters.so and libfontembed.so
-        </seg>
-        <seg>
-          /usr/include/cupsfilters,
-          /usr/include/fontembed,
-          /usr/lib/cups/backend,
-          /usr/lib/cups/filter,
-          /usr/share/cups/banners,
-          /usr/share/cups/charsets,
-          /usr/share/cups/data,
-          /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="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-systemd.xml
===================================================================
--- pst/printing/cups-systemd.xml	(revision 0afe13f2de4279dfa82218b39e493ff9c075aa90)
+++ pst/printing/cups-systemd.xml	(revision 0afe13f2de4279dfa82218b39e493ff9c075aa90)
@@ -0,0 +1,811 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY cups-download-http "http://www.cups.org/software/&cups-version;/cups-&cups-version;-source.tar.bz2">
+  <!ENTITY cups-download-ftp  " ">
+  <!ENTITY cups-md5sum        "2cdd81fea23e9e29555c24bdfd0d7c89">
+  <!ENTITY cups-size          "8.4 MB">
+  <!ENTITY cups-buildsize     "60 MB (additional 28 MB for the tests)">
+  <!ENTITY cups-time          "0.5 SBU (additional 4.4 SBU for the tests)">
+]>
+
+<sect1 id="cups" xreflabel="Cups-&cups-version;">
+  <?dbhtml filename="cups.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <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>
+
+    &lfs76_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">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="colord"/>,
+      <xref linkend="dbus"/> and
+      <xref linkend="libusb"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="avahi"/>,
+      <xref linkend="gnutls"/>,
+      <xref linkend="libpaper"/>,
+      <xref linkend="linux-pam"/>,
+      <xref linkend="mitkrb"/>,
+      <xref linkend="openjdk"/>,
+      <xref linkend="php"/>,
+      <xref linkend="python2"/> and
+      <xref linkend="xdg-utils"/>
+    </para>
+
+    <bridgehead renderas="sect4">Required (Runtime)</bridgehead>
+    <para role="optional">
+      <xref linkend="cups-filters"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional (Runtime)</bridgehead>
+    <para role="optional">
+      <ulink url="https://www.openprinting.org/download/foomatic/">Foomatic</ulink>,
+      <xref linkend="gutenprint"/> and
+      <ulink url="http://hplipopensource.com/hplip-web/index.html">HPLIP</ulink> (HP printers)
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/cups"/>
+    </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>
+
+<screen><literal>Device Drivers  ---&gt;
+  USB support  ---&gt;
+    OHCI HCD (USB 1.1) support: Y or M            [CONFIG_USB_OHCI_HCD]
+    UHCI HCD (most Intel and VIA) support: Y or M [CONFIG_USB_UHCI_HCD]
+    USB Printer support: Y or M                   [CONFIG_USB_PRINTER]</literal></screen>
+
+    <para>
+      If you have a parallel printer, enable the following options in your
+      kernel configuration and recompile the kernel:
+    </para>
+
+<screen><literal>Device Drivers  ---&gt;
+  Parallel port support  ---&gt;                     [CONFIG_PARPORT]
+    PC-style hardware: Y or M                     [CONFIG_PARPORT_PC]
+  Character devices  ---&gt;
+    Parallel printer support: Y or M              [CONFIG_PRINTER]</literal></screen>
+
+    <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>
+
+    <!-- docdir is also document root for cups administration interface, so
+    let's just put it in /usr/share/cups/doc-&cups-version; and create symlink
+    in /usr/share/doc/cups-&cups-version;
+
+    When not using libdir switch, CUPS will install libraries into /usr/lib64
+    on a 64 bit system, and since /usr/lib64 is symlink to /usr/lib it might
+    introduce some difficulties with packaging -->
+
+    <para>
+      Build <application>Cups</application> by running the following commands:
+    </para>
+
+<screen><userinput>sed -i "s:555:755:g;s:444:644:g" Makedefs.in                 &amp;&amp;
+sed -i "/MAN.*.EXT/s:.gz::g" config-scripts/cups-manpages.m4 &amp;&amp;
+sed -i "/LIBGCRYPTCONFIG/d" config-scripts/cups-ssl.m4       &amp;&amp;
+
+aclocal  -I config-scripts &amp;&amp;
+autoconf -I config-scripts &amp;&amp;
+
+./configure --libdir=/usr/lib            \
+            --with-rcdir=/tmp/cupsinit   \
+            --with-system-groups=lpadmin \
+            --with-docdir=/usr/share/cups/doc-&cups-version; &amp;&amp;
+make</userinput></screen>
+
+   <para>
+     To test the results, issue: <command>make -k check</command>. An already
+     active graphical session with bus address is necessary to run the tests.
+     A small number of tests fail for unknown reasons.
+   </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;
+rm -rf /tmp/cupsinit &amp;&amp;
+ln -sfv ../cups/doc-&cups-version; /usr/share/doc/cups-&cups-version;</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 /var/run/cups/cups.sock" > /etc/cups/client.conf</userinput></screen>
+
+    <para>
+      Remove filters that are now part of the <application>Cups
+      Filters</application> package by running the following commands as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>rm -rf /usr/share/cups/banners &amp;&amp;
+rm -rf /usr/share/cups/data/testprint</userinput></screen>
+
+    <note>
+      <para>
+        If you reinstall or update <application>Cups</application>, commands
+        above will break <xref linkend="cups-filters"/>, so it needs to be
+        reinstalled.
+      </para>
+    </note>
+
+    <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>
+      <command>sed -i ... Makedefs.in</command>: This sed fixes
+      permissions of the installed files and directories.
+    </para>
+
+    <para>
+      <command>sed -i ... cups-manpages.m4</command>: This sed
+      prevents compression of the man pages by default.
+    </para>
+
+    <para>
+      <command>sed -i ... cups-ssl.m4</command>: This sed prevents
+      <command>configure</command> from searching for
+      <command>libgcrypt-config</command>, because
+      <application>libgcrypt</application> is not required by the
+      package.
+    </para>
+
+    <para>
+      <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-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>
+        The <application>Cups</application> web interface can be accessed
+        via <ulink url="http://localhost:631"/>. From there, printers
+        and print jobs can be managed, and the server configuration
+        can be changed. Configuration can also be done from the command
+        line using 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="http://www.cups.org/documentation.php"/>. 
+      </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="http://www.linuxprinting.org/foomatic.html">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>Systemd Units</title>
+
+      <para>
+        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"><userinput>systemctl enable org.cups.cupsd</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>
+          accept, cancel, cupsaccept, cupsaddsmb, cups-config, cupsctl, cupsd,
+          cupsdisable, cupsenable, cupsfilter, cupsreject, cupstestdsc,
+          cupstestppd, ippfind, ipptool, lp, lpadmin, lpc, lpinfo, lpmove,
+          lpoptions, lpq, lpr, lprm, lpstat, ppdc, ppdhtml, ppdi, ppdmerge,
+          ppdpo and reject
+        </seg>
+        <seg>
+          libcupscgi.so, libcupsimage.so, libcupsmime.so,
+          libcupsppdc.so and libcups.so
+        </seg>
+        <seg>
+          /etc/cups,
+          /usr/include/cups,
+          /usr/lib/cups,
+          /usr/share/cups,
+          /usr/share/doc/cups-&cups-version;,
+          /var/cache/cups,
+          /var/log/cups,
+          /var/run/cups and
+          /var/spool/cups
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="accept">
+        <term><command>accept</command></term>
+        <listitem>
+          <para>
+            instructs the printing system to accept print jobs to the
+            specified destinations.
+          </para>
+          <indexterm zone="cups accept">
+            <primary sortas="b-accept">accept</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <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="cupsaddsmb">
+        <term><command>cupsaddsmb</command></term>
+        <listitem>
+          <para>
+            exports printers to the <application>Samba</application>
+            software for use with Windows clients.
+          </para>
+          <indexterm zone="cups cupsaddsmb">
+            <primary sortas="b-cupsaddsmb">cupsaddsmb</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="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="cupstestdsc">
+        <term><command>cupstestdsc</command></term>
+        <listitem>
+          <para>
+            tests the conformance of PostScript files.
+          </para>
+          <indexterm zone="cups cupstestdsc">
+            <primary sortas="b-cupstestdsc">cupstestdsc</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="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="reject">
+        <term><command>reject</command></term>
+        <listitem>
+          <para>
+            instructs the printing system to reject print jobs to the
+            specified destinations.
+          </para>
+          <indexterm zone="cups reject">
+            <primary sortas="b-reject">reject</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/cups.xml
===================================================================
--- pst/printing/cups.xml	(revision 3503806d30492fc287a63f5725a25dbbb82cd4cc)
+++ 	(revision )
@@ -1,818 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY cups-download-http "http://www.cups.org/software/&cups-version;/cups-&cups-version;-source.tar.bz2">
-  <!ENTITY cups-download-ftp  " ">
-  <!ENTITY cups-md5sum        "2cdd81fea23e9e29555c24bdfd0d7c89">
-  <!ENTITY cups-size          "8.4 MB">
-  <!ENTITY cups-buildsize     "60 MB (additional 28 MB for the tests)">
-  <!ENTITY cups-time          "0.5 SBU (additional 4.4 SBU for the tests)">
-]>
-
-<sect1 id="cups" xreflabel="Cups-&cups-version;">
-  <?dbhtml filename="cups.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <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>
-
-    &lfs76_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">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="colord"/>,
-      <xref linkend="dbus"/>, and
-      <xref linkend="libusb"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="avahi"/>,
-      <xref linkend="gnutls"/>,
-      <xref linkend="libpaper"/>,
-      <xref linkend="linux-pam"/>,
-      <xref linkend="mitkrb"/>,
-      <xref linkend="openjdk"/>,
-      <xref linkend="php"/>,
-      <xref linkend="python2"/>, and
-      <xref linkend="xdg-utils"/>
-     
-    </para>
-
-    <bridgehead renderas="sect4">Required (Postinstall)</bridgehead>
-    <para role="required runtime">
-      <xref linkend="cups-filters"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (Postinstall)</bridgehead>
-    <para role="optional runtime">
-      <xref linkend="gutenprint"/> and
-      <ulink url="http://hplipopensource.com/hplip-web/index.html">hplip</ulink> (HP printers)
-    </para>
-      
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/cups"/>
-    </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>
-
-<screen><literal>Device Drivers  ---&gt;
-  USB support  ---&gt;
-    OHCI HCD (USB 1.1) support: Y or M            [CONFIG_USB_OHCI_HCD]
-    UHCI HCD (most Intel and VIA) support: Y or M [CONFIG_USB_UHCI_HCD]
-    USB Printer support: Y or M                   [CONFIG_USB_PRINTER]</literal></screen>
-
-    <para>
-      If you have a parallel printer, enable the following options in your
-      kernel configuration and recompile the kernel:
-    </para>
-
-<screen><literal>Device Drivers  ---&gt;
-  Parallel port support  ---&gt;                     [CONFIG_PARPORT]
-    PC-style hardware: Y or M                     [CONFIG_PARPORT_PC]
-  Character devices  ---&gt;
-    Parallel printer support: Y or M              [CONFIG_PRINTER]</literal></screen>
-
-    <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>
-
-    <!-- docdir is also document root for cups administration interface, so
-    let's just put it in /usr/share/cups/doc-&cups-version; and create symlink
-    in /usr/share/doc/cups-&cups-version;
-
-    When not using libdir switch, CUPS will install libraries into /usr/lib64
-    on a 64 bit system, and since /usr/lib64 is symlink to /usr/lib it might
-    introduce some difficulties with packaging -->
-
-    <para>
-      Build <application>Cups</application> by running the following commands:
-    </para>
-
-<screen><userinput>sed -i 's:555:755:g;s:444:644:g' Makedefs.in           &amp;&amp;
-sed -i '/MAN.*.EXT/s:.gz::g' \
-       configure config-scripts/cups-manpages.m4       &amp;&amp;
-sed -i '/LIBGCRYPTCONFIG/d' config-scripts/cups-ssl.m4 &amp;&amp;
-
-aclocal  -I config-scripts &amp;&amp;
-autoconf -I config-scripts &amp;&amp;
-
-./configure --libdir=/usr/lib            \
-            --disable-systemd            \
-            --with-rcdir=/tmp/cupsinit   \
-            --with-system-groups=lpadmin \
-            --with-docdir=/usr/share/cups/doc-&cups-version; &amp;&amp;
-make</userinput></screen>
-
-   <para>
-     To test the results, issue: <command>make -k check</command>. An already
-     active graphical session with bus address is necessary to run the tests.
-     A small number of tests fail for unknown reasons.
-   </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;
-rm -rf /tmp/cupsinit &amp;&amp;
-ln -svnf ../cups/doc-&cups-version; /usr/share/doc/cups-&cups-version;</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 /var/run/cups/cups.sock" > /etc/cups/client.conf</userinput></screen>
-
-    <para>
-      Remove filters that are now part of the <application>Cups
-      Filters</application> package by running the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>rm -rf /usr/share/cups/banners &amp;&amp;
-rm -rf /usr/share/cups/data/testprint</userinput></screen>
-
-    <note>
-      <para>
-        If you reinstall or update <application>Cups</application>, commands
-        above break <xref linkend="cups-filters"/>, which needs, therefore,
-        to be reinstalled.</para>
-    </note>
-
-    <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>
-      <command>sed ... Makedefs.in</command>: Fix files and directories
-      permissions.
-    </para>
-
-    <para>
-      <command>sed ... cups-manpages.m4</command>: This sed prevents
-      compression of the man pages by default.
-    </para>
-
-    <para>
-      <command>sed ... cups-ssl.m4</command>: Prevent
-      <command>configure</command> script from searching
-      <command>libgcrypt-config</command>, because
-      <application>libgcrypt</application> is not used anywere else in the
-      package.
-    </para>
-
-    <para>
-      <parameter>--disable-systemd</parameter>: Systemd is not supported by
-      BLFS.
-    </para>
-
-    <para>
-      <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-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="http://www.cups.org/documentation.php"/>. 
-      </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="http://www.linuxprinting.org/foomatic.html">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>Boot Script</title>
-
-      <para>
-        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>
-
-      <indexterm zone="cups cups-init">
-        <primary sortas="f-cups">cups</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-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>
-          accept, cancel, cupsaccept, cupsaddsmb, cups-config, cupsctl, cupsd,
-          cupsdisable, cupsenable, cupsfilter, cupsreject, cupstestdsc,
-          cupstestppd, ippfind, ipptool, lp, lpadmin, lpc, lpinfo, lpmove,
-          lpoptions, lpq, lpr, lprm, lpstat, ppdc, ppdhtml, ppdi, ppdmerge,
-          ppdpo, and reject
-        </seg>
-        <seg>
-          libcupscgi.so, libcupsimage.so, libcupsmime.so,
-          libcupsppdc.so, and libcups.so
-        </seg>
-        <seg>
-          /etc/cups,
-          /usr/include/cups,
-          /usr/lib/cups,
-          /usr/share/cups,
-          /usr/share/doc/cups-&cups-version;,
-          /var/cache/cups,
-          /var/log/cups,
-          /var/run/cups, and
-          /var/spool/cups
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="accept">
-        <term><command>accept</command></term>
-        <listitem>
-          <para>
-            instructs the printing system to accept print jobs to the
-            specified destinations.
-          </para>
-          <indexterm zone="cups accept">
-            <primary sortas="b-accept">accept</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <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="cupsaddsmb">
-        <term><command>cupsaddsmb</command></term>
-        <listitem>
-          <para>
-            exports printers to the <application>Samba</application>
-            software for use with Windows clients.
-          </para>
-          <indexterm zone="cups cupsaddsmb">
-            <primary sortas="b-cupsaddsmb">cupsaddsmb</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="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="cupstestdsc">
-        <term><command>cupstestdsc</command></term>
-        <listitem>
-          <para>
-            tests the conformance of PostScript files.
-          </para>
-          <indexterm zone="cups cupstestdsc">
-            <primary sortas="b-cupstestdsc">cupstestdsc</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="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="reject">
-        <term><command>reject</command></term>
-        <listitem>
-          <para>
-            instructs the printing system to reject print jobs to the
-            specified destinations.
-          </para>
-          <indexterm zone="cups reject">
-            <primary sortas="b-reject">reject</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 3503806d30492fc287a63f5725a25dbbb82cd4cc)
+++ pst/printing/gs.xml	(revision 0afe13f2de4279dfa82218b39e493ff9c075aa90)
@@ -79,5 +79,5 @@
       <title>Standard Fonts</title>
       <listitem>
-        <para>Download (HTTP): <ulink url="&gs-standard-fonts-download;"/></para>
+        <para>Download (FTP): <ulink url="&gs-standard-fonts-download;"/></para>
       </listitem>
       <listitem>
@@ -120,7 +120,7 @@
       suggested font),
       <xref linkend="gtk2"/>,
+      <xref linkend="lcms"/> (not used by default, nor if lcms2 is present or found),
       <xref linkend="libidn"/>,
-      <xref linkend="libpaper"/>,
-      <xref linkend="lcms"/> (not used by default, nor if lcms2 is present or found), and
+      <xref linkend="libpaper"/>, and
       <xref linkend="x-window-system"/>
     </para>
@@ -156,9 +156,10 @@
       copies of <application>expat</application>,
       <application>freetype</application>, <application>lcms2</application>,
-      <application>libjpeg</application>, and <application>libpng</application>:
+      <application>libjpeg</application>, <application>libpng</application>
+      and <application>zlib</application>:
     </para>
 
 <screen><userinput>sed -i 's/ZLIBDIR=src/ZLIBDIR=$includedir/' configure.ac configure &amp;&amp;
-rm -rf expat freetype lcms2 jpeg libpng</userinput></screen>
+rm -rf expat freetype lcms2 jpeg libpng zlib</userinput></screen>
 <!--
     <note>
@@ -174,7 +175,8 @@
     <para>Compile <application>Ghostscript</application>:</para>
 
-<screen><userinput>rm -rf zlib &amp;&amp;
-./configure --prefix=/usr --disable-compile-inits \
- --enable-dynamic --with-system-libtiff &amp;&amp;
+<screen><userinput>./configure --prefix=/usr           \
+            --disable-compile-inits \
+            --enable-dynamic        \
+            --with-system-libtiff &amp;&amp;
 make</userinput></screen>
 
@@ -210,7 +212,7 @@
     <para>If you want the shared library too:</para>
 
-<screen role="root"><userinput>make soinstall &amp;&amp;
+<screen role="root"><userinput>make soinstall<!-- &amp;&amp;
 install -v -m644 base/*.h /usr/include/ghostscript &amp;&amp;
-ln -v -s ghostscript /usr/include/ps</userinput></screen>
+ln -v -s ghostscript /usr/include/ps--></userinput></screen>
 
     <para>Now make the documentation accessible from the normal place:</para>
@@ -237,11 +239,11 @@
     <para>
       <command>sed -i 's/ZLIBDIR=src/ZLIBDIR=$includedir/' ... </command>:
-      Fix to build with system <application>zlib</application>.
-    </para>
-
-    <para>
+      Fixes building with system <application>Zlib</application>.
+    </para>
+
+    <!-- <para>
       <command>rm -rf zlib</command>:
       <application>zlib</application> was installed as part of LFS.
-    </para>
+    </para> -->
 
     <para>
@@ -255,5 +257,5 @@
     </para>
 
-    <para>
+    <!-- <para> Nothing needs these. The ones installed by soinstall are sufficient.
       <command>install -v -m644 base/*.h... </command>: Some packages
       (<application>ImageMagick</application> is one) need the
@@ -262,8 +264,8 @@
     </para>
 
-    <para>
+    <para> Haven't found anything that needs this
       <command>ln -v -s ghostscript /usr/include/ps</command>: Some packages
       expect to find the interface headers in an alternate location.
-    </para>
+    </para> -->
 
     <para>
@@ -277,4 +279,5 @@
       to the <xref linkend="cups"/> libraries if you have installed those.
     </para>
+
   </sect2>
 
Index: pst/printing/gutenprint-systemd.xml
===================================================================
--- pst/printing/gutenprint-systemd.xml	(revision 0afe13f2de4279dfa82218b39e493ff9c075aa90)
+++ pst/printing/gutenprint-systemd.xml	(revision 0afe13f2de4279dfa82218b39e493ff9c075aa90)
@@ -0,0 +1,256 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY gutenprint-download-http "&sourceforge-repo;/gimp-print/gutenprint-&gutenprint-version;.tar.bz2">
+  <!ENTITY gutenprint-download-ftp  " ">
+  <!ENTITY gutenprint-md5sum        "9ff027103bafac419c37e19da75163ae">
+  <!ENTITY gutenprint-size          "6.0 MB">
+  <!ENTITY gutenprint-buildsize     "73 MB">
+  <!ENTITY gutenprint-time          "0.5 SBU">
+]>
+
+<sect1 id="gutenprint" xreflabel="Gutenprint-&gutenprint-version;">
+  <?dbhtml filename="gutenprint.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <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="gs"/>, <xref linkend="cups"/>,
+    <ulink url="http://www.linuxprinting.org/foomatic.html">Foomatic</ulink>,
+    and the
+    <application>GIMP-2.0</application>. See a list of supported printers at
+    <ulink url="http://gutenprint.sourceforge.net/p_Supported_Printers.php"/>.
+    </para>
+
+    &lfs76_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">Optional</bridgehead>
+    <para role="optional">
+    <ulink url="http://www.linuxprinting.org/foomatic.html">Foomatic</ulink>,
+    <xref linkend="ijs"/></para>
+
+    <bridgehead renderas="sect4">Optional (to Regenerate Documentation)</bridgehead>
+    <para role="optional"><xref linkend="imagemagick"/>,
+    <xref linkend="texlive"/>,
+    <xref linkend="doxygen"/>, and
+    <xref linkend="docbook-utils"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gutenprint"/></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>
+
+<screen>Device Drivers  ---&gt;
+  USB support  ---&gt;
+    OHCI HCD (USB 1.1) support: Y or M
+    UHCI HCD (most Intel and VIA) support: Y or M
+    USB Printer support: Y or M</screen>
+
+    <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 - I suppose you could sed the tests/Makefile to only run 'curve',
+    and perhaps 'run-testdither', it's 'run-weavetest' which takes most of the time -->
+    <para>To test the results, issue: <command>make check</command>. When last
+    tested (version 5.2.7, LFS-7.1, on a uniprocessor box which is admittedly short of
+    memory) this took more than 800 SBUs (more than two days for that box) and used an
+    extra 678 MB of disk space.</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>
+
+    <para><option>--disable-static</option>: This switch prevents the static
+    libraries being installed.</para>
+
+    <!-- redundant, only applies to cups < 1.2.0 : cups-5.0 gives a version of 1.5.0
+    FIXME - delete this on next version upgrade
+    <para><option>\-\-with-translated-ppds=no</option>: When this parameter is
+    given, only US English PPD files for <application>CUPS</application>
+    will be built. Useful if the PPD files are not yet translated into your
+    native language and you want to save some space by not installing unneeded
+    translations.</para>-->
+
+  </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"><userinput>systemctl restart org.cups.cupsd</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,
+        ijsgutenprint.5.2 (if compiled using ijs), 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/gutenprint,
+        /usr/include/gutenprintui2,
+        /usr/lib/gutenprint,
+        /usr/share/doc/gutenprint-&gutenprint-version; and
+        /usr/share/gutenprint</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="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>
+
+      <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>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: pst/printing/gutenprint.xml
===================================================================
--- pst/printing/gutenprint.xml	(revision 3503806d30492fc287a63f5725a25dbbb82cd4cc)
+++ 	(revision )
@@ -1,256 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gutenprint-download-http "&sourceforge-repo;/gimp-print/gutenprint-&gutenprint-version;.tar.bz2">
-  <!ENTITY gutenprint-download-ftp  " ">
-  <!ENTITY gutenprint-md5sum        "9ff027103bafac419c37e19da75163ae">
-  <!ENTITY gutenprint-size          "6.0 MB">
-  <!ENTITY gutenprint-buildsize     "73 MB">
-  <!ENTITY gutenprint-time          "0.5 SBU">
-]>
-
-<sect1 id="gutenprint" xreflabel="Gutenprint-&gutenprint-version;">
-  <?dbhtml filename="gutenprint.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <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="gs"/>, <xref linkend="cups"/>,
-    <ulink url="http://www.linuxprinting.org/foomatic.html">Foomatic</ulink>,
-    and the
-    <application>GIMP-2.0</application>. See a list of supported printers at
-    <ulink url="http://gutenprint.sourceforge.net/p_Supported_Printers.php"/>.
-    </para>
-
-    &lfs76_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">Optional</bridgehead>
-    <para role="optional">
-    <ulink url="http://www.linuxprinting.org/foomatic.html">Foomatic</ulink>,
-    <xref linkend="ijs"/></para>
-
-    <bridgehead renderas="sect4">Optional (to Regenerate Documentation)</bridgehead>
-    <para role="optional"><xref linkend="imagemagick"/>,
-    <xref linkend="texlive"/>,
-    <xref linkend="doxygen"/>, and
-    <xref linkend="docbook-utils"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gutenprint"/></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>
-
-<screen>Device Drivers  ---&gt;
-  USB support  ---&gt;
-    OHCI HCD (USB 1.1) support: Y or M
-    UHCI HCD (most Intel and VIA) support: Y or M
-    USB Printer support: Y or M</screen>
-
-    <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 - I suppose you could sed the tests/Makefile to only run 'curve',
-    and perhaps 'run-testdither', it's 'run-weavetest' which takes most of the time -->
-    <para>To test the results, issue: <command>make check</command>. When last
-    tested (version 5.2.7, LFS-7.1, on a uniprocessor box which is admittedly short of
-    memory) this took more than 800 SBUs (more than two days for that box) and used an
-    extra 678 MB of disk space.</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>
-
-    <para><option>--disable-static</option>: This switch prevents the static
-    libraries being installed.</para>
-
-    <!-- redundant, only applies to cups < 1.2.0 : cups-5.0 gives a version of 1.5.0
-    FIXME - delete this on next version upgrade
-    <para><option>\-\-with-translated-ppds=no</option>: When this parameter is
-    given, only US English PPD files for <application>CUPS</application>
-    will be built. Useful if the PPD files are not yet translated into your
-    native language and you want to save some space by not installing unneeded
-    translations.</para>-->
-
-  </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"><userinput>/etc/rc.d/init.d/cups restart</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,
-        ijsgutenprint.5.2 (if compiled using ijs), 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/gutenprint,
-        /usr/include/gutenprintui2,
-        /usr/lib/gutenprint,
-        /usr/share/doc/gutenprint-&gutenprint-version; and
-        /usr/share/gutenprint</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="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>
-
-      <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>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: pst/printing/printing.xml
===================================================================
--- pst/printing/printing.xml	(revision 3503806d30492fc287a63f5725a25dbbb82cd4cc)
+++ pst/printing/printing.xml	(revision 0afe13f2de4279dfa82218b39e493ff9c075aa90)
@@ -20,8 +20,8 @@
   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-filters.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cups-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cups-filters-systemd.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="gutenprint-systemd.xml"/>
 
 </chapter>
