Index: gnome/add/add.xml
===================================================================
--- gnome/add/add.xml	(revision adb78ee9870fee714b2c898b46cb137340fdc050)
+++ gnome/add/add.xml	(revision e109eb00a80ba2bed5e9aa07c2470d95cd7453bc)
@@ -9,6 +9,6 @@
 &gnome-terminal;
 &gnome-system-monitor;
+&gnome-applets;
 &gnome-utils;
-&gnome-applets;
 &gnome-games;
 &bug-buddy;
Index: gnome/add/applets/gnome-applets-exp.xml
===================================================================
--- gnome/add/applets/gnome-applets-exp.xml	(revision adb78ee9870fee714b2c898b46cb137340fdc050)
+++ gnome/add/applets/gnome-applets-exp.xml	(revision e109eb00a80ba2bed5e9aa07c2470d95cd7453bc)
@@ -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/applets/gnome-applets-inst.xml
===================================================================
--- gnome/add/applets/gnome-applets-inst.xml	(revision adb78ee9870fee714b2c898b46cb137340fdc050)
+++ gnome/add/applets/gnome-applets-inst.xml	(revision e109eb00a80ba2bed5e9aa07c2470d95cd7453bc)
@@ -4,5 +4,5 @@
 <para>Install gnome-applets 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/applets/gnome-applets-intro.xml
===================================================================
--- gnome/add/applets/gnome-applets-intro.xml	(revision adb78ee9870fee714b2c898b46cb137340fdc050)
+++ gnome/add/applets/gnome-applets-intro.xml	(revision e109eb00a80ba2bed5e9aa07c2470d95cd7453bc)
@@ -12,5 +12,5 @@
 
 <screen>gnome-applets depends on:
-<xref linkend="gail"/> and <xref linkend="gnome-panel"/></screen>
+<xref linkend="gail"/>, <xref linkend="libgtop"/> and <xref linkend="gnome-panel"/></screen>
 
 </sect2>
Index: gnome/add/applets/gnome-applets.ent
===================================================================
--- gnome/add/applets/gnome-applets.ent	(revision adb78ee9870fee714b2c898b46cb137340fdc050)
+++ gnome/add/applets/gnome-applets.ent	(revision e109eb00a80ba2bed5e9aa07c2470d95cd7453bc)
@@ -5,7 +5,7 @@
 <!ENTITY gnome-applets-desc SYSTEM "gnome-applets-desc.xml">
 <!ENTITY gnome-applets-config SYSTEM "gnome-applets-config.xml">
-<!ENTITY gnome-applets-buildsize "19.6 MB">
-<!ENTITY gnome-applets-version "2.0.4">
-<!ENTITY gnome-applets-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-applets/2.0/gnome-applets-2.0.4.tar.bz2">
-<!ENTITY gnome-applets-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-applets/2.0/gnome-applets-2.0.4.tar.bz2">
-<!ENTITY gnome-applets-size "1.7 MB">
+<!ENTITY gnome-applets-buildsize "22.2 MB">
+<!ENTITY gnome-applets-version "2.2.0">
+<!ENTITY gnome-applets-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-applets/2.2/gnome-applets-2.2.0.tar.bz2">
+<!ENTITY gnome-applets-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-applets/2.2/gnome-applets-2.2.0.tar.bz2">
+<!ENTITY gnome-applets-size "1.9 MB">
Index: gnome/add/games/gnome-games-exp.xml
===================================================================
--- gnome/add/games/gnome-games-exp.xml	(revision adb78ee9870fee714b2c898b46cb137340fdc050)
+++ gnome/add/games/gnome-games-exp.xml	(revision e109eb00a80ba2bed5e9aa07c2470d95cd7453bc)
@@ -2,11 +2,11 @@
 <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>
 
-<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>
 
 </sect2>
Index: gnome/add/games/gnome-games-inst.xml
===================================================================
--- gnome/add/games/gnome-games-inst.xml	(revision adb78ee9870fee714b2c898b46cb137340fdc050)
+++ gnome/add/games/gnome-games-inst.xml	(revision e109eb00a80ba2bed5e9aa07c2470d95cd7453bc)
@@ -4,5 +4,5 @@
 <para>Install gnome-games by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/opt/gnome2 --localstatedir=/var/lib \
+<para><screen><userinput>./configure --prefix=$GNOME_PREFIX --localstatedir=/var/lib \
 --sysconfdir=/etc/gnome &amp;&amp;
 make &amp;&amp;
Index: gnome/add/games/gnome-games.ent
===================================================================
--- gnome/add/games/gnome-games.ent	(revision adb78ee9870fee714b2c898b46cb137340fdc050)
+++ gnome/add/games/gnome-games.ent	(revision e109eb00a80ba2bed5e9aa07c2470d95cd7453bc)
@@ -5,7 +5,7 @@
 <!ENTITY gnome-games-desc SYSTEM "gnome-games-desc.xml">
 <!ENTITY gnome-games-config SYSTEM "gnome-games-config.xml">
-<!ENTITY gnome-games-buildsize "31 MB">
-<!ENTITY gnome-games-version "2.0.6">
-<!ENTITY gnome-games-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-games/2.0/gnome-games-2.0.6.tar.bz2">
-<!ENTITY gnome-games-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-games/2.0/gnome-games-2.0.6.tar.bz2">
-<!ENTITY gnome-games-size "9 MB">
+<!ENTITY gnome-games-buildsize "32.1 MB">
+<!ENTITY gnome-games-version "2.2.0">
+<!ENTITY gnome-games-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-games/2.2/gnome-games-2.2.0.tar.bz2">
+<!ENTITY gnome-games-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-games/2.2/gnome-games-2.2.0.tar.bz2">
+<!ENTITY gnome-games-size "9.4 MB">
Index: gnome/add/utils/gnome-utils-exp.xml
===================================================================
--- gnome/add/utils/gnome-utils-exp.xml	(revision adb78ee9870fee714b2c898b46cb137340fdc050)
+++ gnome/add/utils/gnome-utils-exp.xml	(revision e109eb00a80ba2bed5e9aa07c2470d95cd7453bc)
@@ -2,15 +2,19 @@
 <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>
+
+<para><userinput>--with-pam-prefix=/etc/pam.d</userinput> : This switch
+puts PAM file in <filename>/etc/pam.d</filename> instead of
+<filename>/etc/gnome</filename>.</para>
 
 </sect2>
Index: gnome/add/utils/gnome-utils-inst.xml
===================================================================
--- gnome/add/utils/gnome-utils-inst.xml	(revision adb78ee9870fee714b2c898b46cb137340fdc050)
+++ gnome/add/utils/gnome-utils-inst.xml	(revision e109eb00a80ba2bed5e9aa07c2470d95cd7453bc)
@@ -4,5 +4,5 @@
 <para>Install gnome-utils 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/utils/gnome-utils.ent
===================================================================
--- gnome/add/utils/gnome-utils.ent	(revision adb78ee9870fee714b2c898b46cb137340fdc050)
+++ gnome/add/utils/gnome-utils.ent	(revision e109eb00a80ba2bed5e9aa07c2470d95cd7453bc)
@@ -5,7 +5,7 @@
 <!ENTITY gnome-utils-desc SYSTEM "gnome-utils-desc.xml">
 <!ENTITY gnome-utils-config SYSTEM "gnome-utils-config.xml">
-<!ENTITY gnome-utils-buildsize "13.9 MB">
-<!ENTITY gnome-utils-version "2.0.6">
-<!ENTITY gnome-utils-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-utils/2.0/gnome-utils-2.0.6.tar.bz2">
-<!ENTITY gnome-utils-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-utils/2.0/gnome-utils-2.0.6.tar.bz2">
-<!ENTITY gnome-utils-size "1.3 MB">
+<!ENTITY gnome-utils-buildsize "14.3 MB">
+<!ENTITY gnome-utils-version "2.2.0.3">
+<!ENTITY gnome-utils-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-utils/2.2/gnome-utils-2.2.0.3.tar.bz2">
+<!ENTITY gnome-utils-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-utils/2.2/gnome-utils-2.2.0.3.tar.bz2">
+<!ENTITY gnome-utils-size "1.2 MB">
Index: gnome/core/control/control-center-exp.xml
===================================================================
--- gnome/core/control/control-center-exp.xml	(revision adb78ee9870fee714b2c898b46cb137340fdc050)
+++ gnome/core/control/control-center-exp.xml	(revision e109eb00a80ba2bed5e9aa07c2470d95cd7453bc)
@@ -4,9 +4,9 @@
 <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 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/core/control/control-center-inst.xml
===================================================================
--- gnome/core/control/control-center-inst.xml	(revision adb78ee9870fee714b2c898b46cb137340fdc050)
+++ gnome/core/control/control-center-inst.xml	(revision e109eb00a80ba2bed5e9aa07c2470d95cd7453bc)
@@ -4,5 +4,5 @@
 <para>Install control-center by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/opt/gnome2 --localstatedir=/var/lib \
+<para><screen><userinput>./configure --prefix=$GNOME_PREFIX --localstatedir=/var/lib \
 --sysconfdir=/etc/gnome &amp;&amp;
 make &amp;&amp;
Index: gnome/core/control/control-center-intro.xml
===================================================================
--- gnome/core/control/control-center-intro.xml	(revision adb78ee9870fee714b2c898b46cb137340fdc050)
+++ gnome/core/control/control-center-intro.xml	(revision e109eb00a80ba2bed5e9aa07c2470d95cd7453bc)
@@ -11,7 +11,5 @@
 
 <screen>control-center depends on:
-<xref linkend="gnome-desktop"/>
-control-center utilizes:
-xscreensaver and <xref linkend="gtk-doc"/></screen>
+<xref linkend="gnome-desktop"/> and <xref linkend="metacity"/></screen>
 
 </sect2>
Index: gnome/core/control/control-center.ent
===================================================================
--- gnome/core/control/control-center.ent	(revision adb78ee9870fee714b2c898b46cb137340fdc050)
+++ gnome/core/control/control-center.ent	(revision e109eb00a80ba2bed5e9aa07c2470d95cd7453bc)
@@ -5,7 +5,7 @@
 <!ENTITY control-center-desc SYSTEM "control-center-desc.xml">
 <!ENTITY control-center-config SYSTEM "control-center-config.xml">
-<!ENTITY control-center-buildsize "14.9 MB">
-<!ENTITY control-center-version "2.0.3.2">
-<!ENTITY control-center-download-http "http://ftp.gnome.org/pub/GNOME/sources/control-center/2.0/control-center-2.0.3.2.tar.bz2">
-<!ENTITY control-center-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/control-center/2.0/control-center-2.0.3.2.tar.bz2">
-<!ENTITY control-center-size "1.2 MB">
+<!ENTITY control-center-buildsize "17.7 MB">
+<!ENTITY control-center-version "2.2.0.1">
+<!ENTITY control-center-download-http "http://ftp.gnome.org/pub/GNOME/sources/control-center/2.2/control-center-2.2.0.1.tar.bz2">
+<!ENTITY control-center-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/control-center/2.2/control-center-2.2.0.1.tar.bz2">
+<!ENTITY control-center-size "1.4 MB">
Index: gnome/core/desktop/gnome-desktop-exp.xml
===================================================================
--- gnome/core/desktop/gnome-desktop-exp.xml	(revision adb78ee9870fee714b2c898b46cb137340fdc050)
+++ gnome/core/desktop/gnome-desktop-exp.xml	(revision e109eb00a80ba2bed5e9aa07c2470d95cd7453bc)
@@ -2,5 +2,5 @@
 <title>Command explanations</title>
 
-<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>$GNOME_PREFIX/etc</filename>.</para>
Index: gnome/core/panel/gnome-panel-exp.xml
===================================================================
--- gnome/core/panel/gnome-panel-exp.xml	(revision adb78ee9870fee714b2c898b46cb137340fdc050)
+++ gnome/core/panel/gnome-panel-exp.xml	(revision e109eb00a80ba2bed5e9aa07c2470d95cd7453bc)
@@ -10,5 +10,5 @@
 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>$GNOME_PREFIX/etc</filename>.</para>
Index: gnome/core/panel/gnome-panel-inst.xml
===================================================================
--- gnome/core/panel/gnome-panel-inst.xml	(revision adb78ee9870fee714b2c898b46cb137340fdc050)
+++ gnome/core/panel/gnome-panel-inst.xml	(revision e109eb00a80ba2bed5e9aa07c2470d95cd7453bc)
@@ -4,5 +4,5 @@
 <para>Install gnome-panel 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/lib/librsvg.xml
===================================================================
--- gnome/lib/librsvg.xml	(revision adb78ee9870fee714b2c898b46cb137340fdc050)
+++ gnome/lib/librsvg.xml	(revision e109eb00a80ba2bed5e9aa07c2470d95cd7453bc)
@@ -5,5 +5,4 @@
 &librsvg-intro;
 &librsvg-inst;
-&librsvg-config;
 &librsvg-desc;
 
Index: gnome/lib/librsvg/librsvg-inst.xml
===================================================================
--- gnome/lib/librsvg/librsvg-inst.xml	(revision adb78ee9870fee714b2c898b46cb137340fdc050)
+++ gnome/lib/librsvg/librsvg-inst.xml	(revision e109eb00a80ba2bed5e9aa07c2470d95cd7453bc)
@@ -4,5 +4,5 @@
 <para>Install librsvg by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/opt/gnome2 &amp;&amp;
+<para><screen><userinput>./configure --prefix=$GNOME_PREFIX &amp;&amp;
 make &amp;&amp;
 make install </userinput></screen></para>
Index: gnome/lib/librsvg/librsvg-intro.xml
===================================================================
--- gnome/lib/librsvg/librsvg-intro.xml	(revision adb78ee9870fee714b2c898b46cb137340fdc050)
+++ gnome/lib/librsvg/librsvg-intro.xml	(revision e109eb00a80ba2bed5e9aa07c2470d95cd7453bc)
@@ -11,5 +11,7 @@
 
 <screen>librsvg depends on:
-<xref linkend="GTK2"/>, <xref linkend="libxml"/> and <xref linkend="libart_lgpl"/></screen>
+<xref linkend="GTK2"/>, <xref linkend="libxml2"/> and <xref linkend="libart_lgpl"/>
+librsvg will utilize:
+libgsf</screen>
 
 </sect2>
Index: gnome/lib/librsvg/librsvg.ent
===================================================================
--- gnome/lib/librsvg/librsvg.ent	(revision adb78ee9870fee714b2c898b46cb137340fdc050)
+++ gnome/lib/librsvg/librsvg.ent	(revision e109eb00a80ba2bed5e9aa07c2470d95cd7453bc)
@@ -5,7 +5,7 @@
 <!ENTITY librsvg-desc SYSTEM "librsvg-desc.xml">
 <!ENTITY librsvg-config SYSTEM "librsvg-config.xml">
-<!ENTITY librsvg-buildsize "1.4 MB">
-<!ENTITY librsvg-version "2.0.1">
-<!ENTITY librsvg-download-http "http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.0/librsvg-2.0.1.tar.bz2">
-<!ENTITY librsvg-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/librsvg/2.0/librsvg-2.0.1.tar.bz2">
-<!ENTITY librsvg-size "200 KB">
+<!ENTITY librsvg-buildsize "2.6 MB">
+<!ENTITY librsvg-version "2.2.3">
+<!ENTITY librsvg-download-http "http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.2/librsvg-2.2.3.tar.bz2">
+<!ENTITY librsvg-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/librsvg/2.2/librsvg-2.2.3.tar.bz2">
+<!ENTITY librsvg-size "224 KB">
Index: gnome/other/gdm/gdm-inst.xml
===================================================================
--- gnome/other/gdm/gdm-inst.xml	(revision adb78ee9870fee714b2c898b46cb137340fdc050)
+++ gnome/other/gdm/gdm-inst.xml	(revision e109eb00a80ba2bed5e9aa07c2470d95cd7453bc)
@@ -6,5 +6,5 @@
 <para><screen><userinput>groupadd gdm &amp;&amp;
 useradd -c gdm -d /dev/null -g gdm -s /bin/bash gdm &amp;&amp;
-./configure --prefix=/opt/gnome2 --sysconfdir=/etc/gnome \
+./configure --prefix=$GNOME_PREFIX --sysconfdir=/etc/gnome \
 --localstatedir=/var/lib --with-pam-prefix=/etc &amp;&amp;
 make &amp;&amp;
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision adb78ee9870fee714b2c898b46cb137340fdc050)
+++ introduction/welcome/changelog.xml	(revision e109eb00a80ba2bed5e9aa07c2470d95cd7453bc)
@@ -24,5 +24,6 @@
 vte-0.10.17, gnome-terminal-2.2.0, libgtop-2.0.1,
 gnome-system-monitor-2.0.4, gail-1.2.0, at-spi-1.1.8,
-libgail-gnome-1.0.2,</para></listitem>
+libgail-gnome-1.0.2, gnome-applets-2.2.0, gnome-utils-2.2.0.3 and
+gnome-games-2.2.0</para></listitem>
 
 <listitem><para>February 8th, 2003 [larry]: Gnome: Added gtk-doc-1.0,
