Index: general/prog/perl/perl-modules-inst.xml
===================================================================
--- general/prog/perl/perl-modules-inst.xml	(revision 6cd7d18c1e012e0181a19e732b1dc434945fe6d1)
+++ general/prog/perl/perl-modules-inst.xml	(revision 1aa8d9a99cf01643bf86bdfa2f404f8d6ad5f319)
@@ -1,10 +1,11 @@
 <sect2>
-<title>Installation of perl modules</title>
+<title>Installation of <application>perl</application> modules</title>
 
-<para>Install perl modules by running the following commands:</para>
+<para>Install <application>perl</application> modules by running the following 
+commands:</para>
 
-<para><screen><userinput>perl Makefile.PL &amp;&amp;
+<screen><userinput><command>perl Makefile.PL &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 <para>Below are installation instructions for modules that happen to be
@@ -12,5 +13,5 @@
 
 <para>Gtk-Perl-&Gtk-Perl-version;:
-<screen><userinput>perl Makefile.PL --without-guessing &amp;&amp;
+<screen><userinput><command>perl Makefile.PL --without-guessing &amp;&amp;
 make
 cp Gtk/Makefile Gtk/Makefile.bak &amp;&amp;
@@ -19,5 +20,5 @@
 sed '/^OBJECT/s/build/./g' Gtk/Makefile.bak > Gtk/Makefile &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen></para>
 
 
Index: general/prog/perl/perl-modules-intro.xml
===================================================================
--- general/prog/perl/perl-modules-intro.xml	(revision 6cd7d18c1e012e0181a19e732b1dc434945fe6d1)
+++ general/prog/perl/perl-modules-intro.xml	(revision 1aa8d9a99cf01643bf86bdfa2f404f8d6ad5f319)
@@ -1,16 +1,26 @@
 <sect2>
-<title>Introduction to perl modules</title>
+<title>Introduction to <application>perl</application> modules</title>
 
-<para>The perl module packages add useful objects to the Perl
-language.  Modules utilized by packages throughout BLFS are listed here
-along with their dependencies.</para>
+<para>The <application>perl</application> module packages add useful objects 
+to the <application>Perl</application> language.  Modules utilized by packages 
+throughout <acronym>BLFS</acronym> are listed here along with their 
+dependencies.</para>
 
-<screen><ulink url="http://search.cpan.org/CPAN/authors/id/C/CS/CSOE/PDL-&PDL-version;.tar.gz">PDL-&PDL-version;</ulink>
-	<ulink url="http://search.cpan.org/CPAN/authors/id/A/AA/AALLAN/Astro-FITS-Header-&Astro-FITS-Header-version;.tar.gz">Astro-FITS-Header-&Astro-FITS-Header-version;</ulink>
-<ulink url="http://search.cpan.org/CPAN/authors/id/L/LU/LUPUS/Gtk-Perl-&Gtk-Perl-version;.tar.gz">Gtk-Perl-&Gtk-Perl-version;</ulink>
-	<ulink url="http://search.cpan.org/CPAN/authors/id/D/DM/DMEGG/XML-Writer-&XML-Writer-version;.tar.gz">XML-Writer-&XML-Writer-version;</ulink>
-	<ulink url="http://search.cpan.org/CPAN/authors/id/C/CO/COOPERCL/XML-Parser-&XML-Parser-version;.tar.gz">XML-Parser-&XML-Parser-version;</ulink>
-<ulink url="http://search.cpan.org/CPAN/authors/id/D/DC/DCONWAY/Parse-RecDescent-&Parse-RecDescent-version;.tar.gz">Parse-RecDescent-&Parse-RecDescent-version;</ulink>
-</screen>
+<sect3><title>Perl Packages</title>
+<itemizedlist spacing='compact'>
+<listitem><para><ulink
+url="http://search.cpan.org/CPAN/authors/id/C/CS/CSOE/PDL-&PDL-version;.tar.gz">PDL-&PDL-version;</ulink></para><itemizedlist spacing='compact'>
+<listitem><para><ulink
+url="http://search.cpan.org/CPAN/authors/id/A/AA/AALLAN/Astro-FITS-Header-&Astro-FITS-Header-version;.tar.gz">Astro-FITS-Header-&Astro-FITS-Header-version;</ulink></para></listitem></itemizedlist></listitem>
+<listitem><para><ulink
+url="http://search.cpan.org/CPAN/authors/id/L/LU/LUPUS/Gtk-Perl-&Gtk-Perl-version;.tar.gz">Gtk-Perl-&Gtk-Perl-version;</ulink></para><itemizedlist spacing='compact'>
+<listitem><para><ulink
+url="http://search.cpan.org/CPAN/authors/id/D/DM/DMEGG/XML-Writer-&XML-Writer-version;.tar.gz">XML-Writer-&XML-Writer-version;</ulink></para></listitem>
+<listitem><para><ulink url="http://search.cpan.org/CPAN/authors/id/C/CO/COOPERCL/XML-Parser-&XML-Parser-version;.tar.gz">XML-Parser-&XML-Parser-version;</ulink>
+</para></listitem></itemizedlist></listitem>
+<listitem><para><ulink
+url="http://search.cpan.org/CPAN/authors/id/D/DC/DCONWAY/Parse-RecDescent-&Parse-RecDescent-version;.tar.gz">Parse-RecDescent-&Parse-RecDescent-version;</ulink></para></listitem></itemizedlist>
+
+</sect3>
 
 
Index: general/prog/perl/perl-modules.ent
===================================================================
--- general/prog/perl/perl-modules.ent	(revision 6cd7d18c1e012e0181a19e732b1dc434945fe6d1)
+++ general/prog/perl/perl-modules.ent	(revision 1aa8d9a99cf01643bf86bdfa2f404f8d6ad5f319)
@@ -6,7 +6,7 @@
 <!ENTITY perl-modules-config SYSTEM "perl-modules-config.xml">
 <!ENTITY Gtk-Perl-version "0.7008">
-<!ENTITY PDL-version "2.3.4">
+<!ENTITY PDL-version "2.4.0">
 <!ENTITY XML-Parser-version "2.31">
 <!ENTITY XML-Writer-version "0.4">
-<!ENTITY Astro-FITS-Header-version "2.2">
-<!ENTITY Parse-RecDescent-version "1.80">
+<!ENTITY Astro-FITS-Header-version "2.7.1">
+<!ENTITY Parse-RecDescent-version "1.94">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 6cd7d18c1e012e0181a19e732b1dc434945fe6d1)
+++ introduction/welcome/changelog.xml	(revision 1aa8d9a99cf01643bf86bdfa2f404f8d6ad5f319)
@@ -12,6 +12,6 @@
 
 <listitem><para>September 16th, 2003 [larry]: update to OpenSSH--3.7p1,
-gtkhtml-3.0.8, libsoup-1.99.23, evolution-1.4.4, gnumeric-1.2.0 and
-abiword-2.0.0.</para>
+gtkhtml-3.0.8, libsoup-1.99.23, evolution-1.4.4, gnumeric-1.2.0,
+abiword-2.0.0 and gimp-1.2.5.</para>
 </listitem>
 
Index: xsoft/office/gimp/gimp-config.xml
===================================================================
--- xsoft/office/gimp/gimp-config.xml	(revision 6cd7d18c1e012e0181a19e732b1dc434945fe6d1)
+++ xsoft/office/gimp/gimp-config.xml	(revision 1aa8d9a99cf01643bf86bdfa2f404f8d6ad5f319)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring gimp</title>
+<title>Configuring <application>gimp</application></title>
 
 <sect3><title>Config files</title>
@@ -8,6 +8,6 @@
 <sect3><title>Configuration Information</title>
 
-<para>GIMP executes a configuration wizard for each users upon their initial
-invocation of the program.
+<para><command>gimp</command> executes a configuration wizard for each users 
+upon their initial invocation of the program.
 </para>
 </sect3>
Index: xsoft/office/gimp/gimp-desc.xml
===================================================================
--- xsoft/office/gimp/gimp-desc.xml	(revision 6cd7d18c1e012e0181a19e732b1dc434945fe6d1)
+++ xsoft/office/gimp/gimp-desc.xml	(revision 1aa8d9a99cf01643bf86bdfa2f404f8d6ad5f319)
@@ -2,7 +2,7 @@
 <title>Contents</title>
 
-<para>The gimp package contains <userinput>gimp</userinput>,
-<userinput>escputil</userinput>, <userinput>gimp-config</userinput>
-and <userinput>gimp-remote</userinput>.</para>
+<para>The <application>gimp</application> package contains <command>gimp
+</command>, <command>escputil</command>, <command>gimp-config</command>
+and <command>gimp-remote</command>.</para>
 
 </sect2>
@@ -11,18 +11,19 @@
 
 <sect3><title>gimp</title>
-<para>gimp is an image manipulation program. It works with a variety of
-image formats and provides a large selection of tools.</para></sect3>
+<para><command>gimp</command> is an image manipulation program. It works with 
+a variety of image formats and provides a large selection of tools.</para>
+</sect3>
 
 <sect3><title>escputil</title>
-<para>escputil is a utility to perform maintenance tasks on an Epson
-Stylus inkjet printer.</para></sect3>
+<para><command>escputil</command> is a utility to perform maintenance tasks on 
+an Epson Stylus inkjet printer.</para></sect3>
 
 <sect3><title>gimp-config</title>
-<para>gimp-config is used by other programs that want to link to gimp
-libraries.</para></sect3>
+<para><command>gimp-config</command> is used by other programs that want to 
+link to <application>gimp</application> libraries.</para></sect3>
 
 <sect3><title>gimp-remote</title>
-<para>gimp-remote is a small utility that tells a running gimp to open a
-local or remote image file.</para></sect3>
+<para><command>gimp-remote</command> is a small utility that tells a running 
+gimp to open a local or remote image file.</para></sect3>
 
 </sect2>
Index: xsoft/office/gimp/gimp-inst.xml
===================================================================
--- xsoft/office/gimp/gimp-inst.xml	(revision 6cd7d18c1e012e0181a19e732b1dc434945fe6d1)
+++ xsoft/office/gimp/gimp-inst.xml	(revision 1aa8d9a99cf01643bf86bdfa2f404f8d6ad5f319)
@@ -1,10 +1,11 @@
 <sect2>
-<title>Installation of gimp</title>
+<title>Installation of <application>gimp</application></title>
 
-<para>Install gimp by running the following commands:</para>
+<para>Install <application>gimp</application> by running the following 
+commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 
Index: xsoft/office/gimp/gimp-intro.xml
===================================================================
--- xsoft/office/gimp/gimp-intro.xml	(revision 6cd7d18c1e012e0181a19e732b1dc434945fe6d1)
+++ xsoft/office/gimp/gimp-intro.xml	(revision 1aa8d9a99cf01643bf86bdfa2f404f8d6ad5f319)
@@ -1,25 +1,42 @@
 <sect2>
-<title>Introduction to gimp</title>
+<title>Introduction to <application>gimp</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&gimp-download-http;"/>
-Download location (FTP):        <ulink url="&gimp-download-ftp;"/>
-Version used:                   &gimp-version;
-Package size:                   &gimp-size;
-Estimated Disk space required:  &gimp-buildsize;</screen>
+<para>The <application><acronym>gimp</acronym></application> package contains 
+the <acronym>GNU</acronym> Image Manipulation Program. This is useful for 
+photo retouching, image composition and image authoring.</para>
 
-<screen>Additional Downloads:
-<ulink url="ftp://ftp.gimp.org/pub/gimp/fonts/freefonts-0.10.tar.gz"/>
-<ulink
-url="ftp://ftp.gimp.org/pub/gimp/v1.2/v1.2.3/gimp-data-extras-1.2.0.tar.bz2"/></screen>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&gimp-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&gimp-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gimp-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&gimp-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&gimp-time;</para></listitem></itemizedlist>
+</sect3>
 
-<para>The gimp package contains the GNU Image Manipulation Program. This
-is useful for photo retouching, image composition and image authoring.</para>
-
-<screen>gimp depends on:
-<xref linkend="GTK"/>
-gimp will utilize:
-<xref linkend="libtiff"/>, <xref linkend="libpng"/>, <xref linkend="libjpeg"/>, 
-<xref linkend="aalib"/>, <ulink url="http://starship.python.net/~gward/mpeglib/mpeg_lib-1.3.1.tar.gz">mpeg_lib-1.3.1</ulink>, <xref linkend="Python"/> and 
-<xref linkend="perl-modules"/>:Gtk-Perl-&Gtk-Perl-version;, PDL-&PDL-version; and Parse-RecDescent-&Parse-RecDescent-version;</screen>
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (FTP): <ulink
+url="ftp://ftp.gimp.org/pub/gimp/fonts/freefonts-0.10.tar.gz"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="ftp://ftp.gimp.org/pub/gimp/v1.2/v1.2.5/gimp-data-extras-1.2.0.tar.bz2"/></para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application>gimp</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="GTK"/></para></sect4>
+<sect4><title>Optional</title>
+<para><xref linkend="libtiff"/>, <xref linkend="libpng"/>, <xref
+linkend="libjpeg"/>,
+<xref linkend="aalib"/>, <ulink
+url="http://starship.python.net/~gward/mpeglib/mpeg_lib-1.3.1.tar.gz">mpeg_lib-1.3.1</ulink>,
+<xref linkend="Python"/> and
+<xref linkend="perl-modules"/>:Gtk-Perl-&Gtk-Perl-version;,
+PDL-&PDL-version; and Parse-RecDescent-&Parse-RecDescent-version;</para></sect4>
+</sect3>
 
 </sect2>
Index: xsoft/office/gimp/gimp.ent
===================================================================
--- xsoft/office/gimp/gimp.ent	(revision 6cd7d18c1e012e0181a19e732b1dc434945fe6d1)
+++ xsoft/office/gimp/gimp.ent	(revision 1aa8d9a99cf01643bf86bdfa2f404f8d6ad5f319)
@@ -6,6 +6,7 @@
 <!ENTITY gimp-config SYSTEM "gimp-config.xml">
 <!ENTITY gimp-buildsize "226 MB">
-<!ENTITY gimp-version "1.2.3">
+<!ENTITY gimp-version "1.2.5">
 <!ENTITY gimp-download-http "">
-<!ENTITY gimp-download-ftp "ftp://ftp.gimp.org/pub/gimp/v1.2/v1.2.3/gimp-1.2.3.tar.bz2">
+<!ENTITY gimp-download-ftp "ftp://ftp.gimp.org/pub/gimp/v1.2/v1.2.5/gimp-1.2.5.tar.bz2">
 <!ENTITY gimp-size "10.6 MB">
+<!ENTITY gimp-time "3.62 SBU">
