Index: pst/printing/cups/cups-config.xml
===================================================================
--- pst/printing/cups/cups-config.xml	(revision 96574fa7fc66221d0f5278fce0ba45f1cb3b8227)
+++ pst/printing/cups/cups-config.xml	(revision 3f16459bcc7d446e0ad2cc3e2157d4b13d1b3ca8)
@@ -1,18 +1,16 @@
 <sect2>
-<title>CUPS Configuration</title>
+<title><acronym>CUPS</acronym> Configuration</title>
 
-<para>Configuration of CUPS is dependent on the type of printer and can be complex.  
-Generally, postscript printers are easier.  For detailed instructions on 
-configuration and use of CUPS, see <ulink url="http://www.cups.org/documentation.php"/>.
-The Software Administrators Manual and Software Users Manual are particularly
-useful.</para>
+<para>Configuration of <acronym>CUPS</acronym> is dependent on the type 
+of printer and can be complex. Generally, postscript printers are easier. 
+For detailed instructions on configuration and use of <acronym>CUPS</acronym>, 
+see <ulink url="http://www.cups.org/documentation.php"/>. The Software 
+Administrators Manual and Software Users Manual are particularly useful.</para>
 
-<para>During the install, cups created the startup file 
-<filename>/etc/rc.d/init.d/cups</filename>.
-The file works, but you may want to change it to a more 
-conventional LFS startup file:</para>
+<para>During the install, <acronym>CUPS</acronym> created the startup file 
+<filename>/etc/rc.d/init.d/cups</filename>. The file works, but you may 
+want to change it to a more conventional <acronym>LFS</acronym> startup file:</para>
 
-<para><screen><userinput>cat &gt; /etc/rc.d/init.d/cups &lt;&lt; "EOF"
-
+<screen><userinput><command>cat &gt; /etc/rc.d/init.d/cups &lt;&lt; "EOF"
 #!/bin/sh
 # Begin $rc_base/init.d/cups
@@ -55,12 +53,15 @@
 
 # End $rc_base/init.d/cups startup script.
-EOF</userinput></screen></para>
+EOF</command></userinput></screen>
 
-<para>The CUPS install also copies the initialization script to the 
-<filename>/etc/rc.d/rc{0,2,3,5}</filename> directories.  You may want 
-to delete those files and add symbolic links to 
-<filename>/etc/rc.d/init.d/cups</filename>.</para>
+<para>Create the symbolic links to this file in the relevant
+<filename class="directory">rc.d</filename> directory
+with the following commands:</para>
 
-
+<screen><userinput><command>cd /etc/rc.d/init.d &amp;&amp;
+ln -sf ../init.d/cups ../rc0.d/K00cups &amp;&amp;
+ln -sf ../init.d/cups ../rc2.d/S99cups &amp;&amp;
+ln -sf ../init.d/cups ../rc3.d/S99cups &amp;&amp;
+ln -sf ../init.d/cups ../rc5.d/S99cups</command></userinput></screen>
 
 </sect2>
Index: pst/printing/cups/cups-desc.xml
===================================================================
--- pst/printing/cups/cups-desc.xml	(revision 96574fa7fc66221d0f5278fce0ba45f1cb3b8227)
+++ pst/printing/cups/cups-desc.xml	(revision 3f16459bcc7d446e0ad2cc3e2157d4b13d1b3ca8)
@@ -2,27 +2,114 @@
 <title>Contents</title>
 
-<para>CUPS provides:</para>
+<para><acronym>CUPS</acronym> provides 
+<command>accept</command>,
+<command>cupsaddsmb</command>,
+<command>cupsd</command>,
+<command>cupstestppd</command>,
+<command>lpadmin</command>,
+<command>lpc</command>,
+<command>lpinfo</command>,
+<command>lpmove</command>,
+<command>reject</command>,
+<command>cancel</command>,
+<command>cups-config</command>,
+<command>disable</command>,
+<command>enable</command>,
+<command>lp</command>,
+<command>lpoptions</command>,
+<command>lppasswd</command>,
+<command>lpq</command>,
+<command>lpr</command>,
+<command>lprm</command>,
+<command>lpstat</command>,
+<filename class="libraryfile">libcups</filename>,
+<filename class="libraryfile">libcupsimage</filename> and various
+scripts and filters.</para>
 
-<para>/usr/sbin/lpc - line printer control program </para> 
-<para>/usr/sbin/cupsd - common unix printing system daemon</para> 
-<para>/usr/sbin/accept - accept jobs sent to a destination</para> 
-<para>/usr/sbin/reject - reject jobs sent to a destination</para> 
-<para>/usr/sbin/cupsaddsmb - export printers to samba for windows clients</para> 
-<para>/usr/sbin/lpadmin - configure cups printers and classes</para> 
-<para>/usr/sbin/lpinfo - show available devices or drivers </para> 
-<para>/usr/sbin/lpmove - move a job to a new destination</para> 
-<para>/usr/sbin/cupstestppd - test conformance of ppd files</para> 
-<para>/usr/bin/lpq - show printer queue status</para> 
-<para>/usr/bin/lpr - print files</para> 
-<para>/usr/bin/lprm -  cancel print jobs</para> 
-<para>/usr/bin/cancel - cancel jobs</para> 
-<para>/usr/bin/disable -  start printers and classes</para> 
-<para>/usr/bin/enable -  start printers and classes</para> 
-<para>/usr/bin/lp - print files </para> 
-<para>/usr/bin/lpoptions - display or set printer options and defaults</para> 
-<para>/usr/bin/lpstat -  print cups status information</para> 
-<para>/usr/bin/lppasswd - add, change, or delete digest passwords</para> 
-<para>/usr/bin/cups-config - get cups api, compiler, directory, and link information</para> 
+<sect3><title>lpc</title>
+<para><command>lpc</command> provides limited control over printer
+and class queues provided by <acronym>CUPS</acronym>.</para></sect3>
+
+<sect3><title>cupsd</title>
+<para><command>cupsd</command> is the scheduler for the Common UNIX Printing System.
+</para></sect3>
+
+<sect3><title>accept</title>
+<para><command>accept</command> instructs the printing system to accept print jobs to the specified
+destinations.
+</para></sect3>
+
+<sect3><title>reject</title>
+<para><command>reject</command> reject instructs the printing system to
+reject print jobs to the specified destinations.
+</para></sect3>
+
+<sect3><title>cupsaddsmb</title>
+<para><command>cupsaddsmb</command> exports printers to the SAMBA software for
+use with Windows clients.
+</para></sect3>
+
+<sect3><title>lpadmin</title>
+<para><command>lpadmin</command> configures printer and class queues provided by 
+<acronym>CUPS</acronym>.
+</para></sect3>
+
+<sect3><title>lpinfo</title>
+<para><command>lpinfo</command> lists the available devices or drivers known to 
+the <acronym>CUPS</acronym> server.
+</para></sect3>
+
+<sect3><title>lpmove</title>
+<para><command>lpmove</command> moves the specified job to a new destination.
+</para></sect3>
+
+<sect3><title>cupstestppd</title>
+<para><command>cupstestppd</command> tests the conformance of <acronym>PPD</acronym> files.
+</para></sect3>
+
+<sect3><title>lpq</title>
+<para><command>lpq</command> shows the current print queue status on the named printer.
+</para></sect3>
+
+<sect3><title>lpr</title>
+<para><command>lpr</command> submits files for printing.
+</para></sect3>
+
+<sect3><title>lprm</title>
+<para><command>lprm</command> cancels print jobs that have been queued for printing.
+</para></sect3>
+
+<sect3><title>cancel</title>
+<para><command>cancel</command> cancels existing print jobs.
+</para></sect3>
+
+<sect3><title>disable</title>
+<para><command>disable</command> stops the named printers or classes.
+</para></sect3>
+
+<sect3><title>enable</title>
+<para><command>enable</command> starts the named printers or classes.
+</para></sect3>
+
+<sect3><title>lp</title>
+<para><command>lp</command> submits files for printing or alters a pending job.
+</para></sect3>
+
+<sect3><title>lpoptions</title>
+<para><command>lpoptions</command> displays or sets printer options and defaults.
+</para></sect3>
+
+<sect3><title>lpstat</title>
+<para><command>lpstat</command> displays status information about the 
+current classes, jobs, and printers.</para></sect3>
+
+<sect3><title>lppasswd</title>
+<para><command>lppasswd</command> adds, changes or deletes passwords in 
+the <acronym>CUPS</acronym> digest password file <filename>passwd.md5</filename>.
+</para></sect3>
+
+<sect3><title>cups-config</title>
+<para><command>cups-config</command> is the <acronym>CUPS</acronym> program configuration utility.
+</para></sect3>
 
 </sect2>
-
Index: pst/printing/cups/cups-exp.xml
===================================================================
--- pst/printing/cups/cups-exp.xml	(revision 96574fa7fc66221d0f5278fce0ba45f1cb3b8227)
+++ pst/printing/cups/cups-exp.xml	(revision 3f16459bcc7d446e0ad2cc3e2157d4b13d1b3ca8)
@@ -1,9 +1,13 @@
 <sect2>
-<title>Installation command explanations</title>
+<title>Command explanations</title>
 
-<para>The basic default behavior of the installation is appropriate for LFS systems.  
-CUPS files are placed in <filename>/usr/bin</filename>,
-<filename>/usr/sbin</filename>, <filename>/var</filename> and
-<filename>/etc/cups</filename>.</para>
+<para>The basic default behavior of the installation is appropriate for
+<acronym>LFS</acronym> systems. <acronym>CUPS</acronym> files are placed in <filename
+class="directory">/usr/bin</filename>, <filename class="directory">/usr/sbin</filename>, <filename
+class="directory">/var</filename> and <filename class="directory">/etc/cups</filename>.</para>
+
+<para><command>rm /etc/rc.d/rc*.d/*cups</command> : We want symbolic
+links to <filename>/etc/rc.d/init.d/cups</filename> instead of the initialization scripts
+which <acronym>CUPS</acronym> installs.</para>
 
 </sect2>
Index: pst/printing/cups/cups-inst.xml
===================================================================
--- pst/printing/cups/cups-inst.xml	(revision 96574fa7fc66221d0f5278fce0ba45f1cb3b8227)
+++ pst/printing/cups/cups-inst.xml	(revision 3f16459bcc7d446e0ad2cc3e2157d4b13d1b3ca8)
@@ -1,11 +1,13 @@
 <sect2>
-<title>Installation of CUPS</title>
+<title>Installation of
+<application><acronym>CUPS</acronym></application></title>
 
-<para>Install CUPS by running the following commands:</para>
+<para>Install <application><acronym>CUPS</acronym></application> by 
+running the following commands:</para>
 
-<para><screen><userinput>./configure &amp;&amp;
+<screen><userinput><command>./configure &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
-
+make install &amp;&amp;
+rm /etc/rc.d/rc*.d/*cups</command></userinput></screen>
 
 </sect2>
Index: pst/printing/cups/cups-intro.xml
===================================================================
--- pst/printing/cups/cups-intro.xml	(revision 96574fa7fc66221d0f5278fce0ba45f1cb3b8227)
+++ pst/printing/cups/cups-intro.xml	(revision 3f16459bcc7d446e0ad2cc3e2157d4b13d1b3ca8)
@@ -1,21 +1,27 @@
 <sect2>
-<title>Introduction to CUPS</title>
+<title>Introduction to
+<application><acronym>CUPS</acronym></application></title>
 
-<screen>Download location (HTTP):       <ulink url="&cups-download-http;"/>
-Download location (FTP):        <ulink url="&cups-download-ftp;"/>
-Version used:                   &cups-version;
-Package size:                   &cups-size;
-Estimated Disk space required:  &cups-buildsize;</screen>
-
-
-<para>The Common UNIX Printing System ("CUPS") is a print spooler and 
+<para>The Common UNIX Printing System (<acronym>CUPS</acronym>) 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>
 
-<screen>CUPS depends on:
-<xref linkend="espgs"/> (for non-postscript printers)
-CUPS will utilize:
-<xref linkend="libjpeg"/>, <xref linkend="libpng"/> and <xref linkend="libtiff"/></screen>
+<sect3><title>Package information</title>
+<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 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>
+</sect3>
+
+<sect3><title><application><acronym>CUPS</acronym></application> dependencies</title>
+<sect4><title>Optional</title>
+<para><xref linkend="libjpeg"/>, <xref linkend="libpng"/>, <xref
+linkend="libtiff"/>, <xref linkend="openssl"/>, <xref
+linkend="Linux_PAM"/>, <!--<xref linkend="php"/>--> and <xref
+linkend="Python"/></para></sect4>
+</sect3>
 
 </sect2>
Index: pst/printing/cups/cups.ent
===================================================================
--- pst/printing/cups/cups.ent	(revision 96574fa7fc66221d0f5278fce0ba45f1cb3b8227)
+++ pst/printing/cups/cups.ent	(revision 3f16459bcc7d446e0ad2cc3e2157d4b13d1b3ca8)
@@ -5,7 +5,8 @@
 <!ENTITY cups-config SYSTEM "cups-config.xml">
 <!ENTITY cups-exp SYSTEM "cups-exp.xml">
-<!ENTITY cups-buildsize "21 MB">
-<!ENTITY cups-version "1.1.18">
-<!ENTITY cups-download-http "http://www.cups.org/software.html">
+<!ENTITY cups-buildsize "32 MB">
+<!ENTITY cups-version "1.1.19">
+<!ENTITY cups-download-http "">
 <!ENTITY cups-download-ftp "ftp://ftp.easysw.com/pub/cups/&cups-version;/cups-&cups-version;-source.tar.bz2">
-<!ENTITY cups-size "3.3 MB">
+<!ENTITY cups-size "3.5 MB">
+<!ENTITY cups-time "0.67 SBU">
