Index: basicnet/netlibs/wvstreams/wvstreams-desc.xml
===================================================================
--- basicnet/netlibs/wvstreams/wvstreams-desc.xml	(revision c47b5f116846027364e8706b9479ffee6ed6e418)
+++ basicnet/netlibs/wvstreams/wvstreams-desc.xml	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
@@ -11,13 +11,13 @@
 <sect2><title>Description</title>
 
-<sect3><title>wvcrypto</title>
+<sect3><title>libwvcrypto</title>
 <para><filename class="libraryfile">libwvcrypto</filename> defines 
 streams with built-in cryptography.</para></sect3>
 
-<sect3><title>wvstreams</title>
+<sect3><title>libwvstreams</title>
 <para><filename class="libraryfile">libwvstreams</filename> defines the 
 basic properties of a stream.</para></sect3>
 
-<sect3><title>wvutils</title>
+<sect3><title>libwvutils</title>
 <para><filename class="libraryfile">libwvutils</filename> contains 
 fundamental support utilites.</para></sect3>
Index: basicnet/textweb/w3m.xml
===================================================================
--- basicnet/textweb/w3m.xml	(revision c47b5f116846027364e8706b9479ffee6ed6e418)
+++ basicnet/textweb/w3m.xml	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
@@ -5,6 +5,6 @@
 &w3m-intro;
 &w3m-inst;
+&w3m-exp;
 &w3m-config;
-&w3m-exp;
 &w3m-desc;
 
Index: basicnet/textweb/w3m/w3m-config.xml
===================================================================
--- basicnet/textweb/w3m/w3m-config.xml	(revision c47b5f116846027364e8706b9479ffee6ed6e418)
+++ basicnet/textweb/w3m/w3m-config.xml	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
@@ -2,22 +2,22 @@
 <title>Configuration</title>
 
-<para>w3m expects the GPM library to be located at
-<filename>/usr/lib/libgpm.so.1</filename>. To make w3m happy, we will
-create a symbolic link to the GPM library. You only need to do this if
-you compiled w3m with mouse support. To create this symbolic link, run
-the following command:</para>
+<para>If you compiled w3m with mouse support then you must create a symbolic
+link to the <acronym>GPM</acronym> library because w3m expects it to be
+located at <filename>/usr/lib/libgpm.so.1</filename>. To create this symbolic 
+link run the following command:</para>
 
-<para><screen><userinput>ln -sf /usr/lib/libgpm.so.?.* /usr/lib/libgpm.so.1</userinput></screen></para>
+<screen><userinput><command>ln -sf /usr/lib/libgpm.so.?.* /usr/lib/libgpm.so.1</command>
+</userinput></screen>
 
 </sect2>
 
 <sect2>
-<title>Possible problems with GPM</title>
+<title>Possible problems with <acronym>GPM</acronym></title>
 
-<para>Depending on what version of GPM you are using, and whether or not
-any patches were applied to GPM, you might receive the following
+<para>Depending on what version of <acronym>GPM</acronym> you are using, and whether or not
+any patches were applied to <acronym>GPM</acronym>, you might receive the following
 warning when starting w3m:</para>
 
-<para><screen>*** debug ***: [/usr/src/gpm-1.20.0/src/liblow.c(202)]:</screen></para>
+<screen>*** debug ***: [/usr/src/gpm-1.20.0/src/liblow.c(202)]:</screen>
 
 <para>Currently, the only known solution to this problem is to disable
Index: basicnet/textweb/w3m/w3m-desc.xml
===================================================================
--- basicnet/textweb/w3m/w3m-desc.xml	(revision c47b5f116846027364e8706b9479ffee6ed6e418)
+++ basicnet/textweb/w3m/w3m-desc.xml	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
@@ -2,6 +2,6 @@
 <title>Contents</title>
 
-<para>The w3m package contains <userinput>w3m</userinput> and
-<userinput>w3mman</userinput>.</para>
+<para>The w3m package contains <command>w3m</command> and
+<command>w3mman</command>.</para>
 
 </sect2>
@@ -10,8 +10,8 @@
 
 <sect3><title>w3m</title>
-<para>w3m is a text based web browser and pager.</para></sect3>
+<para><command>w3m</command> is a text based web browser and pager.</para></sect3>
 
 <sect3><title>w3mman</title>
-<para>w3mman is an interface to the on-line reference manuals in
+<para><command>w3mman</command> is an interface to the on-line reference manuals in
 w3m.</para></sect3>
 
Index: basicnet/textweb/w3m/w3m-exp.xml
===================================================================
--- basicnet/textweb/w3m/w3m-exp.xml	(revision c47b5f116846027364e8706b9479ffee6ed6e418)
+++ basicnet/textweb/w3m/w3m-exp.xml	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
@@ -2,11 +2,11 @@
 <title>Command explanations</title>
 
-<para><userinput>./configure -yes</userinput> : Set all parameters to
+<para><command>./configure -yes</command> : Set all parameters to
 their default values.</para>
 
-<para><userinput>-lang=en</userinput> : Set the default language to
+<para><command>-lang=en</command> : Set the default language to
 English.</para>
 
-<para><userinput>-model=monster</userinput> : This sets the build model
+<para><command>-model=monster</command> : This sets the build model
 to monster. Alternative build models are discussed above.</para>
 
Index: basicnet/textweb/w3m/w3m-inst.xml
===================================================================
--- basicnet/textweb/w3m/w3m-inst.xml	(revision c47b5f116846027364e8706b9479ffee6ed6e418)
+++ basicnet/textweb/w3m/w3m-inst.xml	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
@@ -1,7 +1,7 @@
 <sect2>
-<title>Installation of w3m</title>
+<title>Installation of <application>w3m</application></title>
 
-<para>We configure w3m to use the "monster" model, which includes color,
-menu, mouse, cookie, and SSL support. Other models include:</para>
+<para>We configure <application>w3m</application> to use the "monster" model, which includes color,
+menu, mouse, cookie, and <acronym>SSL</acronym> support. Other models include:</para>
 
 <para><literallayout>baby   - bare minimum
@@ -10,9 +10,9 @@
 cookie - color, menu, mouse, and cookie support</literallayout></para>
 
-<para>Install w3m by running the following commands:</para>
+<para>Install <application>w3m</application> by running the following commands:</para>
 
-<para><screen><userinput>./configure -yes -lang=en -model=monster -prefix=/usr &amp;&amp;
+<screen><userinput><command>./configure -yes -lang=en -model=monster -prefix=/usr &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: basicnet/textweb/w3m/w3m-intro.xml
===================================================================
--- basicnet/textweb/w3m/w3m-intro.xml	(revision c47b5f116846027364e8706b9479ffee6ed6e418)
+++ basicnet/textweb/w3m/w3m-intro.xml	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
@@ -1,12 +1,23 @@
 <sect2>
-<title>Introduction to w3m</title>
+<title>Introduction to <application>w3m</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&w3m-download-http;"/>
-Download location (FTP):        <ulink url="&w3m-download-ftp;"/>
-Version used:                   &w3m-version;
-Package size:                   &w3m-size;
-Estimated Disk space required:  &w3m-buildsize;</screen>
+<para><application>w3m</application> is primarily a pager but it can also be used as a text-mode
+<acronym>WWW</acronym> browser.</para>
 
-<para>w3m is a text based web browser and pager.</para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&w3m-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&w3m-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &w3m-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &w3m-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &w3m-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>w3m</application> dependencies</title>
+<sect4><title>Optional</title>
+<para><xref linkend="gpm"/>, <xref linkend="openssl"/>, <xref
+linkend="imlib"/>, <xref linkend="gdk"/> and <xref
+linkend="compface"/></para></sect4>
+</sect3>
 
 </sect2>
Index: basicnet/textweb/w3m/w3m.ent
===================================================================
--- basicnet/textweb/w3m/w3m.ent	(revision c47b5f116846027364e8706b9479ffee6ed6e418)
+++ basicnet/textweb/w3m/w3m.ent	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
@@ -5,7 +5,8 @@
 <!ENTITY w3m-exp SYSTEM "w3m-exp.xml">
 <!ENTITY w3m-desc SYSTEM "w3m-desc.xml">
-<!ENTITY w3m-buildsize "3 MB">
-<!ENTITY w3m-version "0.3.2.1">
+<!ENTITY w3m-buildsize "8.2 MB">
+<!ENTITY w3m-version "0.4.1">
 <!ENTITY w3m-download-http "http://unc.dl.sourceforge.net/sourceforge/w3m/w3m-&w3m-version;.tar.gz">
 <!ENTITY w3m-download-ftp "">
-<!ENTITY w3m-size "1.1 MB">
+<!ENTITY w3m-size "1.2 MB">
+<!ENTITY w3m-time "0.20 SBU">
Index: book/abstract.xml
===================================================================
--- book/abstract.xml	(revision c47b5f116846027364e8706b9479ffee6ed6e418)
+++ book/abstract.xml	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
@@ -1,3 +1,3 @@
-<abstract>
+<abstract role="dsssl">
 
 <para>This book follows on from the LinuxFromScratch book.  It introduces and
Index: general/general.ent
===================================================================
--- general/general.ent	(revision c47b5f116846027364e8706b9479ffee6ed6e418)
+++ general/general.ent	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
@@ -69,6 +69,8 @@
 <!ENTITY % bc SYSTEM "genutils/bc/bc.ent">
 <!ENTITY % rep-gtk SYSTEM "genutils/rep-gtk/rep-gtk.ent">
+<!ENTITY % compface SYSTEM "genutils/compface/compface.ent">
 %bc;
 %rep-gtk;
+%compface;
 
 <!-- System Utilities -->
Index: general/genutils/compface.xml
===================================================================
--- general/genutils/compface.xml	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
+++ general/genutils/compface.xml	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
@@ -0,0 +1,9 @@
+<sect1 id="compface" xreflabel="compface-&compface-version;">
+<?dbhtml filename="compface.html" dir="general"?>
+<title>compface-&compface-version;</title>
+
+&compface-intro;
+&compface-inst;
+&compface-desc;
+
+</sect1>
Index: general/genutils/compface/compface-desc.xml
===================================================================
--- general/genutils/compface/compface-desc.xml	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
+++ general/genutils/compface/compface-desc.xml	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
@@ -0,0 +1,25 @@
+<sect2>
+<title>Contents</title>
+
+<para>This package contains <command>compface</command>,
+<command>uncompface</command> and
+<filename class="libraryfile">libcompface</filename>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>compface</title>
+<para><command>compface</command> is a filter for generating highly compressed
+representations of 48x48x1 face image files.</para></sect3>
+
+<sect3><title>uncompface</title>
+<para><command>uncompface</command> is an inverse filter which performs an inverse
+transformation with no loss of data.</para></sect3>
+
+<sect3><title>libcompface</title>
+<para><filename class="libraryfile">libcompface</filename> allows the compression 
+and decompression algorithms to be used in other programs such as
+<acronym>MTA</acronym>s.</para></sect3>
+
+</sect2>
Index: general/genutils/compface/compface-inst.xml
===================================================================
--- general/genutils/compface/compface-inst.xml	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
+++ general/genutils/compface/compface-inst.xml	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of <application>compface</application></title>
+
+<para>Install <application>compface</application> by running the
+following commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
Index: general/genutils/compface/compface-intro.xml
===================================================================
--- general/genutils/compface/compface-intro.xml	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
+++ general/genutils/compface/compface-intro.xml	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
@@ -0,0 +1,17 @@
+<sect2>
+<title>Introduction to <application>compface</application></title>
+
+<para><application>Compface</application> provides utilities and a library to convert from/to
+X-Face format, a 48x48 bitmap format used to carry thumbnails of email
+authors in a mail header.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&compface-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&compface-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &compface-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &compface-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &compface-time;</para></listitem></itemizedlist>
+</sect3>
+
+</sect2>
Index: general/genutils/compface/compface.ent
===================================================================
--- general/genutils/compface/compface.ent	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
+++ general/genutils/compface/compface.ent	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
@@ -0,0 +1,13 @@
+<!ENTITY compface SYSTEM "../compface.xml">
+<!ENTITY compface-intro SYSTEM "compface-intro.xml">
+<!ENTITY compface-inst SYSTEM "compface-inst.xml">
+<!ENTITY compface-exp SYSTEM "compface-exp.xml">
+<!ENTITY compface-desc SYSTEM "compface-desc.xml">
+<!ENTITY compface-config SYSTEM "compface-config.xml">
+<!ENTITY compface-buildsize "520 KB">
+<!ENTITY compface-version "1.4">
+<!ENTITY compface-download-http
+"http://www.ibiblio.org/pub/Linux/apps/graphics/convert/compface-&compface-version;.tar.gz">
+<!ENTITY compface-download-ftp "">
+<!ENTITY compface-size "28 KB">
+<!ENTITY compface-time "0.01 SBU">
Index: general/genutils/genutils.xml
===================================================================
--- general/genutils/genutils.xml	(revision c47b5f116846027364e8706b9479ffee6ed6e418)
+++ general/genutils/genutils.xml	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
@@ -5,4 +5,5 @@
 &bc;
 &rep-gtk;
+&compface;
 
 </chapter>
Index: index.xml
===================================================================
--- index.xml	(revision c47b5f116846027364e8706b9479ffee6ed6e418)
+++ index.xml	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
@@ -3,6 +3,6 @@
 			"/usr/share/docbook/docbookx.dtd" [
 
-<!ENTITY version "20030908">
-<!ENTITY releasedate "September 8th, 2003">
+<!ENTITY version "20030909">
+<!ENTITY releasedate "September 9th, 2003">
 
 <!ENTITY % book SYSTEM "book/book.ent">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision c47b5f116846027364e8706b9479ffee6ed6e418)
+++ introduction/welcome/changelog.xml	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
@@ -10,4 +10,8 @@
 
 <itemizedlist>
+
+<listitem><para>September 9th, 2003 [larry]: update to esp
+ghostcript-7.07.1rc2, AFPL Ghostscript-8.11 and w3m-0.4.1 submitted by
+Igor.</para></listitem>
 
 <listitem><para>September 8th, 2003 [tushar]: added bind-utils section for
Index: postlfs/security/firewalling/intro.xml
===================================================================
--- postlfs/security/firewalling/intro.xml	(revision c47b5f116846027364e8706b9479ffee6ed6e418)
+++ postlfs/security/firewalling/intro.xml	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
@@ -73,5 +73,5 @@
 
 <sect3><title>Packetfilter / partly accessible net [partly described
-here, see <xref linkend="postlfs-security-fw-busybox"/>]</title>
+here, see <xref linkend="postlfs-security-fw-busybox"/></title>
 <para>Doing routing or masquerading, but permitting only selected 
 services to be accessible, sometimes only by selected internal users or boxes; 
Index: pst/printing/espgs.xml
===================================================================
--- pst/printing/espgs.xml	(revision c47b5f116846027364e8706b9479ffee6ed6e418)
+++ pst/printing/espgs.xml	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
@@ -1,5 +1,5 @@
 <sect1 id="espgs" xreflabel="GhostScript-&espgs-version;">
 <?dbhtml filename="espgs.html" dir="pst"?>
-<title>Ghostscript-&espgs-version;</title>
+<title>ESP Ghostscript-&espgs-version;</title>
 
 &espgs-intro;
Index: pst/printing/gs.xml
===================================================================
--- pst/printing/gs.xml	(revision c47b5f116846027364e8706b9479ffee6ed6e418)
+++ pst/printing/gs.xml	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
@@ -1,5 +1,5 @@
 <sect1 id="gs" xreflabel="GhostScript-&gs-version;">
 <?dbhtml filename="gs.html" dir="pst"?>
-<title>Ghostscript-&gs-version;</title>
+<title>AFPL Ghostscript-&gs-version;</title>
 
 &gs-intro;
Index: pst/printing/gs/espgs-desc.xml
===================================================================
--- pst/printing/gs/espgs-desc.xml	(revision c47b5f116846027364e8706b9479ffee6ed6e418)
+++ pst/printing/gs/espgs-desc.xml	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
@@ -2,21 +2,19 @@
 <title>Contents</title>
 
-<para>The Ghostscript package contains <userinput>gs</userinput>,
-<userinput>pstoraster</userinput> and
-<userinput>filters</userinput>.</para>
+<para>Ghostscript comes with a lot of filters to render
+Postscript/<acronym>PDF</acronym> files back and forth. Please 
+refer to the <acronym>HTML</acronym> documentation or try
+<userinput>man gs</userinput>. ESP Ghostscript provides pstoraster too.</para>
 
 </sect2>
+
 <sect2>
+
 <title>Description</title>
 
 <sect3>
-<title>gs</title>
-<para>gs is the ghostscript interpreter.  It is responsible for
-rendering the postscript data.</para></sect3>
-
-<sect3>
 <title>pstoraster</title>
-<para>pstoraster allows CUPS to filter output to non-postscript
-printers. It is built and installed if <xref linkend="cups"/> is
+<para><command>pstoraster</command> allows <acronym>CUPS</acronym> to filter output to non-postscript
+printers. It is built and installed only if <xref linkend="cups"/> is
 found.</para></sect3>
 
Index: pst/printing/gs/espgs-exp.xml
===================================================================
--- pst/printing/gs/espgs-exp.xml	(revision c47b5f116846027364e8706b9479ffee6ed6e418)
+++ pst/printing/gs/espgs-exp.xml	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
@@ -1,9 +1,17 @@
 <sect2>
-<title>Installation command explanations</title>
+<title>Command explanations</title>
 
-<para><userinput>--enable-gimp-print</userinput> : This switch enables
+<para><command>--libexecdir=/usr/lib/gs</command> : executable
+libraries of Ghostscript will be installed to
+<filename class="directory">/usr/lib/gs</filename>.</para>
+
+<para><command>--sysconfdir=/etc/gs</command> : Configuration data
+goes to <filename class="directory">/etc/gs</filename> instead of 
+<filename class="directory">/usr/etc</filename>.</para>
+
+<para><command>--enable-gimp-print</command> : This switch enables
 the building of the gimp-print driver.</para>
 
-<para><userinput>--enable-ijs</userinput> : This switch enables the IJS
+<para><command>--enable-ijs</command> : This switch enables the IJS
 driver support.</para>
 
Index: pst/printing/gs/espgs-inst.xml
===================================================================
--- pst/printing/gs/espgs-inst.xml	(revision c47b5f116846027364e8706b9479ffee6ed6e418)
+++ pst/printing/gs/espgs-inst.xml	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
@@ -1,14 +1,28 @@
 <sect2>
-<title>Installation of Ghostscript</title>
+<title>Installation of <application>Ghostscript</application></title>
 
-<para>Install Ghostscript by running the following commands:</para>
+<para>If you want to use <acronym>OMNI</acronym> drivers extract the source archive in
+Ghostscript directory:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput><command>tar xzvf ../Omni-0.9.0.tar.gz</command></userinput></screen>
+
+<para>Install <application>Ghostscript</application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr --libexecdir=/usr/lib/gs \
+    --sysconfdir=/etc/gs --enable-shared --enable-static &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
-<para>To finish the installation, unpack the font packages into
-<filename>/usr/share/ghostscript</filename>.</para>
+<para>To install the shared library <filename>libgs.so</filename>, run
+the following commands additionally:</para>
 
+<screen><userinput><command>make so &amp;&amp;
+make soinstall</command></userinput></screen>
+
+<note><para>The shared library is only used in external programs like
+<xref linkend="gsview"/>.</para></note>
+
+<para>To finish the installation, unpack all fonts you've loaded to
+<filename class="directory">/usr/share/ghostscript</filename>.</para>
 
 </sect2>
Index: pst/printing/gs/espgs-intro.xml
===================================================================
--- pst/printing/gs/espgs-intro.xml	(revision c47b5f116846027364e8706b9479ffee6ed6e418)
+++ pst/printing/gs/espgs-intro.xml	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
@@ -1,22 +1,45 @@
 <sect2>
-<title>Introduction to Ghostscript</title>
+<title>Introduction to <application>Ghostscript</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&espgs-download-http;"/>
-Download location (FTP):        <ulink url="&espgs-download-ftp;"/>
-Version used:                   &espgs-version;
-Package size:                   &espgs-size;
-Estimated Disk space required:  &espgs-buildsize;
-Estimated build time:           &espgs-time;</screen>
+<para><application>Ghostscript</application> is a versatile processor for Postscript data with
+the ability to render Postscript to different targets. ESP Ghostscript
+is a customized version of <acronym>GNU</acronym> Ghostscript that includes an enhanced
+autoconf-based configuration script, the <acronym>CUPS</acronym> raster driver to support
+<acronym>CUPS</acronym> raster printer drivers, and additional patches and drivers from
+various Linux distributors.</para>
 
-<screen>Additional downloads:
-<ulink url="&gs-fonts-download-ftp;">gnu ghostscript fonts - standard</ulink>
-<ulink url="&gs-fontsother-download-ftp;">gnu ghostscript fonts - other</ulink>
-<ulink url="ftp://ftp.gnome.ru/fonts/urw/release/urw-fonts-1.0.7.pre22.tar.bz2">cyrillic fonts</ulink></screen>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&espgs-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&espgs-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &espgs-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &espgs-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &espgs-time;</para></listitem></itemizedlist>
+</sect3>
 
-<para>Ghostscript is a versatile processor for Postscript data with
-the ability to render Postscript to different targets.</para>
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Standard fonts: <ulink
+url="http://ftp.gnu.org/pub/gnu/ghostscript/gnu-gs-fonts-std-6.0.tar.gz"/>
+</para></listitem>
+<listitem><para>Other fonts: <ulink
+url="http://ftp.gnu.org/pub/gnu/ghostscript/gnu-gs-fonts-other-6.0.tar.gz"/>
+</para></listitem>
+<listitem><para>Cyrillic fonts: <ulink
+url="ftp://ftp.gnome.ru/fonts/urw/release/urw-fonts-1.0.7pre22.tar.bz2"/>
+</para></listitem>
+<listitem><para>OMNI drivers: <ulink
+url="http://keihanna.dl.sourceforge.net/sourceforge/omniprint/Omni-0.9.0.tar.gz"/>
+</para></listitem>
+</itemizedlist></sect3>
 
-<screen>Ghostscript will utilize:
-<xref linkend="cups"/> and gimp-print</screen>
+<sect3><title><application>Ghostscript</application>
+dependencies</title>
+<sect4><title>Optional</title>
+<para><xref linkend="cups"/>, <xref linkend="libjpeg"/>, <xref
+linkend="libpng"/>, <xref linkend="xfree86"/> and <xref linkend="gimp"/>
+</para></sect4>
+</sect3>
+
 
 </sect2>
Index: pst/printing/gs/espgs.ent
===================================================================
--- pst/printing/gs/espgs.ent	(revision c47b5f116846027364e8706b9479ffee6ed6e418)
+++ pst/printing/gs/espgs.ent	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
@@ -4,8 +4,9 @@
 <!ENTITY espgs-desc SYSTEM "espgs-desc.xml">
 <!ENTITY espgs-exp SYSTEM "espgs-exp.xml">
-<!ENTITY espgs-buildsize "33 MB">
-<!ENTITY espgs-version "7.05.5">
-<!ENTITY espgs-download-http "http://telia.dl.sourceforge.net/sourceforge/espgs/espgs-7.05.5-source.tar.bz2">
+<!ENTITY espgs-buildsize "158-163 MB (depends on if libgs.so is installed)">
+<!ENTITY espgs-version "7.07.1rc2">
+<!ENTITY espgs-download-http
+"http://heanet.dl.sourceforge.net/sourceforge/espgs/espgs-&espgs-version;-source.tar.bz2">
 <!ENTITY espgs-download-ftp "">
-<!ENTITY espgs-size "5.2 MB">
-<!ENTITY espgs-time "">
+<!ENTITY espgs-size "5.1 MB">
+<!ENTITY espgs-time "2.10-2.85 SBU">
Index: pst/printing/gs/gs-desc.xml
===================================================================
--- pst/printing/gs/gs-desc.xml	(revision c47b5f116846027364e8706b9479ffee6ed6e418)
+++ pst/printing/gs/gs-desc.xml	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
@@ -2,6 +2,7 @@
 <title>Contents</title>
 
-<para>Ghostscript comes with a lot of filters to render Postscript/PDF
-files back and forth. Please refer to the HTML documentation or try
+<para>Ghostscript comes with a lot of filters to render
+Postscript/<acronym>PDF</acronym>
+files back and forth. Please refer to the <acronym>HTML</acronym> documentation or try
 <userinput>man gs</userinput>.</para>
 
Index: pst/printing/gs/gs-exp.xml
===================================================================
--- pst/printing/gs/gs-exp.xml	(revision c47b5f116846027364e8706b9479ffee6ed6e418)
+++ pst/printing/gs/gs-exp.xml	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
@@ -1,12 +1,12 @@
 <sect2>
-<title>Installation command explanations</title>
+<title>Command explanations</title>
 
-<para><userinput>--libexecdir=/usr/lib/gs</userinput> : executable
+<para><command>--libexecdir=/usr/lib/gs</command> : executable
 libraries of Ghostscript will be installed to
-<filename>/usr/lib/gs</filename>.</para>
+<filename class="directory">/usr/lib/gs</filename>.</para>
 
-<para><userinput>--sysconfdir=/etc/gs</userinput> : Configuration data
-goes to <filename>/etc/gs</filename> instead of 
-<filename>/usr/etc</filename>.</para>
+<para><command>--sysconfdir=/etc/gs</command> : Configuration data
+goes to <filename class="directory">/etc/gs</filename> instead of 
+<filename class="directory">/usr/etc</filename>.</para>
 
 </sect2>
Index: pst/printing/gs/gs-inst.xml
===================================================================
--- pst/printing/gs/gs-inst.xml	(revision c47b5f116846027364e8706b9479ffee6ed6e418)
+++ pst/printing/gs/gs-inst.xml	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
@@ -1,17 +1,17 @@
 <sect2>
-<title>Installation of Ghostscript</title>
+<title>Installation of <application>Ghostscript</application></title>
 
-<para>Install Ghostscript by running the following commands:</para>
+<para>Install <application>Ghostscript</application> by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr --libexecdir=/usr/lib/gs \
+<screen><userinput><command>./configure --prefix=/usr --libexecdir=/usr/lib/gs \
     --sysconfdir=/etc/gs --enable-shared --enable-static &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 <para>To install the shared library <filename>libgs.so</filename>, run
 the following commands additionally:</para>
 
-<para><screen><userinput>make so &amp;&amp;
-make soinstall</userinput></screen></para>
+<screen><userinput><command>make so &amp;&amp;
+make soinstall</command></userinput></screen>
 
 <note><para>The shared library is only used in external programs like
@@ -19,5 +19,5 @@
 
 <para>To finish the installation, unpack all fonts you've loaded to
-<filename>/usr/share/ghostscript</filename>.</para>
+<filename class="directory">/usr/share/ghostscript</filename>.</para>
 
 </sect2>
Index: pst/printing/gs/gs-intro.xml
===================================================================
--- pst/printing/gs/gs-intro.xml	(revision c47b5f116846027364e8706b9479ffee6ed6e418)
+++ pst/printing/gs/gs-intro.xml	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
@@ -1,19 +1,37 @@
 <sect2>
-<title>Introduction to Ghostscript</title>
+<title>Introduction to <application>Ghostscript</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&gs-download-http;"/>
-Download location (FTP):        <ulink url="&gs-download-ftp;"/>
-Version used:                   &gs-version;
-Package size:                   &gs-size;
-Estimated Disk space required:  &gs-buildsize;
-Estimated build time:           &gs-time;</screen>
-
-<screen>Additional Downloads:
-<ulink url="&gs-fonts-download-ftp;">gnu ghostscript fonts - standard</ulink>
-<ulink url="&gs-fontsother-download-ftp;">gnu ghostscript fonts - other</ulink>
-<ulink url="ftp://ftp.gnome.ru/fonts/urw/release/urw-fonts-1.0.7.pre22.tar.bz2">cyrillic fonts</ulink></screen>
-
-<para>Ghostscript is a versatile processor for Postscript data with
+<para><application>Ghostscript</application> is a versatile processor for Postscript data with
 the ability to render Postscript to different targets.</para>
 
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&gs-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&gs-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gs-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &gs-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &gs-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Standard fonts: <ulink
+url="ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/fonts/ghostscript-fonts-std-8.11.tar.gz"/>
+</para></listitem>
+<listitem><para>Other fonts: <ulink
+url="http://ftp.gnu.org/pub/gnu/ghostscript/gnu-gs-fonts-other-6.0.tar.gz"/>
+</para></listitem>
+<listitem><para>Cyrillic fonts: <ulink
+url="ftp://ftp.gnome.ru/fonts/urw/release/urw-fonts-1.0.7pre22.tar.bz2"/>
+</para></listitem>
+</itemizedlist></sect3>
+
+<sect3><title><application>Ghostscript</application>
+dependencies</title>
+<sect4><title>Optional</title>
+<para><xref linkend="libjpeg"/>, <xref linkend="libpng"/>
+and <xref linkend="xfree86"/></para></sect4>
+</sect3>
+
+
 </sect2>
Index: pst/printing/gs/gs.ent
===================================================================
--- pst/printing/gs/gs.ent	(revision c47b5f116846027364e8706b9479ffee6ed6e418)
+++ pst/printing/gs/gs.ent	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
@@ -4,10 +4,10 @@
 <!ENTITY gs-desc SYSTEM "gs-desc.xml">
 <!ENTITY gs-exp SYSTEM "gs-exp.xml">
-<!ENTITY gs-buildsize "31-40 MB (depends on if libgs.so is installed)">
-<!ENTITY gs-version "8.00">
-<!ENTITY gs-download-http "http://telia.dl.sourceforge.net/sourceforge/ghostscript/ghostscript-8.00.tar.bz2">
-<!ENTITY gs-download-ftp "ftp://ftp.sourceforge.net/pub/sourceforge/ghostscript/ghostscript-8.00.tar.bz2">
-<!ENTITY gs-fonts-download-ftp "ftp://ftp.gnu.org/gnu/ghostscript/gnu-gs-fonts-std-6.0.tar.gz">
-<!ENTITY gs-fontsother-download-ftp "ftp://ftp.gnu.org/gnu/ghostscript/gnu-gs-fonts-other-6.0.tar.gz">
-<!ENTITY gs-size "5.2 MB">
-<!ENTITY gs-time "">
+<!ENTITY gs-buildsize "50-61 MB (depends on if libgs.so is installed)">
+<!ENTITY gs-version "8.11">
+<!ENTITY gs-download-http
+"http://flow.dl.sourceforge.net/sourceforge/ghostscript/ghostscript-&gs-version;.tar.bz2">
+<!ENTITY gs-download-ftp
+"ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs811/ghostscript-8.11.tar.bz2">
+<!ENTITY gs-size "5.1 MB">
+<!ENTITY gs-time "1.31-2.48 SBU">
