Index: basicnet/netlibs/gnet/gnet.ent
===================================================================
--- basicnet/netlibs/gnet/gnet.ent	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ basicnet/netlibs/gnet/gnet.ent	(revision d50ef4c586ee7a803e55ae86ff0a66a8f958465f)
@@ -5,8 +5,8 @@
 <!ENTITY gnet-desc SYSTEM "gnet-desc.xml">
 <!ENTITY gnet-config SYSTEM "gnet-config.xml">
-<!ENTITY gnet-buildsize "3.1 MB">
-<!ENTITY gnet-version "1.1.9">
+<!ENTITY gnet-buildsize "9.6 MB">
+<!ENTITY gnet-version "2.0.4">
 <!ENTITY gnet-download-http "http://gnetlibrary.org/src/gnet-&gnet-version;.tar.gz">
 <!ENTITY gnet-download-ftp "">
-<!ENTITY gnet-size "348 KB">
-<!ENTITY gnet-time "0.21 SBU">
+<!ENTITY gnet-size "448 KB">
+<!ENTITY gnet-time "0.18 SBU">
Index: basicnet/netprogs/ncpfs/ncpfs-config.xml
===================================================================
--- basicnet/netprogs/ncpfs/ncpfs-config.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ basicnet/netprogs/ncpfs/ncpfs-config.xml	(revision d50ef4c586ee7a803e55ae86ff0a66a8f958465f)
@@ -9,9 +9,9 @@
 
 <para>A config file <filename>~/.nwclient</filename> should be placed
-in each user's home directory that intends to use ncpfs.
+in the home directory of each user that intends to use ncpfs.
 The permissions on this file should be set to 600, for obvious security
-reasons.  The configuration file should contain a sinlge line
+reasons.  The configuration file should contain a single line
 per server that the user will use.  Each line should contain
-the sever name, the user name, and optionally the password.  Below is a
+the server name, the user name, and optionally the password.  Below is a
 sample <filename>.nwclient</filename> file.</para>
 
@@ -39,5 +39,5 @@
 connection to the Novell server.  Mounting each individual volume
 separately would be unwise, as mounting all volumes on a server 
-under one mount point, uses only one client connection.</para>
+under one mount point uses only one client connection.</para>
 
 <para>If you need to set up the IPX protocol at boot, you can create the 
@@ -54,6 +54,6 @@
 
 echo "Setting up the IPX protocol on eth0..."
-/sbin/ipx_interface add eth0 802.2 &&
-/sbin/ipx_configure --auto_interface=on --auto_primary=on
+/bin/ipx_interface add eth0 802.2 &amp;&amp;
+/bin/ipx_configure --auto_interface=on --auto_primary=on
 evaluate_retval
 
@@ -68,6 +68,6 @@
 
 echo "Stoping IPX on the eth0 interface..."
-/usr/bin/ipx_configure --auto_interface=off --auto_primary=off &&
-/usr/bin/ipx_interface del eth0 802.2
+/bin/ipx_configure --auto_interface=off --auto_primary=off &amp;&amp;
+/bin/ipx_interface del eth0 802.2
 evaluate_retval
 
Index: basicnet/netprogs/ncpfs/ncpfs-exp.xml
===================================================================
--- basicnet/netprogs/ncpfs/ncpfs-exp.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ basicnet/netprogs/ncpfs/ncpfs-exp.xml	(revision d50ef4c586ee7a803e55ae86ff0a66a8f958465f)
@@ -2,12 +2,22 @@
 <title>Command explanations</title>
 
-<para>
-<userinput>./configure --prefix=/usr --mandir=/usr/share/man</userinput>:
-installs the binaries and libs to the <filename>/usr</filename> directory 
-and places the man files in <filename>/usr/share/man</filename>.</para>
-<para><userinput>make install-dev</userinput>: Installs the header files
-to <filename>/usr/include</filename>.</para>
-<para>If you do not need to use the IPX protocol, or you use a different 
-IPX package, you can optionally pass <userinput> --disable-ipx </userinput> 
+<para><userinput>--prefix=""</userinput>:
+installs binaries on the root partition so that they are availible at
+boot time.  This may not be ideal for all systems.  If
+<filename>/usr</filename> is mounted locally,
+<userinput>--prefix=/usr</userinput> may be a better option.</para>
+
+<para><userinput>--includedir=/usr/include</userinput>: Tells configure
+to look in <filename>/usr/include</filename> for header files.  It also
+tells make to install ncpfs's headers here.</para>
+
+<para><userinput>--mandir=/usr/share/man</userinput>:  installs the man
+pages in the correct location.</para>
+
+<para><userinput>--datadir=/usr/share</userinput>:  correctly installs the 
+locale files to <filename>/usr/share/</filename>.</para>
+
+<para>Note:  If you do not need to use the IPX protocol, or you use a different
+IPX package, you can optionally pass <userinput> --disable-ipx </userinput>
 and/or <userinput> --disable-ipx-tools </userinput> to the configure
 script to disable these options.</para>
Index: basicnet/netprogs/ncpfs/ncpfs-inst.xml
===================================================================
--- basicnet/netprogs/ncpfs/ncpfs-inst.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ basicnet/netprogs/ncpfs/ncpfs-inst.xml	(revision d50ef4c586ee7a803e55ae86ff0a66a8f958465f)
@@ -4,7 +4,8 @@
 <para>Install ncpfs by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr --mandir=/usr/share/man &&
-make &&
-make install &&
+<para><screen><userinput>./configure --prefix=/usr --inxludedir=/usr/include \
+    --mandir=/usr/share/man --datadir=/usr/share &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
 make install-dev</userinput></screen></para>
 
Index: basicnet/netprogs/ncpfs/ncpfs.ent
===================================================================
--- basicnet/netprogs/ncpfs/ncpfs.ent	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ basicnet/netprogs/ncpfs/ncpfs.ent	(revision d50ef4c586ee7a803e55ae86ff0a66a8f958465f)
@@ -5,5 +5,5 @@
 <!ENTITY ncpfs-desc SYSTEM "ncpfs-desc.xml">
 <!ENTITY ncpfs-config SYSTEM "ncpfs-config.xml">
-<!ENTITY ncpfs-buildsize "18 MB">
+<!ENTITY ncpfs-buildsize "40 MB">
 <!ENTITY ncpfs-version "2.2.3">
 <!ENTITY ncpfs-download-http 
Index: gnome/core/session/gnome-session-desc.xml
===================================================================
--- gnome/core/session/gnome-session-desc.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ gnome/core/session/gnome-session-desc.xml	(revision d50ef4c586ee7a803e55ae86ff0a66a8f958465f)
@@ -2,7 +2,6 @@
 <title>Contents</title>
 
-<para>The gnome-session package contains
-<userinput>gnome-session</userinput>, <userinput>session
-utilities</userinput> and <userinput>manager proxy</userinput>.</para>
+<para>The <application>gnome-session</application> package contains
+<command>gnome-session</command>, session utilities and <command>manager proxy</command>.</para>
 
 </sect2>
@@ -11,5 +10,5 @@
 
 <sect3><title>gnome-session</title>
-<para>gnome-session starts up the GNOME desktop.</para></sect3>
+<para><command>gnome-session</command> starts up the GNOME desktop.</para></sect3>
 
 <sect3><title>session utilities</title>
@@ -18,6 +17,6 @@
 
 <sect3><title>manager proxy</title>
-<para>manager proxy handles basic session management for applications
-that do not support XSM.</para></sect3>
+<para><command>manager proxy</command> handles basic session management for applications
+that do not support <acronym>XSM</acronym>.</para></sect3>
 
 </sect2>
Index: gnome/core/session/gnome-session-exp.xml
===================================================================
--- gnome/core/session/gnome-session-exp.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ gnome/core/session/gnome-session-exp.xml	(revision d50ef4c586ee7a803e55ae86ff0a66a8f958465f)
@@ -2,9 +2,9 @@
 <title>Command explanations</title>
 
-<para><userinput>--localstatedir=/var/lib</userinput> : This switch
+<para><command>--localstatedir=/var/lib</command> : This switch
 puts scrollkeeper files in <filename>/var/lib/scrollkeeper</filename>
 instead of <filename>$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
 
-<para><userinput>--sysconfdir=/etc/gnome</userinput> : This switch
+<para><command>--sysconfdir=/etc/gnome</command> : This switch
 puts configuration files in <filename>/etc/gnome</filename> instead of
 <filename>$GNOME_PREFIX/etc</filename>.</para>
Index: gnome/core/session/gnome-session-inst.xml
===================================================================
--- gnome/core/session/gnome-session-inst.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ gnome/core/session/gnome-session-inst.xml	(revision d50ef4c586ee7a803e55ae86ff0a66a8f958465f)
@@ -1,12 +1,12 @@
 <sect2>
-<title>Installation of gnome-session</title>
+<title>Installation of <application>gnome-session</application></title>
 
-<para>Install gnome-session by running the following commands:</para>
+<para>Install <application>gnome-session</application> by running the following commands:</para>
 
-<para><screen><userinput>export PATH=$PATH:$GNOME_PREFIX/sbin:/sbin &amp;&amp;
+<screen><userinput><command>export PATH=$PATH:$GNOME_PREFIX/sbin:/sbin &amp;&amp;
 ./configure --prefix=$GNOME_PREFIX --localstatedir=/var/lib \
 --sysconfdir=/etc/gnome  &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: gnome/core/session/gnome-session-intro.xml
===================================================================
--- gnome/core/session/gnome-session-intro.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ gnome/core/session/gnome-session-intro.xml	(revision d50ef4c586ee7a803e55ae86ff0a66a8f958465f)
@@ -1,16 +1,25 @@
 <sect2>
-<title>Introduction to gnome-session</title>
+<title>Introduction to <application>gnome-session</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&gnome-session-download-http;"/>
-Download location (FTP):        <ulink url="&gnome-session-download-ftp;"/>
-Version used:                   &gnome-session-version;
-Package size:                   &gnome-session-size;
-Estimated Disk space required:  &gnome-session-buildsize;
-Estimated build time:           &gnome-session-time;</screen>
+<para>The <application>gnome-session</application> package contains the GNOME 
+session manager.</para>
 
-<para>The gnome-session package contains the GNOME session manager.</para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&gnome-session-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&gnome-session-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gnome-session-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&gnome-session-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&gnome-session-time;</para></listitem></itemizedlist>
+</sect3>
 
-<screen>gnome-session depends on:
-<xref linkend="libgnomeui"/></screen>
+<sect3><title><application>gnome-session</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="libgnomeui"/></para></sect4>
+</sect3>
 
 </sect2>
Index: gnome/core/session/gnome-session.ent
===================================================================
--- gnome/core/session/gnome-session.ent	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ gnome/core/session/gnome-session.ent	(revision d50ef4c586ee7a803e55ae86ff0a66a8f958465f)
@@ -5,8 +5,8 @@
 <!ENTITY gnome-session-desc SYSTEM "gnome-session-desc.xml">
 <!ENTITY gnome-session-config SYSTEM "gnome-session-config.xml">
-<!ENTITY gnome-session-buildsize "6.6 MB">
-<!ENTITY gnome-session-version "2.2.1">
-<!ENTITY gnome-session-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-session/2.2/gnome-session-2.2.1.tar.bz2">
-<!ENTITY gnome-session-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-session/2.2/gnome-session-2.2.1.tar.bz2">
-<!ENTITY gnome-session-size "709 KB">
-<!ENTITY gnome-session-time "0.88 SBU">
+<!ENTITY gnome-session-buildsize "15 MB">
+<!ENTITY gnome-session-version "2.2.2">
+<!ENTITY gnome-session-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-session/2.2/gnome-session-2.2.2.tar.bz2">
+<!ENTITY gnome-session-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-session/2.2/gnome-session-2.2.2.tar.bz2">
+<!ENTITY gnome-session-size "704 KB">
+<!ENTITY gnome-session-time "0.22 SBU">
Index: index.xml
===================================================================
--- index.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ index.xml	(revision d50ef4c586ee7a803e55ae86ff0a66a8f958465f)
@@ -3,6 +3,6 @@
 			"/usr/share/docbook/docbookx.dtd" [
 
-<!ENTITY version "20030903">
-<!ENTITY releasedate "September 3rd, 2003">
+<!ENTITY version "20030904">
+<!ENTITY releasedate "September 4th, 2003">
 
 <!ENTITY % book SYSTEM "book/book.ent">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ introduction/welcome/changelog.xml	(revision d50ef4c586ee7a803e55ae86ff0a66a8f958465f)
@@ -10,4 +10,16 @@
 
 <itemizedlist>
+
+<listitem><para>September 4th, 2003 [larry]: multimedia: updated
+avifile and  mplayer submitted by Igor.</para></listitem>
+
+<listitem><para>September 4th, 2003 [larry]: basicnet: applied DJ's
+correction patch to ncpfs.</para></listitem>
+
+<listitem><para>September 4th, 2003 [larry]: x: updated to
+metacity-2.4.55.</para></listitem>
+
+<listitem><para>September 4th, 2003 [larry]: xsoft: updated to
+pan-0.14.2 and gnet-2.0.4.</para></listitem>
 
 <listitem><para>September 3rd, 2003 [larry]: xsoft: updated to
Index: multimedia/libdriv/sdl/sdl.ent
===================================================================
--- multimedia/libdriv/sdl/sdl.ent	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ multimedia/libdriv/sdl/sdl.ent	(revision d50ef4c586ee7a803e55ae86ff0a66a8f958465f)
@@ -5,8 +5,8 @@
 <!ENTITY SDL-desc SYSTEM "sdl-desc.xml">
 <!ENTITY SDL-config SYSTEM "sdl-config.xml">
-<!ENTITY SDL-buildsize "49.2 MB">
-<!ENTITY SDL-version "1.2.5">
+<!ENTITY SDL-buildsize "50.3 MB">
+<!ENTITY SDL-version "1.2.6">
 <!ENTITY SDL-download-http "http://www.libsdl.org/release/SDL-&SDL-version;.tar.gz">
 <!ENTITY SDL-download-ftp "">
-<!ENTITY SDL-size "1.8 MB">
-<!ENTITY SDL-time "0.70 SBU">
+<!ENTITY SDL-size "1.9 MB">
+<!ENTITY SDL-time "0.72 SBU">
Index: multimedia/videoutils/avifile.xml
===================================================================
--- multimedia/videoutils/avifile.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ multimedia/videoutils/avifile.xml	(revision d50ef4c586ee7a803e55ae86ff0a66a8f958465f)
@@ -5,4 +5,5 @@
 &avifile-intro;
 &avifile-inst;
+&avifile-exp;
 &avifile-desc;
 
Index: multimedia/videoutils/avifile/avifile-desc.xml
===================================================================
--- multimedia/videoutils/avifile/avifile-desc.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ multimedia/videoutils/avifile/avifile-desc.xml	(revision d50ef4c586ee7a803e55ae86ff0a66a8f958465f)
@@ -2,9 +2,9 @@
 <title>Contents</title>
 
-<para>The avifile package contains <userinput>aviplay</userinput>,
-<userinput>avibench</userinput>, <userinput>avifile-config</userinput>,
-<userinput>mmxnow-config</userinput>, <userinput>avirecompress</userinput>, <userinput>avicap</userinput>,
-<userinput>avirec</userinput>, <userinput>kv4lsetup</userinput>, <userinput>avicat</userinput>,
-<userinput>avitype</userinput> and <userinput>avimake</userinput>.</para>
+<para>The avifile package contains <command>aviplay</command>,
+<command>avibench</command>, <command>avifile-config</command>,
+<command>mmxnow-config</command>, <command>avirecompress</command>, <command>avicap</command>,
+<command>avirec</command>, <command>kv4lsetup</command>, <command>avicat</command>,
+<command>avitype</command> and <command>avimake</command>.</para>
 
 </sect2>
@@ -13,44 +13,45 @@
 
 <sect3><title>aviplay</title>
-<para>aviplay manages the input formats, the codecs and the output
-formats to display AVI video files on your screen.</para></sect3>
+<para><command>aviplay</command> manages the input formats, the codecs and the output
+formats to display <acronym>AVI</acronym> video files on your screen.</para></sect3>
 
 <sect3><title>avibench</title>
-<para>avibench performs a measurement of the avifile library's
+<para><command>avibench</command> performs a measurement of the avifile library's
 performance for a file.</para></sect3>
 
 <sect3><title>avifile-config</title>
-<para>avifile-config is run by configure for programs wishing to link to
+<para><command>avifile-config</command> is run by configure for programs wishing to link to
 the avifile library.</para></sect3>
 
 <sect3><title>mmxnow-config</title>
-<para>mmxnow-config is run by configure for programs wishing to link to
+<para><command>mmxnow-config</command> is run by configure for programs wishing to link to
 the mmxnow library.</para></sect3>
 
 <sect3><title>avirecompress</title>
-<para>avirecompress is a widget that takes an input file of one codec
+<para><command>avirecompress</command> is a widget that takes an input file of one codec
 type and converts it into a video file of another codec.</para></sect3>
 
 <sect3><title>avicap</title>
-<para>avicap is a widget that displays acquired video fro a Video For
+<para><command>avicap</command> is a widget that displays acquired video fro a Video For
 Windows (vfw) compatible device, like a webcam or a
 TV-tuner.</para></sect3>
 
 <sect3><title>avirec</title>
-<para>avirec is a command line video recording tool.</para></sect3>
+<para><command>avirec</command> is a command line video recording tool.</para></sect3>
 
 <sect3><title>kv4lsetup</title>
-<para>kv4lsetup is a small tool which tells video4linux about the
+<para><command>kv4lsetup</command> is a small tool which tells video4linux about the
 current video mode</para></sect3>
 
 <sect3><title>avicat</title>
-<para>avicat takes a set of AVI files and combines them into a single
-file.</para></sect3>
+<para><command>avicat</command> takes a set of <acronym>AVI</acronym> files and combines 
+them into a single file.</para></sect3>
 
 <sect3><title>avitype</title>
-<para>avitype will read and display AVI file header information.</para></sect3>
+<para><command>avitype</command> will read and display
+<acronym>AVI</acronym> file header information.</para></sect3>
 
 <sect3><title>avimake</title>
-<para>avimake takes a set of JPG images and creates a
+<para><command>avimake</command> takes a set of <acronym>JPG</acronym> images and creates a
 movie.</para></sect3>
 
Index: multimedia/videoutils/avifile/avifile-exp.xml
===================================================================
--- multimedia/videoutils/avifile/avifile-exp.xml	(revision d50ef4c586ee7a803e55ae86ff0a66a8f958465f)
+++ multimedia/videoutils/avifile/avifile-exp.xml	(revision d50ef4c586ee7a803e55ae86ff0a66a8f958465f)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><command> ./autogen.sh &amp;&amp; ./configure &amp;&amp;
+make maintainer-clean &amp;&amp; ./autogen.sh </command> : The 
+author of this package used the old autoconf which leads to
+problems like configure not being able to detect some libraries and compilation
+errors. We fix this by rebuilding the configuration scripts.
+</para>
+
+</sect2>
Index: multimedia/videoutils/avifile/avifile-inst.xml
===================================================================
--- multimedia/videoutils/avifile/avifile-inst.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ multimedia/videoutils/avifile/avifile-inst.xml	(revision d50ef4c586ee7a803e55ae86ff0a66a8f958465f)
@@ -1,12 +1,16 @@
 <sect2>
-<title>Installation of avifile</title>
+<title>Installation of <application>avifile</application></title>
 
-<para>Install avifile by running the following commands:</para>
-
-<para><screen><userinput>install -d /usr/lib/win32 &amp;&amp;
-tar -xzvf ../binaries-011002.tgz -C /usr/lib &amp;&amp;
-./configure --prefix=/usr &amp;&amp;
+<para>Install <application>avifile</application> by running the following commands:</para>
+<screen><userinput><command>install -d /usr/lib/avifile-0.7/win32 &amp;&amp;
+tar xzvf ../binaries-011002.tgz -C /usr/lib/avifile-0.7 &amp;&amp;
+./autogen.sh &amp;&amp;
+./configure &amp;&amp;
+make maintainer-clean &amp;&amp;
+./autogen.sh &amp;&amp;
+./configure --prefix=/usr --with-qt-prefix=/opt/qt \
+--with-win32-path=/usr/lib/avifile-0.7/win32 &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: multimedia/videoutils/avifile/avifile-intro.xml
===================================================================
--- multimedia/videoutils/avifile/avifile-intro.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ multimedia/videoutils/avifile/avifile-intro.xml	(revision d50ef4c586ee7a803e55ae86ff0a66a8f958465f)
@@ -1,22 +1,34 @@
 <sect2>
-<title>Introduction to avifile</title>
+<title>Introduction to <application>avifile</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&avifile-download-http;"/>
-Download location (FTP):        <ulink url="&avifile-download-ftp;"/>
-Version used:                   &avifile-version;
-Package size:                   &avifile-size;
-Estimated Disk space required:  &avifile-buildsize;</screen>
+<para>The <application>avifile</application> package contains an
+<acronym>AVI</acronym> video file player, tools and
+support libraries. This is useful for viewing and editing
+<acronym>AVI</acronym> files.</para>
 
-<screen>Additional downloads:
-<ulink url="http://avifile.sourceforge.net/binaries-011002.tgz"/></screen>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&avifile-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&avifile-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &avifile-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &avifile-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &avifile-time;</para></listitem></itemizedlist>
+</sect3>
 
-<para>The avifile package contains an AVI video file player, tools and
-support libraries. This is useful for viewing and editing AVI files.</para>
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Required codecs: <ulink
+url="http://flow.dl.sourceforge.net/sourceforge/avifile/binaries-011002.tgz"/></para></listitem>
+</itemizedlist></sect3>
 
-<screen>avifile depends on:
-x86 processor, <xref linkend="xfree86"/>, <xref linkend="libjpeg"/> and <xref linkend="SDL"/>
-avifile will utilize:
-qt (&lt; 3.1.0), oss, <xref linkend="ffmpeg"/><!--,  <xref
-linkend="opendivx"/> --> and <xref linkend="xvid"/></screen>
+<sect3><title><application>avifile</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="qt"/> and <xref linkend="SDL"/></para></sect4>
+<sect4><title>Optional</title>
+<para><xref linkend="ffmpeg"/>, <xref linkend="xvid"/>, <ulink
+url="http://www.underbit.com/products/mad">MAD</ulink>, <xref
+linkend="libvorbis"/> and <xref
+linkend="lame"/></para></sect4>
+</sect3>
 
 </sect2>
Index: multimedia/videoutils/avifile/avifile.ent
===================================================================
--- multimedia/videoutils/avifile/avifile.ent	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ multimedia/videoutils/avifile/avifile.ent	(revision d50ef4c586ee7a803e55ae86ff0a66a8f958465f)
@@ -5,9 +5,9 @@
 <!ENTITY avifile-desc SYSTEM "avifile-desc.xml">
 <!ENTITY avifile-config SYSTEM "avifile-config.xml">
-<!ENTITY avifile-buildsize "26.6 MB">
-<!ENTITY avifile-version "0.7.34"> 
+<!ENTITY avifile-buildsize "46.0 MB">
+<!ENTITY avifile-version "0.7.38"> 
 <!ENTITY avifile-download-http
-"http://avifile.sourceforge.net/avifile-0.7.34-20030319.tgz">
+"http://heanet.dl.sourceforge.net/sourceforge/avifile/avifile-0.7-0.7.38.tar.gz">
 <!ENTITY avifile-download-ftp "">
-<!ENTITY avifile-size "2.7 MB">
-<!ENTITY avifile-time "4.11 SBU">
+<!ENTITY avifile-size "2.8 MB">
+<!ENTITY avifile-time "4.28 SBU">
Index: multimedia/videoutils/mplayer/mplayer-config.xml
===================================================================
--- multimedia/videoutils/mplayer/mplayer-config.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ multimedia/videoutils/mplayer/mplayer-config.xml	(revision d50ef4c586ee7a803e55ae86ff0a66a8f958465f)
@@ -1,7 +1,7 @@
 <sect2>
-<title>Configuring mplayer</title>
+<title>Configuring MPlayer</title>
 
 <sect3><title>Config files</title>
-<para><filename>~/.mplayer/config</filename>, <filename>~/.mplayer/codec.conf</filename></para>
+<para><filename>/etc/mplayer/*</filename>, <filename>~/.mplayer/*</filename></para>
 </sect3>
 
@@ -10,22 +10,26 @@
 <para>If you wish to utilize a freetype font, you need to link a TTF
 file to your <filename>~/.mplayer</filename> directory.  For example:
-<screen>ln -sf /usr/X11R6/lib/X11/fonts/TTF/luxisri.ttf ~/.mplayer/subfont.ttf</screen>otherwise 
-<screen>ln -sf /usr/share/mplayer/font/iso-8859-1/arial-14 ~/.mplayer/font</screen>
-where 14 is the font size. You can chose your font size of 14, 18, 24 or 28.</para>
+<screen><userinput><command>ln -sf /usr/X11R6/lib/X11/fonts/TTF/luxisri.ttf /etc/mplayer/subfont.ttf
+</command></userinput></screen>
+otherwise 
+<screen><userinput><command>ln -sf /usr/share/mplayer/font/font-arial-*-iso-8859-1 /etc/mplayer/font
+</command></userinput></screen>
+where * is the font size. You can chose your font size of 14, 18, 24 or 28.
+</para>
 
-<para>Set up the GUI with the following commands executed from your source directory:</para>
+<para>Set up the <acronym>GUI</acronym> with the following commands executed 
+from your source directory:</para>
 
-<para><screen><userinput>cat &gt; ~/.mplayer/config &lt;&lt; "EOF"</userinput>
+<screen><userinput><command>cat &gt; /etc/mplayer/config &lt;&lt; "EOF"
 gui = yes
 skin = default
-<userinput>EOF
-mkdir ~/.mplayer/Skin &amp;&amp;
-tar -xvf ../default.tar -C ~/.mplayer/Skin</userinput></screen>
-</para>
+EOF
+</command></userinput></screen>
 
 <para>The first line, <userinput>gui = yes</userinput>, will make
-MPlayer start in gui mode automatically. If you want to decide whether to start
-in gui mode or not, leave that line out and start mplayer with
-<userinput>-gui</userinput> or as <userinput>gmplayer</userinput> (e.g.
+MPlayer start in <acronym>GUI</acronym> mode automatically. If you want to decide whether to start
+in <acronym>GUI</acronym> mode or not, leave that line out and start
+<command>mplayer</command> with
+<command>-gui</command> or as <command>gmplayer</command> (e.g.
 when starting from a Window Manager menu or command prompt).</para>
 
Index: multimedia/videoutils/mplayer/mplayer-desc.xml
===================================================================
--- multimedia/videoutils/mplayer/mplayer-desc.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ multimedia/videoutils/mplayer/mplayer-desc.xml	(revision d50ef4c586ee7a803e55ae86ff0a66a8f958465f)
@@ -2,6 +2,6 @@
 <title>Contents</title>
 
-<para>The mplayer package contains <userinput>mplayer</userinput>,
-<userinput>gmplayer</userinput> and <userinput>mencoder</userinput>.</para>
+<para>The MPlayer package contains <command>mplayer</command>,
+<command>gmplayer</command> and <command>mencoder</command>.</para>
 
 </sect2>
@@ -10,27 +10,29 @@
 
 <sect3><title>mplayer</title>
-<para>mplayer manages the input formats, the codecs and the output
-formats to play video files, DVDs, (S)VCDs or network streams containing
+<para><command>mplayer</command> manages the input formats, the codecs and the output
+formats to play video files, <acronym>DVD</acronym>s, (S)VCDs or network streams containing
 audio and/or video informations on your system.</para>
-<para><userinput>Examples:</userinput></para>
-<para><screen><userinput>mplayer -fs blfs.avi
+<para>Examples:</para>
+
+<screen><userinput><command>mplayer -fs blfs.avi
 mplayer -vo fbdev -fb /dev/fb0 -dvd 1 -aid 128 -sub en -framedrop
 mplayer -fs -vcd 1; # works both for VCDs and SVCDs
-mplayer http://www.students.uni-marburg.de/~Klossa/hapkidofight_lo.mpg</userinput></screen></para>
+mplayer http://www.students.uni-marburg.de/~Klossa/hapkidofight_lo.mpg</command></userinput></screen>
+
 <para>For further information, have a look at the very good
-documentation
-included in the package in the subdirectory <filename>DOCS/</filename>.
+documentation included in the package in the subdirectory <filename
+class="directory">DOCS/</filename>.
 </para></sect3>
 
 <sect3><title>gmplayer</title>
-<para>gmplayer is MPlayer with a graphical user interface.</para></sect3>
+<para><command>gmplayer</command> is MPlayer with a graphical user interface.</para></sect3>
 
 <sect3><title>mencoder</title>
-<para>mencoder is used to encode any MPlayer-playable movie to DivX4,
-XviD or any codec in libavcodec with PCM/MP3/VBRMP3
-audio.</para>
+<para><command>mencoder</command> is used to encode any MPlayer-playable movie to DivX4,
+XviD or any codec in libavcodec with PCM/MP3/VBRMP3 audio.</para>
 
-<para><userinput>Example:</userinput></para>
-<para><screen><userinput>rm frameno.avi
+<para>Example:</para>
+
+<screen><userinput><command>rm frameno.avi
 mencoder -dvd 1 -aid 128 -ovc frameno -oac mp3lame \
 -lameopts vbr=3 -o frameno.avi
@@ -45,6 +47,5 @@
 mencoder -dvd 1 -aid 128 -oac copy -ovc lavc \
 -lavcopts vcodec=mpeg4:vpass=2:vhq:vbitrate=&lt;bitrate&gt; -o &lt;name.avi&gt;
-mencoder -forceidx &lt;name.avi&gt;</userinput></screen></para>
-
+mencoder -forceidx &lt;name.avi&gt;</command></userinput></screen>
 </sect3>
 
Index: multimedia/videoutils/mplayer/mplayer-exp.xml
===================================================================
--- multimedia/videoutils/mplayer/mplayer-exp.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ multimedia/videoutils/mplayer/mplayer-exp.xml	(revision d50ef4c586ee7a803e55ae86ff0a66a8f958465f)
@@ -2,35 +2,18 @@
 <title>Command explanations</title>
 
-<!--
-<para><userinput>unset CFLAGS</userinput> : This command clears the
-compile flags.  This command is optional, but the indications are that
-the majority of installs will need it.</para>
--->
+<para><command>--enable-gui</command> : This switch tells MPlayer to compile the gui code.</para>
 
-<para><userinput>--enable-freetype</userinput> : This switch tells
-MPlayer to utilize freetype fonts instead of the fonts provided by mplayer.</para>
-
-<para><userinput>--enable-gui</userinput> : This switch tells MPlayer to compile the gui code.</para>
-
-<para><userinput>--enable-menu --enable-new-conf</userinput> :  These
+<para><command>--enable-menu</command> :  These
 switches enable the new menu support.  It's like an OSD, but you can
 also run a shell with it.</para>
 
-<para><userinput>--enable-shared-pp</userinput>  : This enables the
-building of a shared libpostproc (library for post processing, featuring
+<para><command>--enable-shared-pp</command>  : This enables the
+building of a shared <filename
+class="libraryfile">libpostproc</filename> (library for post processing, featuring
 filters like sharpen).</para>
 
-<para><userinput>cp etc/codecs.conf ~/.mplayer</userinput> : This
-command copies the standard codecs.conf file to the user.  MPlayer
-expects this file at startup.</para>
-
-<para><userinput>cp etc/example.conf ~/.mplayer</userinput> : This
-command copies the self documented configuration file to the user.  We
-will create an new config file if you installed the gui or you can copy
-this file to <filename>config</filename> and edit it for your
-situation.</para>
-
+<para><command>cp etc/codecs.conf /etc/mplayer</command> : This
+command copies the standard codecs.conf file to the system-wide configuration directory.
+MPlayer expects this file at startup.</para>
 
 </sect2>
-
-
Index: multimedia/videoutils/mplayer/mplayer-inst.xml
===================================================================
--- multimedia/videoutils/mplayer/mplayer-inst.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ multimedia/videoutils/mplayer/mplayer-inst.xml	(revision d50ef4c586ee7a803e55ae86ff0a66a8f958465f)
@@ -1,65 +1,53 @@
 <sect2>
-<title>Installation of MPlayer</title>
-
-<para>The extra downloads should be located in your source directory with
-the bzip2 files decompressed.</para>
+<title>Installation of <application>MPlayer</application></title>
 
 <note><para>The package maintainers recommend building without any optimization</para></note>
-<para>Install MPlayer by running the following commands:</para>
 
-<para><screen><userinput>install -d /usr/lib/win32 &amp;&amp;
-tar -xvf ../win32codecs.tar -C /usr/lib/win32 &amp;&amp;
-tar -xvf ../qt5dlls.tar -C /usr/lib/win32 &amp;&amp;
-tar -xvf ../qt6dlls.tar -C /usr/lib/win32 &amp;&amp;
-tar -xvf ../qtextras.tar -C /usr/lib/win32 &amp;&amp;
-tar -xvf ../rp9codecs.tar -C /usr/lib/win32 &amp;&amp;
+<para>Install <application>MPlayer</application> by running the following commands:</para>
+
+<screen><userinput><command>install -d /usr/lib/mplayer/extralite &amp;&amp;
+tar xjvf ../extralite.tar.bz2 -C /usr/lib/mplayer &amp;&amp;
 ./configure --prefix=/usr --confdir=/etc/mplayer --enable-largefiles \
---enable-gui --enable-menu --enable-new-conf --enable-qtx-codecs \
---enable-vorbis --with-reallibdir=/usr/lib/win32/rp9codecs \
---enable-freetype --enable-shared-pp &amp;&amp;
+--enable-gui --enable-menu --enable-shared-pp \
+--with-codecsdir=/usr/lib/mplayer/extralite &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
-
-<para> Each user of MPlayer should complete the install by running the
-following commands:
-<screen><userinput>mkdir ~/.mplayer &amp;&amp;
-cp etc/codecs.conf ~/.mplayer &amp;&amp;
-cp etc/example.conf ~/.mplayer/example.conf</userinput></screen></para>
-
-<sect3>
-<title>Installing the prerendered Fonts</title>
+make install &amp;&amp;
+cp etc/codecs.conf /etc/mplayer &amp;&amp;
+tar xjvf ../default-1.7.tar.bz2 -C /usr/share/mplayer/Skin
+</command></userinput></screen>
 
 <para>If freetype is in use, the only advantage of prerendered fonts is
 that they are faster. Install them like this:</para>
 
-<para><screen><userinput>install -d /usr/share/mplayer/font &amp;&amp;
-tar -xvf ../font-arial-iso-8859-1.tar -C /usr/share/mplayer/font &amp;&amp;
-for i in /usr/share/mplayer/font/font-arial-&lt;size&gt;*
-do ln -s $i /usr/share/mplayer/font; done</userinput></screen></para>
+<screen><userinput><command>tar xjvf ../font-arial-iso-8859-1.tar.bz2 -C /usr/share/mplayer/font
+</command></userinput></screen>
 
-<para>Replace <userinput>&lt;size&gt;</userinput> with either 14, 18, 24
-or 28.</para>
+<sect3>
+<title>Installation for <acronym>DVD</acronym> playback</title>
+
+<para>If you want <acronym>DVD</acronym> playback with
+<application>MPlayer</application>, you need to make a link
+from your <acronym>DVD</acronym> drive to <filename>/dev/dvd</filename>:</para>
+
+<screen><userinput><command>ln -s /dev/&lt;dvd drive&gt; /dev/dvd</command></userinput></screen>
+
+<para>Replace <userinput>&lt;dvd drive&gt;</userinput> with whatever
+device is appropriate, for example <filename>/dev/hdc</filename>. if
+you don't know which device to choose, type:</para>
+
+<screen><userinput><command>dmesg | grep DVD</command></userinput></screen>
+
+<para>It should result in an output like:</para>
+
+<screen><userinput><command>hdc: Pioneer DVD-ROM ATAPIModel DVD-114 0110,
+ATAPI CD/DVD-ROM drive</command></userinput></screen>
+
+<para>If you have SCSI-Emulation activated for the drives, you'll need
+to get the right SCSI-device. Every CD/DVD-ROM drive is mapped in the
+same order as in <acronym>IDE</acronym> to the devices named
+<filename>/dev/scd0</filename>,
+<filename>/dev/scd1</filename> and so on.</para>
 
 </sect3>
 
-<sect3>
-<title>Installation for DVD playback</title>
-<para>If you want DVD playback with MPlayer, you need to make a link
-from your DVD drive to <filename>/dev/dvd</filename>:</para>
-<para><screen><userinput>ln -s /dev/&lt;dvd drive&gt; /dev/dvd</userinput></screen></para>
-<para>replace <userinput>&lt;dvd drive&gt;</userinput> with whatever
-device is appropriate, for example <filename>/dev/hdc</filename>. if
-you don't know which device to choose, type:</para>
-<para><screen><userinput>dmesg | grep DVD</userinput></screen></para>
-<para>It should result in an output like:</para>
-<para><screen><userinput>hdc: Pioneer DVD-ROM ATAPIModel DVD-114 0110,
-ATAPI CD/DVD-ROM drive</userinput></screen></para>
-<para>If you have SCSI-Emulation activated for the drives, you'll need
-to get the right SCSI-device. Every CD/DVD-ROM drive is mapped in the
-same order as in IDE to the devices named
-<filename>/dev/scd0</filename>,
-<filename>/dev/scd1</filename> and so on.</para>
-</sect3>
-
 </sect2>
-
Index: multimedia/videoutils/mplayer/mplayer-intro.xml
===================================================================
--- multimedia/videoutils/mplayer/mplayer-intro.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ multimedia/videoutils/mplayer/mplayer-intro.xml	(revision d50ef4c586ee7a803e55ae86ff0a66a8f958465f)
@@ -1,33 +1,55 @@
 <sect2>
-<title>Introduction to MPlayer</title>
+<title>Introduction to <application>MPlayer</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&mplayer-download-http;"/>
-Download location (FTP):        <ulink url="&mplayer-download-ftp;"/>
-Version used:                   &mplayer-version;
-Package size:                   &mplayer-size;
-Estimated Disk space required:  &mplayer-buildsize;
-Estimated build time:           &mplayer-time;</screen>
+<para>The <application>MPlayer</application> package contains an audio/video player that is able to
+play almost every audio and video codec and can be controlled by command
+line or <acronym>GUI</acronym>.</para>
 
-<screen>Additional downloads:
-<ulink url="http://ftp.lug.udel.edu/MPlayer/releases/codecs/win32codecs.tar.bz2">Win32 codecs</ulink>
-<ulink url="http://ftp.lug.udel.edu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2">Fonts for OSD</ulink>
-<ulink url="http://ftp.lug.udel.edu/MPlayer/Skin/default-1.7.tar.bz2">Default Skin</ulink>
-<ulink url="http://ftp.lug.udel.edu/MPlayer/releases/codecs/qt5dlls.tar.bz2">QuickTime 5 codecs</ulink>
-<ulink url="http://ftp.lug.udel.edu/MPlayer/releases/codecs/qt6dlls.tar.bz2">QuickTime 6 codecs</ulink>
-<ulink url="http://ftp.lug.udel.edu/MPlayer/releases/codecs/qtextras.tar.bz2">QuickTime extra codecs</ulink>
-<ulink url="http://ftp.lug.udel.edu/MPlayer/releases/codecs/rp9codecs.tar.bz2">RealPlayer 9 codecs</ulink>
-</screen>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&mplayer-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&mplayer-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &mplayer-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &mplayer-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &mplayer-time;</para></listitem></itemizedlist>
+</sect3>
 
-<para>The MPlayer package contains an audio/video player that is able to
-play almost every audio and video codec and can be controlled by command
-line or GUI.</para>
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Required codecs: <ulink
+url="http://www1.mplayerhq.hu/MPlayer/releases/codecs/extralite.tar.bz2"/></para></listitem>
+<listitem><para>Required skin: <ulink
+url="http://www1.mplayerhq.hu/MPlayer/Skin/default-1.7.tar.bz2"/></para></listitem>
+<listitem><para>Optional fonts: <ulink
+url="http://www1.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2"/></para>
+</listitem>
+</itemizedlist>
 
-<screen>MPlayer depends on:
-<xref linkend="xfree86"/> or <ulink url="http://www.directfb.org">DirectFB</ulink>, <xref linkend="GTK"/> and <xref linkend="libvorbis"/>
-MPlayer will utilize:
-<xref linkend="freetype2"/>, <xref linkend="libpng"/>, <xref linkend="libjpeg"/>, <xref linkend="libungif"/>, 
-<xref linkend="aalib"/>, <xref linkend="SDL"/>, <xref linkend="ffmpeg"/>, <xref linkend="xvid"/><!--, <xref linkend="opendivx"/>-->, 
-oss, <xref linkend="arts"/>, <xref linkend="alsa"/>, <ulink url="http://www.oberhumer.com/opensource/lzo">LZO</ulink>, 
-<ulink url="http://dvd.sourceforge.net">libdvdnav</ulink>, <ulink url="http://www.underbit.com/products/mad">MAD</ulink>, and <xref linkend="CDParanoia"/></screen>
+<note><para>These are the minimum to install working
+<application>MPlayer</application>. For more
+codecs, skins and fonts visit <application>MPlayer</application>'s homepage.</para></note>
+
+</sect3>
+
+<sect3><title><application>MPlayer</application> dependencies</title>
+<sect4><title>Required</title>
+<para>
+<xref linkend="GTK"/>
+</para></sect4>
+
+<sect4><title>Optional</title>
+<para>
+<xref linkend="DirectFB"/>, <xref linkend="SVGAlib"/>, <xref
+linkend="freetype2"/>, <xref linkend="libungif"/>, <xref
+linkend="libvorbis"/>, <xref linkend="aalib"/>, <xref linkend="SDL"/>,
+<xref linkend="ffmpeg"/>, <xref linkend="xvid"/>, <xref
+linkend="arts"/>, <xref linkend="alsa"/>, <ulink
+url="http://www.oberhumer.com/opensource/lzo">LZO</ulink>, <ulink
+url="http://dvd.sourceforge.net">libdvdnav</ulink>, <ulink
+url="http://www.underbit.com/products/mad">MAD</ulink>, <xref
+linkend="CDParanoia"/>, <xref linkend="lame"/> and <xref
+linkend="xmms"/>
+</para></sect4>
+</sect3>
 
 </sect2>
Index: multimedia/videoutils/mplayer/mplayer.ent
===================================================================
--- multimedia/videoutils/mplayer/mplayer.ent	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ multimedia/videoutils/mplayer/mplayer.ent	(revision d50ef4c586ee7a803e55ae86ff0a66a8f958465f)
@@ -5,8 +5,10 @@
 <!ENTITY mplayer-desc SYSTEM "mplayer-desc.xml">
 <!ENTITY mplayer-config SYSTEM "mplayer-config.xml">
-<!ENTITY mplayer-buildsize "44 MB">
-<!ENTITY mplayer-version "0.90">
-<!ENTITY mplayer-download-http "http://ftp.lug.udel.edu/MPlayer/releases/MPlayer-0.90.tar.bz2">
-<!ENTITY mplayer-download-ftp "ftp://ftp.lug.udel.edu/MPlayer/releases/MPlayer-0.90.tar.bz2">
-<!ENTITY mplayer-size "3.3 MB">
-<!ENTITY mplayer-time "6.91 SBU">
+<!ENTITY mplayer-buildsize "67.2 MB">
+<!ENTITY mplayer-version "1.0pre1">
+<!ENTITY mplayer-download-http
+"http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-&mplayer-version;.tar.bz2">
+<!ENTITY mplayer-download-ftp
+"ftp://ftp1.mplayerhq.hu/MPlayer/releases/MPlayer-&mplayer-version;.tar.bz2">
+<!ENTITY mplayer-size "4.0 MB">
+<!ENTITY mplayer-time "3.16 SBU">
Index: x/wm/metacity/metacity-config.xml
===================================================================
--- x/wm/metacity/metacity-config.xml	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ 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 d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ 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 d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ 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 d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ 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 d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ 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">
Index: xsoft/other/pan/pan.ent
===================================================================
--- xsoft/other/pan/pan.ent	(revision d9d389b539dea63cd80107d6fd864aa27df423ec)
+++ xsoft/other/pan/pan.ent	(revision d50ef4c586ee7a803e55ae86ff0a66a8f958465f)
@@ -5,8 +5,8 @@
 <!ENTITY pan-desc SYSTEM "pan-desc.xml">
 <!ENTITY pan-config SYSTEM "pan-config.xml">
-<!ENTITY pan-buildsize "20.1 MB">
-<!ENTITY pan-version "0.14.0">
+<!ENTITY pan-buildsize "67.8 MB">
+<!ENTITY pan-version "0.14.2">
 <!ENTITY pan-download-http "http://pan.rebelbase.com/download/releases/&pan-version;/SOURCE/pan-&pan-version;.tar.bz2">
 <!ENTITY pan-download-ftp "">
-<!ENTITY pan-size "1.7 MB">
-<!ENTITY pan-time "1.32 SBU">
+<!ENTITY pan-size "1.8 MB">
+<!ENTITY pan-time "0.72 SBU">
