Index: general.ent
===================================================================
--- general.ent	(revision b17d4e9dde3fa854f0b7643829c8a6f383267fa1)
+++ general.ent	(revision 7ee5186f916c58d717e810fb375850d77a83ed53)
@@ -683,5 +683,5 @@
 <!ENTITY GConf-version                "3.2.3">
 <!ENTITY gjs-version                  "1.30.0">
-<!ENTITY gnome-desktop-version        "2.30.2">
+<!ENTITY gnome-desktop-version        "3.2.1">
 <!ENTITY gnome-doc-utils-version      "0.20.2">
 <!ENTITY libgnomekbd-version          "2.30.1">
Index: gnome/core/gnome-desktop.xml
===================================================================
--- gnome/core/gnome-desktop.xml	(revision b17d4e9dde3fa854f0b7643829c8a6f383267fa1)
+++ gnome/core/gnome-desktop.xml	(revision 7ee5186f916c58d717e810fb375850d77a83ed53)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!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        "49f06f91b0579c6e5a07ff8195945629">
-  <!ENTITY gnome-desktop-size          "1.6 MB">
-  <!ENTITY gnome-desktop-buildsize     "22 MB">
-  <!ENTITY gnome-desktop-time          "0.7 SBU">
+  <!ENTITY gnome-desktop-download-http "&gnome-download-http;/gnome-desktop/&gnome-version;/gnome-desktop-&gnome-desktop-version;.tar.xz">
+  <!ENTITY gnome-desktop-download-ftp  "&gnome-download-ftp;/gnome-desktop/&gnome-version;/gnome-desktop-&gnome-desktop-version;.tar.xz">
+  <!ENTITY gnome-desktop-md5sum        "6d09ae32ac1f12fb25b8d30572a033a6">
+  <!ENTITY gnome-desktop-size          "903 KB">
+  <!ENTITY gnome-desktop-buildsize     "21 MB">
+  <!ENTITY gnome-desktop-time          "0.5 SBU">
 ]>
 
@@ -30,10 +30,9 @@
     <title>Introduction to GNOME Desktop</title>
 
-    <para>The <application>GNOME Desktop</application> package contains
-    the <command>gnome-about</command> program, the
-    <filename class='libraryfile'>libgnome-desktop-2</filename> library and
+    <para>The <application>GNOME Desktop</application> package contains the
+    <filename class='libraryfile'>libgnome-desktop-3</filename> library and
     <application>GNOME</application>'s core graphics files and icons.</para>
 
-    &lfs65_checked;
+    &lfs70_built;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -62,7 +61,10 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="GConf"/>,
+    <para role="required"><xref linkend="DocBook"/>,
     <xref linkend="gnome-doc-utils"/>,
-    <xref linkend="gtk2"/>,
+    <!-- FIXME:ken
+    <xref linkend="gsettings-desktop-schemas"/>,-->
+    gsettings-desktop-schemas-3.2.0,
+    <xref linkend="gtk3"/>,
     <xref linkend="which"/>, and
     <xref linkend="xorg7-lib"/></para>
@@ -82,7 +84,5 @@
     running the following commands:</para>
 
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; \
-            --localstatedir=/var/lib &amp;&amp;
+<screen><userinput>./configure --prefix=$GNOME_PREFIX &amp;&amp;
 make</userinput></screen>
 
@@ -101,10 +101,4 @@
     href="../../xincludes/gnome-prefix.xml"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gnome-sysconfdir.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/scrollkeeper-dir.xml"/>
-
     <para><option>--with-gnome-distributor="Some Name"</option>: Use this
     parameter to supply a custom name in the <quote>Distributor:</quote>
@@ -114,4 +108,7 @@
     parameter if <application>KDE</application> is installed in any prefix
     other than <filename class='directory'>/usr</filename>.</para>
+
+    <para><option>--disable-static</option>: This switch prevents the static
+    libraries being installed.</para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -124,14 +121,18 @@
 
     <segmentedlist>
-      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>gnome-about</seg>
-        <seg>libgnome-desktop-2.{so,a}</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{include/gnome-desktop-2.0/libgnomeui,
-        share/{applications,gnome-about/headers,gtk-doc/html/gnome-desktop,
-        libgnome-desktop,omf/{fdl,gpl,lgpl}}}</seg>
+        <seg>None</seg>
+        <seg>libgnome-desktop-3.{so,a}</seg>
+        <seg>/usr/{include/gnome-desktop-3.0/libgnome-desktop,
+        share/{gnome/help/{fdl/{C,ar,ca,de,el,es,eu,fr,hu,ko,oc,pl,sl,sv,uk,vi,
+        zh_CN},gpl/{C,ar,ca,cs,de,el,es,eu,fi,fr,hu,ko,nds,oc,pa,sl,sv,uk,vi,
+        zh_CN},lgpl/{C,ar,de,el,es,eu,fi,fr,hu,ko,oc,pa,pt_BR,sl,sv,uk,vi,
+        zh_CN}},gtk-doc/html/gnome-desktop3,libgnome-desktop-3.0,
+        locale/{an/LC_MESSAGES,fur/LC_MESSAGES,ig/LC_MESSAGES,lo/LC_MESSAGES,
+        yo/LC_MESSAGES},omf/{fdl,gpl,lgpl}}}</seg>
       </seglistitem>
     </segmentedlist>
@@ -142,22 +143,12 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="gnome-about">
-        <term><command>gnome-about</command></term>
-        <listitem>
-          <para>produces the about screen.</para>
-          <indexterm zone="gnome-desktop gnome-about">
-            <primary sortas="b-gnome-about">gnome-about</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgnome-desktop-2">
-        <term><filename class='libraryfile'>libgnome-desktop-2.{so,a}</filename></term>
+      <varlistentry id="libgnome-desktop-3">
+        <term><filename class='libraryfile'>libgnome-desktop-3.{so,a}</filename></term>
         <listitem>
           <para>contains APIs being tested for inclusion in
           <application>libgnome</application> or
           <application>libgnomeui</application>.</para>
-          <indexterm zone="gnome-desktop libgnome-desktop-2">
-            <primary sortas="c-libgnome-desktop-2">libgnome-desktop-2.{so,a}</primary>
+          <indexterm zone="gnome-desktop libgnome-desktop-3">
+            <primary sortas="c-libgnome-desktop-3">libgnome-desktop-3.{so,a}</primary>
           </indexterm>
         </listitem>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision b17d4e9dde3fa854f0b7643829c8a6f383267fa1)
+++ introduction/welcome/changelog.xml	(revision 7ee5186f916c58d717e810fb375850d77a83ed53)
@@ -66,4 +66,7 @@
           <para>[ken] - merge gnome-control-center-3.2.2 from Wayne.</para>
         </listitem>
+        <listitem>
+          <para>[ken] - merge gnome-desktop-3.2.1 from Wayne.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
