Index: gnome/add/add.xml
===================================================================
--- gnome/add/add.xml	(revision 5574a2cf3a3fb6627622ada14d3af7a29be0879f)
+++ gnome/add/add.xml	(revision f69efd71191b6bcd3d65c6815356b2bd66fb911b)
@@ -17,4 +17,6 @@
 &gedit;
 &eog;
+&gstreamer;
+&gst-plugins;
 &gnome-media;
 &gnome2-user-docs;
Index: gnome/add/docs/gnome2-user-docs-exp.xml
===================================================================
--- gnome/add/docs/gnome2-user-docs-exp.xml	(revision 5574a2cf3a3fb6627622ada14d3af7a29be0879f)
+++ gnome/add/docs/gnome2-user-docs-exp.xml	(revision f69efd71191b6bcd3d65c6815356b2bd66fb911b)
@@ -2,7 +2,7 @@
 <title>Command explanations</title>
 
-<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>
 
 </sect2>
Index: gnome/add/docs/gnome2-user-docs-inst.xml
===================================================================
--- gnome/add/docs/gnome2-user-docs-inst.xml	(revision 5574a2cf3a3fb6627622ada14d3af7a29be0879f)
+++ gnome/add/docs/gnome2-user-docs-inst.xml	(revision f69efd71191b6bcd3d65c6815356b2bd66fb911b)
@@ -4,5 +4,5 @@
 <para>Install gnome2-user-docs by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/opt/gnome2 --localstatedir=/var/lib &amp;&amp;
+<para><screen><userinput>./configure --prefix=$GNOME_PREFIX --localstatedir=/var/lib &amp;&amp;
 make &amp;&amp;
 make install</userinput></screen></para>
Index: gnome/add/docs/gnome2-user-docs.ent
===================================================================
--- gnome/add/docs/gnome2-user-docs.ent	(revision 5574a2cf3a3fb6627622ada14d3af7a29be0879f)
+++ gnome/add/docs/gnome2-user-docs.ent	(revision f69efd71191b6bcd3d65c6815356b2bd66fb911b)
@@ -5,7 +5,7 @@
 <!ENTITY gnome2-user-docs-desc SYSTEM "gnome2-user-docs-desc.xml">
 <!ENTITY gnome2-user-docs-config SYSTEM "gnome2-user-docs-config.xml">
-<!ENTITY gnome2-user-docs-buildsize "6.3 MB">
-<!ENTITY gnome2-user-docs-version "2.0.1">
-<!ENTITY gnome2-user-docs-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome2-user-docs/2.0/gnome2-user-docs-2.0.1.tar.bz2">
-<!ENTITY gnome2-user-docs-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome2-user-docs/2.0/gnome2-user-docs-2.0.1.tar.bz2">
-<!ENTITY gnome2-user-docs-size "4 MB">
+<!ENTITY gnome2-user-docs-buildsize "13.1 MB">
+<!ENTITY gnome2-user-docs-version "2.0.5">
+<!ENTITY gnome2-user-docs-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome2-user-docs/2.0/gnome2-user-docs-2.0.5.tar.bz2">
+<!ENTITY gnome2-user-docs-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome2-user-docs/2.0/gnome2-user-docs-2.0.5.tar.bz2">
+<!ENTITY gnome2-user-docs-size "7.4 MB">
Index: gnome/add/eog/eog-exp.xml
===================================================================
--- gnome/add/eog/eog-exp.xml	(revision 5574a2cf3a3fb6627622ada14d3af7a29be0879f)
+++ gnome/add/eog/eog-exp.xml	(revision f69efd71191b6bcd3d65c6815356b2bd66fb911b)
@@ -2,15 +2,15 @@
 <title>Command explanations</title>
 
-<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 switch puts
+libexec files in <filename>$GNOME_PREFIX/sbin</filename> instead of
+<filename>$GNOME_PREFIX/libexec</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>--sysconfdir=/etc/gnome :</userinput>  This command
+<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>
 
 </sect2>
Index: gnome/add/eog/eog-inst.xml
===================================================================
--- gnome/add/eog/eog-inst.xml	(revision 5574a2cf3a3fb6627622ada14d3af7a29be0879f)
+++ gnome/add/eog/eog-inst.xml	(revision f69efd71191b6bcd3d65c6815356b2bd66fb911b)
@@ -4,5 +4,5 @@
 <para>Install eog by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/opt/gnome2 --libexecdir=/opt/gnome2/sbin \
+<para><screen><userinput>./configure --prefix=$GNOME_PREFIX --libexecdir=$GNOME_PREFIX/sbin \
 --localstatedir=/var/lib --sysconfdir=/etc/gnome &amp;&amp;
 make &amp;&amp;
Index: gnome/add/eog/eog.ent
===================================================================
--- gnome/add/eog/eog.ent	(revision 5574a2cf3a3fb6627622ada14d3af7a29be0879f)
+++ gnome/add/eog/eog.ent	(revision f69efd71191b6bcd3d65c6815356b2bd66fb911b)
@@ -5,7 +5,7 @@
 <!ENTITY eog-desc SYSTEM "eog-desc.xml">
 <!ENTITY eog-config SYSTEM "eog-config.xml">
-<!ENTITY eog-buildsize "4 MB">
-<!ENTITY eog-version "1.0.4">
-<!ENTITY eog-download-http "http://ftp.gnome.org/pub/GNOME/sources/eog/1.0/eog-1.0.4.tar.bz2">
-<!ENTITY eog-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/eog/1.0/eog-1.0.4.tar.bz2">
-<!ENTITY eog-size "372 KB">
+<!ENTITY eog-buildsize "5 MB">
+<!ENTITY eog-version "2.2.0">
+<!ENTITY eog-download-http "http://ftp.gnome.org/pub/GNOME/sources/eog/2.2/eog-2.2.0.tar.bz2">
+<!ENTITY eog-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/eog/2.2/eog-2.2.0.tar.bz2">
+<!ENTITY eog-size "464 KB">
Index: gnome/add/gst-plugins.xml
===================================================================
--- gnome/add/gst-plugins.xml	(revision f69efd71191b6bcd3d65c6815356b2bd66fb911b)
+++ gnome/add/gst-plugins.xml	(revision f69efd71191b6bcd3d65c6815356b2bd66fb911b)
@@ -0,0 +1,10 @@
+<sect1 id="gst-plugins" xreflabel="gst-plugins-&gst-plugins-version;">
+<?dbhtml filename="gst-plugins.html" dir="SECTION"?>
+<title>gst-plugins-&gst-plugins-version;</title>
+
+&gst-plugins-intro;
+&gst-plugins-inst;
+&gst-plugins-desc;
+
+</sect1>
+
Index: gnome/add/gstreamer.xml
===================================================================
--- gnome/add/gstreamer.xml	(revision f69efd71191b6bcd3d65c6815356b2bd66fb911b)
+++ gnome/add/gstreamer.xml	(revision f69efd71191b6bcd3d65c6815356b2bd66fb911b)
@@ -0,0 +1,10 @@
+<sect1 id="gstreamer" xreflabel="gstreamer-&gstreamer-version;">
+<?dbhtml filename="gstreamer.html" dir="SECTION"?>
+<title>gstreamer-&gstreamer-version;</title>
+
+&gstreamer-intro;
+&gstreamer-inst;
+&gstreamer-desc;
+
+</sect1>
+
Index: gnome/add/media/gst-plugins-desc.xml
===================================================================
--- gnome/add/media/gst-plugins-desc.xml	(revision f69efd71191b6bcd3d65c6815356b2bd66fb911b)
+++ gnome/add/media/gst-plugins-desc.xml	(revision f69efd71191b6bcd3d65c6815356b2bd66fb911b)
@@ -0,0 +1,17 @@
+<sect2>
+<title>Contents</title>
+
+<para>The gst-plugins package contains <userinput>LISTOFFILES</userinput></para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>item1</title>
+<para>item1 does this</para></sect3>
+
+<sect3><title>item2</title>
+<para>item2 does that</para></sect3>
+
+</sect2>
+
Index: gnome/add/media/gst-plugins-inst.xml
===================================================================
--- gnome/add/media/gst-plugins-inst.xml	(revision f69efd71191b6bcd3d65c6815356b2bd66fb911b)
+++ gnome/add/media/gst-plugins-inst.xml	(revision f69efd71191b6bcd3d65c6815356b2bd66fb911b)
@@ -0,0 +1,12 @@
+<sect2>
+<title>Installation of gst-plugins</title>
+
+<para>Install gst-plugins by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=$GNOME_PREFIX &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+gst-register</userinput></screen></para>
+
+</sect2>
+
Index: gnome/add/media/gst-plugins-intro.xml
===================================================================
--- gnome/add/media/gst-plugins-intro.xml	(revision f69efd71191b6bcd3d65c6815356b2bd66fb911b)
+++ gnome/add/media/gst-plugins-intro.xml	(revision f69efd71191b6bcd3d65c6815356b2bd66fb911b)
@@ -0,0 +1,17 @@
+<sect2>
+<title>Introduction to gst-plugins</title>
+
+<screen>Download location (HTTP):       <ulink url="&gst-plugins-download-http;"/>
+Download location (FTP):        <ulink url="&gst-plugins-download-ftp;"/>
+Version used:                   &gst-plugins-version;
+Package size:                   &gst-plugins-size;
+Estimated Disk space required:  &gst-plugins-buildsize;</screen>
+
+<para>The gst-plugins package contains codec interfaces.</para>
+
+<screen>gst-plugins depends on:
+<xref linkend="gstreamer"/>
+gst-plugins will utilize:
+[still compiling]</screen>
+
+</sect2>
Index: gnome/add/media/gst-plugins.ent
===================================================================
--- gnome/add/media/gst-plugins.ent	(revision f69efd71191b6bcd3d65c6815356b2bd66fb911b)
+++ gnome/add/media/gst-plugins.ent	(revision f69efd71191b6bcd3d65c6815356b2bd66fb911b)
@@ -0,0 +1,11 @@
+<!ENTITY gst-plugins SYSTEM "../gst-plugins.xml">
+<!ENTITY gst-plugins-intro SYSTEM "gst-plugins-intro.xml">
+<!ENTITY gst-plugins-inst SYSTEM "gst-plugins-inst.xml">
+<!ENTITY gst-plugins-exp SYSTEM "gst-plugins-exp.xml">
+<!ENTITY gst-plugins-desc SYSTEM "gst-plugins-desc.xml">
+<!ENTITY gst-plugins-config SYSTEM "gst-plugins-config.xml">
+<!ENTITY gst-plugins-buildsize "">
+<!ENTITY gst-plugins-version "0.6.0">
+<!ENTITY gst-plugins-download-http "http://ftp.gnome.org/pub/GNOME/sources/gst-plugins/0.6/gst-plugins-0.6.0.tar.bz2">
+<!ENTITY gst-plugins-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gst-plugins/0.6/gst-plugins-0.6.0.tar.bz2">
+<!ENTITY gst-plugins-size "1.8 MB">
Index: gnome/add/media/gstreamer-desc.xml
===================================================================
--- gnome/add/media/gstreamer-desc.xml	(revision f69efd71191b6bcd3d65c6815356b2bd66fb911b)
+++ gnome/add/media/gstreamer-desc.xml	(revision f69efd71191b6bcd3d65c6815356b2bd66fb911b)
@@ -0,0 +1,8 @@
+<sect2>
+<title>Contents</title>
+
+<para>The gstreamer package contains <userinput>gstreamer libraries</userinput> and <userinput>gst-control libraries</userinput></para>
+
+</sect2>
+
+
Index: gnome/add/media/gstreamer-inst.xml
===================================================================
--- gnome/add/media/gstreamer-inst.xml	(revision f69efd71191b6bcd3d65c6815356b2bd66fb911b)
+++ gnome/add/media/gstreamer-inst.xml	(revision f69efd71191b6bcd3d65c6815356b2bd66fb911b)
@@ -0,0 +1,12 @@
+<sect2>
+<title>Installation of gstreamer</title>
+
+<para>Install gstreamer by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=$GNOME_PREFIX &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+gst-register </userinput></screen></para>
+
+</sect2>
+
Index: gnome/add/media/gstreamer-intro.xml
===================================================================
--- gnome/add/media/gstreamer-intro.xml	(revision f69efd71191b6bcd3d65c6815356b2bd66fb911b)
+++ gnome/add/media/gstreamer-intro.xml	(revision f69efd71191b6bcd3d65c6815356b2bd66fb911b)
@@ -0,0 +1,15 @@
+<sect2>
+<title>Introduction to gstreamer</title>
+
+<screen>Download location (HTTP):       <ulink url="&gstreamer-download-http;"/>
+Download location (FTP):        <ulink url="&gstreamer-download-ftp;"/>
+Version used:                   &gstreamer-version;
+Package size:                   &gstreamer-size;
+Estimated Disk space required:  &gstreamer-buildsize;</screen>
+
+<para>The gstreamer package contains a framework for streaming media. This is useful for interfacing with binary codecs.</para>
+
+<screen>gstreamer depends on:
+<xref linkend="libgnomeui"/></screen>
+
+</sect2>
Index: gnome/add/media/gstreamer.ent
===================================================================
--- gnome/add/media/gstreamer.ent	(revision f69efd71191b6bcd3d65c6815356b2bd66fb911b)
+++ gnome/add/media/gstreamer.ent	(revision f69efd71191b6bcd3d65c6815356b2bd66fb911b)
@@ -0,0 +1,11 @@
+<!ENTITY gstreamer SYSTEM "../gstreamer.xml">
+<!ENTITY gstreamer-intro SYSTEM "gstreamer-intro.xml">
+<!ENTITY gstreamer-inst SYSTEM "gstreamer-inst.xml">
+<!ENTITY gstreamer-exp SYSTEM "gstreamer-exp.xml">
+<!ENTITY gstreamer-desc SYSTEM "gstreamer-desc.xml">
+<!ENTITY gstreamer-config SYSTEM "gstreamer-config.xml">
+<!ENTITY gstreamer-buildsize "65.2 MB">
+<!ENTITY gstreamer-version "0.6.0">
+<!ENTITY gstreamer-download-http "http://ftp.gnome.org/pub/GNOME/sources/gstreamer/0.6/gstreamer-0.6.0.tar.bz2">
+<!ENTITY gstreamer-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gstreamer/0.6/gstreamer-0.6.0.tar.bz2">
+<!ENTITY gstreamer-size "1.1 MB">
Index: gnome/gnome.ent
===================================================================
--- gnome/gnome.ent	(revision 5574a2cf3a3fb6627622ada14d3af7a29be0879f)
+++ gnome/gnome.ent	(revision f69efd71191b6bcd3d65c6815356b2bd66fb911b)
@@ -111,4 +111,6 @@
 <!ENTITY % at-spi SYSTEM "add/gail/at-spi.ent">
 <!ENTITY % libgail-gnome SYSTEM "add/gail/libgail-gnome.ent">
+<!ENTITY % gstreamer SYSTEM "add/media/gstreamer.ent">
+<!ENTITY % gst-plugins SYSTEM "add/media/gst-plugins.ent">
 %gnome-terminal;
 %gnome-utils;
@@ -124,4 +126,6 @@
 %at-spi;
 %libgail-gnome;
+%gstreamer;
+%gst-plugins;
 %gnome2-user-docs;
 
Index: gnome/lib/librsvg/librsvg-inst.xml
===================================================================
--- gnome/lib/librsvg/librsvg-inst.xml	(revision 5574a2cf3a3fb6627622ada14d3af7a29be0879f)
+++ gnome/lib/librsvg/librsvg-inst.xml	(revision f69efd71191b6bcd3d65c6815356b2bd66fb911b)
@@ -4,5 +4,5 @@
 <para>Install librsvg by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=$GNOME_PREFIX -disable-gtk-doc &amp;&amp;
+<para><screen><userinput>./configure --prefix=$GNOME_PREFIX --sysconfdir=/etc/gnome --disable-gtk-doc &amp;&amp;
 make &amp;&amp;
 make install </userinput></screen></para>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 5574a2cf3a3fb6627622ada14d3af7a29be0879f)
+++ introduction/welcome/changelog.xml	(revision f69efd71191b6bcd3d65c6815356b2bd66fb911b)
@@ -14,5 +14,6 @@
 control-center-2.2.0.1, librsvg-2.2.3, eel-2.2.0.2, nautilus-2.2.0.2,
 libgtkhtml-2.2.0, yelp-2.2.0, bug-buddy-2.2.102, libgnomeprint-2.2.1.1,
-libgnomeprintui-2.2.1.1, gtk-thinice-engine-2.0.2, gedit-2.2.0.1.</para></listitem>
+libgnomeprintui-2.2.1.1, gtk-thinice-engine-2.0.2, gedit-2.2.0.1,
+gstreamer-0.6.0 and gst-plugins-0.6.0.</para></listitem>
 
 <listitem><para>February 15th, 2003 [larry]: pst: updated to
