Index: gnome/add/add.xml
===================================================================
--- gnome/add/add.xml	(revision f02f13ce9975bdaaaca41ecbb3effba5bd756bda)
+++ gnome/add/add.xml	(revision bc510ed644baf81ba08d4d8ad95aca8f658acea2)
@@ -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 f02f13ce9975bdaaaca41ecbb3effba5bd756bda)
+++ gnome/add/applets/gnome-applets-exp.xml	(revision bc510ed644baf81ba08d4d8ad95aca8f658acea2)
@@ -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 f02f13ce9975bdaaaca41ecbb3effba5bd756bda)
+++ gnome/add/applets/gnome-applets-inst.xml	(revision bc510ed644baf81ba08d4d8ad95aca8f658acea2)
@@ -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 f02f13ce9975bdaaaca41ecbb3effba5bd756bda)
+++ gnome/add/applets/gnome-applets-intro.xml	(revision bc510ed644baf81ba08d4d8ad95aca8f658acea2)
@@ -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 f02f13ce9975bdaaaca41ecbb3effba5bd756bda)
+++ gnome/add/applets/gnome-applets.ent	(revision bc510ed644baf81ba08d4d8ad95aca8f658acea2)
@@ -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 f02f13ce9975bdaaaca41ecbb3effba5bd756bda)
+++ gnome/add/games/gnome-games-exp.xml	(revision bc510ed644baf81ba08d4d8ad95aca8f658acea2)
@@ -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 f02f13ce9975bdaaaca41ecbb3effba5bd756bda)
+++ gnome/add/games/gnome-games-inst.xml	(revision bc510ed644baf81ba08d4d8ad95aca8f658acea2)
@@ -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 f02f13ce9975bdaaaca41ecbb3effba5bd756bda)
+++ gnome/add/games/gnome-games.ent	(revision bc510ed644baf81ba08d4d8ad95aca8f658acea2)
@@ -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 f02f13ce9975bdaaaca41ecbb3effba5bd756bda)
+++ gnome/add/utils/gnome-utils-exp.xml	(revision bc510ed644baf81ba08d4d8ad95aca8f658acea2)
@@ -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 f02f13ce9975bdaaaca41ecbb3effba5bd756bda)
+++ gnome/add/utils/gnome-utils-inst.xml	(revision bc510ed644baf81ba08d4d8ad95aca8f658acea2)
@@ -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 f02f13ce9975bdaaaca41ecbb3effba5bd756bda)
+++ gnome/add/utils/gnome-utils.ent	(revision bc510ed644baf81ba08d4d8ad95aca8f658acea2)
@@ -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">
