Index: pst/printing/gimp-print.xml
===================================================================
--- pst/printing/gimp-print.xml	(revision 298ebb8b3aa099130c757bfc93c6dc1d83aac426)
+++ pst/printing/gimp-print.xml	(revision e87ad87cd550a8989d380e0895e550fab0b5521c)
@@ -7,7 +7,7 @@
   <!ENTITY gimp-print-download-ftp  " ">
   <!ENTITY gimp-print-md5sum        "766be49f44a6a682d857e5aefec414d4">
-  <!ENTITY gimp-print-size          "5.2 MB">
-  <!ENTITY gimp-print-buildsize     "27 MB">
-  <!ENTITY gimp-print-time          "0.29 SBU">
+  <!ENTITY gimp-print-size          "5.1 MB">
+  <!ENTITY gimp-print-buildsize     "36 MB">
+  <!ENTITY gimp-print-time          "0.32 SBU (additional 4.37 SBUs to run the test suite)">
 ]>
 
@@ -19,4 +19,6 @@
 <?dbhtml filename="gimp-print.html"?>
 <title>Gimp-Print-&gimp-print-version;</title>
+<indexterm zone="gimp-print">
+<primary sortas="a-Gimp-Print">Gimp-Print</primary></indexterm>
 
 <sect2>
@@ -32,4 +34,5 @@
 <ulink url="http://gimp-print.sourceforge.net/p_Supported_Printers.php3"/>.
 </para>
+
 <!-- FIXME: APFL Ghostscript is not tested. Don't forget to check the license. -->
 
@@ -54,5 +57,6 @@
 <ulink url="http://www.linuxprinting.org/foomatic.html">Foomatic</ulink>, 
 <ulink url="http://www.linuxprinting.org/ijs/">IJS</ulink>, 
-<xref linkend="tex"/>, and 
+<xref linkend="tex"/>, 
+<xref linkend="docbook-utils"/> and 
 <xref linkend="espgs"/> or <xref linkend="gs"/></para>
 </sect4>
@@ -68,6 +72,9 @@
 
 <screen><userinput><command>./configure --prefix=/usr &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
+make</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make install</command></userinput></screen>
 
 </sect2>
@@ -95,7 +102,8 @@
 
 <para>For <application><acronym>CUPS</acronym></application> to see newly 
-installed <acronym>PPD</acronym> files, it has to be restarted:</para>
+installed <acronym>PPD</acronym> files, it has to be restarted (as the root 
+user):</para>
 
-<screen><userinput><command>/etc/rc.d/init.d/cups restart</command></userinput></screen>
+<screen><userinput role='root'><command>/etc/rc.d/init.d/cups restart</command></userinput></screen>
 
 <note><para>This command may take a very long time (up to 10 minutes) to
@@ -115,36 +123,62 @@
 <title>Contents</title>
 
-<para>The <application>Gimp-Print</application> package contains 
-<command>gimpprint-config</command>, <command>escputil</command>, 
-<filename class='libraryfile'>libgimpprint</filename> libraries and 
-optionally, <command>rastertoprinter</command> and 
-<command>pstopxl</command> filter scripts for 
-<application><acronym>CUPS</acronym></application>, 
-<command>cups-calibrate</command>, <command>ijsgimpprint</command> and a 
-plugin that allows printing images from 
-<application><acronym>GIMP</acronym>-1.2</application>.</para>
-</sect2>
+<segmentedlist>
+<segtitle>Installed Programs</segtitle>
+<segtitle>Installed Libraries</segtitle>
+<segtitle>Installed Directories</segtitle>
 
-<sect2>
-<title>Description</title>
+<seglistitem>
+<seg>cups-calibrate, escputil, gimpprint-config, ijsgimpprint and 
+testpattern</seg>
+<seg>libgimpprint.[so,a] and optionally, various 
+<application><acronym>CUPS</acronym></application> filters and backend 
+drivers</seg>
+<seg>/usr/include/gimp-print, /usr/lib/gimp, /usr/share/cups/model/C and 
+/usr/share/gimp-print</seg>
+</seglistitem>
+</segmentedlist>
 
-<sect3><title>gimpprint-config</title>
-<para><command>gimpprint-config</command> is a script to get information about 
-the installed version of gimpprint.</para></sect3>
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
 
-<sect3><title>escputil</title>
-<para><command>escputil</command> is a command line utility to perform various 
-maintenance tasks on Epson Stylus inkjet printers.</para></sect3>
+<varlistentry id="cups-calibrate">
+<term><command>cups-calibrate</command></term>
+<listitem><para>calibrates the color output of printers using the 
+<application>Gimp-Print</application>, 
+<application><acronym>CUPS</acronym></application> or
+<application><acronym>ESP</acronym> Print Pro</application> drivers.</para>
+<indexterm zone="gimp-print cups-calibrate">
+<primary sortas="b-cups-calibrate">cups-calibrate</primary>
+</indexterm></listitem>
+</varlistentry>
 
-<sect3><title>cups-calibrate</title>
-<para><command>cups-calibrate</command> calibrates the color output of printers 
-using the <application>Gimp-Print</application> 
-<application><acronym>CUPS</acronym></application> or 
-<application><acronym>ESP</acronym> Print Pro</application> drivers.</para>
-</sect3>
+<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="gimp-print escputil">
+<primary sortas="b-escputil">escputil</primary>
+</indexterm></listitem>
+</varlistentry>
 
-<sect3><title>ijsgimpprint</title>
-<para><command>ijsgimpprint</command> is a Ghostscript driver for 
-<application>Gimp-Print</application>.</para></sect3>
+<varlistentry id="gimpprint-config">
+<term><command>gimpprint-config</command></term>
+<listitem><para>is a script to get information about the installed version 
+of <application>Gimp-Print</application>.</para>
+<indexterm zone="gimp-print gimpprint-config">
+<primary sortas="b-gimpprint-config">gimpprint-config</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="ijsgimpprint">
+<term><command>ijsgimpprint</command></term>
+<listitem><para>is a Ghostscript driver for 
+<application>Gimp-Print</application>.</para>
+<indexterm zone="gimp-print ijsgimpprint">
+<primary sortas="b-ijsgimpprint">ijsgimpprint</primary>
+</indexterm></listitem>
+</varlistentry>
+</variablelist>
 
 </sect2>
