Index: gnome/core/gconf.xml
===================================================================
--- gnome/core/gconf.xml	(revision a006f981e72c5ad5590c6aaaa9f05e17eb9efc02)
+++ gnome/core/gconf.xml	(revision f210178f8c971bf6060d9582e0303403671613ee)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY GConf-download-http "&gnome-download-http;/GConf/2.28/GConf-&GConf-version;.tar.bz2">
-  <!ENTITY GConf-download-ftp  "&gnome-download-ftp;/GConf/2.28/GConf-&GConf-version;.tar.bz2">
-  <!ENTITY GConf-md5sum        "27663faf0af4f6a6d534de9270f6d24a">
-  <!ENTITY GConf-size          "1.4 MB">
-  <!ENTITY GConf-buildsize     "41 MB">
-  <!ENTITY GConf-time          "0.5 SBU">
+  <!ENTITY GConf-download-http "&gnome-download-http;/GConf/&gnome-version;/GConf-&GConf-version;.tar.xz">
+  <!ENTITY GConf-download-ftp  "&gnome-download-ftp;/GConf/&gnome-version;/GConf-&GConf-version;.tar.xz">
+  <!ENTITY GConf-md5sum        "de9047c08d3f642c5b1990b0bef44577">
+  <!ENTITY GConf-size          "1.5 MB">
+  <!ENTITY GConf-buildsize     "47 MB">
+  <!ENTITY GConf-time          "0.3 SBU">
 ]>
 
@@ -33,5 +33,5 @@
     configuration database system.</para>
 
-    &lfs65_checked;
+    &lfs70_built;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -57,22 +57,17 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/GConf-&GConf-version;-sysconfdir-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">GConf Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="ORBit2"/> and
+    <para role="required"><xref linkend="dbus-glib"/>,
+    <xref linkend="intltool"/>, and
+    <xref linkend="libxml2"/><!--, and
+    <xref linkend="ORBit2"/>--></para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended"><xref linkend="gtk3"/> (Required if building a
+    <application>GNOME</application> desktop.
+    <command>gconf-sanity-check-2</command> will not build otherwise.) and
     <xref linkend="polkit"/></para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="gtk2"/> (Required if building a
-    <application>GNOME</application> desktop.
-    <command>gconf-sanity-check-2</command> will not build otherwise.)</para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -91,11 +86,10 @@
     commands:</para>
 
-<screen><userinput>patch -Np1 -i ../GConf-&GConf-version;-sysconfdir-1.patch &amp;&amp;
-./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;
+    <!-- with-gtk=3.0 is the default, and mandir goes to prefix/share/man -->
+
+<screen><userinput>./configure --prefix=$GNOME_PREFIX \
+            --sysconfdir=$GNOME_SYSCONFDIR \
+            --libexecdir=$GNOME_PREFIX/lib/GConf \
+            --disable-orbit &amp;&amp;
 make</userinput></screen>
 
@@ -106,5 +100,5 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
-install -v -m755 -d &gnome-etc-dir;/gconf/gconf.xml.system</userinput></screen>
+install -v -m755 -d $GNOME_SYSCONFDIR/gconf/gconf.xml.system</userinput></screen>
 
     <para>Still as the <systemitem class="username">root</systemitem> user,
@@ -124,6 +118,6 @@
 &lt;busconfig&gt;
 
-  &lt;!-- Search for .conf files in &gnome-etc-dir;/dbus-1/system.d --&gt;
-  &lt;includedir&gt;&gnome-etc-dir;/dbus-1/system.d&lt;/includedir&gt;
+  &lt;!-- Search for .conf files in $GNOME_SYSCONFDIR/dbus-1/system.d --&gt;
+  &lt;includedir&gt;$GNOME_SYSCONFDIR/dbus-1/system.d&lt;/includedir&gt;
 
   &lt;!-- Search for .service files in $GNOME_PREFIX/share/dbus-1/system-services --&gt;
@@ -171,22 +165,22 @@
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This parameter
-    causes the <application>GConf-2</application> configuration database to be
-    built in <filename class="directory">&gnome-etc-dir;</filename> instead of
-    <filename class="directory">$GNOME_PREFIX/etc</filename>. This installation
-    controls all future installations of <application>GConf-2</application>
-    schemas. If you change the location (which includes eliminating this
-    parameter), it <emphasis role='strong'>must</emphasis> be consistent for
-    every subsequent package installation that updates the
-    <application>GConf-2</application> configuration database.</para>
-
-    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
-    ORBit-2.0)/lib/GConf</parameter>: This parameter causes the libexec files
-    to be installed in the preferred location of
-    <filename class="directory">$GNOME_PREFIX/lib/GConf</filename> instead of
-    <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-mandir.xml"/>
+    href="../../xincludes/gnome-sysconfdir.xml"/>
+
+    <para><parameter>--libexecdir=<envar>$GNOME_PREFIX</envar>/lib/GConf</parameter>:
+    This parameter causes the libexec files to be installed in the preferred
+    location of <filename class="directory">$GNOME_PREFIX/lib/GConf</filename>
+    instead of <filename
+    class="directory">$GNOME_PREFIX/libexec</filename>.</para>
+
+    <para><parameter>--disable-orbit</parameter>: This parameter is required if
+    <application>ORBit2</application> is not installed.
+    <application>ORBit2</application> is a deprecated package.</para>
+
+    <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gnome-mandir.xml"/>-->
+
+    <para><option>--enable-static=no</option>: This switch prevents the static
+    libraries being installed.</para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -194,5 +188,5 @@
 
     <para><command>install -v -m755 -d
-    &gnome-etc-dir;/gconf/gconf.xml.system</command>: Creates a missing
+    $GNOME_SYSCONFDIR/gconf/gconf.xml.system</command>: Creates a missing
     directory. Without this directory, <command>gconf-sanity-check-2</command>
     will fail during <application>GDM</application> startup and login.</para>
@@ -209,11 +203,12 @@
 
       <seglistitem>
-        <seg>gconf-merge-tree, gconftool-2, gconf-defaults-mechanism,
-        gconf-sanity-check-2, and gconfd-2</seg>
-        <seg>libgconf-2.{so,a}, libgconfbackend-xml.{so,a}, and
-        libgconfbackend-oldxml.{so,a}</seg>
-        <seg>&gnome-etc-dir;/gconf/{2,gconf.xml.defaults,gconf.xml.mandatory,
-        gconf.xml.system}, <envar>$GNOME_PREFIX</envar>/{include/gconf/2/gconf,
-        lib/GConf/2,share/{gtk-doc/html/gconf,sgml/gconf}}</seg>
+        <seg>gconf-defaults-mechanism, gconf-merge-tree, gconf-sanity-check-2,
+        gconfd-2, gconftool-2, and gsettings-data-convert</seg>
+        <seg>libgconf-2.{so,a}, libgconfbackend-oldxml.{so,a},
+        libgconfbackend-xml.{so,a}, and libgsettingsgconfbackend.{so,a}</seg>
+        <seg><envar>$GNOME_SYSCONFDIR</envar>/{gconf/{2,gconf.xml.defaults,
+        gconf.xml.mandatory,gconf.xml.system},xdg/autostart}
+        <envar>$GNOME_PREFIX</envar>/{include/gconf/2/gconf,lib/GConf/2,
+        share/{gtk-doc/html/gconf,sgml/gconf}}</seg>
       </seglistitem>
     </segmentedlist>
@@ -245,4 +240,15 @@
       </varlistentry>
 
+      <varlistentry id="gsettings-data-convert">
+        <term><command>gsettings-data-convert</command></term>
+        <listitem>
+          <para>reads values out of the users GConf database and stores them in
+          GSettings.</para>
+          <indexterm zone="GConf gsettings-data-convert">
+            <primary sortas="b-gsettings-data-convert">gsettings-data-convert</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="libgconf-2">
         <term><filename class='libraryfile'>libgconf-2.{so,a}</filename></term>
Index: gnome/deprecated/libbonobo.xml
===================================================================
--- gnome/deprecated/libbonobo.xml	(revision a006f981e72c5ad5590c6aaaa9f05e17eb9efc02)
+++ gnome/deprecated/libbonobo.xml	(revision f210178f8c971bf6060d9582e0303403671613ee)
@@ -122,5 +122,5 @@
 
     <para><option>--disable-static</option>: This switch prevents the static
-    libraries from being built.</para>
+    libraries being installed.</para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: gnome/deprecated/libgnome.xml
===================================================================
--- gnome/deprecated/libgnome.xml	(revision a006f981e72c5ad5590c6aaaa9f05e17eb9efc02)
+++ gnome/deprecated/libgnome.xml	(revision f210178f8c971bf6060d9582e0303403671613ee)
@@ -125,5 +125,5 @@
 
     <para><option>--disable-static</option>: This switch prevents the static
-    libraries from being built.</para>
+    libraries being installed.</para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
