Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision fee5290ce5fbb54eba9fbcd1c2e44291370c7648)
+++ introduction/welcome/changelog.xml	(revision 35dc583b37019554afa6ee5e9e927a359b4a12b9)
@@ -46,4 +46,7 @@
       <itemizedlist>
         <listitem>
+          <para>[randy] - Updated to Metacity-2.12.2.</para>
+        </listitem>
+        <listitem>
           <para>[randy] - Updated to libwnck-2.12.2.</para>
         </listitem>
Index: x/wm/metacity.xml
===================================================================
--- x/wm/metacity.xml	(revision fee5290ce5fbb54eba9fbcd1c2e44291370c7648)
+++ x/wm/metacity.xml	(revision 35dc583b37019554afa6ee5e9e927a359b4a12b9)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY metacity-download-http "http://ftp.gnome.org/pub/GNOME/sources/metacity/2.12/metacity-&metacity-version;.tar.bz2">
-  <!ENTITY metacity-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/metacity/2.12/metacity-&metacity-version;.tar.bz2">
-  <!ENTITY metacity-md5sum        "f702edb8599d7364ac58de9c0edfa798">
+  <!ENTITY metacity-download-http "&gnome-download-http;/metacity/&gnome-version;/metacity-&metacity-version;.tar.bz2">
+  <!ENTITY metacity-download-ftp  "&gnome-download-ftp;/metacity/&gnome-version;/metacity-&metacity-version;.tar.bz2">
+  <!ENTITY metacity-md5sum        "4caabbd7a3ae14ec5ccf6ada2d466049">
   <!ENTITY metacity-size          "1.6 MB">
-  <!ENTITY metacity-buildsize     "50.2 MB">
+  <!ENTITY metacity-buildsize     "50.3 MB">
   <!ENTITY metacity-time          "0.5 SBU">
 ]>
@@ -62,11 +62,11 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="intltool"/>,
+    <para role="required"><xref linkend="gtk2"/>,
     <xref linkend="GConf"/>, and
-    <xref linkend="gtk2"/></para>
+    <xref linkend="perl-xml-parser"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="startup-notification"/> (recommended if you are
-    installing <application>GNOME</application>-2) and
+    <para role="optional"><xref linkend="startup-notification"/>
+    (recommended if you are installing <application>GNOME</application>-2) and
     <ulink url="http://freedesktop.org/Software/xlibs">libXcomposite</ulink>*</para>
 
@@ -95,6 +95,10 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr --libexecdir=/usr/sbin --sysconfdir=/etc &amp;&amp;
+<screen><userinput>./configure --prefix=/usr \
+            --libexecdir=/usr/lib/metacity \
+            --sysconfdir=/etc &amp;&amp;
 make</userinput></screen>
+
+    <para>This package does not come with a test suite.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
@@ -110,5 +114,6 @@
     <title>Command Explanations</title>
 
-    <para><option>--with-gconf-schema-file-dir=/etc/gnome/gconf/schemas</option>:
+    <para>
+    <option>--with-gconf-schema-file-dir=&gnome-etc-dir;/gconf/schemas</option>:
     Use this option if you are installing <application>Metacity</application> for
     a <application>GNOME-2</application> installation.</para>
@@ -153,15 +158,14 @@
 
       <seglistitem>
-        <seg>metacity, metacity-dialog, metacity-message, metacity-theme-viewer
+        <seg>metacity, metacity-message, metacity-theme-viewer
         and metacity-window-demo</seg>
         <seg>libmetacity-private.[so,a]</seg>
-        <seg>/etc/gnome/gconf/gconf.xml.defaults/schemas/apps/metacity,
-        /etc/gnome/gconf/gconf.xml.defaults/apps/metacity,
+        <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults[,/schemas]/apps/metacity,
         /usr/include/metacity-1,
+        /usr/lib/metacity,
         /usr/share/doc/metacity-&metacity-version;,
-        /usr/share/themes/[Crux,Simple]/metacity-1,
-        /usr/share/themes/[Atlanta,Bright,Esco,AgingGorilla,Metabox],
+        /usr/share/gnome/wm-properties,
         /usr/share/metacity and
-        /usr/share/gnome/wm-properties</seg>
+        /usr/share/themes/[AgingGorilla,Atlanta,Bright,Crux,Esco,Metabox,Simple]/metacity-1</seg>
       </seglistitem>
     </segmentedlist>
