Index: basicnet/netlibs/libsoup/libsoup-desc.xml
===================================================================
--- basicnet/netlibs/libsoup/libsoup-desc.xml	(revision d6224aa3f6e752e2dbc98befa8940525e20bf255)
+++ basicnet/netlibs/libsoup/libsoup-desc.xml	(revision ad3b706c1febe367e77c0bec9bc9878f0c4acc03)
@@ -3,5 +3,4 @@
 
 <para>The <application>libsoup</application> package contains 
-<command>libsoup-ssl-proxy</command> and
 <filename class="libraryfile">libsoup</filename> libraries.</para>
 
Index: basicnet/netlibs/libsoup/libsoup-intro.xml
===================================================================
--- basicnet/netlibs/libsoup/libsoup-intro.xml	(revision d6224aa3f6e752e2dbc98befa8940525e20bf255)
+++ basicnet/netlibs/libsoup/libsoup-intro.xml	(revision ad3b706c1febe367e77c0bec9bc9878f0c4acc03)
@@ -19,11 +19,12 @@
 <sect4><title>Required</title>
 <para>
-<xref linkend="GLib2"/>
+<xref linkend="GLib2"/> and
+<xref linkend="libxml2"/>
 </para></sect4>
 <sect4><title>Optional</title>
 <para>
-<xref linkend="gtk-doc"/> and
-<xref linkend="openssl"/> or
-<ulink url="http://www.gnu.org/software/gnutls/">GnuTLS</ulink>
+<xref linkend="gtk-doc"/>,
+<ulink url="http://www.gnu.org/software/gnutls/">GnuTLS</ulink> and
+<ulink url="http://www.gnupg.org/">libgpg-error</ulink>
 </para></sect4>
 </sect3>
Index: basicnet/netlibs/libsoup/libsoup.ent
===================================================================
--- basicnet/netlibs/libsoup/libsoup.ent	(revision d6224aa3f6e752e2dbc98befa8940525e20bf255)
+++ basicnet/netlibs/libsoup/libsoup.ent	(revision ad3b706c1febe367e77c0bec9bc9878f0c4acc03)
@@ -3,8 +3,8 @@
 <!ENTITY libsoup-inst SYSTEM "libsoup-inst.xml">
 <!ENTITY libsoup-desc SYSTEM "libsoup-desc.xml">
-<!ENTITY libsoup-version "1.99.26">
-<!ENTITY libsoup-download-http "http://ftp.gnome.org/pub/gnome/sources/libsoup/1.99/libsoup-&libsoup-version;.tar.bz2">
-<!ENTITY libsoup-download-ftp "ftp://ftp.gnome.org/pub/gnome/sources/libsoup/1.99/libsoup-&libsoup-version;.tar.bz2">
-<!ENTITY libsoup-size "228 KB">
-<!ENTITY libsoup-buildsize "6.6 MB">
-<!ENTITY libsoup-time "0.16 SBU">
+<!ENTITY libsoup-version "2.1.9">
+<!ENTITY libsoup-download-http "http://ftp.gnome.org/pub/gnome/sources/libsoup/2.1/libsoup-&libsoup-version;.tar.bz2">
+<!ENTITY libsoup-download-ftp "ftp://ftp.gnome.org/pub/gnome/sources/libsoup/2.1/libsoup-&libsoup-version;.tar.bz2">
+<!ENTITY libsoup-size "365 KB">
+<!ENTITY libsoup-buildsize "13 MB">
+<!ENTITY libsoup-time "0.41 SBU">
Index: gnome/add/add.xml
===================================================================
--- gnome/add/add.xml	(revision d6224aa3f6e752e2dbc98befa8940525e20bf255)
+++ gnome/add/add.xml	(revision ad3b706c1febe367e77c0bec9bc9878f0c4acc03)
@@ -4,13 +4,14 @@
 
 <para>These packages are modular and add desktop applications to the
-<application><acronym>GNOME</acronym></application>  environment.  Feel free to install them on an as needed or
+<application><acronym>GNOME</acronym></application> environment.  Feel free to install them on an as needed or
 as wanted basis.</para>
 
-&libgtkhtml;
 &libgnomeprint;
 &libgnomeprintui;
+&gtkhtml2;
+
+&libgtkhtml;
 &gtksourceview;
 &gal2;
-&gtkhtml2;
 &at-spi;
 &yelp;
Index: gnome/core/nautilus/nautilus-intro.xml
===================================================================
--- gnome/core/nautilus/nautilus-intro.xml	(revision d6224aa3f6e752e2dbc98befa8940525e20bf255)
+++ gnome/core/nautilus/nautilus-intro.xml	(revision ad3b706c1febe367e77c0bec9bc9878f0c4acc03)
@@ -34,6 +34,7 @@
 <xref linkend="CDParanoia"/>,
 <xref linkend="libjpeg"/>,
-<ulink url="http://sourceforge.net/projects/libexif">libexif</ulink> and
-<ulink url="http://ftp.gnome.org/pub/GNOME/sources/medusa/0.5/">medusa</ulink>
+<ulink url="http://sourceforge.net/projects/libexif">libexif</ulink>,
+<ulink url="http://ftp.gnome.org/pub/GNOME/sources/medusa/0.5/">medusa</ulink> and
+<ulink url="http://sources.redhat.com/docbook-tools/">docbook-utils</ulink>
 </para></sect4>
 </sect3>
Index: gnome/gnome.ent
===================================================================
--- gnome/gnome.ent	(revision d6224aa3f6e752e2dbc98befa8940525e20bf255)
+++ gnome/gnome.ent	(revision ad3b706c1febe367e77c0bec9bc9878f0c4acc03)
@@ -82,4 +82,11 @@
 <!-- GNOME Additional Packages -->
 <!ENTITY gnome-add SYSTEM "add/add.xml">
+<!ENTITY % libgnomeprint SYSTEM "lib/libgnomeprint/libgnomeprint.ent">
+%libgnomeprint;
+<!ENTITY % libgnomeprintui SYSTEM "lib/libgnomeprintui/libgnomeprintui.ent">
+%libgnomeprintui;
+<!ENTITY % gtkhtml2 SYSTEM "lib/gtkhtml/gtkhtml2.ent">
+%gtkhtml2;
+
 <!ENTITY % linc SYSTEM "lib/linc/linc.ent">
 <!ENTITY % bonobo-activation SYSTEM "lib/bonobo/bonobo-activation.ent">
@@ -89,7 +96,4 @@
 <!ENTITY % libgtkhtml SYSTEM "lib/libgtkhtml/libgtkhtml.ent">
 <!ENTITY % gal2 SYSTEM "lib/gal/gal2.ent">
-<!ENTITY % libgnomeprint SYSTEM "lib/libgnomeprint/libgnomeprint.ent">
-<!ENTITY % libgnomeprintui SYSTEM "lib/libgnomeprintui/libgnomeprintui.ent">
-<!ENTITY % gtkhtml2 SYSTEM "lib/gtkhtml/gtkhtml2.ent">
 <!ENTITY % gtksourceview SYSTEM "lib/gtksourceview/gtksourceview.ent">
 %linc;
@@ -100,7 +104,4 @@
 %libgtkhtml;
 %gal2;
-%libgnomeprint;
-%libgnomeprintui;
-%gtkhtml2;
 %gtksourceview;
 
Index: gnome/lib/gtkhtml/gtkhtml2-inst.xml
===================================================================
--- gnome/lib/gtkhtml/gtkhtml2-inst.xml	(revision d6224aa3f6e752e2dbc98befa8940525e20bf255)
+++ gnome/lib/gtkhtml/gtkhtml2-inst.xml	(revision ad3b706c1febe367e77c0bec9bc9878f0c4acc03)
@@ -4,8 +4,8 @@
 <para>Install <application>GtkHTML</application> by running the following commands:</para>
 
-<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` &amp;&amp;
+<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+    --libexecdir=`pkg-config --variable=prefix ORBit-2.0`/sbin &amp;&amp;
 make &amp;&amp;
 make install</command></userinput></screen>
 
 </sect2>
-
Index: gnome/lib/gtkhtml/gtkhtml2-intro.xml
===================================================================
--- gnome/lib/gtkhtml/gtkhtml2-intro.xml	(revision d6224aa3f6e752e2dbc98befa8940525e20bf255)
+++ gnome/lib/gtkhtml/gtkhtml2-intro.xml	(revision ad3b706c1febe367e77c0bec9bc9878f0c4acc03)
@@ -18,7 +18,12 @@
 <sect3><title><application>GtkHTML</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="gal2"/> and <xref linkend="gail"/></para></sect4>
+<para>
+<xref linkend="gail"/> and
+<xref linkend="libgnomeprintui"/>
+</para></sect4>
 <sect4><title>Optional</title>
-<para><xref linkend="libsoup"/></para></sect4>
+<para>
+<xref linkend="libsoup"/>
+</para></sect4>
 </sect3>
 
Index: gnome/lib/gtkhtml/gtkhtml2.ent
===================================================================
--- gnome/lib/gtkhtml/gtkhtml2.ent	(revision d6224aa3f6e752e2dbc98befa8940525e20bf255)
+++ gnome/lib/gtkhtml/gtkhtml2.ent	(revision ad3b706c1febe367e77c0bec9bc9878f0c4acc03)
@@ -3,8 +3,8 @@
 <!ENTITY gtkhtml2-inst SYSTEM "gtkhtml2-inst.xml">
 <!ENTITY gtkhtml2-desc SYSTEM "gtkhtml2-desc.xml">
-<!ENTITY gtkhtml2-version "3.0.10">
-<!ENTITY gtkhtml2-download-http "http://ftp.gnome.org/pub/gnome/sources/gtkhtml/3.0/gtkhtml-&gtkhtml2-version;.tar.bz2">
-<!ENTITY gtkhtml2-download-ftp "ftp://ftp.gnome.org/pub/gnome/sources/gtkhtml/3.0/gtkhtml-&gtkhtml2-version;.tar.bz2">
-<!ENTITY gtkhtml2-size "1.0 MB">
-<!ENTITY gtkhtml2-buildsize "141.2 MB">
+<!ENTITY gtkhtml2-version "3.1.12">
+<!ENTITY gtkhtml2-download-http "http://ftp.gnome.org/pub/gnome/sources/gtkhtml/3.1/gtkhtml-&gtkhtml2-version;.tar.bz2">
+<!ENTITY gtkhtml2-download-ftp "ftp://ftp.gnome.org/pub/gnome/sources/gtkhtml/3.1/gtkhtml-&gtkhtml2-version;.tar.bz2">
+<!ENTITY gtkhtml2-size "1.2 MB">
+<!ENTITY gtkhtml2-buildsize "133 MB">
 <!ENTITY gtkhtml2-time "1.84 SBU">
Index: gnome/lib/libgnomeprint/libgnomeprint-intro.xml
===================================================================
--- gnome/lib/libgnomeprint/libgnomeprint-intro.xml	(revision d6224aa3f6e752e2dbc98befa8940525e20bf255)
+++ gnome/lib/libgnomeprint/libgnomeprint-intro.xml	(revision ad3b706c1febe367e77c0bec9bc9878f0c4acc03)
@@ -20,10 +20,17 @@
 <sect3><title><application>libgnomeprint</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="libbonobo"/> and <xref linkend="libart_lgpl"/></para></sect4>
+<para>
+<xref linkend="Pango"/>,
+<xref linkend="libart_lgpl"/>,
+<xref linkend="fontconfig"/> and
+<xref linkend="libxml2"/>
+</para></sect4>
 <sect4><title>Optional</title>
-<para><xref linkend="gtk-doc"/>, <xref linkend="sgml-dtd-3"/> and <xref
-linkend="cups"/></para></sect4>
+<para>
+<xref linkend="cups"/>,
+<xref linkend="gtk-doc"/> and
+<ulink url="http://sources.redhat.com/docbook-tools/">docbook-utils</ulink>
+</para></sect4>
 </sect3>
 
-
 </sect2>
Index: gnome/lib/libgnomeprint/libgnomeprint.ent
===================================================================
--- gnome/lib/libgnomeprint/libgnomeprint.ent	(revision d6224aa3f6e752e2dbc98befa8940525e20bf255)
+++ gnome/lib/libgnomeprint/libgnomeprint.ent	(revision ad3b706c1febe367e77c0bec9bc9878f0c4acc03)
@@ -4,8 +4,8 @@
 <!ENTITY libgnomeprint-exp SYSTEM "libgnomeprint-exp.xml">
 <!ENTITY libgnomeprint-desc SYSTEM "libgnomeprint-desc.xml">
-<!ENTITY libgnomeprint-version "2.6.0">
+<!ENTITY libgnomeprint-version "2.6.1">
 <!ENTITY libgnomeprint-download-http "http://ftp.gnome.org/pub/GNOME/sources/libgnomeprint/2.6/libgnomeprint-&libgnomeprint-version;.tar.bz2">
 <!ENTITY libgnomeprint-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/libgnomeprint/2.6/libgnomeprint-&libgnomeprint-version;.tar.bz2">
-<!ENTITY libgnomeprint-size "672 KB">
-<!ENTITY libgnomeprint-buildsize "27.0 MB">
+<!ENTITY libgnomeprint-size "684 KB">
+<!ENTITY libgnomeprint-buildsize "27 MB">
 <!ENTITY libgnomeprint-time "0.64 SBU">
Index: gnome/lib/libgnomeprintui/libgnomeprintui-intro.xml
===================================================================
--- gnome/lib/libgnomeprintui/libgnomeprintui-intro.xml	(revision d6224aa3f6e752e2dbc98befa8940525e20bf255)
+++ gnome/lib/libgnomeprintui/libgnomeprintui-intro.xml	(revision ad3b706c1febe367e77c0bec9bc9878f0c4acc03)
@@ -21,7 +21,14 @@
 <sect3><title><application>libgnomeprintui</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="libgnomeprint"/> and <xref linkend="libgnomeui"/></para></sect4>
+<para>
+<xref linkend="libgnomeui"/>,
+<xref linkend="gnome-icon-theme"/> and
+<xref linkend="libgnomeprint"/>
+</para></sect4>
+<sect4><title>Optional</title>
+<para>
+<xref linkend="gtk-doc"/>
+</para></sect4>
 </sect3>
 
-
 </sect2>
Index: gnome/lib/libgnomeprintui/libgnomeprintui.ent
===================================================================
--- gnome/lib/libgnomeprintui/libgnomeprintui.ent	(revision d6224aa3f6e752e2dbc98befa8940525e20bf255)
+++ gnome/lib/libgnomeprintui/libgnomeprintui.ent	(revision ad3b706c1febe367e77c0bec9bc9878f0c4acc03)
@@ -4,8 +4,8 @@
 <!ENTITY libgnomeprintui-exp SYSTEM "libgnomeprintui-exp.xml">
 <!ENTITY libgnomeprintui-desc SYSTEM "libgnomeprintui-desc.xml">
-<!ENTITY libgnomeprintui-version "2.6.0">
+<!ENTITY libgnomeprintui-version "2.6.1">
 <!ENTITY libgnomeprintui-download-http "http://ftp.gnome.org/pub/GNOME/sources/libgnomeprintui/2.6/libgnomeprintui-&libgnomeprintui-version;.tar.bz2">
 <!ENTITY libgnomeprintui-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/libgnomeprintui/2.6/libgnomeprintui-&libgnomeprintui-version;.tar.bz2">
-<!ENTITY libgnomeprintui-size "540 KB">
-<!ENTITY libgnomeprintui-buildsize "30.5 MB">
+<!ENTITY libgnomeprintui-size "550 KB">
+<!ENTITY libgnomeprintui-buildsize "31 MB">
 <!ENTITY libgnomeprintui-time "0.29 SBU">
Index: index.xml
===================================================================
--- index.xml	(revision d6224aa3f6e752e2dbc98befa8940525e20bf255)
+++ index.xml	(revision ad3b706c1febe367e77c0bec9bc9878f0c4acc03)
@@ -3,7 +3,7 @@
 			"/usr/share/docbook/docbookx.dtd" [
 
-<!ENTITY version "CVS-20040504">
-<!ENTITY releasedate "May 4th, 2004">
-<!ENTITY pubdate "2004-05-04">
+<!ENTITY version "CVS-20040505">
+<!ENTITY releasedate "May 5th, 2004">
+<!ENTITY pubdate "2004-05-05">
 <!ENTITY blfs-version "cvs">
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision d6224aa3f6e752e2dbc98befa8940525e20bf255)
+++ introduction/welcome/changelog.xml	(revision ad3b706c1febe367e77c0bec9bc9878f0c4acc03)
@@ -11,4 +11,8 @@
 
 <itemizedlist>
+
+<listitem><para>May 5th, 2004 [igor]: Updated to
+libgnomeprint-2.6.1, libgnomeprintui-2.6.1, libsoup-2.1.9
+and GtkHTML-3.1.12.</para></listitem>
 
 <listitem><para>May 4th, 2004 [igor]: Updated to GAIL-1.6.3 and
