Index: gnome/core/control-center.xml
===================================================================
--- gnome/core/control-center.xml	(revision 998dcf89c91f298a5e68028bf35a488716a435f4)
+++ gnome/core/control-center.xml	(revision a6bee1f60f103f0661222317dca17466960d9870)
@@ -7,8 +7,8 @@
   <!ENTITY control-center-download-http "&gnome-download-http;/control-center/&gnome-version;/control-center-&control-center-version;.tar.bz2">
   <!ENTITY control-center-download-ftp  "&gnome-download-ftp;/control-center/&gnome-version;/control-center-&control-center-version;.tar.bz2">
-  <!ENTITY control-center-md5sum        "f3d8520b8544e1f910600ba889e02523">
-  <!ENTITY control-center-size          "1.7 MB">
-  <!ENTITY control-center-buildsize     "57.3 MB">
-  <!ENTITY control-center-time          "1.4 SBU">
+  <!ENTITY control-center-md5sum        "08711b0f14584e7eaa9f4c275085ab36">
+  <!ENTITY control-center-size          "1.8 MB">
+  <!ENTITY control-center-buildsize     "60.2 MB">
+  <!ENTITY control-center-time          "1.5 SBU">
 ]>
 
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">control-center-&control-center-version;.tar</keyword>
-      <keyword role="ftpdir">control-center</keyword>
-    </keywordset>
   </sect1info>
 
@@ -69,7 +65,15 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="evolution-data-server"/>,
-    <xref linkend="alsa"/>,
-    <xref linkend="gst-plugins"/>, and
-    <xref linkend="xscreensaver"/></para>
+    <xref linkend="alsa"/>, and
+    <xref linkend="gst-plugins-base"/></para>
+
+    <para>Though they are only run-time dependencies and
+    <application>Control Center</application> will compile just fine without
+    them installed, there are two screen saver packages that can be installed
+    which will provide a robust collection of screen savers and screen
+    locking capability. <ulink
+    url="&gnome-download-http;/gnome-screensaver/2.14/">GNOME
+    ScreenSaver</ulink> (BLFS page is forthcoming) is looked for first, with a
+    fallback to <xref linkend="xscreensaver"/> if necessary.</para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -84,9 +88,9 @@
     following commands:</para>
 
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-            --libexecdir=`pkg-config \
-            --variable=prefix ORBit-2.0`/lib/control-center \
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
             --localstatedir=/var/lib \
-            --sysconfdir=&gnome-etc-dir; &amp;&amp;
+            --sysconfdir=&gnome-etc-dir; \
+            --libexecdir=$(pkg-config \
+                --variable=prefix ORBit-2.0)/lib/control-center &amp;&amp;
 make</userinput></screen>
 
@@ -102,6 +106,6 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--libexecdir=`pkg-config --variable=prefix
-    ORBit-2.0`/lib/control-center</parameter>: This switch puts libexec files in
+    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
+    ORBit-2.0)/lib/control-center</parameter>: This switch puts libexec files in
     <filename class="directory">$GNOME_PREFIX/lib/control-center</filename>
     instead of
@@ -145,10 +149,9 @@
         modules and <application>Nautilus</application> library module
         extensions</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,desktop/}{,schemas/}apps/{too many to list}
-        and the following subdirectories of $GNOME_PREFIX/:
+        <seg>The following subdirectories of $GNOME_PREFIX/:
         include/gnome-window-settings-2.0,
-        lib/{lib, nautilus, window-manager-settings},
-        share/{{,gnome/help/,omf}control-center-2.0,
-        gnome/{cursor-fonts,vfolders}}</seg>
+        lib/{control-center, nautilus, window-manager-settings},
+        share/{{,gnome/help/,omf/}control-center-2.0,
+        gnome/{default-applications,cursor-fonts}}</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/core/eel.xml
===================================================================
--- gnome/core/eel.xml	(revision 998dcf89c91f298a5e68028bf35a488716a435f4)
+++ gnome/core/eel.xml	(revision a6bee1f60f103f0661222317dca17466960d9870)
@@ -7,7 +7,7 @@
   <!ENTITY eel-download-http "&gnome-download-http;/eel/&gnome-version;/eel-&eel-version;.tar.bz2">
   <!ENTITY eel-download-ftp  "&gnome-download-ftp;/eel/&gnome-version;/eel-&eel-version;.tar.bz2">
-  <!ENTITY eel-md5sum        "d78cd3e33c656a62b5bf1f8d0b8d271f">
-  <!ENTITY eel-size          "675 KB">
-  <!ENTITY eel-buildsize     "13.9 MB">
+  <!ENTITY eel-md5sum        "7002f4f99317ed11da8b9db15b7e4a2b">
+  <!ENTITY eel-size          "639 KB">
+  <!ENTITY eel-buildsize     "14.4 MB">
   <!ENTITY eel-time          "0.5 SBU">
 ]>
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">eel-&eel-version;.tar</keyword>
-      <keyword role="ftpdir">eel</keyword>
-    </keywordset>
   </sect1info>
 
@@ -67,4 +63,7 @@
     <xref linkend="gail"/></para>
 
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="intltool"/></para>
+
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/eel"/></para>
@@ -78,5 +77,5 @@
     following commands:</para>
 
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` &amp;&amp;
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) &amp;&amp;
 make</userinput></screen>
 
Index: gnome/core/gail.xml
===================================================================
--- gnome/core/gail.xml	(revision 998dcf89c91f298a5e68028bf35a488716a435f4)
+++ gnome/core/gail.xml	(revision a6bee1f60f103f0661222317dca17466960d9870)
@@ -7,7 +7,7 @@
   <!ENTITY gail-download-http "&gnome-download-http;/gail/1.8/gail-&gail-version;.tar.bz2">
   <!ENTITY gail-download-ftp  "&gnome-download-ftp;/gail/1.8/gail-&gail-version;.tar.bz2">
-  <!ENTITY gail-md5sum        "9fd96f8f702b46c328329468632c0729">
-  <!ENTITY gail-size          "582 KB">
-  <!ENTITY gail-buildsize     "20.2 MB">
+  <!ENTITY gail-md5sum        "ff79df7dd0cf7a5109c089b9b5fbe17f">
+  <!ENTITY gail-size          "584 KB">
+  <!ENTITY gail-buildsize     "19.5 MB">
   <!ENTITY gail-time          "0.6 SBU">
 ]>
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">gail-&gail-version;.tar</keyword>
-      <keyword role="ftpdir">gail</keyword>
-    </keywordset>
   </sect1info>
 
@@ -82,5 +78,5 @@
     the following commands:</para>
 
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` &amp;&amp;
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) &amp;&amp;
 make</userinput></screen>
 
@@ -94,22 +90,22 @@
     <application>GAIL</application> modules in
     <filename class='directory'>/usr/lib</filename> even if
-    <envar>$GNOME_PREFIX</envar> is <emphasis>NOT</emphasis>
+    <envar>$GNOME_PREFIX</envar> is <emphasis role='strong'>NOT</emphasis>
     <filename class='directory'>/usr</filename>. If <envar>$GNOME_PREFIX</envar>
     is anything other than <filename class='directory'>/usr</filename>, create
     a symlink to <envar>$GNOME_PREFIX</envar> to satisfy this requirement:</para>
 
-<screen role="root"><userinput>ln -v -s `pkg-config --variable=prefix ORBit-2.0`/lib/gtk-2.0/modules \
+<screen role="root"><userinput>ln -v -s $(pkg-config --variable=prefix ORBit-2.0)/lib/gtk-2.0/modules \
          /usr/lib/gtk-2.0</userinput></screen>
 
   </sect2>
 
-  <sect2 role="commands">
+  <!-- <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><option>--enable-gtk-doc</option>: Use this parameter if you have
+    <para><option>-enable-gtk-doc</option>: Use this parameter if you have
     <application>GTK-Doc</application> installed and wish to build the API
     documentation as the source tarball doesn't contain pre-built docs.</para>
 
-  </sect2>
+  </sect2> -->
 
   <sect2 role="content">
Index: gnome/core/gconf.xml
===================================================================
--- gnome/core/gconf.xml	(revision 998dcf89c91f298a5e68028bf35a488716a435f4)
+++ gnome/core/gconf.xml	(revision a6bee1f60f103f0661222317dca17466960d9870)
@@ -7,7 +7,7 @@
   <!ENTITY GConf-download-http "&gnome-download-http;/GConf/&gnome-version;/GConf-&GConf-version;.tar.bz2">
   <!ENTITY GConf-download-ftp  "&gnome-download-http;/GConf/&gnome-version;/GConf-&GConf-version;.tar.bz2">
-  <!ENTITY GConf-md5sum        "247110de013ed24b17cf4191eb6daec5">
-  <!ENTITY GConf-size          "1.9 MB">
-  <!ENTITY GConf-buildsize     "28.9 MB">
+  <!ENTITY GConf-md5sum        "d07c2efcaf477cf34225c604a04b6271">
+  <!ENTITY GConf-size          "1.8 MB">
+  <!ENTITY GConf-buildsize     "29.7 MB">
   <!ENTITY GConf-time          "0.4 SBU">
 ]>
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">GConf-&GConf-version;.tar</keyword>
-      <keyword role="ftpdir">GConf</keyword>
-    </keywordset>
   </sect1info>
 
@@ -82,8 +78,10 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-            --libexecdir=`pkg-config \
-            --variable=prefix ORBit-2.0`/lib/GConf \
-            --sysconfdir=&gnome-etc-dir; &amp;&amp;
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
+            --sysconfdir=&gnome-etc-dir; \
+            --libexecdir=$(pkg-config \
+                --variable=prefix ORBit-2.0)/lib/GConf \
+            --mandir=$(pkg-config \
+                --variable=prefix ORBit-2.0)/share/man &amp;&amp;
 make</userinput></screen>
 
@@ -100,6 +98,6 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--libexecdir=`pkg-config --variable=prefix
-    ORBit-2.0`/lib/GConf</parameter>: This switch puts libexec files in
+    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
+    ORBit-2.0)/lib/GConf</parameter>: This switch puts libexec files in
     <filename class="directory">$GNOME_PREFIX/lib/GConf</filename> instead of
     <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
Index: gnome/core/gnome-applets.xml
===================================================================
--- gnome/core/gnome-applets.xml	(revision 998dcf89c91f298a5e68028bf35a488716a435f4)
+++ gnome/core/gnome-applets.xml	(revision a6bee1f60f103f0661222317dca17466960d9870)
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">gnome-applets-&gnome-applets-version;.tar</keyword>
-      <keyword role="ftpdir">gnome-applets</keyword>
-    </keywordset>
   </sect1info>
 
@@ -69,5 +65,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="libgtop"/>,
-    <xref linkend="gst-plugins"/>,
+    <xref linkend="gst-plugins-base"/>,
     <xref linkend="hal"/>,
     <xref linkend="gucharmap"/>,
@@ -91,9 +87,11 @@
     running the following commands:</para>
 
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-            --libexecdir=`pkg-config \
-            --variable=prefix ORBit-2.0`/lib/gnome-applets \
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
             --localstatedir=/var/lib \
-            --sysconfdir=&gnome-etc-dir; &amp;&amp;
+            --sysconfdir=&gnome-etc-dir; \
+            --libexecdir=$(pkg-config \
+                --variable=prefix ORBit-2.0)/lib/gnome-applets \
+            --mandir=$(pkg-config \
+                --variable=prefix ORBit-2.0)/share/man &amp;&amp;
 make</userinput></screen>
 
Index: gnome/core/gnome-backgrounds.xml
===================================================================
--- gnome/core/gnome-backgrounds.xml	(revision 998dcf89c91f298a5e68028bf35a488716a435f4)
+++ gnome/core/gnome-backgrounds.xml	(revision a6bee1f60f103f0661222317dca17466960d9870)
@@ -7,7 +7,7 @@
   <!ENTITY gnome-backgrounds-download-http "&gnome-download-http;/gnome-backgrounds/&gnome-version;/gnome-backgrounds-&gnome-backgrounds-version;.tar.bz2">
   <!ENTITY gnome-backgrounds-download-ftp  "&gnome-download-ftp;/gnome-backgrounds/&gnome-version;/gnome-backgrounds-&gnome-backgrounds-version;.tar.bz2">
-  <!ENTITY gnome-backgrounds-md5sum        "8c0533d438721ed1923d5dfa87885f53">
-  <!ENTITY gnome-backgrounds-size          "1.7 MB">
-  <!ENTITY gnome-backgrounds-buildsize     "5.2 MB">
+  <!ENTITY gnome-backgrounds-md5sum        "10480df7c2e5a08c920c5b0a2ff4f161">
+  <!ENTITY gnome-backgrounds-size          "1.1 MB">
+  <!ENTITY gnome-backgrounds-buildsize     "4.3 MB">
   <!ENTITY gnome-backgrounds-time          "less than 0.1 SBU">
 ]>
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">gnome-backgrounds-&gnome-backgrounds-version;.tar</keyword>
-      <keyword role="ftpdir">gnome-backgrounds</keyword>
-    </keywordset>
   </sect1info>
 
@@ -65,4 +61,7 @@
     <para role="required"><xref linkend="perl-xml-parser"/></para>
 
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="intltool"/></para>
+
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/gnome-backgrounds"/></para>
@@ -79,5 +78,5 @@
     following commands:</para>
 
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` &amp;&amp;
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) &amp;&amp;
 make</userinput></screen>
 
Index: gnome/core/gnome-desktop-file-utils.xml
===================================================================
--- gnome/core/gnome-desktop-file-utils.xml	(revision 998dcf89c91f298a5e68028bf35a488716a435f4)
+++ gnome/core/gnome-desktop-file-utils.xml	(revision a6bee1f60f103f0661222317dca17466960d9870)
@@ -17,9 +17,8 @@
 
   <para>The <xref linkend="desktop-file-utils"/> package is located in
-  Chapter 10 &mdash; General Utilities and is required by
-  <application>GNOME-2</application> but is not a direct dependency of any
-  <application>GNOME-2</application> package, therefore the package
-  is mentioned within the <application>GNOME-2</application> Core Packages
-  chapter to ensure it is installed.</para>
+  Chapter 10 &mdash; General Utilities and is required by GNOME-2 but is not
+  a direct dependency of any GNOME-2 package, therefore the package is
+  mentioned within the GNOME-2 Core Packages chapter to ensure it is
+  installed.</para>
 
 </sect1>
Index: gnome/core/gnome-desktop.xml
===================================================================
--- gnome/core/gnome-desktop.xml	(revision 998dcf89c91f298a5e68028bf35a488716a435f4)
+++ gnome/core/gnome-desktop.xml	(revision a6bee1f60f103f0661222317dca17466960d9870)
@@ -7,7 +7,7 @@
   <!ENTITY gnome-desktop-download-http "&gnome-download-http;/gnome-desktop/&gnome-version;/gnome-desktop-&gnome-desktop-version;.tar.bz2">
   <!ENTITY gnome-desktop-download-ftp  "&gnome-download-ftp;/gnome-desktop/&gnome-version;/gnome-desktop-&gnome-desktop-version;.tar.bz2">
-  <!ENTITY gnome-desktop-md5sum        "8f92b61ff20c00d6c475e93fce81b3c7">
-  <!ENTITY gnome-desktop-size          "1.0 MB">
-  <!ENTITY gnome-desktop-buildsize     "11.4 MB">
+  <!ENTITY gnome-desktop-md5sum        "9c252124a80453d47377664b31159590">
+  <!ENTITY gnome-desktop-size          "1.1 MB">
+  <!ENTITY gnome-desktop-buildsize     "13.6 MB">
   <!ENTITY gnome-desktop-time          "0.2 SBU">
 ]>
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">gnome-desktop-&gnome-desktop-version;.tar</keyword>
-      <keyword role="ftpdir">gnome-desktop</keyword>
-    </keywordset>
   </sect1info>
 
@@ -81,7 +77,9 @@
     running the following commands:</para>
 
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
             --sysconfdir=&gnome-etc-dir; \
-            --localstatedir=/var/lib &amp;&amp;
+            --localstatedir=/var/lib \
+            --mandir=$(pkg-config \
+                --variable=prefix ORBit-2.0)/share/man &amp;&amp;
 make</userinput></screen>
 
@@ -124,5 +122,7 @@
         <seg>The following subdirectories of $GNOME_PREFIX/:
         include/gnome-desktop-2.0,
-        share/{gnome-about, {gnome/help,omf}/{fdl,gnome-feedback,gpl,lgpl}</seg>
+        share/{gnome-about,
+        {gnome/help,omf}/{fdl,gnome-feedback,gpl,lgpl},
+        gtk-doc/html/gnome-desktop}</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/core/gnome-doc-utils.xml
===================================================================
--- gnome/core/gnome-doc-utils.xml	(revision 998dcf89c91f298a5e68028bf35a488716a435f4)
+++ gnome/core/gnome-doc-utils.xml	(revision a6bee1f60f103f0661222317dca17466960d9870)
@@ -7,7 +7,7 @@
   <!ENTITY gnome-doc-utils-download-http "&gnome-download-http;/gnome-doc-utils/0.4/gnome-doc-utils-&gnome-doc-utils-version;.tar.bz2">
   <!ENTITY gnome-doc-utils-download-ftp  "&gnome-download-ftp;/gnome-doc-utils/0.4/gnome-doc-utils-&gnome-doc-utils-version;.tar.bz2">
-  <!ENTITY gnome-doc-utils-md5sum        "b89d9e9830f5b3e0ead295104637a207">
-  <!ENTITY gnome-doc-utils-size          "382 KB">
-  <!ENTITY gnome-doc-utils-buildsize     "6.5 MB">
+  <!ENTITY gnome-doc-utils-md5sum        "c706b807b15e07e58561f903c0f20c26">
+  <!ENTITY gnome-doc-utils-size          "384 KB">
+  <!ENTITY gnome-doc-utils-buildsize     "9.0 MB">
   <!ENTITY gnome-doc-utils-time          "less than 0.1 SBU">
 ]>
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">gnome-doc-utils-&gnome-doc-utils-version;.tar</keyword>
-      <keyword role="ftpdir">gnome-doc-utils</keyword>
-    </keywordset>
   </sect1info>
 
@@ -69,7 +65,12 @@
     <bridgehead renderas="sect3">GNOME Doc Utils Dependencies</bridgehead>
 
-    <bridgehead renderas="sect4">Required</bridgehead>
+    <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="required"><xref linkend="python"/> and
     <xref linkend="scrollkeeper"/></para>
+
+    <para>The packages are listed as recommended because if they are not
+    installed (and the proper switches are passed to the
+    <command>configure</command> command), functionality will be missing that
+    is expected later in other GNOME packages.</para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -90,5 +91,8 @@
     by running the following commands:</para>
 
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` &amp;&amp;
+<screen><userinput>
+./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
+            --mandir=$(pkg-config \
+                --variable=prefix ORBit-2.0)/share/man &amp;&amp;
 make</userinput></screen>
 
@@ -113,7 +117,10 @@
         <seg>gnome-doc-prepare and xml2po</seg>
         <seg>None</seg>
-        <seg>The following subdirectories of $GNOME_PREFIX/:
-        share/{gnome-doc-utils, gnome/help/gnome-doc-{make,xslt},
-        omf/gnome-doc-{make,xslt}, xml/gnome, and xml2po}</seg>
+        <seg>The following subdirectories of $GNOME_PREFIX/share/:
+        gnome-doc-utils,
+        gnome/help/gnome-doc-{make,xslt},
+        omf/gnome-doc-{make,xslt},
+        xml/gnome and
+        xml2po}</seg>
         <seg>Custom DocBook XSLT stylesheets</seg>
       </seglistitem>
Index: gnome/core/gnome-icon-theme.xml
===================================================================
--- gnome/core/gnome-icon-theme.xml	(revision 998dcf89c91f298a5e68028bf35a488716a435f4)
+++ gnome/core/gnome-icon-theme.xml	(revision a6bee1f60f103f0661222317dca17466960d9870)
@@ -7,7 +7,7 @@
   <!ENTITY gnome-icon-theme-download-http "&gnome-download-http;/gnome-icon-theme/&gnome-version;/gnome-icon-theme-&gnome-icon-theme-version;.tar.bz2">
   <!ENTITY gnome-icon-theme-download-ftp  "&gnome-download-ftp;/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-md5sum        "6f1d33a297bd27e0e9f4c1a5fa956166">
+  <!ENTITY gnome-icon-theme-size          "2.9 MB">
+  <!ENTITY gnome-icon-theme-buildsize     "29.6 MB">
   <!ENTITY gnome-icon-theme-time          "0.2 SBU">
 ]>
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">gnome-icon-theme-&gnome-icon-theme-version;.tar</keyword>
-      <keyword role="ftpdir">gnome-icon-theme</keyword>
-    </keywordset>
   </sect1info>
 
Index: gnome/core/gnome-keyring.xml
===================================================================
--- gnome/core/gnome-keyring.xml	(revision 998dcf89c91f298a5e68028bf35a488716a435f4)
+++ gnome/core/gnome-keyring.xml	(revision a6bee1f60f103f0661222317dca17466960d9870)
@@ -7,7 +7,7 @@
   <!ENTITY gnome-keyring-download-http "&gnome-download-http;/gnome-keyring/0.4/gnome-keyring-&gnome-keyring-version;.tar.bz2">
   <!ENTITY gnome-keyring-download-ftp  "&gnome-download-ftp;/gnome-keyring/0.4/gnome-keyring-&gnome-keyring-version;.tar.bz2">
-  <!ENTITY gnome-keyring-md5sum        "7d94fc9598035ea1a92f4e777dfc4194">
-  <!ENTITY gnome-keyring-size          "379 KB">
-  <!ENTITY gnome-keyring-buildsize     "5.5 MB">
+  <!ENTITY gnome-keyring-md5sum        "9a90820acf11a66e4c3dd9e163231071">
+  <!ENTITY gnome-keyring-size          "396 KB">
+  <!ENTITY gnome-keyring-buildsize     "5.6 MB">
   <!ENTITY gnome-keyring-time          "0.1 SBU">
 ]>
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">gnome-keyring-&gnome-keyring-version;.tar</keyword>
-      <keyword role="ftpdir">gnome-keyring</keyword>
-    </keywordset>
   </sect1info>
 
@@ -78,7 +74,7 @@
     following commands:</para>
 
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-            --libexecdir=`pkg-config \
-            --variable=prefix ORBit-2.0`/lib/gnome-keyring &amp;&amp;
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
+            --libexecdir=$(pkg-config \
+                --variable=prefix ORBit-2.0)/lib/gnome-keyring &amp;&amp;
 make</userinput></screen>
 
@@ -87,5 +83,9 @@
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make install &amp;&amp;
+install -v -m755 -d $(pkg-config \
+        --variable=prefix ORBit-2.0)/share/doc/gnome-keyring-&gnome-keyring-version; &amp;&amp;
+install -v -m644 *.txt $(pkg-config \
+        --variable=prefix ORBit-2.0)/share/doc/gnome-keyring-&gnome-keyring-version;</userinput></screen>
 
   </sect2>
@@ -94,6 +94,6 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--libexecdir=`pkg-config --variable=prefix
-    ORBit-2.0`/lib/gnome-keyring</parameter>: This switch puts libexec files in
+    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
+    ORBit-2.0)/lib/gnome-keyring</parameter>: This switch puts libexec files in
     <filename class="directory">$GNOME_PREFIX/lib/gnome-keyring</filename>
     instead of
@@ -114,6 +114,7 @@
         <seg>libgnome-keyring.so</seg>
         <seg>The following subdirectories of $GNOME_PREFIX/:
-        include/gnome-keyring-1 and
-        lib/gnome-keyring</seg>
+        include/gnome-keyring-1,
+        lib/gnome-keyring and
+        share/doc/gnome-keyring-&gnome-keyring-version;</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/core/gnome-menus.xml
===================================================================
--- gnome/core/gnome-menus.xml	(revision 998dcf89c91f298a5e68028bf35a488716a435f4)
+++ gnome/core/gnome-menus.xml	(revision a6bee1f60f103f0661222317dca17466960d9870)
@@ -7,7 +7,7 @@
   <!ENTITY gnome-menus-download-http "&gnome-download-http;/gnome-menus/&gnome-version;/gnome-menus-&gnome-menus-version;.tar.bz2">
   <!ENTITY gnome-menus-download-ftp  "&gnome-download-ftp;/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-md5sum        "7aa0c08fc8b9caabb4be46e1cfb595fc">
+  <!ENTITY gnome-menus-size          "408 KB">
+  <!ENTITY gnome-menus-buildsize     "7.4 MB">
   <!ENTITY gnome-menus-time          "0.1 SBU">
 ]>
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">gnome-menus-&gnome-menus-version;.tar</keyword>
-      <keyword role="ftpdir">gnome-menus</keyword>
-    </keywordset>
   </sect1info>
 
@@ -71,6 +67,7 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="python"/> and
-    <xref linkend="gamin"/></para>
+    <para role="optional"><xref linkend="python"/>,
+    <xref linkend="gamin"/>, and
+    <xref linkend="intltool"/></para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -88,5 +85,5 @@
     following commands:</para>
 
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
             --sysconfdir=&gnome-etc-dir; &amp;&amp;
 make</userinput></screen>
@@ -137,5 +134,5 @@
 
       <seglistitem>
-        <seg>gnome-menu-spec-test</seg>
+        <seg>gmenu-simple-editor and gnome-menu-spec-test</seg>
         <seg>libgnome-menu.{so,a}</seg>
         <seg>&gnome-etc-dir;/xdg and the following subdirectories of
@@ -151,4 +148,15 @@
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="gmenu-simple-editor">
+        <term><command>gmenu-simple-editor</command></term>
+        <listitem>
+          <para>is a simple front-end script to the
+          <application>Python</application> Gmenu Simple Editor module</para>
+          <indexterm zone="gnome-menus gmenu-simple-editor">
+            <primary sortas="b-gmenu-simple-editor">gmenu-simple-editor</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
       <varlistentry id="gnome-menu-spec-test">
Index: gnome/core/gnome-mime-data.xml
===================================================================
--- gnome/core/gnome-mime-data.xml	(revision 998dcf89c91f298a5e68028bf35a488716a435f4)
+++ gnome/core/gnome-mime-data.xml	(revision a6bee1f60f103f0661222317dca17466960d9870)
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">gnome-mime-data-&gnome-mime-data-version;.tar</keyword>
-      <keyword role="ftpdir">gnome-mime-data</keyword>
-    </keywordset>
   </sect1info>
 
@@ -79,6 +75,8 @@
     the following commands:</para>
 
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-            --sysconfdir=&gnome-etc-dir; &amp;&amp;
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
+            --sysconfdir=&gnome-etc-dir; \
+            --mandir=$(pkg-config \
+                --variable=prefix ORBit-2.0)/share/man &amp;&amp;
 make</userinput></screen>
 
@@ -89,5 +87,6 @@
 <screen role="root"><userinput>make install &amp;&amp;
 install -v -m644 -D man/gnome-vfs-mime.5 \
-    $GNOME_PREFIX/man/man5/gnome-vfs-mime.5</userinput></screen>
+    $(pkg-config \
+        --variable=prefix ORBit-2.0)/share/man/man5/gnome-vfs-mime.5</userinput></screen>
 
   </sect2>
@@ -99,4 +98,9 @@
     configuration files in <filename class="directory">&gnome-etc-dir;</filename>
     instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
+
+    <para><parameter>--mandir=...</parameter>: This switch is unneeded and may
+    be removed as the man page is installed manually. It is only in the
+    instructions in case the man page is ever installed during
+    <command>make install</command>.</para>
 
   </sect2>
Index: gnome/core/gnome-panel.xml
===================================================================
--- gnome/core/gnome-panel.xml	(revision 998dcf89c91f298a5e68028bf35a488716a435f4)
+++ gnome/core/gnome-panel.xml	(revision a6bee1f60f103f0661222317dca17466960d9870)
@@ -7,8 +7,8 @@
   <!ENTITY gnome-panel-download-http "&gnome-download-http;/gnome-panel/&gnome-version;/gnome-panel-&gnome-panel-version;.tar.bz2">
   <!ENTITY gnome-panel-download-ftp  "&gnome-download-ftp;/gnome-panel/&gnome-version;/gnome-panel-&gnome-panel-version;.tar.bz2">
-  <!ENTITY gnome-panel-md5sum        "b48ebb9a2eecc9bcda7d3083e7b16db8">
-  <!ENTITY gnome-panel-size          "2.4 MB">
-  <!ENTITY gnome-panel-buildsize     "57.5 MB">
-  <!ENTITY gnome-panel-time          "0.8 SBU">
+  <!ENTITY gnome-panel-md5sum        "7db1afb3f6cbca12acecc49c68b4a655">
+  <!ENTITY gnome-panel-size          "2.5 MB">
+  <!ENTITY gnome-panel-buildsize     "61.3 MB">
+  <!ENTITY gnome-panel-time          "0.9 SBU">
 ]>
 
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">gnome-panel-&gnome-panel-version;.tar</keyword>
-      <keyword role="ftpdir">gnome-panel</keyword>
-    </keywordset>
   </sect1info>
 
@@ -69,5 +65,6 @@
     <para role="optional"><xref linkend="evolution-data-server"/>
     (required if you plan to install <xref linkend="evolution"/> or
-    <xref linkend="gnomemeeting"/>) and
+    <xref linkend="ekiga"/>),
+    <xref linkend="intltool"/>, and
     <xref linkend="gtk-doc"/></para>
 
@@ -83,9 +80,11 @@
     running the following commands:</para>
 
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-            --libexecdir=`pkg-config \
-            --variable=prefix ORBit-2.0`/lib/gnome-panel \
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
             --localstatedir=/var/lib \
-            --sysconfdir=&gnome-etc-dir; &amp;&amp;
+            --sysconfdir=&gnome-etc-dir; \
+            --libexecdir=$(pkg-config \
+                --variable=prefix ORBit-2.0)/lib/gnome-panel \
+            --mandir=$(pkg-config \
+                --variable=prefix ORBit-2.0)/share/man &amp;&amp;
 make</userinput></screen>
 
@@ -124,6 +123,5 @@
         <seg>gnome-desktop-item-edit, gnome-panel and panel-test-applets</seg>
         <seg>libpanel-applet-2.{so,a}</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas}/apps
-        and the following subdirectories of $GNOME_PREFIX/:
+        <seg>The following subdirectories of $GNOME_PREFIX/:
         include/panel-2.0,
         lib/gnome-panel,
Index: gnome/core/gnome-session.xml
===================================================================
--- gnome/core/gnome-session.xml	(revision 998dcf89c91f298a5e68028bf35a488716a435f4)
+++ gnome/core/gnome-session.xml	(revision a6bee1f60f103f0661222317dca17466960d9870)
@@ -7,7 +7,7 @@
   <!ENTITY gnome-session-download-http "&gnome-download-http;/gnome-session/&gnome-version;/gnome-session-&gnome-session-version;.tar.bz2">
   <!ENTITY gnome-session-download-ftp  "&gnome-download-ftp;/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-md5sum        "191dc3a18eb37aca391914b404cf1cd7">
+  <!ENTITY gnome-session-size          "661 KB">
+  <!ENTITY gnome-session-buildsize     "12.0 MB">
   <!ENTITY gnome-session-time          "0.3 SBU">
 ]>
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">gnome-session-&gnome-session-version;.tar</keyword>
-      <keyword role="ftpdir">gnome-session</keyword>
-    </keywordset>
   </sect1info>
 
@@ -62,8 +58,10 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libgnomeui"/></para>
+    <para role="required"><xref linkend="gnome-desktop"/> and
+    <xref linkend="esound"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="tcpwrappers"/></para>
+    <para role="optional"><xref linkend="tcpwrappers"/> and
+    <ulink url="http://www.galago-project.org/news/index.php">libnotify</ulink></para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -78,6 +76,8 @@
     running the following commands:</para>
 
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-            --sysconfdir=&gnome-etc-dir; &amp;&amp;
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
+            --sysconfdir=&gnome-etc-dir; \
+            --mandir=$(pkg-config \
+                --variable=prefix ORBit-2.0)/share/man &amp;&amp;
 make</userinput></screen>
 
@@ -111,6 +111,5 @@
         gnome-session-save, and gnome-wm</seg>
         <seg>None</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas/}apps/gnome-session
-        and $GNOME_PREFIX/share/pixmaps/splash</seg>
+        <seg>$GNOME_PREFIX/share/pixmaps/splash</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/core/gnome-shared-mime-info.xml
===================================================================
--- gnome/core/gnome-shared-mime-info.xml	(revision 998dcf89c91f298a5e68028bf35a488716a435f4)
+++ gnome/core/gnome-shared-mime-info.xml	(revision a6bee1f60f103f0661222317dca17466960d9870)
@@ -17,9 +17,8 @@
 
   <para>The <xref linkend="shared-mime-info"/> package is located in
-  Chapter 26 &mdash; X Libraries and is required by
-  <application>GNOME-2</application> but is not a direct dependency
-  of any <application>GNOME-2</application> package, therefore the package
-  is mentioned within the <application>GNOME-2</application> Core Packages
-  chapter to ensure it is installed.</para>
+  Chapter 26 &mdash; X Libraries and is required by GNOME-2 but is not a
+  direct dependency of any GNOME-2 package, therefore the package is
+  mentioned within the GNOME-2 Core Packages chapter to ensure it is
+  installed.</para>
 
 </sect1>
Index: gnome/core/gnome-terminal.xml
===================================================================
--- gnome/core/gnome-terminal.xml	(revision 998dcf89c91f298a5e68028bf35a488716a435f4)
+++ gnome/core/gnome-terminal.xml	(revision a6bee1f60f103f0661222317dca17466960d9870)
@@ -7,7 +7,7 @@
   <!ENTITY gnome-terminal-download-http "&gnome-download-http;/gnome-terminal/&gnome-version;/gnome-terminal-&gnome-terminal-version;.tar.bz2">
   <!ENTITY gnome-terminal-download-ftp  "&gnome-download-ftp;/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-md5sum        "da80071cd707e89cedcfb476cab8b39a">
+  <!ENTITY gnome-terminal-size          "1.7 MB">
+  <!ENTITY gnome-terminal-buildsize     "39.0 MB">
   <!ENTITY gnome-terminal-time          "0.3 SBU">
 ]>
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">gnome-terminal-&gnome-terminal-version;.tar</keyword>
-      <keyword role="ftpdir">gnome-terminal</keyword>
-    </keywordset>
   </sect1info>
 
@@ -78,5 +74,5 @@
     running the following commands:</para>
 
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
             --localstatedir=/var/lib \
             --sysconfdir=&gnome-etc-dir; &amp;&amp;
@@ -116,6 +112,5 @@
         <seg>gnome-terminal</seg>
         <seg>None</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas/}apps/gnome-terminal
-        and $GNOME_PREFIX/share/{,gnome/help/, omf/}gnome-terminal</seg>
+        <seg>$GNOME_PREFIX/share/{,gnome/help/,omf/}gnome-terminal</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/core/gnome-themes.xml
===================================================================
--- gnome/core/gnome-themes.xml	(revision 998dcf89c91f298a5e68028bf35a488716a435f4)
+++ gnome/core/gnome-themes.xml	(revision a6bee1f60f103f0661222317dca17466960d9870)
@@ -7,7 +7,7 @@
   <!ENTITY gnome-themes-download-http "&gnome-download-http;/gnome-themes/&gnome-version;/gnome-themes-&gnome-themes-version;.tar.bz2">
   <!ENTITY gnome-themes-download-ftp  "&gnome-download-ftp;/gnome-themes/&gnome-version;/gnome-themes-&gnome-themes-version;.tar.bz2">
-  <!ENTITY gnome-themes-md5sum        "ab6d63ecb304506153fac3e958995ef4">
+  <!ENTITY gnome-themes-md5sum        "aa369e130f9fc3b8fd0fd4481766a56c">
   <!ENTITY gnome-themes-size          "2.5 MB">
-  <!ENTITY gnome-themes-buildsize     "19.6 MB">
+  <!ENTITY gnome-themes-buildsize     "19.7 MB">
   <!ENTITY gnome-themes-time          "0.2 SBU">
 ]>
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">gnome-themes-&gnome-themes-version;.tar</keyword>
-      <keyword role="ftpdir">gnome-themes</keyword>
-    </keywordset>
   </sect1info>
 
@@ -64,4 +60,7 @@
     <para role="required"><xref linkend="perl-xml-parser"/> and
     <xref linkend="gtk-engines"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="intltool"/></para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -108,5 +107,5 @@
         <seg>None</seg>
         <seg>None</seg>
-        <seg>Several directories under /usr/share/{themes,icons}</seg>
+        <seg>Several directories under /usr/share/{icons,themes}</seg>
         <seg>Several themes in the /usr/share/themes hierarchy and icons
         in the /usr/share/icons hierarchy</seg>
Index: gnome/core/gnome-vfs.xml
===================================================================
--- gnome/core/gnome-vfs.xml	(revision 998dcf89c91f298a5e68028bf35a488716a435f4)
+++ gnome/core/gnome-vfs.xml	(revision a6bee1f60f103f0661222317dca17466960d9870)
@@ -7,7 +7,7 @@
   <!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-md5sum        "b657e31974d6981adf9b2c4db981f62c">
+  <!ENTITY gnome-vfs-size          "1.8 MB">
+  <!ENTITY gnome-vfs-buildsize     "54.1 MB">
   <!ENTITY gnome-vfs-time          "1.4 SBU">
 ]>
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">gnome-vfs-&gnome-vfs-version;.tar</keyword>
-      <keyword role="ftpdir">gnome-vfs</keyword>
-    </keywordset>
   </sect1info>
 
@@ -73,4 +69,5 @@
     <xref linkend="hal"/>,
     <xref linkend="gtk-doc"/>,
+    <xref linkend="intltool"/>,
     <xref linkend="openssh"/>,
     <xref linkend="openssl"/> or
@@ -82,5 +79,14 @@
     <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>,
     <ulink url="http://www.openafs.org/">OpenAFS</ulink>, and
-    <ulink url="http://www.porchdogsoft.com/products/howl/">Howl</ulink></para>
+    <ulink url="http://www.avahi.org">Avahi</ulink></para>
+
+    <para>If you run <command>./configure --help</command> for the complete
+    list of dependency requirements and available switches, you may notice a
+    message about the <xref linkend="gnome-mount"/> package. This package is
+    not required at build-time, and is only a run-time dependency. If
+    <application>gnome-mount</application> is available at run-time,
+    <application>GNOME-VFS</application> will use it. If not available,
+    <application>GNOME-VFS</application> will fall back to using other mounting
+    mechanisms.</para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -95,8 +101,8 @@
     by running the following commands:</para>
 
-<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;
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
+            --sysconfdir=&gnome-etc-dir; \
+            --libexecdir=$(pkg-config \
+                --variable=prefix ORBit-2.0)/lib/gnome-vfs-2.0 &amp;&amp;
 make</userinput></screen>
 
@@ -116,23 +122,27 @@
     instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
 
-    <para><parameter>--libexecdir=`pkg-config --variable=prefix
-    ORBit-2.0`/lib/gnome-vfs-2.0</parameter>: This switch puts libexec files in
+    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
+    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>
 
-    <para><command>rmdir `pkg-config --variable=prefix ORBit-2.0`/doc</command>:
+    <!-- Apparently fixed
+    <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>
+    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>
+    or <xref linkend="gnome-mount"/> installed, as the <command>eject</command>
+    program is used if gnome-mount is not installed.</para>
 
-    <para><option>--enable-gtk-doc</option>: Use this option if you have
+    <!-- Commenting this out for now as the documentation is already built
+         and installed by default
+    <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>
+    documentation.</para> -->
 
   </sect2>
Index: gnome/core/gtk-engines.xml
===================================================================
--- gnome/core/gtk-engines.xml	(revision 998dcf89c91f298a5e68028bf35a488716a435f4)
+++ gnome/core/gtk-engines.xml	(revision a6bee1f60f103f0661222317dca17466960d9870)
@@ -7,7 +7,7 @@
   <!ENTITY gtk-engines-download-http "&gnome-download-http;/gtk-engines/2.6/gtk-engines-&gtk-engines-version;.tar.bz2">
   <!ENTITY gtk-engines-download-ftp  "&gnome-download-http;/gtk-engines/2.6/gtk-engines-&gtk-engines-version;.tar.bz2">
-  <!ENTITY gtk-engines-md5sum        "218417d5eb6fd4cfda49d6a65041a8a0">
-  <!ENTITY gtk-engines-size          "479 KB">
-  <!ENTITY gtk-engines-buildsize     "13.0 MB">
+  <!ENTITY gtk-engines-md5sum        "77fb084b60efa8dd4fcfc0fc24882cd1">
+  <!ENTITY gtk-engines-size          "465 KB">
+  <!ENTITY gtk-engines-buildsize     "12.9 MB">
   <!ENTITY gtk-engines-time          "0.4 SBU">
 ]>
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">gtk-engines-&gtk-engines-version;.tar</keyword>
-      <keyword role="ftpdir">gtk-engines</keyword>
-    </keywordset>
   </sect1info>
 
@@ -100,6 +96,6 @@
         <seg><application>GTK-2</application> engines libraries</seg>
         <seg>/usr/lib/gtk-2.0/engines and /usr/share/themes/{theme name}</seg>
-        <seg>Crux, Clearlooks, Industrial, LighthouseBlue, Metal, Mist,
-        Redmond, and ThinIce</seg>
+        <seg>Clearlooks, Crux, Industrial, LighthouseBlue, Metal, Mist,
+        Redmond and ThinIce</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/core/libbonobo.xml
===================================================================
--- gnome/core/libbonobo.xml	(revision 998dcf89c91f298a5e68028bf35a488716a435f4)
+++ gnome/core/libbonobo.xml	(revision a6bee1f60f103f0661222317dca17466960d9870)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY libbonobo-download-http "&gnome-download-http;/libbonobo/2.10/libbonobo-&libbonobo-version;.tar.bz2">
-  <!ENTITY libbonobo-download-ftp  "&gnome-download-ftp;/libbonobo/2.10/libbonobo-&libbonobo-version;.tar.bz2">
-  <!ENTITY libbonobo-md5sum        "927d572970d87121c8375aab1b4b1d37">
+  <!ENTITY libbonobo-download-http "&gnome-download-http;/libbonobo/&gnome-version;/libbonobo-&libbonobo-version;.tar.bz2">
+  <!ENTITY libbonobo-download-ftp  "&gnome-download-ftp;/libbonobo/&gnome-version;/libbonobo-&libbonobo-version;.tar.bz2">
+  <!ENTITY libbonobo-md5sum        "f1f0255f94e3354250d142b688013fad">
   <!ENTITY libbonobo-size          "1.3 MB">
-  <!ENTITY libbonobo-buildsize     "35.3 MB">
+  <!ENTITY libbonobo-buildsize     "35.8 MB">
   <!ENTITY libbonobo-time          "0.7 SBU">
 ]>
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">libbonobo-&libbonobo-version;.tar</keyword>
-      <keyword role="ftpdir">libbonobo</keyword>
-    </keywordset>
   </sect1info>
 
@@ -83,8 +79,10 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-            --libexecdir=`pkg-config \
-            --variable=prefix ORBit-2.0`/lib/bonobo \
-            --sysconfdir=&gnome-etc-dir; &amp;&amp;
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
+            --sysconfdir=&gnome-etc-dir; \
+            --libexecdir=$(pkg-config \
+                --variable=prefix ORBit-2.0)/lib/bonobo \
+            --mandir=$(pkg-config \
+                --variable=prefix ORBit-2.0)/share/man &amp;&amp;
 make</userinput></screen>
 
@@ -100,11 +98,11 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--prefix=`pkg-config --variable=prefix
-    ORBit-2.0`</parameter>: Setting the prefix with this command instead of
+    <para><parameter>--prefix=$(pkg-config --variable=prefix
+    ORBit-2.0)</parameter>: Setting the prefix with this command instead of
     with <envar>GNOME_PREFIX</envar> will ensure that the prefix is
     consistent with the installation environment.</para>
 
-    <para><parameter>--libexecdir=`pkg-config --variable=prefix
-    ORBit-2.0`/lib/bonobo</parameter>: This switch puts libexec files in
+    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
+    ORBit-2.0)/lib/bonobo</parameter>: This switch puts libexec files in
     <filename class="directory">$GNOME_PREFIX/lib/bonobo</filename> instead of
     <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
Index: gnome/core/libbonoboui.xml
===================================================================
--- gnome/core/libbonoboui.xml	(revision 998dcf89c91f298a5e68028bf35a488716a435f4)
+++ gnome/core/libbonoboui.xml	(revision a6bee1f60f103f0661222317dca17466960d9870)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY libbonoboui-download-http "&gnome-download-http;/libbonoboui/2.10/libbonoboui-&libbonoboui-version;.tar.bz2">
-  <!ENTITY libbonoboui-download-ftp  "&gnome-download-ftp;/libbonoboui/2.10/libbonoboui-&libbonoboui-version;.tar.bz2">
-  <!ENTITY libbonoboui-md5sum        "74c4b633ae33524e2f6d3e6573b75f3c">
-  <!ENTITY libbonoboui-size          "884 KB">
-  <!ENTITY libbonoboui-buildsize     "28.7 MB">
-  <!ENTITY libbonoboui-time          "0.9 SBU">
+  <!ENTITY libbonoboui-download-http "&gnome-download-http;/libbonoboui/&gnome-version;/libbonoboui-&libbonoboui-version;.tar.bz2">
+  <!ENTITY libbonoboui-download-ftp  "&gnome-download-ftp;/libbonoboui/&gnome-version;/libbonoboui-&libbonoboui-version;.tar.bz2">
+  <!ENTITY libbonoboui-md5sum        "dc26dc17cddc625cac37ecfab263a51a">
+  <!ENTITY libbonoboui-size          "893 KB">
+  <!ENTITY libbonoboui-buildsize     "29.1 MB">
+  <!ENTITY libbonoboui-time          "1.0 SBU">
 ]>
 
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">libbonoboui-&libbonoboui-version;.tar</keyword>
-      <keyword role="ftpdir">libbonoboui</keyword>
-    </keywordset>
   </sect1info>
 
@@ -86,5 +82,10 @@
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make install &amp;&amp;
+install -v -m755 -d $(pkg-config \
+        --variable=prefix ORBit-2.0)/share/doc/libbonoboui-&libbonoboui-version; &amp;&amp;
+install -v -m644 doc/*.{dtd,txt,xml,html} \
+        $(pkg-config \
+            --variable=prefix ORBit-2.0)/share/doc/libbonoboui-&libbonoboui-version;</userinput></screen>
 
   </sect2>
@@ -103,5 +104,6 @@
         <seg>The following subdirectories of $GNOME_PREFIX/:
         include/libbonoboui-2.0 and
-        share/{applications, gnome-2.0, gtk-doc/html/libbonoboui}</seg>
+        share/{doc/libbonoboui-&libbonoboui-version;,
+        gnome-2.0, gtk-doc/html/libbonoboui}</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/core/libgnome.xml
===================================================================
--- gnome/core/libgnome.xml	(revision 998dcf89c91f298a5e68028bf35a488716a435f4)
+++ gnome/core/libgnome.xml	(revision a6bee1f60f103f0661222317dca17466960d9870)
@@ -7,7 +7,7 @@
   <!ENTITY libgnome-download-http "&gnome-download-http;/libgnome/&gnome-version;/libgnome-&libgnome-version;.tar.bz2">
   <!ENTITY libgnome-download-ftp  "&gnome-download-ftp;/libgnome/&gnome-version;/libgnome-&libgnome-version;.tar.bz2">
-  <!ENTITY libgnome-md5sum        "f239a7ab132d2ec9039bb2537cca1e92">
-  <!ENTITY libgnome-size          "955 KB">
-  <!ENTITY libgnome-buildsize     "18.5 MB">
+  <!ENTITY libgnome-md5sum        "bf53815df10db62bbf00defd4100b8d8">
+  <!ENTITY libgnome-size          "995 KB">
+  <!ENTITY libgnome-buildsize     "17.0 MB">
   <!ENTITY libgnome-time          "0.2 SBU">
 ]>
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">libgnome-&libgnome-version;.tar</keyword>
-      <keyword role="ftpdir">libgnome</keyword>
-    </keywordset>
   </sect1info>
 
@@ -62,9 +58,10 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gnome-vfs"/> and
-    <xref linkend="esound"/></para>
+    <para role="required"><xref linkend="gnome-vfs"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gtk-doc"/></para>
+    <para role="optional"><xref linkend="esound"/>,
+    <xref linkend="gtk-doc"/>, and
+    <xref linkend="intltool"/></para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -79,7 +76,9 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
             --sysconfdir=&gnome-etc-dir; \
-            --localstatedir=/var/lib &amp;&amp;
+            --localstatedir=/var/lib \
+            --mandir=$(pkg-config \
+                --variable=prefix ORBit-2.0)/share/man &amp;&amp;
 make</userinput></screen>
 
@@ -121,8 +120,7 @@
         <seg>libgnome-2.{so,a} and the libmoniker_extra_2.{so,a} bonobo
         library</seg>
-        <seg>&gnome-etc-dir;/{gconf/gconf.xml.defaults/{too many to list},
-        sound},
-        include/libgnome-2.0, and
-        share/gtk-doc/html/libgnome</seg>
+        <seg>&gnome-etc-dir;/sound,
+        and the following subdirectories of $GNOME_PREFIX/:
+        include/libgnome-2.0, share/gtk-doc/html/libgnome</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/core/libgnomecanvas.xml
===================================================================
--- gnome/core/libgnomecanvas.xml	(revision 998dcf89c91f298a5e68028bf35a488716a435f4)
+++ gnome/core/libgnomecanvas.xml	(revision a6bee1f60f103f0661222317dca17466960d9870)
@@ -7,7 +7,7 @@
   <!ENTITY libgnomecanvas-download-http "&gnome-download-http;/libgnomecanvas/&gnome-version;/libgnomecanvas-&libgnomecanvas-version;.tar.bz2">
   <!ENTITY libgnomecanvas-download-ftp  "&gnome-download-ftp;/libgnomecanvas/&gnome-version;/libgnomecanvas-&libgnomecanvas-version;.tar.bz2">
-  <!ENTITY libgnomecanvas-md5sum        "62c0edd3d27803d341662fd9088b2d9b">
-  <!ENTITY libgnomecanvas-size          "590 KB">
-  <!ENTITY libgnomecanvas-buildsize     "12.4 MB">
+  <!ENTITY libgnomecanvas-md5sum        "516c46fb4a1401b05cfef58c350fbd3d">
+  <!ENTITY libgnomecanvas-size          "612 KB">
+  <!ENTITY libgnomecanvas-buildsize     "12.6 MB">
   <!ENTITY libgnomecanvas-time          "0.2 SBU">
 ]>
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">libgnomecanvas-&libgnomecanvas-version;.tar</keyword>
-      <keyword role="ftpdir">libgnomecanvas</keyword>
-    </keywordset>
   </sect1info>
 
@@ -84,5 +80,5 @@
     following commands:</para>
 
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` &amp;&amp;
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) &amp;&amp;
 make</userinput></screen>
 
Index: gnome/core/libgnomeui.xml
===================================================================
--- gnome/core/libgnomeui.xml	(revision 998dcf89c91f298a5e68028bf35a488716a435f4)
+++ gnome/core/libgnomeui.xml	(revision a6bee1f60f103f0661222317dca17466960d9870)
@@ -7,8 +7,8 @@
   <!ENTITY libgnomeui-download-http "&gnome-download-http;/libgnomeui/&gnome-version;/libgnomeui-&libgnomeui-version;.tar.bz2">
   <!ENTITY libgnomeui-download-ftp  "&gnome-download-ftp;/libgnomeui/&gnome-version;/libgnomeui-&libgnomeui-version;.tar.bz2">
-  <!ENTITY libgnomeui-md5sum        "342a5b8a9d427ff950a71a245a5f4485">
+  <!ENTITY libgnomeui-md5sum        "ff6b6c25de0e7e39c79998621cdec048">
   <!ENTITY libgnomeui-size          "1.8 MB">
-  <!ENTITY libgnomeui-buildsize     "39.0 MB">
-  <!ENTITY libgnomeui-time          "0.8 SBU">
+  <!ENTITY libgnomeui-buildsize     "40.0 MB">
+  <!ENTITY libgnomeui-time          "0.7 SBU">
 ]>
 
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">libgnomeui-&libgnomeui-version;.tar</keyword>
-      <keyword role="ftpdir">libgnomeui</keyword>
-    </keywordset>
   </sect1info>
 
@@ -66,5 +62,6 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="libjpeg"/> and
+    <para role="optional"><xref linkend="libjpeg"/>,
+    <xref linkend="esound"/>, and
     <xref linkend="gtk-doc"/></para>
 
@@ -80,7 +77,7 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-            --libexecdir=`pkg-config \
-            --variable=prefix ORBit-2.0`/lib/libgnomeui &amp;&amp;
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
+            --libexecdir=$(pkg-config \
+                --variable=prefix ORBit-2.0)/lib/libgnomeui &amp;&amp;
 make</userinput></screen>
 
@@ -104,6 +101,6 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--libexecdir=`pkg-config --variable=prefix
-    ORBit-2.0`/lib/libgnomeui</parameter>: This switch puts libexec files in
+    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
+    ORBit-2.0)/lib/libgnomeui</parameter>: This switch puts libexec files in
     <filename class="directory">$GNOME_PREFIX/lib/libgnomeui</filename> instead
     of <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
@@ -145,5 +142,5 @@
 
       <seglistitem>
-        <seg>gnome_segv2</seg>
+        <seg></seg>
         <seg>libgnomeui-2.{so,a}, the libgnome.{so,a} Glade library, and
         the libgnome-vfs.{so,a} <application>GTK+</application> library</seg>
Index: gnome/core/libgtop.xml
===================================================================
--- gnome/core/libgtop.xml	(revision 998dcf89c91f298a5e68028bf35a488716a435f4)
+++ gnome/core/libgtop.xml	(revision a6bee1f60f103f0661222317dca17466960d9870)
@@ -7,7 +7,7 @@
   <!ENTITY libgtop-download-http "&gnome-download-http;/libgtop/&gnome-version;/libgtop-&libgtop-version;.tar.bz2">
   <!ENTITY libgtop-download-ftp  "&gnome-download-ftp;/libgtop/&gnome-version;/libgtop-&libgtop-version;.tar.bz2">
-  <!ENTITY libgtop-md5sum        "616ed8352f3463855b3eace26b22536e">
-  <!ENTITY libgtop-size          "740 KB">
-  <!ENTITY libgtop-buildsize     "11.4 MB">
+  <!ENTITY libgtop-md5sum        "59cc661ae518fcae158517cc029b2add">
+  <!ENTITY libgtop-size          "661 KB">
+  <!ENTITY libgtop-buildsize     "12.7 MB">
   <!ENTITY libgtop-time          "0.3 SBU">
 ]>
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">libgtop-&libgtop-version;.tar</keyword>
-      <keyword role="ftpdir">libgtop</keyword>
-    </keywordset>
   </sect1info>
 
@@ -83,7 +79,7 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-            --infodir=`pkg-config \
-            --variable=prefix ORBit-2.0`/share/info &amp;&amp;
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
+            --infodir=$(pkg-config \
+                --variable=prefix ORBit-2.0)/share/info &amp;&amp;
 make</userinput></screen>
 
@@ -99,7 +95,7 @@
     class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>install -v -m755 -d $GNOME_PREFIX/share/libgtop-&libgtop-version;/examples &amp;&amp;
+<screen role="root"><userinput>install -v -m755 -d $GNOME_PREFIX/lib/libgtop/examples &amp;&amp;
 install -v -m755 examples/.libs/* \
-    $GNOME_PREFIX/share/libgtop-&libgtop-version;/examples</userinput></screen>
+    $GNOME_PREFIX/lib/libgtop/examples</userinput></screen>
 
   </sect2>
@@ -108,5 +104,6 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--infodir=`pkg-config --variable=prefix ORBit-2.0`/share/info</parameter>:
+    <para><parameter>--infodir=$(pkg-config --variable=prefix
+    ORBit-2.0)/share/info</parameter>:
     This switch installs the info documentation in
     <filename class='directory'>$GNOME_PREFIX/share/info</filename> instead of
@@ -157,5 +154,5 @@
         <seg>The following subdirectories of $GNOME_PREFIX/:
         include/libgtop-2.0 and
-        share/libgtop-&libgtop-version;</seg>
+        lib/libgtop/examples</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome/core/nautilus.xml
===================================================================
--- gnome/core/nautilus.xml	(revision 998dcf89c91f298a5e68028bf35a488716a435f4)
+++ gnome/core/nautilus.xml	(revision a6bee1f60f103f0661222317dca17466960d9870)
@@ -7,8 +7,8 @@
   <!ENTITY nautilus-download-http "&gnome-download-http;/nautilus/&gnome-version;/nautilus-&nautilus-version;.tar.bz2">
   <!ENTITY nautilus-download-ftp  "&gnome-download-ftp;/nautilus/&gnome-version;/nautilus-&nautilus-version;.tar.bz2">
-  <!ENTITY nautilus-md5sum        "1c1304e458eda551da11ed8c52b1faa2">
+  <!ENTITY nautilus-md5sum        "d8bad8b9141bc823c612abb7d460b725">
   <!ENTITY nautilus-size          "4.0 MB">
-  <!ENTITY nautilus-buildsize     "84.9 MB">
-  <!ENTITY nautilus-time          "1.0 SBU">
+  <!ENTITY nautilus-buildsize     "93.6 MB">
+  <!ENTITY nautilus-time          "1.2 SBU">
 ]>
 
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">nautilus-&nautilus-version;.tar</keyword>
-      <keyword role="ftpdir">nautilus</keyword>
-    </keywordset>
   </sect1info>
 
@@ -63,9 +59,17 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="eel"/>,
+    <xref linkend="esound"/>,
     <xref linkend="libexif"/>, and
     <xref linkend="librsvg"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="startup-notification"/> and
+    <para role="optional"><xref linkend="startup-notification"/>,
+    <ulink url="http://www.gnome.org/~jamiemcc/tracker/">Tracker</ulink>
+    (requires <xref linkend="mysql"/> and
+    <xref linkend="dbus"/>, and can use
+    <xref linkend="gamin"/> and
+    <filename class='headerfile'>inotify.h</filename> capability),
+    <ulink url="http://beaglewiki.org/Main_Page">Beagle</ulink>
+    (uses <filename class='headerfile'>inotify.h</filename> capability), and
     <xref linkend="docbook-utils"/></para>
 
@@ -81,5 +85,5 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
             --sysconfdir=&gnome-etc-dir; &amp;&amp;
 make</userinput></screen>
@@ -90,8 +94,8 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
-install -v -m755 -d `pkg-config \
-    --variable=prefix ORBit-2.0`/share/doc/nautilus-&nautilus-version; &amp;&amp;
-install -v -m644 docs/*.{txt,dia,pdf,sxw,faq,html} `pkg-config \
-    --variable=prefix ORBit-2.0`/share/doc/nautilus-&nautilus-version;</userinput></screen>
+install -v -m755 -d $(pkg-config \
+    --variable=prefix ORBit-2.0)/share/doc/nautilus-&nautilus-version; &amp;&amp;
+install -v -m644 docs/*.{txt,dia,pdf,sxw,faq,html} $(pkg-config \
+    --variable=prefix ORBit-2.0)/share/doc/nautilus-&nautilus-version;</userinput></screen>
 
   </sect2>
@@ -117,7 +121,6 @@
         <seg>nautilus, nautilus-connect-server, and
         nautilus-file-management-properties</seg>
-        <seg>libnautilus-extension.so, libnautilus-private.so</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas}apps/nautilus
-        and the following subdirectories of $GNOME_PREFIX/:
+        <seg>libnautilus-extension.so</seg>
+        <seg>The following subdirectories of $GNOME_PREFIX/:
         include/nautilus,
         share/{doc/nautilus-&nautilus-version;, {,pixmaps}nautilus}</seg>
@@ -141,9 +144,9 @@
 
       <varlistentry id="libnautilus">
-        <term><filename class='libraryfile'>libnautilus-*.so</filename></term>
+        <term><filename class='libraryfile'>libnautilus-extension.so</filename></term>
         <listitem>
           <para>supplies the functions needed by the file manager.</para>
           <indexterm zone="nautilus libnautilus">
-            <primary sortas="c-libnautilus">libnautilus-*.so</primary>
+            <primary sortas="c-libnautilus">libnautilus-extension.so</primary>
           </indexterm>
         </listitem>
Index: gnome/core/orbit2.xml
===================================================================
--- gnome/core/orbit2.xml	(revision 998dcf89c91f298a5e68028bf35a488716a435f4)
+++ gnome/core/orbit2.xml	(revision a6bee1f60f103f0661222317dca17466960d9870)
@@ -7,8 +7,8 @@
   <!ENTITY ORBit2-download-http "&gnome-download-http;/ORBit2/&gnome-version;/ORBit2-&ORBit2-version;.tar.bz2">
   <!ENTITY ORBit2-download-ftp  "&gnome-download-ftp;/ORBit2/&gnome-version;/ORBit2-&ORBit2-version;.tar.bz2">
-  <!ENTITY ORBit2-md5sum        "aa2cae6e7957c369edccbd98ba78dea9">
-  <!ENTITY ORBit2-size          "676 KB">
-  <!ENTITY ORBit2-buildsize     "32.3 MB">
-  <!ENTITY ORBit2-time          "0.7 SBU">
+  <!ENTITY ORBit2-md5sum        "bb1b4859522cb6e1a3a3dc4b7397db64">
+  <!ENTITY ORBit2-size          "704 KB">
+  <!ENTITY ORBit2-buildsize     "34.1 MB">
+  <!ENTITY ORBit2-time          "0.6 SBU">
 ]>
 
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">ORBit2-&ORBit2-version;.tar</keyword>
-      <keyword role="ftpdir">ORBit2</keyword>
-    </keywordset>
   </sect1info>
 
Index: gnome/core/vte.xml
===================================================================
--- gnome/core/vte.xml	(revision 998dcf89c91f298a5e68028bf35a488716a435f4)
+++ gnome/core/vte.xml	(revision a6bee1f60f103f0661222317dca17466960d9870)
@@ -7,7 +7,7 @@
   <!ENTITY vte-download-http "&gnome-download-http;/vte/0.11/vte-&vte-version;.tar.bz2">
   <!ENTITY vte-download-ftp  "&gnome-download-ftp;/vte/0.11/vte-&vte-version;.tar.bz2">
-  <!ENTITY vte-md5sum        "a9dc7b330d52ce384e3e5715d396c72f">
-  <!ENTITY vte-size          "959 KB">
-  <!ENTITY vte-buildsize     "24.7 MB">
+  <!ENTITY vte-md5sum        "7cb1bd6ca528bc4db5ec685549fd3eb1">
+  <!ENTITY vte-size          "974 KB">
+  <!ENTITY vte-buildsize     "25.3 MB">
   <!ENTITY vte-time          "0.7 SBU">
 ]>
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">vte-&vte-version;.tar</keyword>
-      <keyword role="ftpdir">vte</keyword>
-    </keywordset>
   </sect1info>
 
@@ -62,9 +58,12 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gtk2"/></para>
+    <para role="required"><xref linkend="gtk2"/> and
+    <xref linkend="perl-xml-parser"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gtk-doc"/> and
-    <ulink url="http://www.pygtk.org/">PyGTK</ulink></para>
+    <para role="optional"><xref linkend="gtk-doc"/>,
+    <xref linkend="intltool"/>, and
+    <ulink url="http://www.pygtk.org/">PyGTK</ulink>
+    (requires <xref linkend="python"/>)</para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -80,7 +79,11 @@
 
 <screen><userinput>sed -i 's%\\177:%&amp;kh=\\EOH:@7=\\EOF:%' termcaps/xterm &amp;&amp;
+sed -i 's/FT2_LIBS $LIBS/&amp; $X_LIBS/' configure &amp;&amp;
+sed -i -e 's/^ssfe_LDADD =.*$/&amp; -lncurses/' \
+       -e 's/^LDFLAGS =.*$/&amp; @X_LIBS@/' \
+    src/Makefile.in &amp;&amp;
+
 ./configure --prefix=/usr \
-            --libexecdir=/usr/lib/vte \
-            --disable-gtk-doc &amp;&amp;
+            --libexecdir=/usr/lib/vte &amp;&amp;
 make</userinput></screen>
 
@@ -96,7 +99,26 @@
     <title>Command Explanations</title>
 
-    <para><command>sed -i ...</command>: The <keysym>Home</keysym> and
-    <keysym>End</keysym> keys are broken in the <filename>xterm</filename>
-    termcap file. This <command>sed</command> command fixes them.</para>
+    <para><command>sed -i ... termcaps/xterm</command>: The
+    <keysym>Home</keysym> and <keysym>End</keysym> keys are broken in the
+    <command>xterm</command> termcap file. This <command>sed</command> command
+    fixes them.</para>
+
+    <para><command>sed -i ... configure</command>: If you pass the
+    <option>--with-glX</option> parameter to the <command>configure</command>
+    script, <command>configure</command> will fail because it doesn't include
+    the <application>X Window System</application> library directory in the
+    <envar>LDFLAGS</envar> in one of the checks. This command adds the required
+    directory. This command is not required if your
+    <application>X Window System</application> libraries are located in
+    <filename class='directory'>/usr/lib</filename>.</para>
+
+    <para><command>sed -i ... src/Makefile.in</command>: For the same reason
+    the previous <command>sed</command> command is used, this one does a
+    similar modification to fix the <filename>Makefile</filename> used to
+    build the programs and library. This <command>sed</command> also fixes an
+    issue by adding the <filename class='libraryfile'>libncurses</filename>
+    library to the <envar>LDFLAGS</envar> for building the
+    <command>ssfe</command> program. This issue is also caused by passing the
+    additional parameters to the <command>configure</command> script.</para>
 
     <para><parameter>--libexecdir=/usr/lib/vte</parameter>: This switch puts
@@ -104,8 +126,15 @@
     instead of <filename class="directory">/usr/libexec</filename>.</para>
 
-    <para><parameter>--disable-gtk-doc</parameter>: This switch prevents the
+    <para><option>--with-xft2 --with-pangox --with-glX</option>: These
+    parameters can be passed to the <command>configure</command> script
+    to enable additional drawing methods in the
+    <application>VTE</application> library.</para>
+
+    <!-- Disabling as the docs are not built by default in this release and
+         the tarball contains current docs
+    <para><parameter>-disable-gtk-doc</parameter>: This switch prevents the
     building of documentation. Remove it if you have
     <application>GTK-Doc</application> installed and wish to rebuild the
-    documentation.</para>
+    documentation.</para> -->
 
   </sect2>
@@ -121,5 +150,5 @@
       <seglistitem>
         <seg>vte</seg>
-        <seg>libvte.{so,a} and vtemodule.{so,a}
+        <seg>libvte.{so,a} and the vtemodule.{so,a}
         <application>Python</application> module</seg>
         <seg>/usr/include/vte, /usr/lib/vte, /usr/share/gtk-doc/html/vte,
Index: gnome/core/yelp.xml
===================================================================
--- gnome/core/yelp.xml	(revision 998dcf89c91f298a5e68028bf35a488716a435f4)
+++ gnome/core/yelp.xml	(revision a6bee1f60f103f0661222317dca17466960d9870)
@@ -7,8 +7,8 @@
   <!ENTITY yelp-download-http "&gnome-download-http;/yelp/&gnome-version;/yelp-&yelp-version;.tar.bz2">
   <!ENTITY yelp-download-ftp  "&gnome-download-ftp;/yelp/&gnome-version;/yelp-&yelp-version;.tar.bz2">
-  <!ENTITY yelp-md5sum        "e229529aa1dacfd269024511e2c12ad2">
-  <!ENTITY yelp-size          "815 KB">
-  <!ENTITY yelp-buildsize     "12.2 MB">
-  <!ENTITY yelp-time          "0.2 SBU">
+  <!ENTITY yelp-md5sum        "4294fe3b01824675bd8be9d7936dcaa7">
+  <!ENTITY yelp-size          "774 KB">
+  <!ENTITY yelp-buildsize     "15.6 MB">
+  <!ENTITY yelp-time          "0.3 SBU">
 ]>
 
@@ -19,8 +19,4 @@
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
-    <keywordset>
-      <keyword role="package">yelp-&yelp-version;.tar</keyword>
-      <keyword role="ftpdir">yelp</keyword>
-    </keywordset>
   </sect1info>
 
@@ -63,8 +59,16 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="libgnomeui"/>,
+    <xref linkend="libgnomeprintui"/>,
+    <xref linkend="startup-notification"/>,
     <xref linkend="gnome-doc-utils"/>, and
-    a Gecko HTML rendering engine (<xref linkend="seamonkey"/> or
+    a mozilla.org Gecko layout engine
+    (<xref linkend="seamonkey"/> or
     <xref linkend="firefox"/> or
-    <xref linkend="thunderbird"/>)</para>
+    <xref linkend="thunderbird"/> or
+    <ulink url="http://www.mozilla.org/products/mozilla1.x/">Mozilla</ulink>)</para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+    <ulink url="http://beaglewiki.org/Main_Page">Beagle</ulink></para>
 
     <note>
@@ -74,8 +78,7 @@
       built-in Help provided by core <application>GNOME</application> and many
       of the support applications. This is mentioned here because you may not
-      wish to install a Gecko rendering engine. Without a Gecko rendering
-      engine you will have no graphical browser capability as the default
-      <application>GNOME</application> browser, <xref linkend="epiphany"/>,
-      also requires a Gecko rendering engine.</para>
+      wish to install a Gecko layout engine. Without a Gecko layout engine you
+      will have no graphical browser capability as the default GNOME browser,
+      <xref linkend="epiphany"/>, also requires a Gecko layout engine.</para>
     </note>
 
@@ -91,5 +94,5 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
             --localstatedir=/var/lib \
             --sysconfdir=&gnome-etc-dir; &amp;&amp;
@@ -125,6 +128,5 @@
         <seg>gnome-help and yelp</seg>
         <seg>None</seg>
-        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas/}apps/yelp and
-        $GNOME_PREFIX/share/yelp</seg>
+        <seg>$GNOME_PREFIX/share/yelp</seg>
       </seglistitem>
     </segmentedlist>
@@ -140,5 +142,5 @@
           <para>is a symbolic link to <command>yelp</command>.</para>
           <indexterm zone="yelp gnome-help">
-            <primary sortas="b-gnome-help">gnome-help</primary>
+            <primary sortas="g-gnome-help">gnome-help</primary>
           </indexterm>
         </listitem>
