Index: x/wm/metacity/metacity-config.xml
===================================================================
--- x/wm/metacity/metacity-config.xml	(revision 42270f3a1d24e23baa3a476b5584aa8e1abe1825)
+++ x/wm/metacity/metacity-config.xml	(revision d50ef4c586ee7a803e55ae86ff0a66a8f958465f)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring metacity</title>
+<title>Configuring <application>metacity</application></title>
 
 <sect3><title>Configuration Information</title>
@@ -7,8 +7,8 @@
 before proceeding.</para>
 
-<para><screen><userinput>cat &gt;&gt; ~/.xinitrc &lt;&lt; "EOF"</userinput>
+<screen><userinput><command>cat &gt;&gt; ~/.xinitrc &lt;&lt; "EOF"</command>
 xterm &amp;
 exec metacity
-<userinput>EOF</userinput></screen></para>
+<command>EOF</command></userinput></screen>
 </sect3>
 
Index: x/wm/metacity/metacity-desc.xml
===================================================================
--- x/wm/metacity/metacity-desc.xml	(revision 42270f3a1d24e23baa3a476b5584aa8e1abe1825)
+++ x/wm/metacity/metacity-desc.xml	(revision d50ef4c586ee7a803e55ae86ff0a66a8f958465f)
@@ -2,5 +2,6 @@
 <title>Contents</title>
 
-<para>The metacity package contains <userinput>metacity</userinput>.</para>
+<para>The <application>metacity</application> package contains
+<command>metacity</command>.</para>
 
 </sect2>
@@ -9,5 +10,5 @@
 
 <sect3><title>metacity</title>
-<para>metacity is a window manager used mainly by Gnome.</para></sect3>
+<para><command>metacity</command> is a window manager used mainly by Gnome.</para></sect3>
 
 </sect2>
Index: x/wm/metacity/metacity-inst.xml
===================================================================
--- x/wm/metacity/metacity-inst.xml	(revision 42270f3a1d24e23baa3a476b5584aa8e1abe1825)
+++ x/wm/metacity/metacity-inst.xml	(revision d50ef4c586ee7a803e55ae86ff0a66a8f958465f)
@@ -1,10 +1,10 @@
 <sect2>
-<title>Installation of metacity</title>
+<title>Installation of <application>metacity</application></title>
 
-<para>Install metacity by running the following commands:</para>
+<para>Install <application>metacity</application> by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr --libexec=/usr/sbin --sysconfdir=/etc &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr --libexec=/usr/sbin --sysconfdir=/etc &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 
Index: x/wm/metacity/metacity-intro.xml
===================================================================
--- x/wm/metacity/metacity-intro.xml	(revision 42270f3a1d24e23baa3a476b5584aa8e1abe1825)
+++ x/wm/metacity/metacity-intro.xml	(revision d50ef4c586ee7a803e55ae86ff0a66a8f958465f)
@@ -1,19 +1,30 @@
 <sect2>
-<title>Introduction to metacity</title>
+<title>Introduction to <application>metacity</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&metacity-download-http;"/>
-Download location (FTP):        <ulink url="&metacity-download-ftp;"/>
-Version used:                   &metacity-version;
-Package size:                   &metacity-size;
-Estimated Disk space required:  &metacity-buildsize;
-Estimated build time:           &metacity-time;</screen>
-
-<para>The metacity package contains a window manager. This is useful for
+<para>The <application>metacity</application> package contains a window manager. This is useful for
 organizing and displaying windows.</para>
 
-<screen>metacity depends on:
-<xref linkend="xfree86"/>, <xref linkend="intltool"/> and <xref linkend="GTK2"/>
-metacity will utilize:
-<xref linkend="startup-notification"/> and <xref linkend="GConf"/></screen>
+<sect3><title>Package information</title>
+<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 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>
+
+<sect3><title><application>template</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="xfree86"/>, <xref linkend="intltool"/> and <xref
+linkend="GTK2"/>
+</para></sect4>
+<sect4><title>Optional</title>
+<para><xref linkend="startup-notification"/> and <xref linkend="GConf"/></para></sect4>
+</sect3>
+
 
 </sect2>
Index: x/wm/metacity/metacity.ent
===================================================================
--- x/wm/metacity/metacity.ent	(revision 42270f3a1d24e23baa3a476b5584aa8e1abe1825)
+++ x/wm/metacity/metacity.ent	(revision d50ef4c586ee7a803e55ae86ff0a66a8f958465f)
@@ -5,8 +5,8 @@
 <!ENTITY metacity-desc SYSTEM "metacity-desc.xml">
 <!ENTITY metacity-config SYSTEM "metacity-config.xml">
-<!ENTITY metacity-buildsize "15.8 MB">
-<!ENTITY metacity-version "2.4.34">
-<!ENTITY metacity-download-http "http://ftp.gnome.org/pub/GNOME/sources/metacity/2.4/metacity-2.4.34.tar.bz2">
-<!ENTITY metacity-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/metacity/2.4/metacity-2.4.34.tar.bz2">
-<!ENTITY metacity-size "1.2 MB">
-<!ENTITY metacity-time "1.33 SBU">
+<!ENTITY metacity-buildsize "31.5 MB">
+<!ENTITY metacity-version "2.4.55">
+<!ENTITY metacity-download-http "http://ftp.gnome.org/pub/GNOME/sources/metacity/2.4/metacity-2.4.55.tar.bz2">
+<!ENTITY metacity-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/metacity/2.4/metacity-2.4.55.tar.bz2">
+<!ENTITY metacity-size "1.3 MB">
+<!ENTITY metacity-time "0.49 SBU">
