Index: x/wm/metacity.xml
===================================================================
--- x/wm/metacity.xml	(revision b36e6e4c01c9fb245bafb1f77a4bb41b10d47b5e)
+++ x/wm/metacity.xml	(revision 69e285dd5af7c21949526f370f1da42ec34df90f)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY metacity-download-http "http://ftp.gnome.org/pub/GNOME/sources/metacity/2.8/metacity-&metacity-version;.tar.bz2">
-  <!ENTITY metacity-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/metacity/2.8/metacity-&metacity-version;.tar.bz2">
-  <!ENTITY metacity-md5sum        "c49e4b5575503975516159780855e317">
-  <!ENTITY metacity-size          "2.1 MB">
-  <!ENTITY metacity-buildsize     "46.9 MB">
-  <!ENTITY metacity-time          "0.41 SBU">
+  <!ENTITY metacity-download-http "http://ftp.gnome.org/pub/GNOME/sources/metacity/2.10/metacity-&metacity-version;.tar.bz2">
+  <!ENTITY metacity-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/metacity/2.10/metacity-&metacity-version;.tar.bz2">
+  <!ENTITY metacity-md5sum        "c326eb1aed8742057e9ad94b9ccae877">
+  <!ENTITY metacity-size          "1.6 MB">
+  <!ENTITY metacity-buildsize     "47.6 MB">
+  <!ENTITY metacity-time          "0.5 SBU">
 ]>
 
@@ -35,10 +35,16 @@
 
 <itemizedlist spacing='compact'>
-  <listitem><para>Download (HTTP): <ulink url="&metacity-download-http;"/></para></listitem>
-  <listitem><para>Download (FTP): <ulink url="&metacity-download-ftp;"/></para></listitem>
-  <listitem><para>Download MD5 sum: &metacity-md5sum;</para></listitem>
-  <listitem><para>Download size: &metacity-size;</para></listitem>
-  <listitem><para>Estimated disk space required: &metacity-buildsize;</para></listitem>
-  <listitem><para>Estimated build time: &metacity-time;</para></listitem>
+  <listitem><para>Download (HTTP): 
+    <ulink url="&metacity-download-http;"/></para></listitem>
+  <listitem><para>Download (FTP): 
+    <ulink url="&metacity-download-ftp;"/></para></listitem>
+  <listitem><para>Download MD5 sum: 
+    &metacity-md5sum;</para></listitem>
+  <listitem><para>Download size: 
+    &metacity-size;</para></listitem>
+  <listitem><para>Estimated disk space required: 
+    &metacity-buildsize;</para></listitem>
+  <listitem><para>Estimated build time: 
+    &metacity-time;</para></listitem>
 </itemizedlist>
 </sect3>
@@ -63,11 +69,11 @@
 </para>
 
-<para>* <filename class='libraryfile'>libXrender</filename> is included in a 
-<acronym>BLFS</acronym> <application>X</application> Window System 
-installation, but the pkgconfig <filename>.pc</filename> file 
+<para>* <filename class='libraryfile'>libXrender</filename> is installed 
+during an <application>XFree86</application> installation, but the 
+<application>pkgconfig</application> <filename>.pc</filename> file 
 <application>Metacity</application> looks for is not installed. Satisfy the 
 requirement by installing an <filename>xrender.pc</filename> file into 
-<filename class='directory'>/usr/X11R6/lib/pkgconfig</filename> which can be 
-installed as:</para>
+<filename class='directory'>/usr/X11R6/lib/pkgconfig</filename> (not
+applicable if you have <application>Xorg</application> installed):</para>
 
 <screen><userinput><command>cat &gt; /usr/X11R6/lib/pkgconfig/xrender.pc &lt;&lt; "EOF"</command>
@@ -106,5 +112,8 @@
 <para>Now, as the root user:</para>
  
-<screen><userinput role='root'><command>make install</command></userinput></screen>
+<screen><userinput role='root'><command>make install &amp;&amp;
+install -v -m755 -d /usr/share/doc/metacity-&metacity-version; &amp;&amp;
+install -v -m644 README rationales.txt doc/*.txt \
+    /usr/share/doc/metacity-&metacity-version;</command></userinput></screen>
 
 </sect2>
@@ -114,7 +123,6 @@
 
 <para><option>--with-gconf-schema-file-dir=/etc/gnome/gconf/schemas</option>: 
-Use this option if you have the 
-<application><acronym>GNOME</acronym>-2</application> 
-<application>GConf</application> package installed.</para>
+Use this option if you are installing <application>Metacity</application> for 
+a <application><acronym>GNOME</acronym>-2</application> installation.</para>
 
 </sect2>
@@ -128,6 +136,9 @@
 <para>To automatically start the <application>Metacity</application> window 
 manager when you issue the <command>startx</command> command, append to (or 
-create) <filename>.xinitrc</filename> using the command below. Ensure you 
-backup your current <filename>~/.xinitrc</filename> before proceeding.</para>
+create) <filename>.xinitrc</filename> using the command below (not required 
+if you are installing <application>Metacity</application> for
+a <application><acronym>GNOME</acronym>-2</application> installation). Ensure 
+you backup your current <filename>~/.xinitrc</filename> before 
+proceeding:</para>
 
 <indexterm zone="metacity metacity-config">
@@ -147,12 +158,20 @@
 
 <segmentedlist>
-  <segtitle>Installed Program</segtitle>
-  <segtitle>Installed Libraries</segtitle>
+  <segtitle>Installed Programs</segtitle>
+  <segtitle>Installed Library</segtitle>
   <segtitle>Installed Directories</segtitle>
  
   <seglistitem>
-    <seg>metacity</seg>
-    <seg>None</seg>
-    <seg>None</seg>
+    <seg>metacity, metacity-dialog, 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, 
+      /usr/include/metacity-1, 
+      /usr/share/doc/metacity-&metacity-version;, 
+      /usr/share/themes/[Crux,Simple]/metacity-1, 
+      /usr/share/themes/[Atlanta,Bright,Esco,AgingGorilla,Metabox], 
+      /usr/share/metacity and 
+      /usr/share/gnome/wm-properties</seg>
   </seglistitem>
 </segmentedlist>
@@ -174,4 +193,29 @@
 </varlistentry>
 
+<varlistentry id="metacity-theme-viewer">
+  <term><command>metacity-theme-viewer</command></term>
+  <listitem>
+    <para>allows you to preview any installed 
+      <application>Metacity</application> theme. When designing a new 
+      <application>Metacity</application> theme, you can use 
+      <command>metacity-theme-viewer</command> to measure the performance 
+      of a window frame option, and to preview the option.
+    </para>
+    <indexterm zone="metacity metacity-theme-viewer">
+      <primary sortas="b-metacity-theme-viewer">metacity-theme-viewer</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
+
+<varlistentry id="metacity-window-demo">
+  <term><command>metacity-window-demo</command></term>
+  <listitem>
+    <para>demonstrates various kinds of windows that window managers and 
+      window manager themes should handle.</para>
+    <indexterm zone="metacity metacity-window-demo">
+      <primary sortas="b-metacity-window-demo">metacity-window-demo</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
 </variablelist>
 
