Index: gnome/core/gconf.xml
===================================================================
--- gnome/core/gconf.xml	(revision 1e93fcc930cdf26c94e8f013a2a18594a08c1d3c)
+++ gnome/core/gconf.xml	(revision 227a40a59788baed1dd90a5a3b494331a75dbe61)
@@ -5,6 +5,6 @@
   %general-entities;
 
-<!ENTITY GConf-download-http "http://ftp.gnome.org/pub/GNOME/sources/GConf/2.6/GConf-&GConf-version;.tar.bz2">
-<!ENTITY GConf-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/GConf/2.6/GConf-&GConf-version;.tar.bz2">
+<!ENTITY GConf-download-http "http://ftp.gnome.org/pub/GNOME/sources/GConf/&gnome-version;/GConf-&GConf-version;.tar.bz2">
+<!ENTITY GConf-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/GConf/&gnome-version;/GConf-&GConf-version;.tar.bz2">
 <!ENTITY GConf-md5sum "b1173cbe33404bcbcc15710ce2a28f67">
 <!ENTITY GConf-size "1.7 MB">
@@ -63,5 +63,5 @@
 <screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
     --libexecdir=`pkg-config --variable=prefix ORBit-2.0`/sbin \
-    --sysconfdir=/etc/gnome &amp;&amp;
+    --sysconfdir=/etc/gnome --disable-gtk-doc &amp;&amp;
 make &amp;&amp;
 make install</command></userinput></screen>
@@ -85,4 +85,9 @@
 <emphasis>must</emphasis> be consistent for every subsequent 
 <application><acronym>GNOME</acronym>-2</application> installation.</para>
+
+<para><option>--disable-gtk-doc</option>: This switch disables building the
+documentation during the <command>make</command> step. Omit this option if 
+you have <application>GTK-Doc</application> installed and wish to rebuild and 
+install the documentation.</para>
 
 </sect2>
Index: gnome/core/gnome-vfs.xml
===================================================================
--- gnome/core/gnome-vfs.xml	(revision 1e93fcc930cdf26c94e8f013a2a18594a08c1d3c)
+++ gnome/core/gnome-vfs.xml	(revision 227a40a59788baed1dd90a5a3b494331a75dbe61)
@@ -5,10 +5,10 @@
   %general-entities;
 
-<!ENTITY gnome-vfs-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.6/gnome-vfs-&gnome-vfs-version;.tar.bz2">
-<!ENTITY gnome-vfs-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/2.6/gnome-vfs-&gnome-vfs-version;.tar.bz2">
-<!ENTITY gnome-vfs-size "1.4 MB">
-<!ENTITY gnome-vfs-buildsize "64.3 MB">
+<!ENTITY gnome-vfs-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/&gnome-version;/gnome-vfs-&gnome-vfs-version;.tar.bz2">
+<!ENTITY gnome-vfs-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-vfs/&gnome-version;/gnome-vfs-&gnome-vfs-version;.tar.bz2">
+<!ENTITY gnome-vfs-md5sum "5484694e7250c80a231cfc525d924cc3">
+<!ENTITY gnome-vfs-size "1.9 MB">
+<!ENTITY gnome-vfs-buildsize "49.5 MB">
 <!ENTITY gnome-vfs-time "1.36 SBU">
-
 ]>
 
@@ -25,7 +25,8 @@
 File System</application></title>
 
-<para>The <application><acronym>GNOME</acronym> Virtual File System</application> package contains virtual file system libraries. This
-is used
-as one of the foundations of the <application>Nautilus</application> file manager.</para>
+<para>The <application><acronym>GNOME</acronym> Virtual File 
+System</application> package contains virtual file system libraries. This is 
+used as one of the foundations of the <application>Nautilus</application> file 
+manager.</para>
 
 <sect3><title>Package information</title>
@@ -35,4 +36,5 @@
 <listitem><para>Download (FTP): <ulink
 url="&gnome-vfs-download-ftp;"/></para></listitem>
+<listitem><para>Download MD5 sum: &gnome-vfs-md5sum;</para></listitem>
 <listitem><para>Download size: &gnome-vfs-size;</para></listitem>
 <listitem><para>Estimated Disk space required:
@@ -42,23 +44,27 @@
 </sect3>
 
-<sect3><title><application><acronym>GNOME</acronym> Virtual File System</application> dependencies</title>
+<sect3><title><application><acronym>GNOME</acronym> Virtual File 
+System</application> dependencies</title>
 <sect4><title>Required</title>
-<para>
-<xref linkend="intltool"/>,
+<para><xref linkend="intltool"/>, 
 <xref linkend="GConf"/>,
 <xref linkend="libbonobo"/>,
 <xref linkend="gnome-mime-data"/> and
-<xref linkend="shared-mime-info"/>
-</para></sect4>
+<xref linkend="shared-mime-info"/></para>
+</sect4>
+
 <sect4><title>Optional</title>
-<para>
-<xref linkend="samba3"/>,
+<para><xref linkend="samba3"/>, 
 <xref linkend="CDParanoia"/>,
 <xref linkend="fam"/>,
 <xref linkend="gtk-doc"/>,
+<xref linkend="basicnet-netprogs-openssh"/>,
 <xref linkend="openssl"/> or
-<ulink url="http://www.gnu.org/software/gnutls/">GnuTLS</ulink>, and
-<ulink url="http://www.openafs.org/">OpenAFS</ulink>
-</para></sect4>
+<ulink url="http://www.gnu.org/software/gnutls/">GnuTLS</ulink>, 
+<xref linkend="heimdal"/> or <xref linkend="mitkrb"/>, 
+<ulink url="http://www.openafs.org/">OpenAFS</ulink>, 
+<ulink url="http://www.porchdogsoft.com/products/howl/">Howl</ulink> and 
+<ulink url="http://hal.freedesktop.org/wiki/Software_2fhal">HAL</ulink></para>
+</sect4>
 </sect3>
 
@@ -69,5 +75,6 @@
 File System</application></title>
 
-<para>Install <application><acronym>GNOME</acronym> Virtual File System</application> by running the following commands:</para>
+<para>Install <application><acronym>GNOME</acronym> Virtual File 
+System</application> by running the following commands:</para>
 
 <screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
@@ -82,15 +89,17 @@
 <title>Command explanations</title>
 
-<para><parameter>--sysconfdir=/etc/gnome</parameter>: This switch
-puts configuration files in <filename class="directory">/etc/gnome</filename> instead of
-<filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
+<para><parameter>--sysconfdir=/etc/gnome</parameter>: This switch puts 
+configuration files in <filename class="directory">/etc/gnome</filename> 
+instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
 
-<para><parameter>--libexecdir=`pkg-config --variable=prefix ORBit-2.0`/sbin
-</parameter>: This switch puts libexec files in
+<para><parameter>--libexecdir=`pkg-config --variable=prefix 
+ORBit-2.0`/sbin</parameter>: This switch puts libexec files in
 <filename class="directory">$GNOME_PREFIX/sbin</filename> instead of
 <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
 
-<para><option>--disable-gtk-doc</option>: This switch will prevent
-the rebuilding of documentation during the <command>make</command> command.</para>
+<para><command>rmdir `pkg-config --variable=prefix ORBit-2.0`/doc</command>: 
+Use this command if <envar>$GNOME_PREFIX</envar> is anything other than 
+<filename class='directory'>/usr</filename> as the directory is unneeded and
+unpopulated.</para>
 
 </sect2>
@@ -99,6 +108,15 @@
 <title>Contents</title>
 
-<para>The <application><acronym>GNOME</acronym> Virtual File
-System</application> package contains <filename class="libraryfile">libgnomevfs</filename> libraries.</para>
+<para>The <application><acronym>GNOME</acronym> Virtual File 
+System</application> package contains 
+<command>gnome-vfs-daemon</command>, 
+<command>gnomevfs-cat</command>, 
+<command>gnomevfs-copy</command>, 
+<command>gnomevfs-info</command>, 
+<command>gnomevfs-ls</command>, 
+<command>gnomevfs-mkdir</command>, 
+<command>gnomevfs-rm</command>, 
+<filename class="libraryfile">libgnomevfs</filename> libraries and 
+numerous library modules.</para>
 
 </sect2>
Index: gnome/core/libbonobo.xml
===================================================================
--- gnome/core/libbonobo.xml	(revision 1e93fcc930cdf26c94e8f013a2a18594a08c1d3c)
+++ gnome/core/libbonobo.xml	(revision 227a40a59788baed1dd90a5a3b494331a75dbe61)
@@ -5,6 +5,6 @@
   %general-entities;
 
-<!ENTITY libbonobo-download-http "http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.6/libbonobo-&libbonobo-version;.tar.bz2">
-<!ENTITY libbonobo-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.6/libbonobo-&libbonobo-version;.tar.bz2">
+<!ENTITY libbonobo-download-http "http://ftp.gnome.org/pub/GNOME/sources/libbonobo/&gnome-version;/libbonobo-&libbonobo-version;.tar.bz2">
+<!ENTITY libbonobo-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/libbonobo/&gnome-version;/libbonobo-&libbonobo-version;.tar.bz2">
 <!ENTITY libbonobo-md5sum "e3358680e50e69779535d126b1c56ee7">
 <!ENTITY libbonobo-size "1.4 MB">
