Index: gnome/add/add.xml
===================================================================
--- gnome/add/add.xml	(revision 204067e1a88af37a60a8a558b6963550824752fd)
+++ gnome/add/add.xml	(revision 22af1866e4dc623f059877c3b76f335870560d96)
@@ -20,4 +20,5 @@
 &gst-plugins;
 &gnome-media;
+&nautilus-media;
 &gnome2-user-docs;
 
Index: gnome/add/gstreamer.xml
===================================================================
--- gnome/add/gstreamer.xml	(revision 204067e1a88af37a60a8a558b6963550824752fd)
+++ gnome/add/gstreamer.xml	(revision 22af1866e4dc623f059877c3b76f335870560d96)
@@ -5,4 +5,5 @@
 &gstreamer-intro;
 &gstreamer-inst;
+&gstreamer-exp;
 &gstreamer-desc;
 
Index: gnome/add/media/gnome-media-exp.xml
===================================================================
--- gnome/add/media/gnome-media-exp.xml	(revision 204067e1a88af37a60a8a558b6963550824752fd)
+++ gnome/add/media/gnome-media-exp.xml	(revision 22af1866e4dc623f059877c3b76f335870560d96)
@@ -2,15 +2,15 @@
 <title>Command explanations</title>
 
-<para><userinput>--sysconfdir=/etc/gnome :</userinput> This command puts
+<para><userinput>--sysconfdir=/etc/gnome</userinput> : This switch puts
 configuration files in <filename>/etc/gnome</filename> instead of
-<filename>/opt/gnome2/etc</filename>.</para>
+<filename>$GNOME_PREFIX/etc</filename>.</para>
 
-<para><userinput>--localstatedir=/var/lib :</userinput> This command
+<para><userinput>--localstatedir=/var/lib</userinput> : This switch
 puts scrollkeeper files in <filename>/var/lib/scrollkeeper</filename>
-instead of <filename>/opt/gnome2/var/scrollkeeper</filename>.</para>
+instead of <filename>$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
 
-<para><userinput>--libexecdir=/opt/gnome2/sbin :</userinput> This
-command puts libexec files in <filename>/opt/gnome2/sbin</filename>
-instead of <filename>/opt/gnome2/libexec</filename>.</para>
+<para><userinput>--libexecdir=$GNOME_PREFIX/sbin</userinput> : This
+command puts libexec files in <filename>$GNOME_PREFIX/sbin</filename>
+instead of <filename>$GNOME_PREFIX/libexec</filename>.</para>
 
 </sect2>
Index: gnome/add/media/gnome-media-inst.xml
===================================================================
--- gnome/add/media/gnome-media-inst.xml	(revision 204067e1a88af37a60a8a558b6963550824752fd)
+++ gnome/add/media/gnome-media-inst.xml	(revision 22af1866e4dc623f059877c3b76f335870560d96)
@@ -4,6 +4,6 @@
 <para>Install gnome-media by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/opt/gnome2 --sysconfdir=/etc/gnome \
---localstatedir=/var/lib --libexecdir=/opt/gnome2/sbin &amp;&amp;
+<para><screen><userinput>./configure --prefix=$GNOME_PREFIX --sysconfdir=/etc/gnome \
+--localstatedir=/var/lib --libexecdir=$GNOME_PREFIX/sbin &amp;&amp;
 make &amp;&amp;
 make install </userinput></screen></para>
Index: gnome/add/media/gnome-media-intro.xml
===================================================================
--- gnome/add/media/gnome-media-intro.xml	(revision 204067e1a88af37a60a8a558b6963550824752fd)
+++ gnome/add/media/gnome-media-intro.xml	(revision 22af1866e4dc623f059877c3b76f335870560d96)
@@ -11,5 +11,5 @@
 
 <screen>gnome-media depends on:
-<xref linkend="libgnomeui"/></screen>
+<xref linkend="libgnomeui"/> and <xref linkend="gstreamer"/></screen>
 
 </sect2>
Index: gnome/add/media/gnome-media.ent
===================================================================
--- gnome/add/media/gnome-media.ent	(revision 204067e1a88af37a60a8a558b6963550824752fd)
+++ gnome/add/media/gnome-media.ent	(revision 22af1866e4dc623f059877c3b76f335870560d96)
@@ -5,7 +5,7 @@
 <!ENTITY gnome-media-desc SYSTEM "gnome-media-desc.xml">
 <!ENTITY gnome-media-config SYSTEM "gnome-media-config.xml">
-<!ENTITY gnome-media-buildsize "10.5 MB">
-<!ENTITY gnome-media-version "2.0.3">
-<!ENTITY gnome-media-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.0/gnome-media-2.0.3.tar.bz2">
-<!ENTITY gnome-media-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.0/gnome-media-2.0.3.tar.bz2">
-<!ENTITY gnome-media-size "1 MB">
+<!ENTITY gnome-media-buildsize "12.3 MB">
+<!ENTITY gnome-media-version "2.2.1.1">
+<!ENTITY gnome-media-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.2/gnome-media-2.2.1.1.tar.bz2">
+<!ENTITY gnome-media-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.2/gnome-media-2.2.1.1.tar.bz2">
+<!ENTITY gnome-media-size "1.1 MB">
Index: gnome/add/media/gstreamer-exp.xml
===================================================================
--- gnome/add/media/gstreamer-exp.xml	(revision 22af1866e4dc623f059877c3b76f335870560d96)
+++ gnome/add/media/gstreamer-exp.xml	(revision 22af1866e4dc623f059877c3b76f335870560d96)
@@ -0,0 +1,9 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>--localstatedir=/var/lib</userinput> : This switch
+puts gst-register's cache in <filename>/var/lib/cache</filename>
+instead of <filename>$GNOME_PREFIX/var/cache</filename>.</para>
+
+</sect2>
+
Index: gnome/add/media/gstreamer-inst.xml
===================================================================
--- gnome/add/media/gstreamer-inst.xml	(revision 204067e1a88af37a60a8a558b6963550824752fd)
+++ gnome/add/media/gstreamer-inst.xml	(revision 22af1866e4dc623f059877c3b76f335870560d96)
@@ -4,5 +4,5 @@
 <para>Install gstreamer by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=$GNOME_PREFIX &amp;&amp;
+<para><screen><userinput>./configure --prefix=$GNOME_PREFIX --localstatedir=/var/log  &amp;&amp;
 make &amp;&amp;
 make install &amp;&amp;
Index: gnome/add/media/nautilus-media-desc.xml
===================================================================
--- gnome/add/media/nautilus-media-desc.xml	(revision 22af1866e4dc623f059877c3b76f335870560d96)
+++ gnome/add/media/nautilus-media-desc.xml	(revision 22af1866e4dc623f059877c3b76f335870560d96)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Contents</title>
+
+<para>The nautilus-media package contains
+<userinput>nautilus-audio-view</userinput> and
+<userinput>support libraries</userinput></para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>nautilus-audio-view</title>
+<para>nautilus-audio-view  displays the directory as audio tracks.</para></sect3>
+
+</sect2>
+
Index: gnome/add/media/nautilus-media-exp.xml
===================================================================
--- gnome/add/media/nautilus-media-exp.xml	(revision 22af1866e4dc623f059877c3b76f335870560d96)
+++ gnome/add/media/nautilus-media-exp.xml	(revision 22af1866e4dc623f059877c3b76f335870560d96)
@@ -0,0 +1,17 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>--sysconfdir=/etc/gnome</userinput> : This switch puts
+configuration files in <filename>/etc/gnome</filename> instead of
+<filename>$GNOME_PREFIX/etc</filename>.</para>
+
+<para><userinput>--localstatedir=/var/lib</userinput> : This switch
+puts scrollkeeper files in <filename>/var/lib/scrollkeeper</filename>
+instead of <filename>$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
+
+<para><userinput>--libexecdir=/opt/gnome2/sbin</userinput> : This
+command puts libexec files in <filename>$GNOME_PREFIX/sbin</filename>
+instead of <filename>$GNOME_PREFIX/libexec</filename>.</para>
+
+</sect2>
+
Index: gnome/add/media/nautilus-media-inst.xml
===================================================================
--- gnome/add/media/nautilus-media-inst.xml	(revision 22af1866e4dc623f059877c3b76f335870560d96)
+++ gnome/add/media/nautilus-media-inst.xml	(revision 22af1866e4dc623f059877c3b76f335870560d96)
@@ -0,0 +1,12 @@
+<sect2>
+<title>Installation of nautilus-media</title>
+
+<para>Install nautilus-media by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=$GNOME_PREFIX --sysconfdir=/etc/gnome \
+--localstatedir=/var/lib --libexecdir=$GNOME_PREFIX/sbin &amp;&amp;
+make &amp;&amp;
+make install </userinput></screen></para>
+
+</sect2>
+
Index: gnome/add/media/nautilus-media-intro.xml
===================================================================
--- gnome/add/media/nautilus-media-intro.xml	(revision 22af1866e4dc623f059877c3b76f335870560d96)
+++ gnome/add/media/nautilus-media-intro.xml	(revision 22af1866e4dc623f059877c3b76f335870560d96)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Introduction to nautilus-media</title>
+
+<screen>Download location (HTTP):       <ulink url="&nautilus-media-download-http;"/>
+Download location (FTP):        <ulink url="&nautilus-media-download-ftp;"/>
+Version used:                   &nautilus-media-version;
+Package size:                   &nautilus-media-size;
+Estimated Disk space required:  &nautilus-media-buildsize;</screen>
+
+<para>The nautilus-media package contains GNOME's media applications
+used by nautilus.</para>
+
+<screen>nautilus-media depends on:
+<xref linkend="libgnomeui"/> and <xref linkend="gstreamer"/></screen>
+
+</sect2>
Index: gnome/add/media/nautilus-media.ent
===================================================================
--- gnome/add/media/nautilus-media.ent	(revision 22af1866e4dc623f059877c3b76f335870560d96)
+++ gnome/add/media/nautilus-media.ent	(revision 22af1866e4dc623f059877c3b76f335870560d96)
@@ -0,0 +1,11 @@
+<!ENTITY nautilus-media SYSTEM "../nautilus-media.xml">
+<!ENTITY nautilus-media-intro SYSTEM "nautilus-media-intro.xml">
+<!ENTITY nautilus-media-inst SYSTEM "nautilus-media-inst.xml">
+<!ENTITY nautilus-media-exp SYSTEM "nautilus-media-exp.xml">
+<!ENTITY nautilus-media-desc SYSTEM "nautilus-media-desc.xml">
+<!ENTITY nautilus-media-config SYSTEM "nautilus-media-config.xml">
+<!ENTITY nautilus-media-buildsize "4.6 MB">
+<!ENTITY nautilus-media-version "0.2.1">
+<!ENTITY nautilus-media-download-http "http://ftp.gnome.org/pub/GNOME/sources/nautilus-media/0.2/nautilus-media-0.2.1.tar.bz2">
+<!ENTITY nautilus-media-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/nautilus-media/0.2/nautilus-media-0.2.1.tar.bz2">
+<!ENTITY nautilus-media-size "280 KB">
Index: gnome/add/nautilus-media.xml
===================================================================
--- gnome/add/nautilus-media.xml	(revision 22af1866e4dc623f059877c3b76f335870560d96)
+++ gnome/add/nautilus-media.xml	(revision 22af1866e4dc623f059877c3b76f335870560d96)
@@ -0,0 +1,11 @@
+<sect1 id="nautilus-media" xreflabel="nautilus-media-&nautilus-media-version;">
+<?dbhtml filename="nautilus-media.html" dir="gnome"?>
+<title>nautilus-media-&nautilus-media-version;</title>
+
+&nautilus-media-intro;
+&nautilus-media-inst;
+&nautilus-media-exp;
+&nautilus-media-desc;
+
+</sect1>
+
