Index: general/genlib/aspell/aspell-config.xml
===================================================================
--- general/genlib/aspell/aspell-config.xml	(revision 284d8e17d3b7858281c0c790894adaf0eef34924)
+++ general/genlib/aspell/aspell-config.xml	(revision 4fea592a560f6f4bb83b688a3bb66803b792cdff)
@@ -1,14 +1,14 @@
 <sect2>
-<title>Configuring aspell</title>
+<title>Configuring <application>aspell</application></title>
 
 <sect3><title>Configuration Information</title>
 
-<para>After Aspell is installed at least one dictionary needs to be 
-installed. You can find them at <ulink url="http://aspell.net/"/>.</para>
+<para>After <application>Aspell</application> is installed at least one 
+dictionary needs to be installed. You can find them at <ulink url="http://aspell.net/"/>.</para>
 
 <para>Install your dictionary or dictionaries 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</command></userinput></screen>
 
 </sect3>
Index: general/genlib/aspell/aspell-desc.xml
===================================================================
--- general/genlib/aspell/aspell-desc.xml	(revision 284d8e17d3b7858281c0c790894adaf0eef34924)
+++ general/genlib/aspell/aspell-desc.xml	(revision 4fea592a560f6f4bb83b688a3bb66803b792cdff)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The aspell package contains the <filename>libaspell</filename>
+<para>The <application>aspell</application> package contains the <filename>libaspell</filename>
 libraries.</para>
 
@@ -10,5 +10,5 @@
 
 <sect3><title>aspell library</title>
-<para>The aspell library is a spell checking library interface.</para></sect3>
+<para>The <filename>libaspell</filename> library is a spell checking library interface.</para></sect3>
 
 </sect2>
Index: general/genlib/aspell/aspell-inst.xml
===================================================================
--- general/genlib/aspell/aspell-inst.xml	(revision 284d8e17d3b7858281c0c790894adaf0eef34924)
+++ general/genlib/aspell/aspell-inst.xml	(revision 4fea592a560f6f4bb83b688a3bb66803b792cdff)
@@ -1,10 +1,10 @@
 <sect2>
-<title>Installation of aspell</title>
+<title>Installation of <application>aspell</application></title>
 
-<para>Install aspell by running the following commands:</para>
+<para>Install <application>aspell</application> by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: general/genlib/aspell/aspell-intro.xml
===================================================================
--- general/genlib/aspell/aspell-intro.xml	(revision 284d8e17d3b7858281c0c790894adaf0eef34924)
+++ general/genlib/aspell/aspell-intro.xml	(revision 4fea592a560f6f4bb83b688a3bb66803b792cdff)
@@ -1,13 +1,20 @@
 <sect2>
-<title>Introduction to aspell-&aspell-version;</title>
+<title>Introduction to <application>aspell</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&aspell-download-http;"/>
-Download location (FTP):        <ulink url="&aspell-download-ftp;"/>
-Version used:                   &aspell-version;
-Package size:                   &aspell-size;
-Estimated Disk space required:  &aspell-buildsize;</screen>
+<para>The <application>aspell</application> package contains the aspell 
+library, used to interface to spell checking libraries.</para>
 
-<para>The aspell package contains the aspell library, used to
-interface to spell checking libraries.</para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&aspell-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&aspell-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &aspell-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&aspell-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&aspell-time;</para></listitem></itemizedlist>
+</sect3>
 
 </sect2>
Index: general/genlib/aspell/aspell.ent
===================================================================
--- general/genlib/aspell/aspell.ent	(revision 284d8e17d3b7858281c0c790894adaf0eef34924)
+++ general/genlib/aspell/aspell.ent	(revision 4fea592a560f6f4bb83b688a3bb66803b792cdff)
@@ -10,3 +10,3 @@
 <!ENTITY aspell-download-ftp "ftp://ftp.gnu.org/gnu/aspell/aspell-&aspell-version;.tar.gz">
 <!ENTITY aspell-size "917 KB">
-<!ENTITY aspell-time "1.08 SBU">
+<!ENTITY aspell-time "0.54 SBU">
Index: general/genlib/libesmtp/libesmtp-config.xml
===================================================================
--- general/genlib/libesmtp/libesmtp-config.xml	(revision 284d8e17d3b7858281c0c790894adaf0eef34924)
+++ general/genlib/libesmtp/libesmtp-config.xml	(revision 4fea592a560f6f4bb83b688a3bb66803b792cdff)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring libesmtp</title>
+<title>Configuring <application>libesmtp</application></title>
 
 <sect3><title>Configuration Information</title>
Index: general/genlib/libesmtp/libesmtp-desc.xml
===================================================================
--- general/genlib/libesmtp/libesmtp-desc.xml	(revision 284d8e17d3b7858281c0c790894adaf0eef34924)
+++ general/genlib/libesmtp/libesmtp-desc.xml	(revision 4fea592a560f6f4bb83b688a3bb66803b792cdff)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The libesmtp package contains the <filename>libesmtp</filename>
+<para>The <application>libesmtp</application> package contains the <filename>libesmtp</filename>
 library.</para>
 
@@ -10,5 +10,5 @@
 
 <sect3><title>libesmtp library</title>
-<para>The libesmtp library is used to manage submission of electronic mail to a Mail Transport Agent.</para></sect3>
+<para>The <filename>libesmtp</filename> library is used to manage submission of electronic mail to a Mail Transport Agent.</para></sect3>
 
 </sect2>
Index: general/genlib/libesmtp/libesmtp-inst.xml
===================================================================
--- general/genlib/libesmtp/libesmtp-inst.xml	(revision 284d8e17d3b7858281c0c790894adaf0eef34924)
+++ general/genlib/libesmtp/libesmtp-inst.xml	(revision 4fea592a560f6f4bb83b688a3bb66803b792cdff)
@@ -1,10 +1,10 @@
 <sect2>
-<title>Installation of libesmtp</title>
+<title>Installation of <application>libesmtp</application></title>
 
-<para>Install libesmtp by running the following commands:</para>
+<para>Install <application>libesmtp</application> by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: general/genlib/libesmtp/libesmtp-intro.xml
===================================================================
--- general/genlib/libesmtp/libesmtp-intro.xml	(revision 284d8e17d3b7858281c0c790894adaf0eef34924)
+++ general/genlib/libesmtp/libesmtp-intro.xml	(revision 4fea592a560f6f4bb83b688a3bb66803b792cdff)
@@ -1,14 +1,22 @@
 <sect2>
-<title>Introduction to libesmtp-&libesmtp-version;</title>
+<title>Introduction to <application>libesmtp</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&libesmtp-download-http;"/>
-Download location (FTP):        <ulink url="&libesmtp-download-ftp;"/>
-Version used:                   &libesmtp-version;
-Package size:                   &libesmtp-size;
-Estimated Disk space required:  &libesmtp-buildsize;
-Estimated build time:           &libesmtp-time;</screen>
+<para>The <application>libesmtp</application> package contains the libesmtp 
+libraries which are used by some programs to manage email submission to a 
+mail transport layer.</para>
 
-<para>The libesmtp package contains the libesmtp libraries which are used by some
-programs to manage email submission to a mail transport layer.</para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&libesmtp-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&libesmtp-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &libesmtp-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&libesmtp-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&libesmtp-time;</para></listitem></itemizedlist>
+</sect3>
+
 
 </sect2>
Index: general/genlib/libesmtp/libesmtp.ent
===================================================================
--- general/genlib/libesmtp/libesmtp.ent	(revision 284d8e17d3b7858281c0c790894adaf0eef34924)
+++ general/genlib/libesmtp/libesmtp.ent	(revision 4fea592a560f6f4bb83b688a3bb66803b792cdff)
@@ -5,8 +5,8 @@
 <!ENTITY libesmtp-desc SYSTEM "libesmtp-desc.xml">
 <!ENTITY libesmtp-config SYSTEM "libesmtp-config.xml">
-<!ENTITY libesmtp-buildsize "6.6 MB">
-<!ENTITY libesmtp-version "0.8.12">
+<!ENTITY libesmtp-buildsize "5.0 MB">
+<!ENTITY libesmtp-version "1.0">
 <!ENTITY libesmtp-download-http "http://www.stafford.uklinux.net/libesmtp/libesmtp-1.0.tar.bz2">
 <!ENTITY libesmtp-download-ftp "">
-<!ENTITY libesmtp-size "249 KB">
-<!ENTITY libesmtp-time "0.25 SBU">
+<!ENTITY libesmtp-size "232 KB">
+<!ENTITY libesmtp-time "0.15 SBU">
Index: gnome/lib/eel/eel-config.xml
===================================================================
--- gnome/lib/eel/eel-config.xml	(revision 284d8e17d3b7858281c0c790894adaf0eef34924)
+++ gnome/lib/eel/eel-config.xml	(revision 4fea592a560f6f4bb83b688a3bb66803b792cdff)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring eel</title>
+<title>Configuring <application>eel</application></title>
 
 
Index: gnome/lib/eel/eel-desc.xml
===================================================================
--- gnome/lib/eel/eel-desc.xml	(revision 284d8e17d3b7858281c0c790894adaf0eef34924)
+++ gnome/lib/eel/eel-desc.xml	(revision 4fea592a560f6f4bb83b688a3bb66803b792cdff)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The eel package contains <filename>libeel</filename> libraries.</para>
+<para>The <application>eel</application> package contains <filename>libeel</filename> libraries.</para>
 
 </sect2>
@@ -9,6 +9,6 @@
 
 <sect3><title>libeel libraries</title>
-<para>libeel libraries is a collection of widgets developed by the
-Nautilus project.</para></sect3>
+<para><filename>libeel</filename> libraries is a collection of widgets developed by the
+<application>Nautilus</application> project.</para></sect3>
 
 
Index: gnome/lib/eel/eel-inst.xml
===================================================================
--- gnome/lib/eel/eel-inst.xml	(revision 284d8e17d3b7858281c0c790894adaf0eef34924)
+++ gnome/lib/eel/eel-inst.xml	(revision 4fea592a560f6f4bb83b688a3bb66803b792cdff)
@@ -1,10 +1,10 @@
 <sect2>
-<title>Installation of eel</title>
+<title>Installation of <application>eel</application></title>
 
-<para>Install eel by running the following commands:</para>
+<para>Install <application>eel</application> by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=$GNOME_PREFIX &amp;&amp;
+<screen><userinput><command>./configure --prefix=$GNOME_PREFIX &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: gnome/lib/eel/eel-intro.xml
===================================================================
--- gnome/lib/eel/eel-intro.xml	(revision 284d8e17d3b7858281c0c790894adaf0eef34924)
+++ gnome/lib/eel/eel-intro.xml	(revision 4fea592a560f6f4bb83b688a3bb66803b792cdff)
@@ -1,17 +1,25 @@
 <sect2>
-<title>Introduction to eel</title>
+<title>Introduction to <application>eel</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&eel-download-http;"/>
-Download location (FTP):        <ulink url="&eel-download-ftp;"/>
-Version used:                   &eel-version;
-Package size:                   &eel-size;
-Estimated Disk space required:  &eel-buildsize;
-Estimated build time:           &eel-time;</screen>
-
-<para>The eel package contains the Eazel Extensions Library.  This is a
+<para>The <application>eel</application> package contains the Eazel Extensions Library.  This is a
 collection of widgets and extensions to the GNOME platform.</para>
 
-<screen>eel depends on:
-<xref linkend="libgnomeui"/></screen>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&eel-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&eel-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &eel-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&eel-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&eel-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>eel</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="libgnomeui"/></para></sect4>
+</sect3>
 
 </sect2>
Index: gnome/lib/eel/eel.ent
===================================================================
--- gnome/lib/eel/eel.ent	(revision 284d8e17d3b7858281c0c790894adaf0eef34924)
+++ gnome/lib/eel/eel.ent	(revision 4fea592a560f6f4bb83b688a3bb66803b792cdff)
@@ -5,8 +5,8 @@
 <!ENTITY eel-desc SYSTEM "eel-desc.xml">
 <!ENTITY eel-config SYSTEM "eel-config.xml">
-<!ENTITY eel-buildsize "8.1 MB">
-<!ENTITY eel-version "2.2.2">
-<!ENTITY eel-download-http "http://ftp.gnome.org/pub/GNOME/sources/eel/2.2/eel-2.2.2.tar.bz2">
-<!ENTITY eel-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/eel/2.2/eel-2.2.2.tar.bz2">
-<!ENTITY eel-size "474 KB">
-<!ENTITY eel-time "1.98 SBU">
+<!ENTITY eel-buildsize "23.6 MB">
+<!ENTITY eel-version "2.2.4">
+<!ENTITY eel-download-http "http://ftp.gnome.org/pub/GNOME/sources/eel/2.2/eel-2.2.4.tar.bz2">
+<!ENTITY eel-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/eel/2.2/eel-2.2.4.tar.bz2">
+<!ENTITY eel-size "484 KB">
+<!ENTITY eel-time "0.76 SBU">
Index: gnome/lib/gtk-doc/gtk-doc-intro.xml
===================================================================
--- gnome/lib/gtk-doc/gtk-doc-intro.xml	(revision 284d8e17d3b7858281c0c790894adaf0eef34924)
+++ gnome/lib/gtk-doc/gtk-doc-intro.xml	(revision 4fea592a560f6f4bb83b688a3bb66803b792cdff)
@@ -33,5 +33,6 @@
 <para><xref linkend="openjade"/>, <xref linkend="libxslt"/>, <xref
 linkend="DocBook"/>,
-<xref linkend="sgml-dtd-3"/> and <xref linkend="sgml-dtd"/></para></sect4>
+<xref linkend="sgml-dtd-3"/>, <xref linkend="sgml-dtd"/> and <xref
+linkend="docbook-dsssl"/></para></sect4>
 </sect3>
 
Index: gnome/lib/libgtkhtml/libgtkhtml-config.xml
===================================================================
--- gnome/lib/libgtkhtml/libgtkhtml-config.xml	(revision 284d8e17d3b7858281c0c790894adaf0eef34924)
+++ gnome/lib/libgtkhtml/libgtkhtml-config.xml	(revision 4fea592a560f6f4bb83b688a3bb66803b792cdff)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring libgtkhtml</title>
+<title>Configuring <application>libgtkhtml</application></title>
 
 
Index: gnome/lib/libgtkhtml/libgtkhtml-desc.xml
===================================================================
--- gnome/lib/libgtkhtml/libgtkhtml-desc.xml	(revision 284d8e17d3b7858281c0c790894adaf0eef34924)
+++ gnome/lib/libgtkhtml/libgtkhtml-desc.xml	(revision 4fea592a560f6f4bb83b688a3bb66803b792cdff)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The libgtkhtml package contains <filename>libgtkhtml</filename> libraries.</para>
+<para>The <application>libgtkhtml</application> package contains <filename>libgtkhtml</filename> libraries.</para>
 
 </sect2>
@@ -9,6 +9,6 @@
 
 <sect3><title>libgtkhtml libraries</title>
-<para>libgtkhtml libraries provide the functions necessary to render
-and/or edit HTML.</para></sect3>
+<para><filename>libgtkhtml</filename> libraries provide the functions necessary to render
+and/or edit <acronym>HTML</acronym>.</para></sect3>
 
 
Index: gnome/lib/libgtkhtml/libgtkhtml-inst.xml
===================================================================
--- gnome/lib/libgtkhtml/libgtkhtml-inst.xml	(revision 284d8e17d3b7858281c0c790894adaf0eef34924)
+++ gnome/lib/libgtkhtml/libgtkhtml-inst.xml	(revision 4fea592a560f6f4bb83b688a3bb66803b792cdff)
@@ -1,10 +1,10 @@
 <sect2>
-<title>Installation of libgtkhtml</title>
+<title>Installation of <application>libgtkhtml</application></title>
 
-<para>Install libgtkhtml by running the following commands:</para>
+<para>Install <application>libgtkhtml</application> by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=$GNOME_PREFIX &amp;&amp;
+<screen><userinput><command>./configure --prefix=$GNOME_PREFIX &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: gnome/lib/libgtkhtml/libgtkhtml-intro.xml
===================================================================
--- gnome/lib/libgtkhtml/libgtkhtml-intro.xml	(revision 284d8e17d3b7858281c0c790894adaf0eef34924)
+++ gnome/lib/libgtkhtml/libgtkhtml-intro.xml	(revision 4fea592a560f6f4bb83b688a3bb66803b792cdff)
@@ -1,16 +1,25 @@
 <sect2>
-<title>Introduction to libgtkhtml</title>
+<title>Introduction to <application>libgtkhtml</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&libgtkhtml-download-http;"/>
-Download location (FTP):        <ulink url="&libgtkhtml-download-ftp;"/>
-Version used:                   &libgtkhtml-version;
-Package size:                   &libgtkhtml-size;
-Estimated Disk space required:  &libgtkhtml-buildsize;
-Estimated build time:           &libgtkhtml-time;</screen>
+<para>The <application>libgtkhtml</application> package contains libgtkhtml libraries.</para>
 
-<para>The libgtkhtml package contains libgtkhtml libraries.</para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&libgtkhtml-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&libgtkhtml-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &libgtkhtml-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&libgtkhtml-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&libgtkhtml-time;</para></listitem></itemizedlist>
+</sect3>
 
-<screen>libgtkhtml depends on:
-<xref linkend="gail"/> and <xref linkend="gnome-vfs"/></screen>
+<sect3><title><application>libgtkhtml</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="gail"/> and <xref linkend="gnome-vfs"/></para></sect4>
+</sect3>
+
 
 </sect2>
Index: gnome/lib/libgtkhtml/libgtkhtml.ent
===================================================================
--- gnome/lib/libgtkhtml/libgtkhtml.ent	(revision 284d8e17d3b7858281c0c790894adaf0eef34924)
+++ gnome/lib/libgtkhtml/libgtkhtml.ent	(revision 4fea592a560f6f4bb83b688a3bb66803b792cdff)
@@ -5,8 +5,8 @@
 <!ENTITY libgtkhtml-desc SYSTEM "libgtkhtml-desc.xml">
 <!ENTITY libgtkhtml-config SYSTEM "libgtkhtml-config.xml">
-<!ENTITY libgtkhtml-buildsize "7 MB">
-<!ENTITY libgtkhtml-version "2.2.1">
-<!ENTITY libgtkhtml-download-http "http://ftp.gnome.org/pub/GNOME/sources/libgtkhtml/2.2/libgtkhtml-2.2.1.tar.bz2">
-<!ENTITY libgtkhtml-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/libgtkhtml/2.2/libgtkhtml-2.2.1.tar.bz2">
-<!ENTITY libgtkhtml-size "325 KB">
-<!ENTITY libgtkhtml-time "3.50 SBU">
+<!ENTITY libgtkhtml-buildsize "129 MB">
+<!ENTITY libgtkhtml-version "2.2.4">
+<!ENTITY libgtkhtml-download-http "http://ftp.gnome.org/pub/GNOME/sources/libgtkhtml/2.2/libgtkhtml-2.2.4.tar.bz2">
+<!ENTITY libgtkhtml-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/libgtkhtml/2.2/libgtkhtml-2.2.4.tar.bz2">
+<!ENTITY libgtkhtml-size "336 KB">
+<!ENTITY libgtkhtml-time "1.40 SBU">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 284d8e17d3b7858281c0c790894adaf0eef34924)
+++ introduction/welcome/changelog.xml	(revision 4fea592a560f6f4bb83b688a3bb66803b792cdff)
@@ -10,4 +10,7 @@
 
 <itemizedlist>
+
+<listitem><para>September 2nd, 2003 [larry]: updated to libesmtp-1.0,
+eel-2.2.4 and libgtkhtml-2.2.4.</para></listitem>
 
 <listitem><para>September 2nd, 2003 [larry]: Edit submission by DJ,
