Index: gnome/core/gnome-vfs.xml
===================================================================
--- gnome/core/gnome-vfs.xml	(revision e7307aa1ca5deba74f174acf14ae980036e05a47)
+++ gnome/core/gnome-vfs.xml	(revision e9039e4963a0156e9428757492a29e1623f956e6)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!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        "95b0308d49aba17b9cb36c84f8467017">
-  <!ENTITY gnome-vfs-size          "1.7 MB">
-  <!ENTITY gnome-vfs-buildsize     "51.6 MB">
-  <!ENTITY gnome-vfs-time          "1.3 SBU">
+  <!ENTITY gnome-vfs-download-http "&gnome-download-http;/gnome-vfs/&gnome-version;/gnome-vfs-&gnome-vfs-version;.tar.bz2">
+  <!ENTITY gnome-vfs-download-ftp  "&gnome-download-ftp;/gnome-vfs/&gnome-version;/gnome-vfs-&gnome-vfs-version;.tar.bz2">
+  <!ENTITY gnome-vfs-md5sum        "4d7b9c14af29a9bf813ab4831eeeacbb">
+  <!ENTITY gnome-vfs-size          "1.5 MB">
+  <!ENTITY gnome-vfs-buildsize     "52.2 MB">
+  <!ENTITY gnome-vfs-time          "1.4 SBU">
 ]>
 
@@ -60,21 +60,10 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch if <application>Samba</application> version
-        greater than 3.0.14 is installed: <ulink
-        url="&patch-root;/gnome-vfs-&gnome-vfs-version;-samba_3.0.20-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">GNOME Virtual File System Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="intltool"/>,
-    <xref linkend="GConf"/>,
-    <xref linkend="libbonobo"/>,
-    <xref linkend="gnome-mime-data"/> and
-    <xref linkend="shared-mime-info"/></para>
+    <para role="required"><xref linkend="GConf"/>,
+    <xref linkend="libbonobo"/>, and
+    <xref linkend="gnome-mime-data"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -86,7 +75,11 @@
     <xref linkend="openssh"/>,
     <xref linkend="openssl"/> or
-    <ulink url="http://www.gnu.org/software/gnutls/">GnuTLS</ulink>,
+    <ulink url="http://www.gnu.org/software/gnutls/">GnuTLS</ulink>
+    (which needs <ulink
+    url="http://www.gnupg.org/(en)/download/index.html#libgpg-error">libgpg-error</ulink>
+    then <ulink
+    url="http://www.gnupg.org/(en)/download/index.html#libgcrypt">libgcrypt</ulink>),
     <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>,
-    <ulink url="http://www.openafs.org/">OpenAFS</ulink> and
+    <ulink url="http://www.openafs.org/">OpenAFS</ulink>, and
     <ulink url="http://www.porchdogsoft.com/products/howl/">Howl</ulink></para>
 
@@ -99,8 +92,8 @@
     by running the following commands:</para>
 
-<screen><userinput>patch -Np1 -i ../gnome-vfs-&gnome-vfs-version;-samba_3.0.20-1.patch &amp;&amp;
-./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --libexecdir=`pkg-config --variable=prefix ORBit-2.0`/sbin \
-    --sysconfdir=/etc/gnome &amp;&amp;
+<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+    --libexecdir=`pkg-config \
+    --variable=prefix ORBit-2.0`/lib/gnome-vfs-2.0 \
+    --sysconfdir=&gnome-etc-dir; &amp;&amp;
 make</userinput></screen>
 
@@ -116,11 +109,12 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--sysconfdir=/etc/gnome</parameter>: This switch puts
-    configuration files in <filename class="directory">/etc/gnome</filename>
+    <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch puts
+    configuration files in <filename class="directory">&gnome-etc-dir;</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
-    <filename class="directory">$GNOME_PREFIX/sbin</filename> instead of
+    ORBit-2.0`/lib/gnome-vfs-2.0</parameter>: This switch puts libexec files in
+    <filename class="directory">$GNOME_PREFIX/lib/gnome-vfs-2.0</filename>
+    instead of
     <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
 
@@ -134,4 +128,8 @@
     url="http://ca.geocities.com/jefftranter@rogers.com/eject.html">Eject</ulink>
     installed as the <command>eject</command> program is used by default.</para>
+
+    <para><option>--enable-gtk-doc</option>: Use this option if you have
+    <application>GTK-Doc</application> installed and wish to build the API
+    documentation.</para>
 
   </sect2>
@@ -149,7 +147,7 @@
         gnomevfs-mkdir, gnomevfs-mv, gnomevfs-rm, and gnome-vfs-daemon</seg>
         <seg>libgnomevfs-2.[so,a] and modules</seg>
-        <seg>/etc/gnome/gconf/schemas,
-        /etc/gnome/gconf/gconf.xml.defaults/[desktop,schemas,system],
-        /etc/gnome/gnome-vfs-2.0,
+        <seg>&gnome-etc-dir;/gconf/schemas,
+        &gnome-etc-dir;/gconf/gconf.xml.defaults/[desktop,schemas,system],
+        &gnome-etc-dir;/gnome-vfs-2.0,
         $GNOME_PREFIX/include/gnome-vfs-2.0,
         $GNOME_PREFIX/include/gnome-vfs-module-2.0,
