Index: basicnet/netlibs/libsoup.xml
===================================================================
--- basicnet/netlibs/libsoup.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ basicnet/netlibs/libsoup.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY libsoup-download-http "&gnome-download-http;/libsoup/&gnome-version;/libsoup-&libsoup-version;.tar.bz2">
-  <!ENTITY libsoup-download-ftp  "&gnome-download-ftp;/libsoup/&gnome-version;/libsoup-&libsoup-version;.tar.bz2">
+  <!ENTITY libsoup-download-http "&gnome-download-http;/libsoup/&gnome-old-version;/libsoup-&libsoup-version;.tar.bz2">
+  <!ENTITY libsoup-download-ftp  "&gnome-download-ftp;/libsoup/&gnome-old-version;/libsoup-&libsoup-version;.tar.bz2">
   <!ENTITY libsoup-md5sum        "31d7ad416005eed4b78f07ac01b6b9f0">
   <!ENTITY libsoup-size          "705 KB">
Index: book/organization.xml
===================================================================
--- book/organization.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ book/organization.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -63,5 +63,5 @@
   <para><application>GNOME</application> is the main alternative to
   <application>KDE</application> in the Desktop Environment arena and
-  we cover <application>GNOME</application>-&gnome-version; here.</para>
+  we cover <application>GNOME</application>-&gnome-old-version; here.</para>
 
   <bridgehead renderas="sect2">Part IX - X Software</bridgehead>
Index: general.ent
===================================================================
--- general.ent	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ general.ent	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -4,5 +4,5 @@
 -->
 
-<!ENTITY day          "14">                   <!-- Always 2 digits -->
+<!ENTITY day          "15">                   <!-- Always 2 digits -->
 <!ENTITY month        "08">                   <!-- Always 2 digits -->
 <!ENTITY year         "2010">
@@ -563,7 +563,8 @@
 
 <!-- Part IX -->
-<!ENTITY gnome-version                "2.28">
+<!ENTITY gnome-version                "2.30">
+<!ENTITY gnome-old-version            "2.28">
 <!ENTITY gnome-minor-version          ".2">
-<!ENTITY gnome-etc-dir                "/etc/gnome/&gnome-version;&gnome-minor-version;">
+<!ENTITY gnome-etc-dir                "/etc/gnome/&gnome-old-version;&gnome-minor-version;">
 <!ENTITY gnome-download-http          "http://ftp.gnome.org/pub/gnome/sources">
 <!ENTITY gnome-download-ftp           "ftp://ftp.gnome.org/pub/gnome/sources">
Index: general/genutils/scrollkeeper.xml
===================================================================
--- general/genutils/scrollkeeper.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ general/genutils/scrollkeeper.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -84,5 +84,5 @@
             --with-omfdirs=/usr/share/omf:\
 /opt/kde-&kde-version;/share/omf:\
-/opt/gnome-&gnome-version;&gnome-minor-version;/share/omf &amp;&amp;
+/opt/gnome-&gnome-old-version;&gnome-minor-version;/share/omf &amp;&amp;
 
 make</userinput></screen>
Index: general/prog/python-modules.xml
===================================================================
--- general/prog/python-modules.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ general/prog/python-modules.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -55,6 +55,6 @@
   <!ENTITY gnome-python-time          "0.3 SBU">
 
-  <!ENTITY gnome-python-desktop-download-http "&gnome-download-http;/gnome-python-desktop/&gnome-version;/gnome-python-desktop-&gnome-python-desktop-version;.tar.bz2">
-  <!ENTITY gnome-python-desktop-download-ftp  "&gnome-download-ftp;/gnome-python-desktop/&gnome-version;/gnome-python-desktop-&gnome-python-desktop-version;.tar.bz2">
+  <!ENTITY gnome-python-desktop-download-http "&gnome-download-http;/gnome-python-desktop/&gnome-old-version;/gnome-python-desktop-&gnome-python-desktop-version;.tar.bz2">
+  <!ENTITY gnome-python-desktop-download-ftp  "&gnome-download-ftp;/gnome-python-desktop/&gnome-old-version;/gnome-python-desktop-&gnome-python-desktop-version;.tar.bz2">
   <!ENTITY gnome-python-desktop-md5sum        "d97bb3d8e1adc00505be060fbc832f44">
   <!ENTITY gnome-python-desktop-size          "599 KB">
Index: gnome/add/brasero.xml
===================================================================
--- gnome/add/brasero.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/add/brasero.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY brasero-download-http "&gnome-download-http;/brasero/&gnome-version;/brasero-&brasero-version;.tar.bz2">
-  <!ENTITY brasero-download-ftp  "&gnome-download-ftp;/brasero/&gnome-version;/brasero-&brasero-version;.tar.bz2">
+  <!ENTITY brasero-download-http "&gnome-download-http;/brasero/&gnome-old-version;/brasero-&brasero-version;.tar.bz2">
+  <!ENTITY brasero-download-ftp  "&gnome-download-ftp;/brasero/&gnome-old-version;/brasero-&brasero-version;.tar.bz2">
   <!ENTITY brasero-md5sum        "6ef5cc07325f1869577a85d15ac67eb3">
   <!ENTITY brasero-size          "3.8 MB">
Index: gnome/add/bug-buddy.xml
===================================================================
--- gnome/add/bug-buddy.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/add/bug-buddy.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY bug-buddy-download-http "&gnome-download-http;/bug-buddy/&gnome-version;/bug-buddy-&bug-buddy-version;.tar.bz2">
-  <!ENTITY bug-buddy-download-ftp  "&gnome-download-ftp;/bug-buddy/&gnome-version;/bug-buddy-&bug-buddy-version;.tar.bz2">
+  <!ENTITY bug-buddy-download-http "&gnome-download-http;/bug-buddy/&gnome-old-version;/bug-buddy-&bug-buddy-version;.tar.bz2">
+  <!ENTITY bug-buddy-download-ftp  "&gnome-download-ftp;/bug-buddy/&gnome-old-version;/bug-buddy-&bug-buddy-version;.tar.bz2">
   <!ENTITY bug-buddy-md5sum        "ee9c586fee2e6b8ce3b787e696f37100">
   <!ENTITY bug-buddy-size          "1.1 MB">
Index: gnome/add/eog.xml
===================================================================
--- gnome/add/eog.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/add/eog.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY eog-download-http "&gnome-download-http;/eog/&gnome-version;/eog-&eog-version;.tar.bz2">
-  <!ENTITY eog-download-ftp  "&gnome-download-ftp;/eog/&gnome-version;/eog-&eog-version;.tar.bz2">
+  <!ENTITY eog-download-http "&gnome-download-http;/eog/&gnome-old-version;/eog-&eog-version;.tar.bz2">
+  <!ENTITY eog-download-ftp  "&gnome-download-ftp;/eog/&gnome-old-version;/eog-&eog-version;.tar.bz2">
   <!ENTITY eog-md5sum        "ee5fd7f3cdd37467cb86052a858757c3">
   <!ENTITY eog-size          "2.6 MB">
Index: gnome/add/epiphany.xml
===================================================================
--- gnome/add/epiphany.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/add/epiphany.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY epiphany-download-http "&gnome-download-http;/epiphany/&gnome-version;/epiphany-&epiphany-version;.tar.bz2">
-  <!ENTITY epiphany-download-ftp  "&gnome-download-ftp;/epiphany/&gnome-version;/epiphany-&epiphany-version;.tar.bz2">
+  <!ENTITY epiphany-download-http "&gnome-download-http;/epiphany/&gnome-old-version;/epiphany-&epiphany-version;.tar.bz2">
+  <!ENTITY epiphany-download-ftp  "&gnome-download-ftp;/epiphany/&gnome-old-version;/epiphany-&epiphany-version;.tar.bz2">
   <!ENTITY epiphany-md5sum        "cf32404bfe6f0cb4d3f01d0c33c08def">
   <!ENTITY epiphany-size          "5.4 MB">
@@ -145,5 +145,5 @@
         <seg>epiphany</seg>
         <seg>None</seg>
-        <seg><envar>$GNOME_PREFIX</envar>{/include/epiphany/&gnome-version;/epiphany,
+        <seg><envar>$GNOME_PREFIX</envar>{/include/epiphany/&gnome-old-version;/epiphany,
         share/{epiphany/{glade,icons/hicolor/*},gnome/help/epiphany/*}}</seg>
       </seglistitem>
Index: gnome/add/evince.xml
===================================================================
--- gnome/add/evince.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/add/evince.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY evince-download-http "&gnome-download-http;/evince/&gnome-version;/evince-&evince-version;.tar.bz2">
-  <!ENTITY evince-download-ftp  "&gnome-download-ftp;/evince/&gnome-version;/evince-&evince-version;.tar.bz2">
+  <!ENTITY evince-download-http "&gnome-download-http;/evince/&gnome-old-version;/evince-&evince-version;.tar.bz2">
+  <!ENTITY evince-download-ftp  "&gnome-download-ftp;/evince/&gnome-old-version;/evince-&evince-version;.tar.bz2">
   <!ENTITY evince-md5sum        "f8b9a1ee6fe8cd0a1b7a51ad4db96e59">
   <!ENTITY evince-size          "1.9 MB">
Index: gnome/add/evolution-data-server.xml
===================================================================
--- gnome/add/evolution-data-server.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/add/evolution-data-server.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY evolution-data-server-download-http "&gnome-download-http;/evolution-data-server/&gnome-version;/evolution-data-server-&evolution-data-server-version;.tar.bz2">
-  <!ENTITY evolution-data-server-download-ftp  "&gnome-download-ftp;/evolution-data-server/&gnome-version;/evolution-data-server-&evolution-data-server-version;.tar.bz2">
+  <!ENTITY evolution-data-server-download-http "&gnome-download-http;/evolution-data-server/&gnome-old-version;/evolution-data-server-&evolution-data-server-version;.tar.bz2">
+  <!ENTITY evolution-data-server-download-ftp  "&gnome-download-ftp;/evolution-data-server/&gnome-old-version;/evolution-data-server-&evolution-data-server-version;.tar.bz2">
   <!ENTITY evolution-data-server-md5sum        "416248e60b1bec3f913a6857576cbcb0">
   <!ENTITY evolution-data-server-size          "21.3 MB">
@@ -209,7 +209,7 @@
         libegroupwise-1.2.so, libexchange-storage-1.2.so, libgdata-1.2.so,
         libgdata-google and numerous provider and extension modules.</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{include/evolution-data-server-&gnome-version;/*,
+        <seg><envar>$GNOME_PREFIX</envar>/{include/evolution-data-server-&gnome-old-version;/*,
         lib/evolution-data-server-1.2/{camel-providers,extensions},
-        share/{evolution-data-server-&gnome-version;/{glade,weather},
+        share/{evolution-data-server-&gnome-old-version;/{glade,weather},
         gtk-doc/html/*,idl/evolution-data-server-1.2,
         pixmaps/evolution-data-server}}</seg>
Index: gnome/add/file-roller.xml
===================================================================
--- gnome/add/file-roller.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/add/file-roller.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY file-roller-download-http "&gnome-download-http;/file-roller/&gnome-version;/file-roller-&file-roller-version;.tar.bz2">
-  <!ENTITY file-roller-download-ftp  "&gnome-download-ftp;/file-roller/&gnome-version;/file-roller-&file-roller-version;.tar.bz2">
+  <!ENTITY file-roller-download-http "&gnome-download-http;/file-roller/&gnome-old-version;/file-roller-&file-roller-version;.tar.bz2">
+  <!ENTITY file-roller-download-ftp  "&gnome-download-ftp;/file-roller/&gnome-old-version;/file-roller-&file-roller-version;.tar.bz2">
   <!ENTITY file-roller-md5sum        "fce19505b34e4adf78149d3595fb8fe4">
   <!ENTITY file-roller-size          "1.7 MB">
Index: gnome/add/gconf-editor.xml
===================================================================
--- gnome/add/gconf-editor.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/add/gconf-editor.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gconf-editor-download-http "&gnome-download-http;/gconf-editor/&gnome-version;/gconf-editor-&gconf-editor-version;.tar.bz2">
-  <!ENTITY gconf-editor-download-ftp  "&gnome-download-ftp;/gconf-editor/&gnome-version;/gconf-editor-&gconf-editor-version;.tar.bz2">
+  <!ENTITY gconf-editor-download-http "&gnome-download-http;/gconf-editor/&gnome-old-version;/gconf-editor-&gconf-editor-version;.tar.bz2">
+  <!ENTITY gconf-editor-download-ftp  "&gnome-download-ftp;/gconf-editor/&gnome-old-version;/gconf-editor-&gconf-editor-version;.tar.bz2">
   <!ENTITY gconf-editor-md5sum        "f3f19df4ce47ca27bf69d355f24ac5ba">
   <!ENTITY gconf-editor-size          "1.3 MB">
Index: gnome/add/gdm.xml
===================================================================
--- gnome/add/gdm.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/add/gdm.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gdm-download-http "&gnome-download-http;/gdm/&gnome-version;/gdm-&gdm-version;.tar.bz2">
-  <!ENTITY gdm-download-ftp  "&gnome-download-ftp;/gdm/&gnome-version;/gdm-&gdm-version;.tar.bz2">
+  <!ENTITY gdm-download-http "&gnome-download-http;/gdm/&gnome-old-version;/gdm-&gdm-version;.tar.bz2">
+  <!ENTITY gdm-download-ftp  "&gnome-download-ftp;/gdm/&gnome-old-version;/gdm-&gdm-version;.tar.bz2">
   <!ENTITY gdm-md5sum        "9607c6bac31c9d8bd3446e66a4576c2e">
   <!ENTITY gdm-size          "2.2 MB">
@@ -166,5 +166,5 @@
 
       <indexterm zone="gdm gdm-config">
-        <primary sortas="e-etc-gnome-&gnome-version;&gnome-minor-version;gdm-custom.conf">
+        <primary sortas="e-etc-gnome-&gnome-old-version;&gnome-minor-version;gdm-custom.conf">
         &gnome-etc-dir;/gdm/custom.conf</primary>
       </indexterm>
@@ -268,5 +268,5 @@
       <envar>GNOME_PREFIX</envar> environment variable is anything other than
       <filename class='directory'>/usr</filename> or <filename
-      class='directory'>/opt/gnome-&gnome-version;&gnome-minor-version;</filename>,
+      class='directory'>/opt/gnome-&gnome-old-version;&gnome-minor-version;</filename>,
       you will need to modify the <envar>PATH</envar> statement in the script
       to include the path where you have <application>GNOME</application>
Index: gnome/add/gedit.xml
===================================================================
--- gnome/add/gedit.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/add/gedit.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gedit-download-http "&gnome-download-http;/gedit/&gnome-version;/gedit-&gedit-version;.tar.bz2">
-  <!ENTITY gedit-download-ftp  "&gnome-download-ftp;/gedit/&gnome-version;/gedit-&gedit-version;.tar.bz2">
+  <!ENTITY gedit-download-http "&gnome-download-http;/gedit/&gnome-old-version;/gedit-&gedit-version;.tar.bz2">
+  <!ENTITY gedit-download-ftp  "&gnome-download-ftp;/gedit/&gnome-old-version;/gedit-&gedit-version;.tar.bz2">
   <!ENTITY gedit-md5sum        "562b2e15cf4d3cef068caf7a25843ccd">
   <!ENTITY gedit-size          "4.4 MB">
Index: gnome/add/gnome-disk-utility.xml
===================================================================
--- gnome/add/gnome-disk-utility.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/add/gnome-disk-utility.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gnome-disk-utility-download-http "&gnome-download-http;/gnome-disk-utility/&gnome-version;/gnome-disk-utility-&gnome-disk-utility-version;.tar.bz2">
-  <!ENTITY gnome-disk-utility-download-ftp  "&gnome-download-ftp;/gnome-disk-utility/&gnome-version;/gnome-disk-utility-&gnome-disk-utility-version;.tar.bz2">
+  <!ENTITY gnome-disk-utility-download-http "&gnome-download-http;/gnome-disk-utility/&gnome-old-version;/gnome-disk-utility-&gnome-disk-utility-version;.tar.bz2">
+  <!ENTITY gnome-disk-utility-download-ftp  "&gnome-download-ftp;/gnome-disk-utility/&gnome-old-version;/gnome-disk-utility-&gnome-disk-utility-version;.tar.bz2">
   <!ENTITY gnome-disk-utility-md5sum        "d0e6191b7446717d80ccd7b3da611941">
   <!ENTITY gnome-disk-utility-size          "1.5 MB">
Index: gnome/add/gnome-games.xml
===================================================================
--- gnome/add/gnome-games.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/add/gnome-games.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gnome-games-download-http "&gnome-download-http;/gnome-games/&gnome-version;/gnome-games-&gnome-games-version;.tar.bz2">
-  <!ENTITY gnome-games-download-ftp  "&gnome-download-ftp;/gnome-games/&gnome-version;/gnome-games-&gnome-games-version;.tar.bz2">
+  <!ENTITY gnome-games-download-http "&gnome-download-http;/gnome-games/&gnome-old-version;/gnome-games-&gnome-games-version;.tar.bz2">
+  <!ENTITY gnome-games-download-ftp  "&gnome-download-ftp;/gnome-games/&gnome-old-version;/gnome-games-&gnome-games-version;.tar.bz2">
   <!ENTITY gnome-games-md5sum        "6dcd006d4393524c1e4f39ca0310ac8d">
   <!ENTITY gnome-games-size          "24.3 MB">
@@ -35,5 +35,5 @@
     can download the <application>GNOME</application> Games Extra Data package
     from <ulink
-    url="&gnome-download-http;/gnome-games-extra-data/&gnome-version;/"/>.
+    url="&gnome-download-http;/gnome-games-extra-data/&gnome-old-version;/"/>.
     </para>
 
Index: gnome/add/gnome-media.xml
===================================================================
--- gnome/add/gnome-media.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/add/gnome-media.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gnome-media-download-http "&gnome-download-http;/gnome-media/&gnome-version;/gnome-media-&gnome-media-version;.tar.bz2">
-  <!ENTITY gnome-media-download-ftp  "&gnome-download-ftp;/gnome-media/&gnome-version;/gnome-media-&gnome-media-version;.tar.bz2">
+  <!ENTITY gnome-media-download-http "&gnome-download-http;/gnome-media/&gnome-old-version;/gnome-media-&gnome-media-version;.tar.bz2">
+  <!ENTITY gnome-media-download-ftp  "&gnome-download-ftp;/gnome-media/&gnome-old-version;/gnome-media-&gnome-media-version;.tar.bz2">
   <!ENTITY gnome-media-md5sum        "44fa273824cb18bb3118756d4bef69e6">
   <!ENTITY gnome-media-size          "2.4 MB">
Index: gnome/add/gnome-power-manager.xml
===================================================================
--- gnome/add/gnome-power-manager.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/add/gnome-power-manager.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gnome-power-manager-download-http "&gnome-download-http;/gnome-power-manager/&gnome-version;/gnome-power-manager-&gnome-power-manager-version;.tar.bz2">
-  <!ENTITY gnome-power-manager-download-ftp  "&gnome-download-ftp;/gnome-power-manager/&gnome-version;/gnome-power-manager-&gnome-power-manager-version;.tar.bz2">
+  <!ENTITY gnome-power-manager-download-http "&gnome-download-http;/gnome-power-manager/&gnome-old-version;/gnome-power-manager-&gnome-power-manager-version;.tar.bz2">
+  <!ENTITY gnome-power-manager-download-ftp  "&gnome-download-ftp;/gnome-power-manager/&gnome-old-version;/gnome-power-manager-&gnome-power-manager-version;.tar.bz2">
   <!ENTITY gnome-power-manager-md5sum        "76c00e82ba3ab1cd748dd981dc7af2eb">
   <!ENTITY gnome-power-manager-size          "3.6 MB">
Index: gnome/add/gnome-screensaver.xml
===================================================================
--- gnome/add/gnome-screensaver.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/add/gnome-screensaver.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gnome-screensaver-download-http "&gnome-download-http;/gnome-screensaver/&gnome-version;/gnome-screensaver-&gnome-screensaver-version;.tar.bz2">
-  <!ENTITY gnome-screensaver-download-ftp  "&gnome-download-ftp;/gnome-screensaver/&gnome-version;/gnome-screensaver-&gnome-screensaver-version;.tar.bz2">
+  <!ENTITY gnome-screensaver-download-http "&gnome-download-http;/gnome-screensaver/&gnome-old-version;/gnome-screensaver-&gnome-screensaver-version;.tar.bz2">
+  <!ENTITY gnome-screensaver-download-ftp  "&gnome-download-ftp;/gnome-screensaver/&gnome-old-version;/gnome-screensaver-&gnome-screensaver-version;.tar.bz2">
   <!ENTITY gnome-screensaver-md5sum        "b37d4a210cac22a7312f9736f0c4356f">
   <!ENTITY gnome-screensaver-size          "4.6 MB">
@@ -210,5 +210,5 @@
       </indexterm>
       <indexterm zone="gnome-screensaver gnome-screensaver-config">
-        <primary sortas="etc-gnome-&gnome-version;&gnome-minor-version;gdm-custom.conf">
+        <primary sortas="etc-gnome-&gnome-old-version;&gnome-minor-version;gdm-custom.conf">
         &gnome-etc-dir;/gdm/custom.conf</primary>
       </indexterm>
Index: gnome/add/gnome-utils.xml
===================================================================
--- gnome/add/gnome-utils.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/add/gnome-utils.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gnome-utils-download-http "&gnome-download-http;/gnome-utils/&gnome-version;/gnome-utils-&gnome-utils-version;.tar.bz2">
-  <!ENTITY gnome-utils-download-ftp  "&gnome-download-ftp;/gnome-utils/&gnome-version;/gnome-utils-&gnome-utils-version;.tar.bz2">
+  <!ENTITY gnome-utils-download-http "&gnome-download-http;/gnome-utils/&gnome-old-version;/gnome-utils-&gnome-utils-version;.tar.bz2">
+  <!ENTITY gnome-utils-download-ftp  "&gnome-download-ftp;/gnome-utils/&gnome-old-version;/gnome-utils-&gnome-utils-version;.tar.bz2">
   <!ENTITY gnome-utils-md5sum        "3c811993191ae0bbf8666405a504288a">
   <!ENTITY gnome-utils-size          "6.5 MB">
Index: gnome/add/gok.xml
===================================================================
--- gnome/add/gok.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/add/gok.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gok-download-http "&gnome-download-http;/gok/&gnome-version;/gok-&gok-version;.tar.bz2">
-  <!ENTITY gok-download-ftp  "&gnome-download-ftp;/gok/&gnome-version;/gok-&gok-version;.tar.bz2">
+  <!ENTITY gok-download-http "&gnome-download-http;/gok/&gnome-old-version;/gok-&gok-version;.tar.bz2">
+  <!ENTITY gok-download-ftp  "&gnome-download-ftp;/gok/&gnome-old-version;/gok-&gok-version;.tar.bz2">
   <!ENTITY gok-md5sum        "d7305f12c703e13eeaed796f996dbc86">
   <!ENTITY gok-size          "1.5 MB">
Index: gnome/add/gucharmap.xml
===================================================================
--- gnome/add/gucharmap.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/add/gucharmap.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gucharmap-download-http "&gnome-download-http;/gucharmap/&gnome-version;/gucharmap-&gucharmap-version;.tar.bz2">
-  <!ENTITY gucharmap-download-ftp  "&gnome-download-ftp;/gucharmap/&gnome-version;/gucharmap-&gucharmap-version;.tar.bz2">
+  <!ENTITY gucharmap-download-http "&gnome-download-http;/gucharmap/&gnome-old-version;/gucharmap-&gucharmap-version;.tar.bz2">
+  <!ENTITY gucharmap-download-ftp  "&gnome-download-ftp;/gucharmap/&gnome-old-version;/gucharmap-&gucharmap-version;.tar.bz2">
   <!ENTITY gucharmap-md5sum        "d4ff2195141ca71aebfeb766e18d9607">
   <!ENTITY gucharmap-size          "2.9 MB">
Index: gnome/add/orca.xml
===================================================================
--- gnome/add/orca.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/add/orca.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY orca-download-http "&gnome-download-http;/orca/&gnome-version;/orca-&orca-version;.tar.bz2">
-  <!ENTITY orca-download-ftp  "&gnome-download-ftp;/orca/&gnome-version;/orca-&orca-version;.tar.bz2">
+  <!ENTITY orca-download-http "&gnome-download-http;/orca/&gnome-old-version;/orca-&orca-version;.tar.bz2">
+  <!ENTITY orca-download-ftp  "&gnome-download-ftp;/orca/&gnome-old-version;/orca-&orca-version;.tar.bz2">
   <!ENTITY orca-md5sum        "ae4c3eae0800d46a74c2b66f4f3681f9">
   <!ENTITY orca-size          "2.1 MB">
Index: gnome/add/totem-pl-parser.xml
===================================================================
--- gnome/add/totem-pl-parser.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/add/totem-pl-parser.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY totem-pl-parser-download-http "&gnome-download-http;/totem-pl-parser/&gnome-version;/totem-pl-parser-&totem-pl-parser-version;.tar.bz2">
-  <!ENTITY totem-pl-parser-download-ftp  "&gnome-download-ftp;/totem-pl-parser/&gnome-version;/totem-pl-parser-&totem-pl-parser-version;.tar.bz2">
+  <!ENTITY totem-pl-parser-download-http "&gnome-download-http;/totem-pl-parser/&gnome-old-version;/totem-pl-parser-&totem-pl-parser-version;.tar.bz2">
+  <!ENTITY totem-pl-parser-download-ftp  "&gnome-download-ftp;/totem-pl-parser/&gnome-old-version;/totem-pl-parser-&totem-pl-parser-version;.tar.bz2">
   <!ENTITY totem-pl-parser-md5sum        "a641b6061761535eb3646752bb1545f3">
   <!ENTITY totem-pl-parser-size          "694 KB">
Index: gnome/add/totem.xml
===================================================================
--- gnome/add/totem.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/add/totem.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY totem-download-http "&gnome-download-http;/totem/&gnome-version;/totem-&totem-version;.tar.bz2">
-  <!ENTITY totem-download-ftp  "&gnome-download-ftp;/totem/&gnome-version;/totem-&totem-version;.tar.bz2">
+  <!ENTITY totem-download-http "&gnome-download-http;/totem/&gnome-old-version;/totem-&totem-version;.tar.bz2">
+  <!ENTITY totem-download-ftp  "&gnome-download-ftp;/totem/&gnome-old-version;/totem-&totem-version;.tar.bz2">
   <!ENTITY totem-md5sum        "a08fca39db3c3e7885c584e0fd533f5a">
   <!ENTITY totem-size          "2.9 MB">
Index: gnome/add/zenity.xml
===================================================================
--- gnome/add/zenity.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/add/zenity.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY zenity-download-http "&gnome-download-http;/zenity/&gnome-version;/zenity-&zenity-version;.tar.bz2">
-  <!ENTITY zenity-download-ftp  "&gnome-download-ftp;/zenity/&gnome-version;/zenity-&zenity-version;.tar.bz2">
+  <!ENTITY zenity-download-http "&gnome-download-http;/zenity/&gnome-old-version;/zenity-&zenity-version;.tar.bz2">
+  <!ENTITY zenity-download-ftp  "&gnome-download-ftp;/zenity/&gnome-old-version;/zenity-&zenity-version;.tar.bz2">
   <!ENTITY zenity-md5sum        "262c476aebbf67a7043cd80c6a03add3">
   <!ENTITY zenity-size          "3.0 MB">
Index: gnome/core/gnome-applets.xml
===================================================================
--- gnome/core/gnome-applets.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/core/gnome-applets.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gnome-applets-download-http "&gnome-download-http;/gnome-applets/&gnome-version;/gnome-applets-&gnome-applets-version;.tar.bz2">
-  <!ENTITY gnome-applets-download-ftp  "&gnome-download-ftp;/gnome-applets/&gnome-version;/gnome-applets-&gnome-applets-version;.tar.bz2">
+  <!ENTITY gnome-applets-download-http "&gnome-download-http;/gnome-applets/&gnome-old-version;/gnome-applets-&gnome-applets-version;.tar.bz2">
+  <!ENTITY gnome-applets-download-ftp  "&gnome-download-ftp;/gnome-applets/&gnome-old-version;/gnome-applets-&gnome-applets-version;.tar.bz2">
   <!ENTITY gnome-applets-md5sum        "9eb00e9dc468d2c5c71b70c9fb2b751c">
   <!ENTITY gnome-applets-size          "9.2 MB">
Index: gnome/core/gnome-backgrounds.xml
===================================================================
--- gnome/core/gnome-backgrounds.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/core/gnome-backgrounds.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gnome-backgrounds-download-http "&gnome-download-http;/gnome-backgrounds/&gnome-version;/gnome-backgrounds-&gnome-backgrounds-version;.tar.bz2">
-  <!ENTITY gnome-backgrounds-download-ftp  "&gnome-download-ftp;/gnome-backgrounds/&gnome-version;/gnome-backgrounds-&gnome-backgrounds-version;.tar.bz2">
+  <!ENTITY gnome-backgrounds-download-http "&gnome-download-http;/gnome-backgrounds/&gnome-old-version;/gnome-backgrounds-&gnome-backgrounds-version;.tar.bz2">
+  <!ENTITY gnome-backgrounds-download-ftp  "&gnome-download-ftp;/gnome-backgrounds/&gnome-old-version;/gnome-backgrounds-&gnome-backgrounds-version;.tar.bz2">
   <!ENTITY gnome-backgrounds-md5sum        "a137eae321c12ba253a1ce55b13b622d">
   <!ENTITY gnome-backgrounds-size          "9.5 MB">
Index: gnome/core/gnome-control-center.xml
===================================================================
--- gnome/core/gnome-control-center.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/core/gnome-control-center.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gnome-control-center-download-http "&gnome-download-http;/gnome-control-center/&gnome-version;/gnome-control-center-&gnome-control-center-version;.tar.bz2">
-  <!ENTITY gnome-control-center-download-ftp  "&gnome-download-ftp;/gnome-control-center/&gnome-version;/gnome-control-center-&gnome-control-center-version;.tar.bz2">
+  <!ENTITY gnome-control-center-download-http "&gnome-download-http;/gnome-control-center/&gnome-old-version;/gnome-control-center-&gnome-control-center-version;.tar.bz2">
+  <!ENTITY gnome-control-center-download-ftp  "&gnome-download-ftp;/gnome-control-center/&gnome-old-version;/gnome-control-center-&gnome-control-center-version;.tar.bz2">
   <!ENTITY gnome-control-center-md5sum        "a37a1b5ff4cfce45baef0cf31126d380">
   <!ENTITY gnome-control-center-size          "2.2 MB">
Index: gnome/core/gnome-desktop.xml
===================================================================
--- gnome/core/gnome-desktop.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/core/gnome-desktop.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gnome-desktop-download-http "&gnome-download-http;/gnome-desktop/&gnome-version;/gnome-desktop-&gnome-desktop-version;.tar.bz2">
-  <!ENTITY gnome-desktop-download-ftp  "&gnome-download-ftp;/gnome-desktop/&gnome-version;/gnome-desktop-&gnome-desktop-version;.tar.bz2">
+  <!ENTITY gnome-desktop-download-http "&gnome-download-http;/gnome-desktop/&gnome-old-version;/gnome-desktop-&gnome-desktop-version;.tar.bz2">
+  <!ENTITY gnome-desktop-download-ftp  "&gnome-download-ftp;/gnome-desktop/&gnome-old-version;/gnome-desktop-&gnome-desktop-version;.tar.bz2">
   <!ENTITY gnome-desktop-md5sum        "036423159a3240a258cc3892573f0e0f">
   <!ENTITY gnome-desktop-size          "1.5 MB">
Index: gnome/core/gnome-icon-theme.xml
===================================================================
--- gnome/core/gnome-icon-theme.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/core/gnome-icon-theme.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gnome-icon-theme-download-http "&gnome-download-http;/gnome-icon-theme/&gnome-version;/gnome-icon-theme-&gnome-icon-theme-version;.tar.bz2">
-  <!ENTITY gnome-icon-theme-download-ftp  "&gnome-download-ftp;/gnome-icon-theme/&gnome-version;/gnome-icon-theme-&gnome-icon-theme-version;.tar.bz2">
+  <!ENTITY gnome-icon-theme-download-http "&gnome-download-http;/gnome-icon-theme/&gnome-old-version;/gnome-icon-theme-&gnome-icon-theme-version;.tar.bz2">
+  <!ENTITY gnome-icon-theme-download-ftp  "&gnome-download-ftp;/gnome-icon-theme/&gnome-old-version;/gnome-icon-theme-&gnome-icon-theme-version;.tar.bz2">
   <!ENTITY gnome-icon-theme-md5sum        "1b6a782e3f733a5dbb8e62e87a7bdc61">
   <!ENTITY gnome-icon-theme-size          "3.3 MB">
Index: gnome/core/gnome-keyring.xml
===================================================================
--- gnome/core/gnome-keyring.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/core/gnome-keyring.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gnome-keyring-download-http "&gnome-download-http;/gnome-keyring/&gnome-version;/gnome-keyring-&gnome-keyring-version;.tar.bz2">
-  <!ENTITY gnome-keyring-download-ftp  "&gnome-download-ftp;/gnome-keyring/&gnome-version;/gnome-keyring-&gnome-keyring-version;.tar.bz2">
+  <!ENTITY gnome-keyring-download-http "&gnome-download-http;/gnome-keyring/&gnome-old-version;/gnome-keyring-&gnome-keyring-version;.tar.bz2">
+  <!ENTITY gnome-keyring-download-ftp  "&gnome-download-ftp;/gnome-keyring/&gnome-old-version;/gnome-keyring-&gnome-keyring-version;.tar.bz2">
   <!ENTITY gnome-keyring-md5sum        "97ea6823e88b39284187764c1ca95a59">
   <!ENTITY gnome-keyring-size          "2.9 MB">
Index: gnome/core/gnome-menus.xml
===================================================================
--- gnome/core/gnome-menus.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/core/gnome-menus.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gnome-menus-download-http "&gnome-download-http;/gnome-menus/&gnome-version;/gnome-menus-&gnome-menus-version;.tar.bz2">
-  <!ENTITY gnome-menus-download-ftp  "&gnome-download-ftp;/gnome-menus/&gnome-version;/gnome-menus-&gnome-menus-version;.tar.bz2">
+  <!ENTITY gnome-menus-download-http "&gnome-download-http;/gnome-menus/&gnome-old-version;/gnome-menus-&gnome-menus-version;.tar.bz2">
+  <!ENTITY gnome-menus-download-ftp  "&gnome-download-ftp;/gnome-menus/&gnome-old-version;/gnome-menus-&gnome-menus-version;.tar.bz2">
   <!ENTITY gnome-menus-md5sum        "279316228fd84917acb9405476f74b53">
   <!ENTITY gnome-menus-size          "451 KB">
Index: gnome/core/gnome-panel.xml
===================================================================
--- gnome/core/gnome-panel.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/core/gnome-panel.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gnome-panel-download-http "&gnome-download-http;/gnome-panel/&gnome-version;/gnome-panel-&gnome-panel-version;.tar.bz2">
-  <!ENTITY gnome-panel-download-ftp  "&gnome-download-ftp;/gnome-panel/&gnome-version;/gnome-panel-&gnome-panel-version;.tar.bz2">
+  <!ENTITY gnome-panel-download-http "&gnome-download-http;/gnome-panel/&gnome-old-version;/gnome-panel-&gnome-panel-version;.tar.bz2">
+  <!ENTITY gnome-panel-download-ftp  "&gnome-download-ftp;/gnome-panel/&gnome-old-version;/gnome-panel-&gnome-panel-version;.tar.bz2">
   <!ENTITY gnome-panel-md5sum        "9f0ea283d44bbcce67dc2e8a02fe9fad">
   <!ENTITY gnome-panel-size          "2.8 MB">
Index: gnome/core/gnome-session.xml
===================================================================
--- gnome/core/gnome-session.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/core/gnome-session.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gnome-session-download-http "&gnome-download-http;/gnome-session/&gnome-version;/gnome-session-&gnome-session-version;.tar.bz2">
-  <!ENTITY gnome-session-download-ftp  "&gnome-download-ftp;/gnome-session/&gnome-version;/gnome-session-&gnome-session-version;.tar.bz2">
+  <!ENTITY gnome-session-download-http "&gnome-download-http;/gnome-session/&gnome-old-version;/gnome-session-&gnome-session-version;.tar.bz2">
+  <!ENTITY gnome-session-download-ftp  "&gnome-download-ftp;/gnome-session/&gnome-old-version;/gnome-session-&gnome-session-version;.tar.bz2">
   <!ENTITY gnome-session-md5sum        "b1a2307b02e833010d6c5312b9ff9048">
   <!ENTITY gnome-session-size          "803 KB">
Index: gnome/core/gnome-settings-daemon.xml
===================================================================
--- gnome/core/gnome-settings-daemon.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/core/gnome-settings-daemon.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gnome-settings-daemon-download-http "&gnome-download-http;/gnome-settings-daemon/&gnome-version;/gnome-settings-daemon-&gnome-settings-daemon-version;.tar.bz2">
-  <!ENTITY gnome-settings-daemon-download-ftp  "&gnome-download-ftp;/gnome-settings-daemon/&gnome-version;/gnome-settings-daemon-&gnome-settings-daemon-version;.tar.bz2">
+  <!ENTITY gnome-settings-daemon-download-http "&gnome-download-http;/gnome-settings-daemon/&gnome-old-version;/gnome-settings-daemon-&gnome-settings-daemon-version;.tar.bz2">
+  <!ENTITY gnome-settings-daemon-download-ftp  "&gnome-download-ftp;/gnome-settings-daemon/&gnome-old-version;/gnome-settings-daemon-&gnome-settings-daemon-version;.tar.bz2">
   <!ENTITY gnome-settings-daemon-md5sum        "cadb2e161846c4df76fec45679db1f50">
   <!ENTITY gnome-settings-daemon-size          "1.1 MB">
Index: gnome/core/gnome-terminal.xml
===================================================================
--- gnome/core/gnome-terminal.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/core/gnome-terminal.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gnome-terminal-download-http "&gnome-download-http;/gnome-terminal/&gnome-version;/gnome-terminal-&gnome-terminal-version;.tar.bz2">
-  <!ENTITY gnome-terminal-download-ftp  "&gnome-download-ftp;/gnome-terminal/&gnome-version;/gnome-terminal-&gnome-terminal-version;.tar.bz2">
+  <!ENTITY gnome-terminal-download-http "&gnome-download-http;/gnome-terminal/&gnome-old-version;/gnome-terminal-&gnome-terminal-version;.tar.bz2">
+  <!ENTITY gnome-terminal-download-ftp  "&gnome-download-ftp;/gnome-terminal/&gnome-old-version;/gnome-terminal-&gnome-terminal-version;.tar.bz2">
   <!ENTITY gnome-terminal-md5sum        "aa053ff38932cf032c70ab6522603053">
   <!ENTITY gnome-terminal-size          "2.1 MB">
Index: gnome/core/gnome-themes.xml
===================================================================
--- gnome/core/gnome-themes.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/core/gnome-themes.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gnome-themes-download-http "&gnome-download-http;/gnome-themes/&gnome-version;/gnome-themes-&gnome-themes-version;.tar.bz2">
-  <!ENTITY gnome-themes-download-ftp  "&gnome-download-ftp;/gnome-themes/&gnome-version;/gnome-themes-&gnome-themes-version;.tar.bz2">
+  <!ENTITY gnome-themes-download-http "&gnome-download-http;/gnome-themes/&gnome-old-version;/gnome-themes-&gnome-themes-version;.tar.bz2">
+  <!ENTITY gnome-themes-download-ftp  "&gnome-download-ftp;/gnome-themes/&gnome-old-version;/gnome-themes-&gnome-themes-version;.tar.bz2">
   <!ENTITY gnome-themes-md5sum        "0159b27d7f72c74ae9595486fc13814b">
   <!ENTITY gnome-themes-size          "1.5 MB">
Index: gnome/core/gnome-user-docs.xml
===================================================================
--- gnome/core/gnome-user-docs.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/core/gnome-user-docs.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gnome-user-docs-download-http "&gnome-download-http;/gnome-user-docs/&gnome-version;/gnome-user-docs-&gnome-user-docs-version;.tar.bz2">
-  <!ENTITY gnome-user-docs-download-ftp  "&gnome-download-ftp;/gnome-user-docs/&gnome-version;/gnome-user-docs-&gnome-user-docs-version;.tar.bz2">
+  <!ENTITY gnome-user-docs-download-http "&gnome-download-http;/gnome-user-docs/&gnome-old-version;/gnome-user-docs-&gnome-user-docs-version;.tar.bz2">
+  <!ENTITY gnome-user-docs-download-ftp  "&gnome-download-ftp;/gnome-user-docs/&gnome-old-version;/gnome-user-docs-&gnome-user-docs-version;.tar.bz2">
   <!ENTITY gnome-user-docs-md5sum        "f9a5ed2c914cabb0d69b5fe2d527485e">
   <!ENTITY gnome-user-docs-size          "16.8 MB">
Index: gnome/core/libgnome.xml
===================================================================
--- gnome/core/libgnome.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/core/libgnome.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY libgnome-download-http "&gnome-download-http;/libgnome/&gnome-version;/libgnome-&libgnome-version;.tar.bz2">
-  <!ENTITY libgnome-download-ftp  "&gnome-download-ftp;/libgnome/&gnome-version;/libgnome-&libgnome-version;.tar.bz2">
+  <!ENTITY libgnome-download-http "&gnome-download-http;/libgnome/&gnome-old-version;/libgnome-&libgnome-version;.tar.bz2">
+  <!ENTITY libgnome-download-ftp  "&gnome-download-ftp;/libgnome/&gnome-old-version;/libgnome-&libgnome-version;.tar.bz2">
   <!ENTITY libgnome-md5sum        "5c7efe21dc28c137aa766a77a84c0c29">
   <!ENTITY libgnome-size          "1.3 MB">
Index: gnome/core/libgnomekbd.xml
===================================================================
--- gnome/core/libgnomekbd.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/core/libgnomekbd.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY libgnomekbd-download-http "&gnome-download-http;/libgnomekbd/&gnome-version;/libgnomekbd-&libgnomekbd-version;.tar.bz2">
-  <!ENTITY libgnomekbd-download-ftp  "&gnome-download-ftp;/libgnomekbd/&gnome-version;/libgnomekbd-&libgnomekbd-version;.tar.bz2">
+  <!ENTITY libgnomekbd-download-http "&gnome-download-http;/libgnomekbd/&gnome-old-version;/libgnomekbd-&libgnomekbd-version;.tar.bz2">
+  <!ENTITY libgnomekbd-download-ftp  "&gnome-download-ftp;/libgnomekbd/&gnome-old-version;/libgnomekbd-&libgnomekbd-version;.tar.bz2">
   <!ENTITY libgnomekbd-md5sum        "28dce813a6c76439a2136fbd2394a058">
   <!ENTITY libgnomekbd-size          "389 KB">
Index: gnome/core/libgweather.xml
===================================================================
--- gnome/core/libgweather.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/core/libgweather.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY libgweather-download-http "&gnome-download-http;/libgweather/&gnome-version;/libgweather-&libgweather-version;.tar.bz2">
-  <!ENTITY libgweather-download-ftp "&gnome-download-ftp;/libgweather/&gnome-version;/libgweather-&libgweather-version;.tar.bz2">
+  <!ENTITY libgweather-download-http "&gnome-download-http;/libgweather/&gnome-old-version;/libgweather-&libgweather-version;.tar.bz2">
+  <!ENTITY libgweather-download-ftp "&gnome-download-ftp;/libgweather/&gnome-old-version;/libgweather-&libgweather-version;.tar.bz2">
   <!ENTITY libgweather-md5sum        "9f4457144d32d4004e0e045240ab51dc">
   <!ENTITY libgweather-size          "6.0 MB">
Index: gnome/core/nautilus.xml
===================================================================
--- gnome/core/nautilus.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/core/nautilus.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY nautilus-download-http "&gnome-download-http;/nautilus/&gnome-version;/nautilus-&nautilus-version;.tar.bz2">
-  <!ENTITY nautilus-download-ftp  "&gnome-download-ftp;/nautilus/&gnome-version;/nautilus-&nautilus-version;.tar.bz2">
+  <!ENTITY nautilus-download-http "&gnome-download-http;/nautilus/&gnome-old-version;/nautilus-&nautilus-version;.tar.bz2">
+  <!ENTITY nautilus-download-ftp  "&gnome-download-ftp;/nautilus/&gnome-old-version;/nautilus-&nautilus-version;.tar.bz2">
   <!ENTITY nautilus-md5sum        "28c97e0e5195ae1ad5101e8b703cbf52">
   <!ENTITY nautilus-size          "5.8 MB">
Index: gnome/core/pre-install-config.xml
===================================================================
--- gnome/core/pre-install-config.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/core/pre-install-config.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -34,14 +34,14 @@
     <systemitem class='username'>root</systemitem> user:</para>
 
-<screen role='root'><userinput>install -v -m755 -d /opt/gnome-&gnome-version;&gnome-minor-version; &amp;&amp;
-ln -v -s gnome-&gnome-version;&gnome-minor-version; /opt/gnome</userinput></screen>
+<screen role='root'><userinput>install -v -m755 -d /opt/gnome-&gnome-old-version;&gnome-minor-version; &amp;&amp;
+ln -v -s gnome-&gnome-old-version;&gnome-minor-version; /opt/gnome</userinput></screen>
   </note>
 
   <para>If you created the symbolic link, change all instances of <filename
-  class='directory'>/opt/gnome-&gnome-version;&gnome-minor-version;</filename>
+  class='directory'>/opt/gnome-&gnome-old-version;&gnome-minor-version;</filename>
   to <filename class='directory'>/opt/gnome</filename> in the instructions
   below.</para>
 
-<screen><userinput>export GNOME_PREFIX=/opt/gnome-&gnome-version;&gnome-minor-version;</userinput></screen>
+<screen><userinput>export GNOME_PREFIX=/opt/gnome-&gnome-old-version;&gnome-minor-version;</userinput></screen>
 
   <para>The try-out group will also need to make all the following
@@ -50,8 +50,8 @@
   <para>Add to your system or personal profile:</para>
 
-<screen><literal>export PATH=$PATH:/opt/gnome-&gnome-version;&gnome-minor-version;/bin
-export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/gnome-&gnome-version;&gnome-minor-version;/lib/pkgconfig
-export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/gnome-&gnome-version;&gnome-minor-version;/share/pkgconfig
-export GNOME_LIBCONFIG_PATH=/usr/lib:/opt/gnome-&gnome-version;&gnome-minor-version;/lib</literal></screen>
+<screen><literal>export PATH=$PATH:/opt/gnome-&gnome-old-version;&gnome-minor-version;/bin
+export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/gnome-&gnome-old-version;&gnome-minor-version;/lib/pkgconfig
+export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/gnome-&gnome-old-version;&gnome-minor-version;/share/pkgconfig
+export GNOME_LIBCONFIG_PATH=/usr/lib:/opt/gnome-&gnome-old-version;&gnome-minor-version;/lib</literal></screen>
 
   <para>Add to your <filename>/etc/ld.so.conf</filename>:</para>
@@ -60,5 +60,5 @@
 <literal># Begin gnome addition to /etc/ld.so.conf
 
-/opt/gnome-&gnome-version;&gnome-minor-version;/lib
+/opt/gnome-&gnome-old-version;&gnome-minor-version;/lib
 
 # End gnome addition</literal>
@@ -70,5 +70,5 @@
 <literal># Begin gnome addition to man_db.conf
 
-MANDATORY_MANPATH /opt/gnome-&gnome-version;&gnome-minor-version;/share/man
+MANDATORY_MANPATH /opt/gnome-&gnome-old-version;&gnome-minor-version;/share/man
 
 # End gnome addition to man_db.conf</literal>
Index: gnome/core/yelp.xml
===================================================================
--- gnome/core/yelp.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/core/yelp.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY yelp-download-http "&gnome-download-http;/yelp/&gnome-version;/yelp-&yelp-version;.tar.bz2">
-  <!ENTITY yelp-download-ftp  "&gnome-download-ftp;/yelp/&gnome-version;/yelp-&yelp-version;.tar.bz2">
+  <!ENTITY yelp-download-http "&gnome-download-http;/yelp/&gnome-old-version;/yelp-&yelp-version;.tar.bz2">
+  <!ENTITY yelp-download-ftp  "&gnome-download-ftp;/yelp/&gnome-old-version;/yelp-&yelp-version;.tar.bz2">
   <!ENTITY yelp-md5sum        "faf7eac7abf4eded189566f9ffafc188">
   <!ENTITY yelp-size          "1.1 MB">
Index: gnome/gnome-intro.xml
===================================================================
--- gnome/gnome-intro.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ gnome/gnome-intro.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -26,21 +26,21 @@
 
   <!-- <para>This chapter presents the instructions to install a complete
-  GNOME-&gnome-version;&gnome-minor-version; desktop environment; and a limited
+  GNOME-&gnome-old-version;&gnome-minor-version; desktop environment; and a limited
   GNOME 1.4 library environment that is sufficient to run GNOME 1.4
   applications included in this book. The order of the pages follows the build
   order defined by the GNOME development team and documented in the <ulink
-  url="http://www.gnome.org/start/&gnome-version;/notes/en/rninstallation.html">
+  url="http://www.gnome.org/start/&gnome-old-version;/notes/en/rninstallation.html">
   Release Notes</ulink>.</para> -->
 
   <para>This chapter presents the instructions to install a complete
-  GNOME-&gnome-version;&gnome-minor-version; desktop environment. The order of
+  GNOME-&gnome-old-version;&gnome-minor-version; desktop environment. The order of
   the installed packages follows the build order defined by the GNOME
   development team and has been thoroughly tested by the BLFS team.</para>
 
-  <para>The installation of GNOME-&gnome-version;&gnome-minor-version; is a
+  <para>The installation of GNOME-&gnome-old-version;&gnome-minor-version; is a
   large undertaking and one we would like to see you complete with the least
   amount of stress. One of the first goals in this installation is to protect
   your previously installed software, especially if you are testing GNOME on
-  your machine. GNOME-&gnome-version; packages utilize the
+  your machine. GNOME-&gnome-old-version; packages utilize the
   <option>--prefix=option</option> passed to <command>configure</command>,
   so you will use that and an environment variable (<envar>GNOME_PREFIX</envar>)
@@ -51,5 +51,5 @@
   are going to keep the GNOME installation, or you think you will update to the
   newest releases as they become available, you should install with
-  <option>--prefix=/opt/gnome-&gnome-version;&gnome-minor-version;</option>.
+  <option>--prefix=/opt/gnome-&gnome-old-version;&gnome-minor-version;</option>.
   Setting the environment variable and the additional edits required by the
   second option are covered in the Pre-Installation Configuration
@@ -57,18 +57,18 @@
 
   <para>If you choose the second option, removal of
-  GNOME-&gnome-version;&gnome-minor-version; is as easy as removing the edits
+  GNOME-&gnome-old-version;&gnome-minor-version; is as easy as removing the edits
   from the pre-installation page and issuing the following command (you may
   need to become the <systemitem class='username'>root</systemitem>
   user):</para>
 
-<screen role="root"><userinput>rm -rf /opt/gnome-&gnome-version;&gnome-minor-version;</userinput></screen>
+<screen role="root"><userinput>rm -rf /opt/gnome-&gnome-old-version;&gnome-minor-version;</userinput></screen>
 
   <para>If your system was completely built per LFS and BLFS instructions,
   you have a very good chance of using
-  GNOME-&gnome-version;&gnome-minor-version; after your first installation. If
+  GNOME-&gnome-old-version;&gnome-minor-version; after your first installation. If
   you are a typical LFS user, you have made modifications to the instructions
   along the way knowing that you have to take those modifications into account
   on future installations. You should have no problems integrating
-  GNOME-&gnome-version;&gnome-minor-version; into your unique setup, but you
+  GNOME-&gnome-old-version;&gnome-minor-version; into your unique setup, but you
   will have to install well over 50 packages before you can run GNOME through
   any testing (assuming your windowing system is preinstalled and tested). You
@@ -98,5 +98,5 @@
   <filename class='directory'>/var</filename>. You should consider using
   the GNOME 1.4 hint located at <ulink url="&hints-root;"/> if you have no
-  interest in GNOME-&gnome-version;&gnome-minor-version;.</para> -->
+  interest in GNOME-&gnome-old-version;&gnome-minor-version;.</para> -->
 
   <bridgehead renderas="sect3">Alternate Installation Methods</bridgehead>
@@ -104,8 +104,8 @@
   significant project. Some may find it too tedious or time-consuming to perform
   a full installation following the BLFS book. You may wish to review the
-  automated methods mentioned in the GNOME-&gnome-version; <ulink
-  url="http://www.gnome.org/start/&gnome-version;/notes/en/rninstallation.html">Release
+  automated methods mentioned in the GNOME-&gnome-old-version; <ulink
+  url="http://www.gnome.org/start/&gnome-old-version;/notes/en/rninstallation.html">Release
   Notes</ulink>. Note that using any other method to install
-  GNOME-&gnome-version;&gnome-minor-version; other than using the BLFS
+  GNOME-&gnome-old-version;&gnome-minor-version; other than using the BLFS
   instructions cannot be supported by the BLFS team. Alternate methods are only
   mentioned as a courtesy to builders who would like to build GNOME from sources
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ introduction/welcome/changelog.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -42,4 +42,14 @@
 -->
     <listitem>
+      <para>August 15th, 2010</para>
+      <itemizedlist>
+        <listitem>
+          <para>[wblaszcz] - GNOME update prep. (Changed gnome-version to
+          gnome-old-version)</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>August 14th, 2010</para>
       <itemizedlist>
Index: x/lib/libwnck.xml
===================================================================
--- x/lib/libwnck.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ x/lib/libwnck.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY libwnck-download-http "&gnome-download-http;/libwnck/&gnome-version;/libwnck-&libwnck-version;.tar.bz2">
-  <!ENTITY libwnck-download-ftp  "&gnome-download-ftp;/libwnck/&gnome-version;/libwnck-&libwnck-version;.tar.bz2">
+  <!ENTITY libwnck-download-http "&gnome-download-http;/libwnck/&gnome-old-version;/libwnck-&libwnck-version;.tar.bz2">
+  <!ENTITY libwnck-download-ftp  "&gnome-download-ftp;/libwnck/&gnome-old-version;/libwnck-&libwnck-version;.tar.bz2">
   <!ENTITY libwnck-md5sum        "a9311661aa954e7c918439b6dd578792">
   <!ENTITY libwnck-size          "696 KB">
Index: x/wm/metacity.xml
===================================================================
--- x/wm/metacity.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ x/wm/metacity.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY metacity-download-http "&gnome-download-http;/metacity/&gnome-version;/metacity-&metacity-version;.tar.bz2">
-  <!ENTITY metacity-download-ftp  "&gnome-download-ftp;/metacity/&gnome-version;/metacity-&metacity-version;.tar.bz2">
+  <!ENTITY metacity-download-http "&gnome-download-http;/metacity/&gnome-old-version;/metacity-&metacity-version;.tar.bz2">
+  <!ENTITY metacity-download-ftp  "&gnome-download-ftp;/metacity/&gnome-old-version;/metacity-&metacity-version;.tar.bz2">
   <!ENTITY metacity-md5sum        "9d87e390cf9979978f2290aebc41f83b">
   <!ENTITY metacity-size          "2.2 MB">
Index: xsoft/office/evolution.xml
===================================================================
--- xsoft/office/evolution.xml	(revision fa050c09ea318f85510459865da51175e35200e0)
+++ xsoft/office/evolution.xml	(revision 35fd944b5310deaf8509bc3d90dc17fd5744fe55)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY evolution-download-http "&gnome-download-http;/evolution/&gnome-version;/evolution-&evolution-version;.tar.bz2">
-  <!ENTITY evolution-download-ftp  "&gnome-download-ftp;/evolution/&gnome-version;/evolution-&evolution-version;.tar.bz2">
+  <!ENTITY evolution-download-http "&gnome-download-http;/evolution/&gnome-old-version;/evolution-&evolution-version;.tar.bz2">
+  <!ENTITY evolution-download-ftp  "&gnome-download-ftp;/evolution/&gnome-old-version;/evolution-&evolution-version;.tar.bz2">
   <!ENTITY evolution-md5sum        "2af2e699cd8a46b8f7b9baec3184f685">
   <!ENTITY evolution-size          "28 MB">
