Index: gnome/otherlibs/guppi/guppi-config.xml
===================================================================
--- gnome/otherlibs/guppi/guppi-config.xml	(revision 7b2b30692ea5b6da1c39532f8bb043dca3556903)
+++ gnome/otherlibs/guppi/guppi-config.xml	(revision 6e3aa8ef5a50fd6fbbbd528d5e519bf6191fac03)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring Guppi</title>
+<title>Configuring <application>Guppi</application></title>
 &library-config;
 </sect2>
Index: gnome/otherlibs/guppi/guppi-desc.xml
===================================================================
--- gnome/otherlibs/guppi/guppi-desc.xml	(revision 7b2b30692ea5b6da1c39532f8bb043dca3556903)
+++ gnome/otherlibs/guppi/guppi-desc.xml	(revision 6e3aa8ef5a50fd6fbbbd528d5e519bf6191fac03)
@@ -2,6 +2,6 @@
 <title>Contents</title>
 
-<para>The guppi package contains plotting libraries and plugins for
-Gnome 1.4.</para>
+<para>The <application>guppi</application> package contains plotting libraries 
+and plugins for GNOME 1.4.</para>
 
 </sect2>
Index: gnome/otherlibs/guppi/guppi-exp.xml
===================================================================
--- gnome/otherlibs/guppi/guppi-exp.xml	(revision 7b2b30692ea5b6da1c39532f8bb043dca3556903)
+++ gnome/otherlibs/guppi/guppi-exp.xml	(revision 6e3aa8ef5a50fd6fbbbd528d5e519bf6191fac03)
@@ -2,5 +2,6 @@
 <title>Command explanations</title>
 
-<para><userinput>--prefix=/opt/gnome</userinput> : Install Guppi in the Gnome 1.4 area.</para>
+<para><command>--prefix=/opt/gnome</command> : Install <application>Guppi
+</application> in the GNOME 1.4 area.</para>
 
 </sect2>
Index: gnome/otherlibs/guppi/guppi-inst.xml
===================================================================
--- gnome/otherlibs/guppi/guppi-inst.xml	(revision 7b2b30692ea5b6da1c39532f8bb043dca3556903)
+++ gnome/otherlibs/guppi/guppi-inst.xml	(revision 6e3aa8ef5a50fd6fbbbd528d5e519bf6191fac03)
@@ -1,10 +1,11 @@
 <sect2>
-<title>Installation of Guppi</title>
+<title>Installation of <application>Guppi</application></title>
 
-<para>Install Guppi by running the following commands:</para>
+<para>Install <application>Guppi</application> by running the following 
+commands:</para>
 
-<para><screen><userinput>./configure --prefix=/opt/gnome &amp;&amp;
+<screen><userinput><command>./configure --prefix=/opt/gnome &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: gnome/otherlibs/guppi/guppi-intro.xml
===================================================================
--- gnome/otherlibs/guppi/guppi-intro.xml	(revision 7b2b30692ea5b6da1c39532f8bb043dca3556903)
+++ gnome/otherlibs/guppi/guppi-intro.xml	(revision 6e3aa8ef5a50fd6fbbbd528d5e519bf6191fac03)
@@ -1,13 +1,29 @@
 <sect2>
-<title>Introduction to Guppi-&guppi-version;</title>
+<title>Introduction to <application>Guppi</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&guppi-download-http;"/>
-Download location (FTP):        <ulink url="&guppi-download-ftp;"/>
-Version used:                   &guppi-version;
-Package size:                   &guppi-size;
-Estimated Disk space required:  &guppi-buildsize;</screen>
-
-<para>The Guppi package contains a guile-scriptable plot program with
+<para>The <application>Guppi</application> package contains a
+<application>guile</application>-scriptable plot program with
 integrated statistics capabilities.</para>
 
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&guppi-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&guppi-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &guppi-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&guppi-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&guppi-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>Guppi</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="bonobo14"/> and <xref linkend="gal"/></para></sect4>
+<sect4><title>Optional</title>
+<para><xref linkend="libglade14"/></para></sect4>
+</sect3>
+
+
 </sect2>
Index: gnome/otherlibs/guppi/guppi.ent
===================================================================
--- gnome/otherlibs/guppi/guppi.ent	(revision 7b2b30692ea5b6da1c39532f8bb043dca3556903)
+++ gnome/otherlibs/guppi/guppi.ent	(revision 6e3aa8ef5a50fd6fbbbd528d5e519bf6191fac03)
@@ -5,7 +5,8 @@
 <!ENTITY guppi-desc SYSTEM "guppi-desc.xml">
 <!ENTITY guppi-config SYSTEM "guppi-config.xml">
-<!ENTITY guppi-buildsize "15 MB">
+<!ENTITY guppi-buildsize "89.2 MB">
 <!ENTITY guppi-version "0.40.3">
 <!ENTITY guppi-download-http "http://ftp.gnome.org/pub/GNOME/sources/Guppi/0.40/Guppi-&guppi-version;.tar.bz2">
 <!ENTITY guppi-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/Guppi/0.40/Guppi-&guppi-version;.tar.bz2">
-<!ENTITY guppi-size "990 KB">
+<!ENTITY guppi-size "1.0 MB">
+<!ENTITY guppi-time "1.83 SBU">
Index: gnome/otherlibs/guppi/guppi.xml
===================================================================
--- gnome/otherlibs/guppi/guppi.xml	(revision 7b2b30692ea5b6da1c39532f8bb043dca3556903)
+++ gnome/otherlibs/guppi/guppi.xml	(revision 6e3aa8ef5a50fd6fbbbd528d5e519bf6191fac03)
@@ -6,5 +6,4 @@
 &guppi-inst;
 &guppi-exp;
-&guppi-config;
 &guppi-desc;
 
