Index: gnome/core/control-center.xml
===================================================================
--- gnome/core/control-center.xml	(revision 0c4e1165472cff0493190d8d8b9af5642709fa9f)
+++ gnome/core/control-center.xml	(revision 51d7b7061de2d7c6265dbca9fe74d90fb5d444f5)
@@ -6,9 +6,9 @@
 
   <!ENTITY control-center-download-http "http://ftp.gnome.org/pub/GNOME/sources/control-center/&gnome-version;/control-center-&control-center-version;.tar.bz2">
-  <!ENTITY control-center-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/control-center/&gnome-version;/control-center-&control-center-version;.tar.bz2">
-  <!ENTITY control-center-md5sum "d95a5746aa349536dc0f59c61cdaf19f">
-  <!ENTITY control-center-size "2.6 MB">
-  <!ENTITY control-center-buildsize "54 MB">
-  <!ENTITY control-center-time "1.0 SBU">
+  <!ENTITY control-center-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/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">
 ]>
 
@@ -59,11 +59,11 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para><xref linkend="libxklavier"/>,
-    <xref linkend="gnome-menus"/>,
     <xref linkend="metacity"/>,
-    <xref linkend="nautilus"/> and
-    <xref linkend="gnome-icon-theme"/></para>
+    <xref linkend="gnome-icon-theme"/> and
+    <xref linkend="nautilus"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="alsa"/>,
+    <para><xref linkend="evolution-data-server"/>,
+    <xref linkend="alsa"/>,
     <xref linkend="gst-plugins"/> and
     <xref linkend="xscreensaver"/></para>
@@ -79,5 +79,6 @@
 <screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
     --libexecdir=`pkg-config --variable=prefix ORBit-2.0`/sbin \
-    --localstatedir=/var/lib --sysconfdir=/etc/gnome &amp;&amp;
+    --localstatedir=/var/lib --sysconfdir=/etc/gnome \
+    --enable-aboutme &amp;&amp;
 make</userinput></screen>
 
@@ -107,4 +108,7 @@
     instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
 
+    <para><parameter>--enable-aboutme</parameter>: Enables building the
+    <command>gnome-about-me</command> capplet.</para>
+
   </sect2>
 
@@ -118,6 +122,6 @@
 
       <seglistitem>
-        <seg>gnome-accessibility-keyboard-properties, gnome-at-properties,
-        gnome-background-properties, gnome-control-center,
+        <seg>gnome-about-me,gnome-accessibility-keyboard-properties,
+        gnome-at-properties, gnome-background-properties, gnome-control-center,
         gnome-default-applications-properties, gnome-display-properties,
         gnome-font-properties, gnome-font-viewer, gnome-keybinding-properties,
Index: gnome/core/eel.xml
===================================================================
--- gnome/core/eel.xml	(revision 0c4e1165472cff0493190d8d8b9af5642709fa9f)
+++ gnome/core/eel.xml	(revision 51d7b7061de2d7c6265dbca9fe74d90fb5d444f5)
@@ -6,9 +6,9 @@
 
   <!ENTITY eel-download-http "http://ftp.gnome.org/pub/GNOME/sources/eel/&gnome-version;/eel-&eel-version;.tar.bz2">
-  <!ENTITY eel-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/eel/&gnome-version;/eel-&eel-version;.tar.bz2">
-  <!ENTITY eel-md5sum "2978fae17565dfb6e2d7ca129e738b9d">
-  <!ENTITY eel-size "672 KB">
-  <!ENTITY eel-buildsize "13 MB">
-  <!ENTITY eel-time "0.4 SBU">
+  <!ENTITY eel-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/eel/&gnome-version;/eel-&eel-version;.tar.bz2">
+  <!ENTITY eel-md5sum        "08281630bef2e2f957ec2c349d73d112">
+  <!ENTITY eel-size          "675 KB">
+  <!ENTITY eel-buildsize     "14.0 MB">
+  <!ENTITY eel-time          "0.5 SBU">
 ]>
 
@@ -59,5 +59,8 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="libgnomeui"/> and <xref linkend="gail"/></para>
+    <para><xref linkend="libgnomeui"/>,
+    <xref linkend="gnome-desktop"/>,
+    <xref linkend="gnome-menus"/> and
+    <xref linkend="gail"/></para>
 
   </sect2>
Index: gnome/core/gail.xml
===================================================================
--- gnome/core/gail.xml	(revision 0c4e1165472cff0493190d8d8b9af5642709fa9f)
+++ gnome/core/gail.xml	(revision 51d7b7061de2d7c6265dbca9fe74d90fb5d444f5)
@@ -6,9 +6,9 @@
 
   <!ENTITY gail-download-http "http://ftp.gnome.org/pub/GNOME/sources/gail/1.8/gail-&gail-version;.tar.bz2">
-  <!ENTITY gail-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gail/1.8/gail-&gail-version;.tar.bz2">
-  <!ENTITY gail-md5sum "9e5db197dea8f92eec1f07984f12542a">
-  <!ENTITY gail-size "562 KB">
-  <!ENTITY gail-buildsize "19 MB">
-  <!ENTITY gail-time "0.5 SBU">
+  <!ENTITY gail-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/gail/1.8/gail-&gail-version;.tar.bz2">
+  <!ENTITY gail-md5sum        "7587a0a9ee643bb59ef6b2dea06c5a28">
+  <!ENTITY gail-size          "563 KB">
+  <!ENTITY gail-buildsize     "19.3 MB">
+  <!ENTITY gail-time          "0.6 SBU">
 ]>
 
@@ -92,6 +92,15 @@
     a symlink to <envar>$GNOME_PREFIX</envar> to satisfy this requirement:</para>
 
-<screen role="root"><userinput>ln -v -sf `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">
+    <title>Command Explanations</title>
+    
+    <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>
Index: gnome/core/gconf.xml
===================================================================
--- gnome/core/gconf.xml	(revision 0c4e1165472cff0493190d8d8b9af5642709fa9f)
+++ gnome/core/gconf.xml	(revision 51d7b7061de2d7c6265dbca9fe74d90fb5d444f5)
@@ -6,9 +6,9 @@
 
   <!ENTITY GConf-download-http "http://ftp.gnome.org/pub/GNOME/sources/GConf/&gnome-version;/GConf-&GConf-version;.tar.bz2">
-  <!ENTITY GConf-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/GConf/&gnome-version;/GConf-&GConf-version;.tar.bz2">
-  <!ENTITY GConf-md5sum "a7cd37be4e317195a6668a086fc72033">
-  <!ENTITY GConf-size "1.7 MB">
-  <!ENTITY GConf-buildsize "26 MB">
-  <!ENTITY GConf-time "0.4 SBU">
+  <!ENTITY GConf-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/GConf/&gnome-version;/GConf-&GConf-version;.tar.bz2">
+  <!ENTITY GConf-md5sum        "e674d838922a9e9de0cee9fd2ef1ea0c">
+  <!ENTITY GConf-size          "1.8 MB">
+  <!ENTITY GConf-buildsize     "28.6 MB">
+  <!ENTITY GConf-time          "0.4 SBU">
 ]>
 
@@ -63,4 +63,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para><xref linkend="gtk2"/>,
+    <xref linkend="openldap"/>,
     <xref linkend="gtk-doc"/> and
     <xref linkend="docbook-utils"/></para>
@@ -96,5 +97,5 @@
 
     <para><parameter>--sysconfdir=/etc/gnome</parameter>: This switch
-    puts <application>GNOMEGConf-2</application> configuration files
+    puts <application>GConf-2</application> configuration files
     in <filename class="directory">/etc/gnome</filename> instead of
     <filename class="directory">$GNOME_PREFIX/etc</filename>.  This
@@ -102,5 +103,6 @@
     change the location (which includes eliminating this parameter), it
     <emphasis>must</emphasis> be consistent for every subsequent
-    <application>GNOMEGConf-2</application> package installation.</para>
+    package installation that updates the <application>GConf-2</application>
+    configuration database.</para>
 
   </sect2>
Index: gnome/core/gtk-engines.xml
===================================================================
--- gnome/core/gtk-engines.xml	(revision 0c4e1165472cff0493190d8d8b9af5642709fa9f)
+++ gnome/core/gtk-engines.xml	(revision 51d7b7061de2d7c6265dbca9fe74d90fb5d444f5)
@@ -6,9 +6,9 @@
 
   <!ENTITY gtk-engines-download-http "http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/2.6/gtk-engines-&gtk-engines-version;.tar.bz2">
-  <!ENTITY gtk-engines-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gtk-engines/2.6/gtk-engines-&gtk-engines-version;.tar.bz2">
-  <!ENTITY gtk-engines-md5sum "ba5975f8ab390fa43fc0bf94f4a3b023">
-  <!ENTITY gtk-engines-size "469 KB">
-  <!ENTITY gtk-engines-buildsize "13 MB">
-  <!ENTITY gtk-engines-time "0.4 SBU">
+  <!ENTITY gtk-engines-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/gtk-engines/2.6/gtk-engines-&gtk-engines-version;.tar.bz2">
+  <!ENTITY gtk-engines-md5sum        "28469a797ba1e6aaa3f7eea4c9f5f9b7">
+  <!ENTITY gtk-engines-size          "477 KB">
+  <!ENTITY gtk-engines-buildsize     "13.0 MB">
+  <!ENTITY gtk-engines-time          "0.4 SBU">
 ]>
 
Index: gnome/core/libbonobo.xml
===================================================================
--- gnome/core/libbonobo.xml	(revision 0c4e1165472cff0493190d8d8b9af5642709fa9f)
+++ gnome/core/libbonobo.xml	(revision 51d7b7061de2d7c6265dbca9fe74d90fb5d444f5)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY libbonobo-download-http "http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.8/libbonobo-&libbonobo-version;.tar.bz2">
-  <!ENTITY libbonobo-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.8/libbonobo-&libbonobo-version;.tar.bz2">
-  <!ENTITY libbonobo-md5sum "54f863c20016cf8a2cf25056f6c7cda7">
-  <!ENTITY libbonobo-size "1.0 MB">
-  <!ENTITY libbonobo-buildsize "35 MB">
-  <!ENTITY libbonobo-time "0.8 SBU (additional 0.2 SBU to run the test suite)">
+  <!ENTITY libbonobo-download-http "http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.10/libbonobo-&libbonobo-version;.tar.bz2">
+  <!ENTITY libbonobo-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.10/libbonobo-&libbonobo-version;.tar.bz2">
+  <!ENTITY libbonobo-md5sum        "927d572970d87121c8375aab1b4b1d37">
+  <!ENTITY libbonobo-size          "1.3 MB">
+  <!ENTITY libbonobo-buildsize     "35.3 MB">
+  <!ENTITY libbonobo-time          "0.7 SBU (additional 0.2 SBU to run the test suite)">
 ]>
 
@@ -21,5 +21,5 @@
   </sect1info>
 
-  <title>Libbonobo-&libbonobo-version;</title>
+  <title>libbonobo-&libbonobo-version;</title>
 
   <indexterm zone="libbonobo">
@@ -28,5 +28,5 @@
 
   <sect2 role="package">
-    <title>Introduction to Libbonobo</title>
+    <title>Introduction to libbonobo</title>
 
     <para>The <application>libbonobo</application> package contains
@@ -57,5 +57,5 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Libbonobo Dependencies</bridgehead>
+    <bridgehead renderas="sect3">libbonobo Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -71,5 +71,5 @@
 
   <sect2 role="installation">
-    <title>Installation of Libbonobo</title>
+    <title>Installation of libbonobo</title>
 
     <para>Install <application>libbonobo</application> by running the following
Index: gnome/core/libbonoboui.xml
===================================================================
--- gnome/core/libbonoboui.xml	(revision 0c4e1165472cff0493190d8d8b9af5642709fa9f)
+++ gnome/core/libbonoboui.xml	(revision 51d7b7061de2d7c6265dbca9fe74d90fb5d444f5)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY libbonoboui-download-http "http://ftp.gnome.org/pub/GNOME/sources/libbonoboui/2.8/libbonoboui-&libbonoboui-version;.tar.bz2">
-  <!ENTITY libbonoboui-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/libbonoboui/2.8/libbonoboui-&libbonoboui-version;.tar.bz2">
-  <!ENTITY libbonoboui-md5sum "b23daafa8344a88696d497f20285ef55">
-  <!ENTITY libbonoboui-size "1.0 MB">
-  <!ENTITY libbonoboui-buildsize "28 MB">
-  <!ENTITY libbonoboui-time "0.9 SBU">
+  <!ENTITY libbonoboui-download-http "http://ftp.gnome.org/pub/GNOME/sources/libbonoboui/2.10/libbonoboui-&libbonoboui-version;.tar.bz2">
+  <!ENTITY libbonoboui-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/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">
 ]>
 
@@ -21,5 +21,5 @@
   </sect1info>
 
-  <title>Libbonoboui-&libbonoboui-version;</title>
+  <title>libbonoboui-&libbonoboui-version;</title>
 
   <indexterm zone="libbonoboui">
@@ -28,5 +28,5 @@
 
   <sect2 role="package">
-    <title>Introduction to Libbonoboui</title>
+    <title>Introduction to libbonoboui</title>
 
     <para>The <application>libbonoboui</application> package contains
@@ -55,5 +55,5 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Libbonoboui Dependencies</bridgehead>
+    <bridgehead renderas="sect3">libbonoboui Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -66,5 +66,5 @@
 
   <sect2 role="installation">
-    <title>Installation of Libbonoboui</title>
+    <title>Installation of libbonoboui</title>
 
     <para>Install <application>libbonoboui</application> by running the
@@ -92,5 +92,5 @@
       <seglistitem>
         <seg>bonobo-browser and test-moniker</seg>
-        <seg>libbonoboui-2.[so,a] and libbonobo.[so,a] glade library</seg>
+        <seg>libbonoboui-2.[so,a] and libbonobo.[so,a] Glade library</seg>
         <seg>$GNOME_PREFIX/include/libbonoboui-2.0,
         $GNOME_PREFIX/share/applications,
Index: gnome/core/libgnome.xml
===================================================================
--- gnome/core/libgnome.xml	(revision 0c4e1165472cff0493190d8d8b9af5642709fa9f)
+++ gnome/core/libgnome.xml	(revision 51d7b7061de2d7c6265dbca9fe74d90fb5d444f5)
@@ -6,9 +6,9 @@
 
   <!ENTITY libgnome-download-http "http://ftp.gnome.org/pub/GNOME/sources/libgnome/&gnome-version;/libgnome-&libgnome-version;.tar.bz2">
-  <!ENTITY libgnome-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/libgnome/&gnome-version;/libgnome-&libgnome-version;.tar.bz2">
-  <!ENTITY libgnome-md5sum "f8e1225d96126f5139232821a6723d15">
-  <!ENTITY libgnome-size "871 KB">
-  <!ENTITY libgnome-buildsize "18 MB">
-  <!ENTITY libgnome-time "0.2 SBU">
+  <!ENTITY libgnome-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/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-time          "0.2 SBU">
 ]>
 
@@ -21,5 +21,5 @@
   </sect1info>
 
-  <title>Libgnome-&libgnome-version;</title>
+  <title>libgnome-&libgnome-version;</title>
 
   <indexterm zone="libgnome">
@@ -28,5 +28,5 @@
 
   <sect2 role="package">
-    <title>Introduction to Libgnome</title>
+    <title>Introduction to libgnome</title>
 
     <para>The <application>libgnome</application> package contains the
@@ -55,5 +55,5 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Libgnome Dependencies</bridgehead>
+    <bridgehead renderas="sect3">libgnome Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -66,5 +66,5 @@
 
   <sect2 role="installation">
-    <title>Installation of Libgnome</title>
+    <title>Installation of libgnome</title>
 
     <para>Install <application>libgnome</application> by running the following
Index: gnome/core/libgnomecanvas.xml
===================================================================
--- gnome/core/libgnomecanvas.xml	(revision 0c4e1165472cff0493190d8d8b9af5642709fa9f)
+++ gnome/core/libgnomecanvas.xml	(revision 51d7b7061de2d7c6265dbca9fe74d90fb5d444f5)
@@ -6,9 +6,9 @@
 
   <!ENTITY libgnomecanvas-download-http "http://ftp.gnome.org/pub/GNOME/sources/libgnomecanvas/&gnome-version;/libgnomecanvas-&libgnomecanvas-version;.tar.bz2">
-  <!ENTITY libgnomecanvas-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/libgnomecanvas/&gnome-version;/libgnomecanvas-&libgnomecanvas-version;.tar.bz2">
-  <!ENTITY libgnomecanvas-md5sum "88aac06c8dfd24671db3fe3bf881b5fc">
-  <!ENTITY libgnomecanvas-size "575 KB">
-  <!ENTITY libgnomecanvas-buildsize "12 MB">
-  <!ENTITY libgnomecanvas-time "0.3 SBU">
+  <!ENTITY libgnomecanvas-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/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-time          "0.2 SBU">
 ]>
 
@@ -21,5 +21,5 @@
   </sect1info>
 
-  <title>Libgnomecanvas-&libgnomecanvas-version;</title>
+  <title>libgnomecanvas-&libgnomecanvas-version;</title>
 
   <indexterm zone="libgnomecanvas">
@@ -28,5 +28,5 @@
 
   <sect2 role="package">
-    <title>Introduction to Libgnomecanvas</title>
+    <title>Introduction to libgnomecanvas</title>
 
     <para>The <application>libgnomecanvas</application> package contains
@@ -57,5 +57,5 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Libgnomecanvas Dependencies</bridgehead>
+    <bridgehead renderas="sect3">libgnomecanvas Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -69,5 +69,5 @@
 
   <sect2 role="installation">
-    <title>Installation of Libgnomecanvas</title>
+    <title>Installation of libgnomecanvas</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -98,5 +98,5 @@
       <seglistitem>
         <seg>None</seg>
-        <seg>libgnomecanvas-2.[so,a] and the libcanvas.[so,a] glade
+        <seg>libgnomecanvas-2.[so,a] and the libcanvas.[so,a] Glade
         library</seg>
         <seg>$GNOME_PREFIX/include/libgnomecanvas-2.0,
Index: gnome/core/libgnomeui.xml
===================================================================
--- gnome/core/libgnomeui.xml	(revision 0c4e1165472cff0493190d8d8b9af5642709fa9f)
+++ gnome/core/libgnomeui.xml	(revision 51d7b7061de2d7c6265dbca9fe74d90fb5d444f5)
@@ -6,9 +6,9 @@
 
   <!ENTITY libgnomeui-download-http "http://ftp.gnome.org/pub/GNOME/sources/libgnomeui/&gnome-version;/libgnomeui-&libgnomeui-version;.tar.bz2">
-  <!ENTITY libgnomeui-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/libgnomeui/&gnome-version;/libgnomeui-&libgnomeui-version;.tar.bz2">
-  <!ENTITY libgnomeui-md5sum "e17c0d97e5f240513ac2d36268d696ed">
-  <!ENTITY libgnomeui-size "1.6 MB">
-  <!ENTITY libgnomeui-buildsize "37 MB">
-  <!ENTITY libgnomeui-time "0.9 SBU">
+  <!ENTITY libgnomeui-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/libgnomeui/&gnome-version;/libgnomeui-&libgnomeui-version;.tar.bz2">
+  <!ENTITY libgnomeui-md5sum        "342a5b8a9d427ff950a71a245a5f4485">
+  <!ENTITY libgnomeui-size          "1.8 MB">
+  <!ENTITY libgnomeui-buildsize     "39.0 MB">
+  <!ENTITY libgnomeui-time          "0.8 SBU">
 ]>
 
@@ -21,5 +21,5 @@
   </sect1info>
 
-  <title>Libgnomeui-&libgnomeui-version;</title>
+  <title>libgnomeui-&libgnomeui-version;</title>
 
   <indexterm zone="libgnomeui">
@@ -28,5 +28,5 @@
 
   <sect2 role="package">
-    <title>Introduction to Libgnomeui</title>
+    <title>Introduction to libgnomeui</title>
 
     <para>The <application>libgnomeui</application> package contains
@@ -55,5 +55,5 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Libgnomeui Dependencies</bridgehead>
+    <bridgehead renderas="sect3">libgnomeui Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -61,10 +61,11 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="libjpeg"/> and <xref linkend="gtk-doc"/></para>
+    <para><xref linkend="libjpeg"/>
+    and <xref linkend="gtk-doc"/></para>
 
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation of Libgnomeui</title>
+    <title>Installation of libgnomeui</title>
 
     <para>Install <application>libgnomeui</application> by running the following
@@ -81,4 +82,12 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
+    <para>If your <application>GNOME</application> installation prefix is
+    anything other than <filename class='directory'>/usr</filename>, create
+    the following symbolic link as the
+    <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>ln -v -s $GNOME_PREFIX/lib/gtk-2.0/2.4.0/filesystems \
+        /usr/lib/gtk-2.0/2.4.0</userinput></screen>
+
   </sect2>
 
@@ -91,8 +100,12 @@
     <filename class="directory">$GNOME_PREFIX/libexec</filename>.</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>
 
   <sect2 role="configuration">
-    <title>Configuring Libgnomeui</title>
+    <title>Configuring libgnomeui</title>
 
     <sect3>
Index: gnome/core/libgtop.xml
===================================================================
--- gnome/core/libgtop.xml	(revision 0c4e1165472cff0493190d8d8b9af5642709fa9f)
+++ gnome/core/libgtop.xml	(revision 51d7b7061de2d7c6265dbca9fe74d90fb5d444f5)
@@ -6,9 +6,9 @@
 
   <!ENTITY libgtop-download-http "http://ftp.gnome.org/pub/GNOME/sources/libgtop/&gnome-version;/libgtop-&libgtop-version;.tar.bz2">
-  <!ENTITY libgtop-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/libgtop/&gnome-version;/libgtop-&libgtop-version;.tar.bz2">
-  <!ENTITY libgtop-md5sum "b006baa3bd486005411a03534b45708e">
-  <!ENTITY libgtop-size "750 KB">
-  <!ENTITY libgtop-buildsize "14 MB">
-  <!ENTITY libgtop-time "0.3 SBU">
+  <!ENTITY libgtop-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/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-time          "0.3 SBU">
 ]>
 
@@ -77,5 +77,5 @@
 
 <screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --infodir=$GNOME_PREFIX/share/info &amp;&amp;
+    --infodir=`pkg-config --variable=prefix ORBit-2.0`/share/info &amp;&amp;
 make</userinput></screen>
 
@@ -100,8 +100,11 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--infodir=$GNOME_PREFIX/share/info</parameter>: This switch
-    installs the info documentation in
+    <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
-    <filename class='directory'>$GNOME_PREFIX/info</filename>.</para>
+    <filename class='directory'>$GNOME_PREFIX/info</filename>. You may need to
+    add this directory to your <envar>$INFOPATH</envar> environment variable if
+    your <application>GNOME</application> installation prefix is anything other
+    than <filename class='directory'>/usr</filename>.</para>
 
     <para><option>--with-libgtop-examples</option>: Adding this parameter to
Index: gnome/core/nautilus.xml
===================================================================
--- gnome/core/nautilus.xml	(revision 0c4e1165472cff0493190d8d8b9af5642709fa9f)
+++ gnome/core/nautilus.xml	(revision 51d7b7061de2d7c6265dbca9fe74d90fb5d444f5)
@@ -6,9 +6,9 @@
 
   <!ENTITY nautilus-download-http "http://ftp.gnome.org/pub/GNOME/sources/nautilus/&gnome-version;/nautilus-&nautilus-version;.tar.bz2">
-  <!ENTITY nautilus-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/nautilus/&gnome-version;/nautilus-&nautilus-version;.tar.bz2">
-  <!ENTITY nautilus-md5sum "976d725db15e901bc881dfb8c50145c1">
-  <!ENTITY nautilus-size "5.9 MB">
-  <!ENTITY nautilus-buildsize "81 MB">
-  <!ENTITY nautilus-time "0.9 SBU">
+  <!ENTITY nautilus-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/nautilus/&gnome-version;/nautilus-&nautilus-version;.tar.bz2">
+  <!ENTITY nautilus-md5sum        "61878b1c3f9bee37cd568e17b31d66b1">
+  <!ENTITY nautilus-size          "4.0 MB">
+  <!ENTITY nautilus-buildsize     "85.0 MB">
+  <!ENTITY nautilus-time          "1.0 SBU">
 ]>
 
@@ -59,16 +59,10 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para><xref linkend="eel"/>,
-    <xref linkend="libexif"/>,
-    <xref linkend="librsvg"/> and
-    <xref linkend="gnome-desktop"/></para>
+    <xref linkend="libexif"/> and
+    <xref linkend="librsvg"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="startup-notification"/>,
-    <xref linkend="libgsf"/>,
-    <xref linkend="libcroco"/>,
-    <xref linkend="cdparanoia"/>,
-    <xref linkend="libjpeg"/>,
-    <xref linkend="docbook-utils"/> and
-    <ulink url="http://ftp.gnome.org/pub/GNOME/sources/medusa/0.5/">medusa</ulink></para>
+    <para><xref linkend="startup-notification"/> and
+    <xref linkend="docbook-utils"/></para>
 
   </sect2>
@@ -144,5 +138,5 @@
         <term><filename class='libraryfile'>libnautilus-*.so</filename></term>
         <listitem>
-          <para>supply the functions needed by the file manager.</para>
+          <para>supplies the functions needed by the file manager.</para>
           <indexterm zone="nautilus libnautilus">
             <primary sortas="c-libnautilus">libnautilus-*.so</primary>
Index: gnome/core/orbit2.xml
===================================================================
--- gnome/core/orbit2.xml	(revision 0c4e1165472cff0493190d8d8b9af5642709fa9f)
+++ gnome/core/orbit2.xml	(revision 51d7b7061de2d7c6265dbca9fe74d90fb5d444f5)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY ORBit2-download-http "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.12/ORBit2-&ORBit2-version;.tar.bz2">
-  <!ENTITY ORBit2-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.12/ORBit2-&ORBit2-version;.tar.bz2">
-  <!ENTITY ORBit2-md5sum "7f963dcd0d84e6854460449383cc8c70">
-  <!ENTITY ORBit2-size "678 KB">
-  <!ENTITY ORBit2-buildsize "32 MB">
-  <!ENTITY ORBit2-time "0.7 SBU (additional 0.2 SBU to run the test suite)">
+  <!ENTITY ORBit2-download-http "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/&gnome-version;/ORBit2-&ORBit2-version;.tar.bz2">
+  <!ENTITY ORBit2-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/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 (additional 0.2 SBU to run the test suite)">
 ]>
 
@@ -86,7 +86,7 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--prefix=$GNOME_PREFIX</parameter>: This is the Base
+    <para><parameter>--prefix=$GNOME_PREFIX</parameter>: This is the base
     installation for <application>GNOME-2</application> from which all future
-    installations will receive their prefix parameter.  Be sure that
+    package installations will receive their prefix parameter. Be sure that
     <envar>GNOME_PREFIX</envar> is set for this install or globally to your
     install directory as described in the introduction of this Chapter.</para>
@@ -95,4 +95,8 @@
     configuration files in <filename class="directory">/etc/gnome</filename>
     instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
+
+    <para><option>--enable-gtk-doc</option>: Use this parameter if you have
+    <application>GTK-Doc</application> installed and you wish to build the
+    documentation.</para>
 
   </sect2>
Index: gnome/core/scrollkeeper.xml
===================================================================
--- gnome/core/scrollkeeper.xml	(revision 0c4e1165472cff0493190d8d8b9af5642709fa9f)
+++ gnome/core/scrollkeeper.xml	(revision 51d7b7061de2d7c6265dbca9fe74d90fb5d444f5)
@@ -6,9 +6,9 @@
 
   <!ENTITY scrollkeeper-download-http "http://ftp.gnome.org/pub/GNOME/sources/scrollkeeper/0.3/scrollkeeper-&scrollkeeper-version;.tar.bz2">
-  <!ENTITY scrollkeeper-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/scrollkeeper/0.3/scrollkeeper-&scrollkeeper-version;.tar.bz2">
-  <!ENTITY scrollkeeper-md5sum "b175e582a6cec3e50a9de73a5bb7455a">
-  <!ENTITY scrollkeeper-size "546 KB">
-  <!ENTITY scrollkeeper-buildsize "12 MB">
-  <!ENTITY scrollkeeper-time "0.1 SBU">
+  <!ENTITY scrollkeeper-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/scrollkeeper/0.3/scrollkeeper-&scrollkeeper-version;.tar.bz2">
+  <!ENTITY scrollkeeper-md5sum        "b175e582a6cec3e50a9de73a5bb7455a">
+  <!ENTITY scrollkeeper-size          "546 KB">
+  <!ENTITY scrollkeeper-buildsize     "12 MB">
+  <!ENTITY scrollkeeper-time          "0.1 SBU">
 ]>
 
@@ -102,6 +102,8 @@
     <para><parameter>--with-omfdirs=...</parameter>: This switch defines the
     locations of <filename>OMF</filename> files for
-    <application>ScrollKeeper</application>. This information is stored in
-    <filename>/etc/scrollkeeper.conf</filename> and can be updated manually,
+    <application>ScrollKeeper</application>. Change the locations if you have
+    <application>KDE</application> and/or <application>GNOME</application>-2
+    installed in a prefix other than the ones shown. This information is stored
+    in <filename>/etc/scrollkeeper.conf</filename> and can be updated manually,
     if necessary.</para>
 
@@ -127,7 +129,7 @@
       <para>The configuration file sets the <envar>OMF_DIR</envar> variable
       to the location of all of the <filename class="directory">omf</filename>
-      directories in the system. This was set in the <command>configure</command>
-      command so no further action is needed until another <filename>OMF</filename>
-      directory is created.</para>
+      directories in the system. This was set in the
+      <command>configure</command> command so no further action is needed until
+      another <filename>OMF</filename> directory is created.</para>
 
     </sect3>
Index: gnome/core/vte.xml
===================================================================
--- gnome/core/vte.xml	(revision 0c4e1165472cff0493190d8d8b9af5642709fa9f)
+++ gnome/core/vte.xml	(revision 51d7b7061de2d7c6265dbca9fe74d90fb5d444f5)
@@ -72,5 +72,5 @@
     commands:</para>
 
-<screen><userinput>sed -i -e 's%\\177:%&amp;kh=\\EOH:@7=\\EOF:%g' termcaps/xterm &amp;&amp;
+<screen><userinput>sed -i 's%\\177:%&amp;kh=\\EOH:@7=\\EOF:%' termcaps/xterm &amp;&amp;
 ./configure --prefix=/usr --libexecdir=/usr/sbin --disable-gtk-doc &amp;&amp;
 make</userinput></screen>
@@ -87,5 +87,5 @@
     <title>Command Explanations</title>
 
-    <para><command>sed -i -e ...</command>: The <keysym>Home</keysym> and
+    <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>
Index: gnome/core/yelp.xml
===================================================================
--- gnome/core/yelp.xml	(revision 0c4e1165472cff0493190d8d8b9af5642709fa9f)
+++ gnome/core/yelp.xml	(revision 51d7b7061de2d7c6265dbca9fe74d90fb5d444f5)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY yelp-download-http "http://ftp.gnome.org/pub/GNOME/sources/yelp/2.6/yelp-&yelp-version;.tar.bz2">
-  <!ENTITY yelp-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/yelp/2.6/yelp-&yelp-version;.tar.bz2">
-  <!ENTITY yelp-md5sum "9bd94af344ee6a0bf69aa6f9cbd6b7e9">
-  <!ENTITY yelp-size "654 KB">
-  <!ENTITY yelp-buildsize "9 MB">
-  <!ENTITY yelp-time "0.2 SBU">
+  <!ENTITY yelp-download-http "http://ftp.gnome.org/pub/GNOME/sources/yelp/&gnome-version;/yelp-&yelp-version;.tar.bz2">
+  <!ENTITY yelp-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/yelp/&gnome-version;/yelp-&yelp-version;.tar.bz2">
+  <!ENTITY yelp-md5sum        "d6a9c142ca367447f06cee003b6d8a5d">
+  <!ENTITY yelp-size          "815 KB">
+  <!ENTITY yelp-buildsize     "12.5 MB">
+  <!ENTITY yelp-time          "0.2 SBU">
 ]>
 
@@ -59,10 +59,20 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para><xref linkend="libgnomeui"/>,
-    <xref linkend="libgtkhtml"/> and
-    <xref linkend="scrollkeeper"/></para>
+    <xref linkend="gnome-doc-utils"/> and
+    a Gecko HTML rendering engine (<xref linkend="mozilla"/> or
+    <xref linkend="firefox"/> or
+    <xref linkend="thunderbird"/>)</para>
 
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para><xref linkend="gnome-doc-utils"/> (required for XSLT
-    transformations)</para>
+    <note>
+      <para>The <application>Yelp</application> package is not required for a
+      functional <application>GNOME</application> desktop. Note, however, that
+      without <application>Yelp</application> you will not be able to view the
+      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>
+    </note>
 
   </sect2>
@@ -75,5 +85,5 @@
 
 <screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --localstatedir=/var/lib &amp;&amp;
+    --localstatedir=/var/lib --sysconfdir=/etc/gnome &amp;&amp;
 make</userinput></screen>
 
@@ -101,11 +111,13 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>gnome-help and yelp</seg>
-        <seg>GNOME_Yelp.server bonobo server</seg>
-        <seg>$GNOME_PREFIX/share/sgml/docbook/yelp and
+        <seg>None</seg>
+        <seg>/etc/gnome/gconf/gconf.xml.defaults/apps/yelp,
+        /etc/gnome/gconf/gconf.xml.defaults/schemas/apps/yelp,
+        $GNOME_PREFIX/share/icons/hicolor/192x192 and
         $GNOME_PREFIX/share/yelp</seg>
       </seglistitem>
