Index: gnome/core/gnome-applets.xml
===================================================================
--- gnome/core/gnome-applets.xml	(revision 3b269b95647108dadcb6aab997af431d0f744e2f)
+++ gnome/core/gnome-applets.xml	(revision 0c4e1165472cff0493190d8d8b9af5642709fa9f)
@@ -6,9 +6,9 @@
 
   <!ENTITY gnome-applets-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-applets/&gnome-version;/gnome-applets-&gnome-applets-version;.tar.bz2">
-  <!ENTITY gnome-applets-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-applets/&gnome-version;/gnome-applets-&gnome-applets-version;.tar.bz2">
-  <!ENTITY gnome-applets-md5sum "da9cd75f77972c96eec9551d41878a7f">
-  <!ENTITY gnome-applets-size "6.2 MB">
-  <!ENTITY gnome-applets-buildsize "108 MB">
-  <!ENTITY gnome-applets-time "0.9 SBU">
+  <!ENTITY gnome-applets-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-applets/&gnome-version;/gnome-applets-&gnome-applets-version;.tar.bz2">
+  <!ENTITY gnome-applets-md5sum        "06dd0b634d7092fa8af2ce302f68f912">
+  <!ENTITY gnome-applets-size          "5.3 MB">
+  <!ENTITY gnome-applets-buildsize     "97.1 MB">
+  <!ENTITY gnome-applets-time          "1.0 SBU">
 ]>
 
@@ -66,9 +66,10 @@
     <para><xref linkend="libgtop"/>,
     <xref linkend="gst-plugins"/>,
+    <xref linkend="hal"/>,
     <xref linkend="gucharmap"/>,
     <xref linkend="system-tools-backends"/>,
-    <xref linkend="docbook-utils"/> and
-    <ulink
-    url="http://club.pep.ne.jp/~ishioka/Software/Linux/libapm-e.html">libapm</ulink></para>
+    <xref linkend="docbook-utils"/>,
+    <ulink url="http://club.pep.ne.jp/~ishioka/Software/Linux/libapm-e.html">libapm</ulink>
+    and <ulink url="http://www.galago-project.org/news/index.php">libnotify</ulink></para>
 
   </sect2>
@@ -96,7 +97,5 @@
 
 <screen role="root"><userinput>make tooldir=$PRE/lib/gnome-applets install &amp;&amp;
-make -C man install-man &amp;&amp;
-chmod -v 644 $PRE/share/gnome/help/\
-{gtik2_applet2/C/*.xml,cpufreq-applet/{C,uk}/legal.xml}</userinput></screen>
+make -C man install-man</userinput></screen>
 
     <para>Remove the variable from the unprivileged user's environment using
@@ -148,5 +147,5 @@
         mixer_applet2, modem_applet, multiload-applet-2, null_applet,
         stickynotes_applet, and trashapplet</seg>
-        <seg>bonobo servers</seg>
+        <seg>None</seg>
         <seg>several config directories under the
         /etc/gnome/gconf/gconf.xml.defaults/ hierarchy,
Index: gnome/core/gnome-backgrounds.xml
===================================================================
--- gnome/core/gnome-backgrounds.xml	(revision 3b269b95647108dadcb6aab997af431d0f744e2f)
+++ gnome/core/gnome-backgrounds.xml	(revision 0c4e1165472cff0493190d8d8b9af5642709fa9f)
@@ -6,9 +6,9 @@
 
   <!ENTITY gnome-backgrounds-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-backgrounds/&gnome-version;/gnome-backgrounds-&gnome-backgrounds-version;.tar.bz2">
-  <!ENTITY gnome-backgrounds-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-backgrounds/&gnome-version;/gnome-backgrounds-&gnome-backgrounds-version;.tar.bz2">
-  <!ENTITY gnome-backgrounds-md5sum "2a4ec2862c6a1a2bf3ad330c830edae4">
-  <!ENTITY gnome-backgrounds-size "2.2 MB">
-  <!ENTITY gnome-backgrounds-buildsize "6 MB">
-  <!ENTITY gnome-backgrounds-time "less then 0.1 SBU">
+  <!ENTITY gnome-backgrounds-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-backgrounds/&gnome-version;/gnome-backgrounds-&gnome-backgrounds-version;.tar.bz2">
+  <!ENTITY gnome-backgrounds-md5sum        "3f84adbe8c22e18033f10e8c506d601f">
+  <!ENTITY gnome-backgrounds-size          "1.7 MB">
+  <!ENTITY gnome-backgrounds-buildsize     "5.0 MB">
+  <!ENTITY gnome-backgrounds-time          "less than 0.1 SBU">
 ]>
 
@@ -21,5 +21,5 @@
   </sect1info>
 
-  <title>Gnome-backgrounds-&gnome-backgrounds-version;</title>
+  <title>gnome-backgrounds-&gnome-backgrounds-version;</title>
 
   <indexterm zone="gnome-backgrounds">
@@ -28,5 +28,5 @@
 
   <sect2 role="package">
-    <title>Introduction to Gnome-backgrounds</title>
+    <title>Introduction to gnome-backgrounds</title>
 
     <para>The <application>gnome-backgrounds</application> package contains
@@ -56,5 +56,5 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Gnome-backgrounds Dependencies</bridgehead>
+    <bridgehead renderas="sect3">gnome-backgrounds Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -64,5 +64,5 @@
 
   <sect2 role="installation">
-    <title>Installation of Gnome-backgrounds</title>
+    <title>Installation of gnome-backgrounds</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: gnome/core/gnome-desktop-file-utils.xml
===================================================================
--- gnome/core/gnome-desktop-file-utils.xml	(revision 3b269b95647108dadcb6aab997af431d0f744e2f)
+++ gnome/core/gnome-desktop-file-utils.xml	(revision 0c4e1165472cff0493190d8d8b9af5642709fa9f)
@@ -14,5 +14,5 @@
   </sect1info>
 
-  <title>Desktop-file-utils-&desktop-file-utils-version;</title>
+  <title>desktop-file-utils-&desktop-file-utils-version;</title>
 
   <para>The <xref linkend="desktop-file-utils"/> package is located in
Index: gnome/core/gnome-desktop.xml
===================================================================
--- gnome/core/gnome-desktop.xml	(revision 3b269b95647108dadcb6aab997af431d0f744e2f)
+++ gnome/core/gnome-desktop.xml	(revision 0c4e1165472cff0493190d8d8b9af5642709fa9f)
@@ -6,9 +6,9 @@
 
   <!ENTITY gnome-desktop-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/&gnome-version;/gnome-desktop-&gnome-desktop-version;.tar.bz2">
-  <!ENTITY gnome-desktop-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/&gnome-version;/gnome-desktop-&gnome-desktop-version;.tar.bz2">
-  <!ENTITY gnome-desktop-md5sum "5d6d21e4b5d66975c9c2c04add7da6e2">
-  <!ENTITY gnome-desktop-size "1.0 MB">
-  <!ENTITY gnome-desktop-buildsize "12 MB">
-  <!ENTITY gnome-desktop-time "0.2 SBU">
+  <!ENTITY gnome-desktop-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/&gnome-version;/gnome-desktop-&gnome-desktop-version;.tar.bz2">
+  <!ENTITY gnome-desktop-md5sum        "e6841d3a401ec2f5aa17a0529ba4bf55">
+  <!ENTITY gnome-desktop-size          "1.0 MB">
+  <!ENTITY gnome-desktop-buildsize     "11.3 MB">
+  <!ENTITY gnome-desktop-time          "0.2 SBU">
 ]>
 
@@ -60,5 +60,6 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="libgnomeui"/> and
+    <para><xref linkend="libgnomeui"/>,
+    <xref linkend="gnome-doc-utils"/> and
     <xref linkend="scrollkeeper"/></para>
 
@@ -92,4 +93,12 @@
     puts configuration files in <filename class="directory">/etc/gnome</filename>
     instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
+
+    <para><option>--with-gnome-distributor="Some Name"</option>: Use this
+    parameter to supply a custom name in the <quote>Distributor:</quote>
+    field of the <quote>GNOME About</quote> display window.</para>
+
+    <para><option>--with-kde-datadir=$KDE_PREFIX/share</option>: Use this
+    parameter if <application>KDE</application> is installed in any prefix
+    other than <filename class='directory'>/usr</filename>.</para>
 
   </sect2>
Index: gnome/core/gnome-doc-utils.xml
===================================================================
--- gnome/core/gnome-doc-utils.xml	(revision 3b269b95647108dadcb6aab997af431d0f744e2f)
+++ gnome/core/gnome-doc-utils.xml	(revision 0c4e1165472cff0493190d8d8b9af5642709fa9f)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY gnome-doc-utils-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-doc-utils/0.2/gnome-doc-utils-&gnome-doc-utils-version;.tar.bz2">
-  <!ENTITY gnome-doc-utils-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-doc-utils/0.2/gnome-doc-utils-&gnome-doc-utils-version;.tar.bz2">
-  <!ENTITY gnome-doc-utils-md5sum        "c72f2a974e4f05210d2736e92399c58e">
-  <!ENTITY gnome-doc-utils-size          "285 KB">
-  <!ENTITY gnome-doc-utils-buildsize     "5 MB">
-  <!ENTITY gnome-doc-utils-time          "0.2 SBU">
+  <!ENTITY gnome-doc-utils-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-doc-utils/0.4/gnome-doc-utils-&gnome-doc-utils-version;.tar.bz2">
+  <!ENTITY gnome-doc-utils-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-doc-utils/0.4/gnome-doc-utils-&gnome-doc-utils-version;.tar.bz2">
+  <!ENTITY gnome-doc-utils-md5sum        "3ea18197de296936619ef99bf75ca364">
+  <!ENTITY gnome-doc-utils-size          "374 KB">
+  <!ENTITY gnome-doc-utils-buildsize     "8.1 MB">
+  <!ENTITY gnome-doc-utils-time          "less than 0.1 SBU">
 ]>
 
@@ -35,6 +35,9 @@
     files in your source tree, and it contains the DocBook XSLT stylesheets that
     were once distributed with <application>Yelp</application>. Starting with
-    <application>GNOME</application> 2.8, <application>Yelp</application> will
-    require <application>GNOME Doc Utils</application> for the XSLT.</para>
+    <application>GNOME</application> 2.8, <application>Yelp</application>
+    requires <application>GNOME Doc Utils</application> for the XSLT. Starting
+    with <application>GNOME</application> 2.12, many of the core
+    <application>GNOME</application> packages requre
+    <application>GNOME Doc Utils</application>.</para>
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -120,5 +123,5 @@
         $GNOME_PREFIX/share/xml/gnome and
         $GNOME_PREFIX/share/xml2po</seg>
-        <seg>Custom DocBook XSLT stylesheets used by Yelp</seg>
+        <seg>Custom DocBook XSLT stylesheets</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/core/gnome-icon-theme.xml
===================================================================
--- gnome/core/gnome-icon-theme.xml	(revision 3b269b95647108dadcb6aab997af431d0f744e2f)
+++ gnome/core/gnome-icon-theme.xml	(revision 0c4e1165472cff0493190d8d8b9af5642709fa9f)
@@ -6,9 +6,9 @@
 
   <!ENTITY gnome-icon-theme-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-icon-theme/&gnome-version;/gnome-icon-theme-&gnome-icon-theme-version;.tar.bz2">
-  <!ENTITY gnome-icon-theme-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-icon-theme/&gnome-version;/gnome-icon-theme-&gnome-icon-theme-version;.tar.bz2">
-  <!ENTITY gnome-icon-theme-md5sum "680a57ed3cecb9a16824570f7002879e">
-  <!ENTITY gnome-icon-theme-size "2.9 MB">
-  <!ENTITY gnome-icon-theme-buildsize "28 MB">
-  <!ENTITY gnome-icon-theme-time "0.2 SBU">
+  <!ENTITY gnome-icon-theme-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-icon-theme/&gnome-version;/gnome-icon-theme-&gnome-icon-theme-version;.tar.bz2">
+  <!ENTITY gnome-icon-theme-md5sum        "a5401d6f085979fe6601f2241743af86">
+  <!ENTITY gnome-icon-theme-size          "3.1 MB">
+  <!ENTITY gnome-icon-theme-buildsize     "29.7 MB">
+  <!ENTITY gnome-icon-theme-time          "0.2 SBU">
 ]>
 
@@ -62,4 +62,7 @@
     <xref linkend="perl-xml-parser"/></para>
 
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para><xref linkend="pkgconfig"/></para>
+
   </sect2>
 
Index: gnome/core/gnome-keyring.xml
===================================================================
--- gnome/core/gnome-keyring.xml	(revision 3b269b95647108dadcb6aab997af431d0f744e2f)
+++ gnome/core/gnome-keyring.xml	(revision 0c4e1165472cff0493190d8d8b9af5642709fa9f)
@@ -6,9 +6,9 @@
 
   <!ENTITY gnome-keyring-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/0.4/gnome-keyring-&gnome-keyring-version;.tar.bz2">
-  <!ENTITY gnome-keyring-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/0.4/gnome-keyring-&gnome-keyring-version;.tar.bz2">
-  <!ENTITY gnome-keyring-md5sum "220930f6685780089cc5c769dd4ad561">
-  <!ENTITY gnome-keyring-size "369 KB">
-  <!ENTITY gnome-keyring-buildsize "5 MB">
-  <!ENTITY gnome-keyring-time "0.1 SBU">
+  <!ENTITY gnome-keyring-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/0.4/gnome-keyring-&gnome-keyring-version;.tar.bz2">
+  <!ENTITY gnome-keyring-md5sum        "4de9c720ed46ff1a5d0f59b3b7a0864f">
+  <!ENTITY gnome-keyring-size          "376 KB">
+  <!ENTITY gnome-keyring-buildsize     "5.4 MB">
+  <!ENTITY gnome-keyring-time          "0.1 SBU">
 ]>
 
@@ -21,5 +21,5 @@
   </sect1info>
 
-  <title>Gnome-keyring-&gnome-keyring-version;</title>
+  <title>gnome-keyring-&gnome-keyring-version;</title>
 
   <indexterm zone="gnome-keyring">
@@ -28,5 +28,5 @@
 
   <sect2 role="package">
-    <title>Introduction to Gnome-keyring</title>
+    <title>Introduction to gnome-keyring</title>
 
     <para>The <application>gnome-keyring</application> package contains a
@@ -55,5 +55,5 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Gnome-keyring Dependencies</bridgehead>
+    <bridgehead renderas="sect3">gnome-keyring Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -63,5 +63,5 @@
 
   <sect2 role="installation">
-    <title>Installation of Gnome-keyring</title>
+    <title>Installation of gnome-keyring</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: gnome/core/gnome-menus.xml
===================================================================
--- gnome/core/gnome-menus.xml	(revision 3b269b95647108dadcb6aab997af431d0f744e2f)
+++ gnome/core/gnome-menus.xml	(revision 0c4e1165472cff0493190d8d8b9af5642709fa9f)
@@ -6,9 +6,9 @@
 
   <!ENTITY gnome-menus-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-menus/&gnome-version;/gnome-menus-&gnome-menus-version;.tar.bz2">
-  <!ENTITY gnome-menus-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-menus/&gnome-version;/gnome-menus-&gnome-menus-version;.tar.bz2">
-  <!ENTITY gnome-menus-md5sum "83d9695a35ed2215620e8773ee918b8a">
-  <!ENTITY gnome-menus-size "339 KB">
-  <!ENTITY gnome-menus-buildsize "5 MB">
-  <!ENTITY gnome-menus-time "0.1 SBU">
+  <!ENTITY gnome-menus-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-menus/&gnome-version;/gnome-menus-&gnome-menus-version;.tar.bz2">
+  <!ENTITY gnome-menus-md5sum        "615392c4f729f70c03aa3aa7dbe40a95">
+  <!ENTITY gnome-menus-size          "393 KB">
+  <!ENTITY gnome-menus-buildsize     "7.0 MB">
+  <!ENTITY gnome-menus-time          "0.1 SBU">
 ]>
 
@@ -21,5 +21,5 @@
   </sect1info>
 
-  <title>Gnome-menus-&gnome-menus-version;</title>
+  <title>gnome-menus-&gnome-menus-version;</title>
 
   <indexterm zone="gnome-menus">
@@ -28,5 +28,5 @@
 
   <sect2 role="package">
-    <title>Introduction to Gnome-menus</title>
+    <title>Introduction to gnome-menus</title>
 
     <para>The <application>gnome-menus</application> package contains an
@@ -60,13 +60,21 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Gnome-menus Dependencies</bridgehead>
+    <bridgehead renderas="sect3">gnome-menus Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="gnome-vfs"/></para>
+    <para><xref linkend="glib2"/> and
+    <xref linkend="intltool"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para><xref linkend="python"/> and
+    <xref linkend="gamin"/></para>
 
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation of Gnome-menus</title>
+    <title>Installation of gnome-menus</title>
+
+     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+     href="../without-gnome.xml"/>
 
     <para>Install <application>gnome-menus</application> by running the
@@ -83,8 +91,18 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
+    <para>If your <application>GNOME</application>-2 installation prefix is
+    anything other than <filename class='directory'>/usr</filename> and you
+    have <application>Python</application> installed, create some symbolic
+    links as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>ln -v -s $GNOME_PREFIX/lib/python2.4/site-packages/GMenuSimpleEditor \
+         /usr/lib/python2.4/site-packages &amp;&amp;
+ln -v -s $GNOME_PREFIX/lib/python2.4/site-packages/gmenu.* \
+         /usr/lib/python2.4/site-packages</userinput></screen>
+
   </sect2>
 
   <sect2 role="configuration">
-    <title>Configuring Gnome-menus</title>
+    <title>Configuring gnome-menus</title>
 
     <sect3>
@@ -94,5 +112,6 @@
       configuration files, ensure you set the <envar>XDG_CONFIG_DIRS</envar>
       environment variable in the system profile, or in individual user's
-      profiles as shown below:</para>
+      profiles as shown below (you may add additional directories, separated
+      with colons, if desired):</para>
 
 <screen><literal>XDG_CONFIG_DIRS=/etc/gnome/xdg</literal></screen>
@@ -113,5 +132,6 @@
         <seg>gnome-menu-spec-test</seg>
         <seg>libgnome-menu.[so,a]</seg>
-        <seg>/etc/gnome/xdg, $GNOME_PREFIX/include/gnome-menus and
+        <seg>/etc/gnome/xdg, $GNOME_PREFIX/include/gnome-menus,
+        $GNOME_PREFIX/lib/python2.4/site-packages/GMenuSimpleEditor and
         $GNOME_PREFIX/share/desktop-directories</seg>
       </seglistitem>
Index: gnome/core/gnome-mime-data.xml
===================================================================
--- gnome/core/gnome-mime-data.xml	(revision 3b269b95647108dadcb6aab997af431d0f744e2f)
+++ gnome/core/gnome-mime-data.xml	(revision 0c4e1165472cff0493190d8d8b9af5642709fa9f)
@@ -6,9 +6,9 @@
 
   <!ENTITY gnome-mime-data-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-mime-data/2.4/gnome-mime-data-&gnome-mime-data-version;.tar.bz2">
-  <!ENTITY gnome-mime-data-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-mime-data/2.4/gnome-mime-data-&gnome-mime-data-version;.tar.bz2">
-  <!ENTITY gnome-mime-data-md5sum "37242776b08625fa10c73c18b790e552">
-  <!ENTITY gnome-mime-data-size "849 KB">
-  <!ENTITY gnome-mime-data-buildsize "12 MB">
-  <!ENTITY gnome-mime-data-time "less than 0.1 SBU">
+  <!ENTITY gnome-mime-data-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-mime-data/2.4/gnome-mime-data-&gnome-mime-data-version;.tar.bz2">
+  <!ENTITY gnome-mime-data-md5sum        "37242776b08625fa10c73c18b790e552">
+  <!ENTITY gnome-mime-data-size          "849 KB">
+  <!ENTITY gnome-mime-data-buildsize     "12 MB">
+  <!ENTITY gnome-mime-data-time          "less than 0.1 SBU">
 ]>
 
Index: gnome/core/gnome-panel.xml
===================================================================
--- gnome/core/gnome-panel.xml	(revision 3b269b95647108dadcb6aab997af431d0f744e2f)
+++ gnome/core/gnome-panel.xml	(revision 0c4e1165472cff0493190d8d8b9af5642709fa9f)
@@ -6,9 +6,9 @@
 
   <!ENTITY gnome-panel-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/&gnome-version;/gnome-panel-&gnome-panel-version;.tar.bz2">
-  <!ENTITY gnome-panel-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-panel/&gnome-version;/gnome-panel-&gnome-panel-version;.tar.bz2">
-  <!ENTITY gnome-panel-md5sum "a2719f5c79a9e48bca086f08a77a6889">
-  <!ENTITY gnome-panel-size "2.3 MB">
-  <!ENTITY gnome-panel-buildsize "55 MB">
-  <!ENTITY gnome-panel-time "0.7 SBU">
+  <!ENTITY gnome-panel-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-panel/&gnome-version;/gnome-panel-&gnome-panel-version;.tar.bz2">
+  <!ENTITY gnome-panel-md5sum        "a532717e8ac7f67b7198c256909cd7dd">
+  <!ENTITY gnome-panel-size          "2.4 MB">
+  <!ENTITY gnome-panel-buildsize     "57.2 MB">
+  <!ENTITY gnome-panel-time          "0.8 SBU">
 ]>
 
@@ -87,7 +87,5 @@
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>make install &amp;&amp;
-chmod -v 644 `pkg-config --variable=prefix ORBit-2.0`/share/gnome/help/\
-{fish-applet-2,window-list,workspace-switcher}/C/*.xml</userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
 
   </sect2>
Index: gnome/core/gnome-session.xml
===================================================================
--- gnome/core/gnome-session.xml	(revision 3b269b95647108dadcb6aab997af431d0f744e2f)
+++ gnome/core/gnome-session.xml	(revision 0c4e1165472cff0493190d8d8b9af5642709fa9f)
@@ -6,9 +6,9 @@
 
   <!ENTITY gnome-session-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-session/&gnome-version;/gnome-session-&gnome-session-version;.tar.bz2">
-  <!ENTITY gnome-session-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-session/&gnome-version;/gnome-session-&gnome-session-version;.tar.bz2">
-  <!ENTITY gnome-session-md5sum "cbeb2db49dac11bf8088e6b025265fff">
-  <!ENTITY gnome-session-size "796 KB">
-  <!ENTITY gnome-session-buildsize "11 MB">
-  <!ENTITY gnome-session-time "0.2 SBU">
+  <!ENTITY gnome-session-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-session/&gnome-version;/gnome-session-&gnome-session-version;.tar.bz2">
+  <!ENTITY gnome-session-md5sum        "835e9340d23e139430224b931ff4c597">
+  <!ENTITY gnome-session-size          "864 KB">
+  <!ENTITY gnome-session-buildsize     "11.8 MB">
+  <!ENTITY gnome-session-time          "0.3 SBU">
 ]>
 
@@ -72,5 +72,5 @@
 
 <screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --localstatedir=/var/lib --sysconfdir=/etc/gnome  &amp;&amp;
+    --sysconfdir=/etc/gnome  &amp;&amp;
 make</userinput></screen>
 
@@ -85,9 +85,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para><parameter>--localstatedir=/var/lib</parameter>: This switch puts
-    <application>ScrollKeeper</application> files in
-    <filename class="directory">/var/lib/scrollkeeper</filename> instead of
-    <filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
 
     <para><parameter>--sysconfdir=/etc/gnome</parameter>: This switch puts
Index: gnome/core/gnome-terminal.xml
===================================================================
--- gnome/core/gnome-terminal.xml	(revision 3b269b95647108dadcb6aab997af431d0f744e2f)
+++ gnome/core/gnome-terminal.xml	(revision 0c4e1165472cff0493190d8d8b9af5642709fa9f)
@@ -6,9 +6,9 @@
 
   <!ENTITY gnome-terminal-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-terminal/&gnome-version;/gnome-terminal-&gnome-terminal-version;.tar.bz2">
-  <!ENTITY gnome-terminal-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-terminal/&gnome-version;/gnome-terminal-&gnome-terminal-version;.tar.bz2">
-  <!ENTITY gnome-terminal-md5sum "062744daca0c7f708b8c52f47b5db0d1">
-  <!ENTITY gnome-terminal-size "2.3 MB">
-  <!ENTITY gnome-terminal-buildsize "33 MB">
-  <!ENTITY gnome-terminal-time "0.2 SBU">
+  <!ENTITY gnome-terminal-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-terminal/&gnome-version;/gnome-terminal-&gnome-terminal-version;.tar.bz2">
+  <!ENTITY gnome-terminal-md5sum        "483c9397dd165845e2528a80e3df6dfc">
+  <!ENTITY gnome-terminal-size          "1.6 MB">
+  <!ENTITY gnome-terminal-buildsize     "34.6 MB">
+  <!ENTITY gnome-terminal-time          "0.3 SBU">
 ]>
 
@@ -102,10 +102,10 @@
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>gnome-terminal</seg>
-        <seg>gnome-terminal.server bonobo server</seg>
+        <seg>None</seg>
         <seg>/etc/gnome/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal,
         /etc/gnome/gconf/gconf.xml.defaults/apps/gnome-terminal,
Index: gnome/core/gnome-themes.xml
===================================================================
--- gnome/core/gnome-themes.xml	(revision 3b269b95647108dadcb6aab997af431d0f744e2f)
+++ gnome/core/gnome-themes.xml	(revision 0c4e1165472cff0493190d8d8b9af5642709fa9f)
@@ -6,9 +6,9 @@
 
   <!ENTITY gnome-themes-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-themes/&gnome-version;/gnome-themes-&gnome-themes-version;.tar.bz2">
-  <!ENTITY gnome-themes-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-themes/&gnome-version;/gnome-themes-&gnome-themes-version;.tar.bz2">
-  <!ENTITY gnome-themes-md5sum "f365c73ccfbe35640e17fe8d877273fe">
-  <!ENTITY gnome-themes-size "2.5 MB">
-  <!ENTITY gnome-themes-buildsize "19 MB">
-  <!ENTITY gnome-themes-time "0.2 SBU">
+  <!ENTITY gnome-themes-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-themes/&gnome-version;/gnome-themes-&gnome-themes-version;.tar.bz2">
+  <!ENTITY gnome-themes-md5sum        "ab6d63ecb304506153fac3e958995ef4">
+  <!ENTITY gnome-themes-size          "2.5 MB">
+  <!ENTITY gnome-themes-buildsize     "19.6 MB">
+  <!ENTITY gnome-themes-time          "0.2 SBU">
 ]>
 
@@ -68,5 +68,5 @@
     running the following commands:</para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --enable-all-themes &amp;&amp;
 make</userinput></screen>
 
@@ -76,4 +76,12 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+    
+    <para><option>--enable-all-themes</option>: Using this parameter enables
+    the installation of additional accessibility themes.</para>
 
   </sect2>
@@ -92,6 +100,6 @@
         <seg>None</seg>
         <seg>Several directories under /usr/share/[themes,icons]</seg>
-        <seg>Several themes under the /usr/share/themes hierarchy and icons
-        under the /usr/share/icons hierarchy</seg>
+        <seg>Several themes in the /usr/share/themes hierarchy and icons
+        in the /usr/share/icons hierarchy</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/core/gnome-vfs.xml
===================================================================
--- gnome/core/gnome-vfs.xml	(revision 3b269b95647108dadcb6aab997af431d0f744e2f)
+++ gnome/core/gnome-vfs.xml	(revision 0c4e1165472cff0493190d8d8b9af5642709fa9f)
@@ -6,9 +6,9 @@
 
   <!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 "88b520e5de748a310a2aef62fc095c8b">
-  <!ENTITY gnome-vfs-size "1.9 MB">
-  <!ENTITY gnome-vfs-buildsize "49 MB">
-  <!ENTITY gnome-vfs-time "1.3 SBU">
+  <!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">
 ]>
 
@@ -59,7 +59,7 @@
     <itemizedlist spacing='compact'>
       <listitem>
-        <para>Required patch if <application>HAL-0.5.4</application> is
-        installed: <ulink
-        url="&patch-root;/gnome-vfs-&gnome-vfs-version;-hal_0.5.0-1.patch"/></para>
+        <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>
@@ -95,5 +95,5 @@
     by running the following commands:</para>
 
-<screen><userinput>patch -Np1 -i ../gnome-vfs-&gnome-vfs-version;-hal_0.5.0-1.patch &amp;&amp;
+<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 \
@@ -126,4 +126,9 @@
     unpopulated.</para>
 
+    <para><option>--with-hal-eject=PROGRAM</option>: This parameter does not
+    need to be passed if you have <ulink
+    url="http://ca.geocities.com/jefftranter@rogers.com/eject.html">Eject</ulink>
+    installed as the <command>eject</command> program is used by default.</para>
+
   </sect2>
 
@@ -153,3 +158,2 @@
 
 </sect1>
-
Index: gnome/core/gnome2-user-docs.xml
===================================================================
--- gnome/core/gnome2-user-docs.xml	(revision 3b269b95647108dadcb6aab997af431d0f744e2f)
+++ gnome/core/gnome2-user-docs.xml	(revision 0c4e1165472cff0493190d8d8b9af5642709fa9f)
@@ -6,9 +6,9 @@
 
   <!ENTITY gnome2-user-docs-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome2-user-docs/2.8/gnome2-user-docs-&gnome2-user-docs-version;.tar.bz2">
-  <!ENTITY gnome2-user-docs-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome2-user-docs/2.8/gnome2-user-docs-&gnome2-user-docs-version;.tar.bz2">
-  <!ENTITY gnome2-user-docs-md5sum "90bdd21ea3e3e794f641dd805216f275">
-  <!ENTITY gnome2-user-docs-size "1.0 MB">
-  <!ENTITY gnome2-user-docs-buildsize "6 MB">
-  <!ENTITY gnome2-user-docs-time "less than 0.1 SBU">
+  <!ENTITY gnome2-user-docs-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/gnome2-user-docs/2.8/gnome2-user-docs-&gnome2-user-docs-version;.tar.bz2">
+  <!ENTITY gnome2-user-docs-md5sum        "90bdd21ea3e3e794f641dd805216f275">
+  <!ENTITY gnome2-user-docs-size          "1.0 MB">
+  <!ENTITY gnome2-user-docs-buildsize     "6 MB">
+  <!ENTITY gnome2-user-docs-time          "less than 0.1 SBU">
 ]>
 
