Index: gnome/gnome-intro.xml
===================================================================
--- gnome/gnome-intro.xml	(revision 26a12b5636711db8bf6acd94c09a590c7bd5474e)
+++ gnome/gnome-intro.xml	(revision 5407cf76c487586a43a7275a9e8811f6a7a90dcf)
@@ -2,52 +2,41 @@
 <title>Introduction to Gnome</title>
 
-<para>This chapter attempts to install a complete Gnome-2.2 desktop
+<para>This chapter attempts to install a complete Gnome-&gnome-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 are meant to follow the build order defined by the
-Gnome2 development team as published in the <ulink url="http://www.gnome.org/start/2.2/notes/rninstallation.html">release notes</ulink>.  If a package is in the release notes build list, but not in this chapter, it has been installed elsewhere in the book.</para>
+Gnome development team as published in the <ulink url="http://www.gnome.org/start/&gnome-version;/notes/rninstallation.html">release notes</ulink>.  If a package is in the release notes build list, but not in this chapter, it has been installed elsewhere in the book.</para>
 
-<para>The installation of Gnome-2.2 is a large undertaking and one we would
-very much like to see you complete with the least amount of stress. One
+<para>The installation of Gnome-&gnome-version; is a large undertaking and one we would
+like to see you complete with the least amount of stress. One
 of our first goals in this installation is to protect your previously
-installed software.  For absolute protection, we would construct a
-chroot jail for the installation, but since Gnome-2.2 packages utilize the
---prefix= option for configure, we will use that to fulfill our goal.
-There are two locations usable for our purposes,
-<filename>/usr/local</filename> and <filename>/opt/package</filename>.
-Since <filename>/usr/local</filename> is not utilized any where in the
-BLFS book, installation there would closely parallel a Gnome-2.2
-installation using --prefix=/usr.  However, it is not
-entirely safe for us to assume that your installation does not have any
-files in <filename>/usr/local</filename>.  Therefore we are going to
-install with --prefix=/opt/gnome2.  This will require additional edits
-which are covered on the pre-installation page.  Removal of Gnome-2.2 for
-any reason is as easy as removing the edits from the pre-installation
-page and issue the following commands:
-<screen><userinput>rm /opt/gnome-2.2 -r &amp;&amp;
-rm /etc/gnome -r</userinput></screen></para>
+installed software, especially if you are testing Gnome on your machine.
+Gnome-&gnome-version; packages utilize the --prefix= option for configure, so we will
+use that and an Environment variable (GNOME_PREFIX) to add flexibility to 
+the install.</para>
 
-<para>If your system was completely built per LFS 4.0 and BLFS
-instructions, you have a very good chance of using Gnome-2.2
+<para>If you know that you want Gnome as your desktop, it is recommended that
+you install with --prefix=/usr. If you are not sure that you are going
+to keep Gnome on your installation, it is recommended that you install with 
+--prefix=/opt/gnome-&gnome-version;.  Setting the Environment variable and the
+additional edits required by the second option are covered on the
+pre-installation page.</para>
+
+<para>If you choose the second option, removal of Gnome-2.2 is as easy as removing the edits from the pre-installation page and issue the following commands:
+<screen><userinput>rm /opt/gnome-&gnome-version; -r </userinput></screen></para>
+
+<para>If your system was completely built per LFS and BLFS
+instructions, you have a very good chance of using Gnome-&gnome-version;
 after your first install.  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-2.2 into your unique setup, but
+should have no problems integrating Gnome-&gnome-version; into your unique setup, but
 you will have 28 to 33 packages installed before you can run Gnome
 through any testing (assuming your window manager is preinstalled and
 tested). We would anticipate that you will be rebuilding gnome at least
-once to make adjustments for your setup. If this is the only chapter you
-are utilizing from the BLFS book, we think you should be successful by
-following these instructions, but you may find problems along the way
-that we may or may not be able to help you though on the blfs-support mailing
-list.</para>
-
-<para>If you don't need the Gnome 1.4 library environment, you may skip
-pages that are headed (Gnome 1.4).</para>
+once to make adjustments for your setup.</para>
 
 <para>If you are building a Gnome 1.4 desktop environment, you would
-install those labeled pages <emphasis>and</emphasis> any dependancies
-listed on those pages whether labeled or not. Gnome packages without
-pages are simply installed with:
+install only those libraries in the Gnome 1.4 chapter <emphasis>and</emphasis> any dependancies listed on those pages whether labeled or not. Gnome packages without pages are simply installed with:
 <screen><userinput>./configure --prefix=/opt/gnome &amp;&amp;
 make &amp;&amp;
@@ -60,9 +49,14 @@
 <filename>/var</filename>.  You should consider using the Gnome 1.4 hint
 located at <ulink url="http://hints.linuxfromscratch.org/hints"/> if you
-have no interest in Gnome-2.2.</para>
+have no interest in Gnome-&gnome-version;.</para>
 
-<para>At this time, we feel that Gnome-2.2 should be left in <filename>/opt/gnome2</filename>, but you can easily adjust the --prefix= option to your
-chosen destination. This will be covered on the pre-installation
-page.</para>
+<para><screen>Gnome-&gnome-version; requires:
+<xref linkend="xfree86"/>, Xft, fontconfig, <xref linkend="GTK2"/>,
+<xref linkend="libpng"/>, <xref linkend="libjpeg"/>, 
+<xref linkend="libtiff"/>, <xref linkend="popt"/>
+Gnome-&gnome-version; will utilize:
+<xref linkend="libxml2"/>, <xref linkend="libxslt"/>, 
+<xref linkend="DocBook"/>, <xref linkend="docbook-xsl"/> and 
+<xref linkend="libfam"/></screen></para>
 
 </partintro>
