diff --git a/appendices/old/old.xml b/appendices/old/old.xml
index 96f97a3f83..6c8e74eaa1 100644
--- a/appendices/old/old.xml
+++ b/appendices/old/old.xml
@@ -14,5 +14,5 @@ future releases.</para>
 &fnlib;
 &pspell;
 &postlfs-security-nessus;
-
+&bonobo-conf;
 </appendix>
diff --git a/gnome/otherlibs/gtkhtml/gtkhtml-config.xml b/gnome/otherlibs/gtkhtml/gtkhtml-config.xml
index a0d9f8ecd4..fb308d7642 100644
--- a/gnome/otherlibs/gtkhtml/gtkhtml-config.xml
+++ b/gnome/otherlibs/gtkhtml/gtkhtml-config.xml
@@ -1,5 +1,5 @@
 <sect2>
-<title>Configuring gtkhtml</title>
+<title>Configuring <application>gtkhtml</application></title>
 &library-config;
 </sect2>
 
diff --git a/gnome/otherlibs/gtkhtml/gtkhtml-desc.xml b/gnome/otherlibs/gtkhtml/gtkhtml-desc.xml
index 106c7f73f4..ce08033049 100644
--- a/gnome/otherlibs/gtkhtml/gtkhtml-desc.xml
+++ b/gnome/otherlibs/gtkhtml/gtkhtml-desc.xml
@@ -1,6 +1,7 @@
 <sect2>
 <title>Contents</title>
 
-<para>The gtkhtml package contains the Gnome 1.4 html rendering engine.</para>
+<para>The <application>gtkhtml</application> package contains the GNOME 1.4 
+<acronym>html</acronym> rendering engine.</para>
 
 </sect2>
diff --git a/gnome/otherlibs/gtkhtml/gtkhtml-exp.xml b/gnome/otherlibs/gtkhtml/gtkhtml-exp.xml
index 90461766ab..3e5fdc8c28 100644
--- a/gnome/otherlibs/gtkhtml/gtkhtml-exp.xml
+++ b/gnome/otherlibs/gtkhtml/gtkhtml-exp.xml
@@ -1,7 +1,8 @@
 <sect2>
 <title>Command explanations</title>
 
-<para><userinput>--prefix=/opt/gnome</userinput> : Install gtkhtml in the Gnome 1.4 area.</para>
+<para><command>--prefix=/opt/gnome</command> : Install
+<application>gtkhtml</application> in the GNOME 1.4 area.</para>
 
 </sect2>
 
diff --git a/gnome/otherlibs/gtkhtml/gtkhtml-inst.xml b/gnome/otherlibs/gtkhtml/gtkhtml-inst.xml
index d9d2024ad9..f655276c17 100644
--- a/gnome/otherlibs/gtkhtml/gtkhtml-inst.xml
+++ b/gnome/otherlibs/gtkhtml/gtkhtml-inst.xml
@@ -1,11 +1,12 @@
 <sect2>
-<title>Installation of gtkhtml</title>
+<title>Installation of <application>gtkhtml</application></title>
 
-<para>Install gtkhtml by running the following commands:</para>
+<para>Install <application>gtkhtml</application> by running the following 
+commands:</para>
 
-<para><screen><userinput>./configure --prefix=/opt/gnome --disable-gtk-doc &amp;&amp;
+<screen><userinput><command>./configure --prefix=/opt/gnome --disable-gtk-doc &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
 
diff --git a/gnome/otherlibs/gtkhtml/gtkhtml-intro.xml b/gnome/otherlibs/gtkhtml/gtkhtml-intro.xml
index d29bc429d4..f2eb409168 100644
--- a/gnome/otherlibs/gtkhtml/gtkhtml-intro.xml
+++ b/gnome/otherlibs/gtkhtml/gtkhtml-intro.xml
@@ -1,16 +1,28 @@
 <sect2>
-<title>Introduction to gtkhtml-&gtkhtml-version;</title>
+<title>Introduction to <application>gtkhtml</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&gtkhtml-download-http;"/>
-Download location (FTP):        <ulink url="&gtkhtml-download-ftp;"/>
-Version used:                   &gtkhtml-version;
-Package size:                   &gtkhtml-size;
-Estimated Disk space required:  &gtkhtml-buildsize;</screen>
- 
-<para>The gtkhtml package contains is a lightweight HTML
-rendering/printing/editing engine.</para>
+<para>The <application>gtkhtml</application> package contains is a lightweight
+<acronym>HTML</acronym> rendering/printing/editing engine.</para>
 
-<screen>gtkhtml depends on:
-<xref linkend="gal"></xref>, <xref linkend ="libglade14"></xref> and <xref linkend="libcapplet"></xref>.</screen>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&gtkhtml-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&gtkhtml-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gtkhtml-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&gtkhtml-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&gtkhtml-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application>gtkhtml</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="GConf1"/>, <xref linkend="gal"/>, <xref
+linkend ="libglade14"/> and <xref linkend="libcapplet"/></para></sect4>
+<sect4><title>Optional</title>
+<para><xref linkend="soup"/></para></sect4>
+</sect3>
 
 </sect2>
diff --git a/gnome/otherlibs/gtkhtml/gtkhtml.ent b/gnome/otherlibs/gtkhtml/gtkhtml.ent
index 330b8ca23a..9b1e60d522 100644
--- a/gnome/otherlibs/gtkhtml/gtkhtml.ent
+++ b/gnome/otherlibs/gtkhtml/gtkhtml.ent
@@ -4,8 +4,9 @@
 <!ENTITY gtkhtml-exp SYSTEM "gtkhtml-exp.xml">
 <!ENTITY gtkhtml-desc SYSTEM "gtkhtml-desc.xml">
 <!ENTITY gtkhtml-config SYSTEM "gtkhtml-config.xml">
-<!ENTITY gtkhtml-buildsize "62 MB">
+<!ENTITY gtkhtml-buildsize "78.6 MB">
 <!ENTITY gtkhtml-version "1.1.7">
 <!ENTITY gtkhtml-download-http "http://ftp.gnome.org/pub/GNOME/sources/gtkhtml/1.1/gtkhtml-&gtkhtml-version;.tar.bz2">
 <!ENTITY gtkhtml-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gtkhtml/1.1/gtkhtml-&gtkhtml-version;.tar.bz2">
 <!ENTITY gtkhtml-size "1.1 KB">
+<!ENTITY gtkhtml-time "1.83 SBU">
diff --git a/gnome/otherlibs/gtkhtml/gtkhtml.xml b/gnome/otherlibs/gtkhtml/gtkhtml.xml
index 9f1328a2f0..601d7debde 100644
--- a/gnome/otherlibs/gtkhtml/gtkhtml.xml
+++ b/gnome/otherlibs/gtkhtml/gtkhtml.xml
@@ -5,7 +5,6 @@
 &gtkhtml-intro;
 &gtkhtml-inst;
 &gtkhtml-exp;
-&gtkhtml-config;
 &gtkhtml-desc;
 
 </sect1>
diff --git a/gnome/otherlibs/libghttp/libghttp-config.xml b/gnome/otherlibs/libghttp/libghttp-config.xml
index e9cb8b078f..a2a5e90c3a 100644
--- a/gnome/otherlibs/libghttp/libghttp-config.xml
+++ b/gnome/otherlibs/libghttp/libghttp-config.xml
@@ -1,5 +1,5 @@
 <sect2>
-<title>Configuring libghttp</title>
+<title>Configuring <application>libghttp</application></title>
 &library-config;
 </sect2>
 
diff --git a/gnome/otherlibs/libghttp/libghttp-desc.xml b/gnome/otherlibs/libghttp/libghttp-desc.xml
index 504b8ef3ab..cc5a997001 100644
--- a/gnome/otherlibs/libghttp/libghttp-desc.xml
+++ b/gnome/otherlibs/libghttp/libghttp-desc.xml
@@ -1,6 +1,7 @@
 <sect2>
 <title>Contents</title>
 
-<para>The libghttp package contains an Gnome 1.4 HTTP client library.</para>
+<para>The <application>libghttp</application> package contains an GNOME
+1.4 <acronym>HTTP</acronym> client library.</para>
 </sect2>
 
diff --git a/gnome/otherlibs/libghttp/libghttp-exp.xml b/gnome/otherlibs/libghttp/libghttp-exp.xml
index 71f6cdf9a1..9130c87ef7 100644
--- a/gnome/otherlibs/libghttp/libghttp-exp.xml
+++ b/gnome/otherlibs/libghttp/libghttp-exp.xml
@@ -1,7 +1,8 @@
 <sect2>
 <title>Command explanations</title>
 
-<para><userinput>--prefix=/opt/gnome</userinput> : Install libghttp in the Gnome 1.4 area.</para>
+<para><command>--prefix=/opt/gnome</command> : Install
+<application>libghttp</application> in the GNOME 1.4 area.</para>
 
 </sect2>
 
diff --git a/gnome/otherlibs/libghttp/libghttp-inst.xml b/gnome/otherlibs/libghttp/libghttp-inst.xml
index 06773eddde..8c6eeccfc3 100644
--- a/gnome/otherlibs/libghttp/libghttp-inst.xml
+++ b/gnome/otherlibs/libghttp/libghttp-inst.xml
@@ -1,11 +1,12 @@
 <sect2>
-<title>Installation of libghttp</title>
+<title>Installation of <application>libghttp</application></title>
 
-<para>Install libghttp by running the following commands:</para>
+<para>Install <application>libghttp</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>
 
diff --git a/gnome/otherlibs/libghttp/libghttp-intro.xml b/gnome/otherlibs/libghttp/libghttp-intro.xml
index fccfbc40c7..7823637100 100644
--- a/gnome/otherlibs/libghttp/libghttp-intro.xml
+++ b/gnome/otherlibs/libghttp/libghttp-intro.xml
@@ -1,12 +1,21 @@
 <sect2>
-<title>Introduction to libghttp-&libghttp-version;</title>
+<title>Introduction to <application>libghttp</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&libghttp-download-http;"/>
-Download location (FTP):        <ulink url="&libghttp-download-ftp;"/>
-Version used:                   &libghttp-version;
-Package size:                   &libghttp-size;
-Estimated Disk space required:  &libghttp-buildsize;</screen>
+<para>The <application>libghttp</application> package contains a GNOME
+1.4 <acronym>HTTP</acronym> client library.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&libghttp-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&libghttp-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &libghttp-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&libghttp-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&libghttp-time;</para></listitem></itemizedlist>
+</sect3>
 
-<para>The libghttp package contains a Gnome 1.4 HTTP client library.</para>
 
 </sect2>
diff --git a/gnome/otherlibs/libghttp/libghttp.ent b/gnome/otherlibs/libghttp/libghttp.ent
index 8d5e728b2c..6cbce9360d 100644
--- a/gnome/otherlibs/libghttp/libghttp.ent
+++ b/gnome/otherlibs/libghttp/libghttp.ent
@@ -9,3 +9,4 @@
 <!ENTITY libghttp-download-http "http://ftp.gnome.org/pub/GNOME/sources/libghttp/1.0/libghttp-&libghttp-version;.tar.gz">
 <!ENTITY libghttp-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/libghttp/1.0/libghttp-&libghttp-version;.tar.gz">
 <!ENTITY libghttp-size "148 KB">
+<!ENTITY libghttp-time "0.01 SBU">
diff --git a/gnome/otherlibs/libghttp/libghttp.xml b/gnome/otherlibs/libghttp/libghttp.xml
index 7be1ce47ac..3eb2828d8e 100644
--- a/gnome/otherlibs/libghttp/libghttp.xml
+++ b/gnome/otherlibs/libghttp/libghttp.xml
@@ -5,7 +5,6 @@
 &libghttp-intro;
 &libghttp-inst;
 &libghttp-exp;
-&libghttp-config;
 &libghttp-desc;
 
 </sect1>
diff --git a/gnome/otherlibs/otherlibs.xml b/gnome/otherlibs/otherlibs.xml
index f4bbfa76ce..19e6d7e063 100644
--- a/gnome/otherlibs/otherlibs.xml
+++ b/gnome/otherlibs/otherlibs.xml
@@ -20,8 +20,7 @@ these libraries are needed for a Gnome desktop install.
 &gal;
 &guppi;
 &libcapplet;
+&soup;
 &gtkhtml;
 &libghttp;
-&bonobo-conf;
-&soup;
 </chapter>
diff --git a/gnome/otherlibs/soup/soup-config.xml b/gnome/otherlibs/soup/soup-config.xml
index 2d23528d7a..09eedb8578 100644
--- a/gnome/otherlibs/soup/soup-config.xml
+++ b/gnome/otherlibs/soup/soup-config.xml
@@ -1,5 +1,5 @@
 <sect2>
-<title>Configuring Soup</title>
+<title>Configuring <application>Soup</application></title>
 &library-config;
 </sect2>
 
diff --git a/gnome/otherlibs/soup/soup-desc.xml b/gnome/otherlibs/soup/soup-desc.xml
index b3be08734b..024618e414 100644
--- a/gnome/otherlibs/soup/soup-desc.xml
+++ b/gnome/otherlibs/soup/soup-desc.xml
@@ -1,7 +1,8 @@
 <sect2>
 <title>Contents</title>
 
-<para>The soup package contains SOAP libraries, used to implement
-XML remote procedure calls.</para>
+<para>The <application>soup</application> package contains
+<acronym>SOAP</acronym> libraries, used to implement
+<acronym>XML</acronym> remote procedure calls.</para>
 
 </sect2>
diff --git a/gnome/otherlibs/soup/soup-exp.xml b/gnome/otherlibs/soup/soup-exp.xml
index d1c6e0787e..d147c00369 100644
--- a/gnome/otherlibs/soup/soup-exp.xml
+++ b/gnome/otherlibs/soup/soup-exp.xml
@@ -1,7 +1,8 @@
 <sect2>
 <title>Command explanations</title>
 
-<para><userinput>--prefix=/opt/gnome</userinput> : Install Soup in the Gnome 1.4 area.</para>
+<para><command>--prefix=/opt/gnome</command> : Install
+<application>Soup</application> in the GNOME 1.4 area.</para>
 
 </sect2>
 
diff --git a/gnome/otherlibs/soup/soup-inst.xml b/gnome/otherlibs/soup/soup-inst.xml
index df0cac64c6..b660602309 100644
--- a/gnome/otherlibs/soup/soup-inst.xml
+++ b/gnome/otherlibs/soup/soup-inst.xml
@@ -1,11 +1,12 @@
 <sect2>
-<title>Installation of Soup</title>
+<title>Installation of <application>Soup</application></title>
 
-<para>Install Soup by running the following commands:</para>
+<para>Install <application>Soup</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>
 
diff --git a/gnome/otherlibs/soup/soup-intro.xml b/gnome/otherlibs/soup/soup-intro.xml
index 039843eb13..3c6ae1e6fc 100644
--- a/gnome/otherlibs/soup/soup-intro.xml
+++ b/gnome/otherlibs/soup/soup-intro.xml
@@ -1,13 +1,22 @@
 <sect2>
-<title>Introduction to Soup</title>
+<title>Introduction to <application>Soup</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&soup-download-http;"/>
-Download location (FTP):        <ulink url="&soup-download-ftp;"/>
-Version used:                   &soup-version;
-Package size:                   &soup-size;
-Estimated Disk space required:  &soup-buildsize;</screen>
+<para>The <application>Soup</application> package contains a
+<acronym>SOAP</acronym> (Simple Object Access Protocol)
+implementation in <application>C</application>.  </para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&soup-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&soup-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &soup-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&soup-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&soup-time;</para></listitem></itemizedlist>
+</sect3>
 
-<para>The Soup package contains a SOAP (Simple Object Access Protocol)
-implementation in C.  </para>
 
 </sect2>
diff --git a/gnome/otherlibs/soup/soup.ent b/gnome/otherlibs/soup/soup.ent
index 5ae1583701..84e0f7ce49 100644
--- a/gnome/otherlibs/soup/soup.ent
+++ b/gnome/otherlibs/soup/soup.ent
@@ -4,8 +4,9 @@
 <!ENTITY soup-exp SYSTEM "soup-exp.xml">
 <!ENTITY soup-desc SYSTEM "soup-desc.xml">
 <!ENTITY soup-config SYSTEM "soup-config.xml">
-<!ENTITY soup-buildsize "4.1 MB">
-<!ENTITY soup-version "0.7.4">
-<!ENTITY soup-download-http "http://ftp.gnome.org/pub/GNOME/sources/soup/0.7/soup-0.7.4.tar.bz2">
-<!ENTITY soup-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/soup/0.7/soup-0.7.4.tar.bz2">
-<!ENTITY soup-size "302 KB">
+<!ENTITY soup-buildsize "11.1 MB">
+<!ENTITY soup-version "0.7.11">
+<!ENTITY soup-download-http "http://ftp.gnome.org/pub/GNOME/sources/soup/0.7/soup-0.7.11.tar.bz2">
+<!ENTITY soup-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/soup/0.7/soup-0.7.11.tar.bz2">
+<!ENTITY soup-size "324 KB">
+<!ENTITY soup-time "0.33">
diff --git a/gnome/otherlibs/soup/soup.xml b/gnome/otherlibs/soup/soup.xml
index 7a13d2ae94..748e52ef66 100644
--- a/gnome/otherlibs/soup/soup.xml
+++ b/gnome/otherlibs/soup/soup.xml
@@ -5,7 +5,6 @@
 &soup-intro;
 &soup-inst;
 &soup-exp;
-&soup-config;
 &soup-desc;
 
 </sect1>
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index acabef85b8..f10060e307 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -10,6 +10,9 @@ page in Chapter 1 for details on who wrote what.</para>
 
 <itemizedlist>
 
+<listitem><para>September 18th, 2003 [larry]: update to
+soup-0.7.11.</para></listitem>
+
 <listitem><para>September 18th, 2003 [igor]: updated instructions
 for fcron-2.9.3.</para></listitem>
     
diff --git a/xsoft/office/gnucash/gnucash-intro.xml b/xsoft/office/gnucash/gnucash-intro.xml
index 32905095bd..bdb8cd069d 100644
--- a/xsoft/office/gnucash/gnucash-intro.xml
+++ b/xsoft/office/gnucash/gnucash-intro.xml
@@ -20,7 +20,7 @@ url="&gnucash-download-ftp;"/></para></listitem>
 <sect4><title>Required</title>
 <para><xref linkend="gnome-print"></xref>, <xref
 linkend="libglade14"></xref>, <xref linkend="db-3.3"></xref>,
-<xref linkend="gal"></xref>, <xref linkend="libcapplet"></xref>, <xref
+<xref linkend="gal"></xref>, , <xref
 linkend="gtkhtml"></xref>,
 <xref linkend="libghttp"></xref>, <xref linkend="bonobo14"></xref>,
 <xref linkend="guppi"></xref>,