Index: gnome/core/panel/gnome-panel-exp.xml
===================================================================
--- gnome/core/panel/gnome-panel-exp.xml	(revision 1c931a156e59673f50232f3f36ab967a6ace1576)
+++ gnome/core/panel/gnome-panel-exp.xml	(revision a513a179f79820f374d446a845bf77d1cd2511c8)
@@ -14,4 +14,7 @@
 <filename>$GNOME_PREFIX/etc</filename>.</para>
 
+<para><userinput>--disable-gtk-doc</userinput> : This switch prevents
+the rebuilding of documentation during the make command.</para>
+
 </sect2>
 
Index: gnome/core/panel/gnome-panel-inst.xml
===================================================================
--- gnome/core/panel/gnome-panel-inst.xml	(revision 1c931a156e59673f50232f3f36ab967a6ace1576)
+++ gnome/core/panel/gnome-panel-inst.xml	(revision a513a179f79820f374d446a845bf77d1cd2511c8)
@@ -5,5 +5,5 @@
 
 <para><screen><userinput>./configure --prefix=$GNOME_PREFIX --libexecdir=$GNOME_PREFIX/sbin \
---localstatedir=/var/lib --sysconfdir=/etc/gnome &amp;&amp;
+--localstatedir=/var/lib --sysconfdir=/etc/gnome --disable-gtk-doc &amp;&amp;
 make &amp;&amp;
 make install</userinput></screen></para>
Index: gnome/lib/libglade/libglade-intro.xml
===================================================================
--- gnome/lib/libglade/libglade-intro.xml	(revision 1c931a156e59673f50232f3f36ab967a6ace1576)
+++ gnome/lib/libglade/libglade-intro.xml	(revision a513a179f79820f374d446a845bf77d1cd2511c8)
@@ -14,5 +14,5 @@
 <xref linkend="libxml2"/> and <xref linkend="GTK2"/>
 libglade will utilize:
-<xref linkend="Python"/> if compiled utilizing expat, <xref linkend="gtk-doc"/> and <xref linkend="sgml-dtd-3"/>.</screen>
+<xref linkend="Python"/> if compiled utilizing <xref linkend="expat"/>, <xref linkend="gtk-doc"/> and <xref linkend="sgml-dtd-3"/>.</screen>
 
 </sect2>
Index: gnome/lib/librsvg/librsvg-inst.xml
===================================================================
--- gnome/lib/librsvg/librsvg-inst.xml	(revision 1c931a156e59673f50232f3f36ab967a6ace1576)
+++ gnome/lib/librsvg/librsvg-inst.xml	(revision a513a179f79820f374d446a845bf77d1cd2511c8)
@@ -4,5 +4,5 @@
 <para>Install librsvg by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=$GNOME_PREFIX &amp;&amp;
+<para><screen><userinput>./configure --prefix=$GNOME_PREFIX -disable-gtk-doc &amp;&amp;
 make &amp;&amp;
 make install </userinput></screen></para>
Index: gnome/other/gdm/gdm-config.xml
===================================================================
--- gnome/other/gdm/gdm-config.xml	(revision 1c931a156e59673f50232f3f36ab967a6ace1576)
+++ gnome/other/gdm/gdm-config.xml	(revision a513a179f79820f374d446a845bf77d1cd2511c8)
@@ -29,5 +29,5 @@
 
 <para>To automate the running of gdm, use the following command to
-create the init.d script:
+create the init.d script if your GNOME_PREFIX=/opt/gnome-&gnome-version;.  The fully qualified paths can be removed for GNOME_PREFIX=/usr:
 <screen><userinput>cat &gt; /etc/rc.d/init.d/gdm &lt;&lt; "EOF"</userinput>
 #!/bin/bash
@@ -43,5 +43,5 @@
         start)
                 echo "Starting gdm..."
-                loadproc /opt/gnome2/bin/gdm
+                loadproc /opt/gnome-&gnome-version;/bin/gdm
                 ;;
 
@@ -49,5 +49,5 @@
                 echo "Stopping gdm..."
 		if [ -f /var/run/gdm.pid ]; then
-                loadproc /opt/gnome2/sbin/gdm-stop
+                loadproc /opt/gnome-&gnome-version;/sbin/gdm-stop
 		fi
                 ;;
@@ -55,10 +55,10 @@
         reload)
                 echo "Reloading gdm..."
-                reloadproc /opt/gnome2/sbin/gdm-safe-restart
+                reloadproc /opt/gnome-&gnome-version;/sbin/gdm-safe-restart
                 ;;
 
         restart)
                 echo "Restarting gdm..."
-		loadproc /opt/gnome2/sbin/gdm-restart
+		loadproc /opt/gnome-&gnome-version;/sbin/gdm-restart
                 ;;
 
Index: gnome/other/gdm/gdm-intro.xml
===================================================================
--- gnome/other/gdm/gdm-intro.xml	(revision 1c931a156e59673f50232f3f36ab967a6ace1576)
+++ gnome/other/gdm/gdm-intro.xml	(revision a513a179f79820f374d446a845bf77d1cd2511c8)
@@ -12,5 +12,7 @@
 
 <screen>gdm depends on:
-<xref linkend="Linux_PAM"/> and <xref linkend="libgnome"/></screen>
+<xref linkend="Linux_PAM"/>, <xref linkend="librsvg"/>  and <xref linkend="libgnome"/>
+gdm will utilize:
+<xref linkend="tcpwrappers"/></screen>
 
 </sect2>
Index: gnome/other/gdm/gdm.ent
===================================================================
--- gnome/other/gdm/gdm.ent	(revision 1c931a156e59673f50232f3f36ab967a6ace1576)
+++ gnome/other/gdm/gdm.ent	(revision a513a179f79820f374d446a845bf77d1cd2511c8)
@@ -5,7 +5,7 @@
 <!ENTITY gdm-desc SYSTEM "gdm-desc.xml">
 <!ENTITY gdm-config SYSTEM "gdm-config.xml">
-<!ENTITY gdm-buildsize "33.4 MB">
-<!ENTITY gdm-version "2.4.0.12">
-<!ENTITY gdm-download-http "http://ftp.gnome.org/pub/GNOME/sources/gdm/2.4/gdm-2.4.0.12.tar.bz2">
-<!ENTITY gdm-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gdm/2.4/gdm-2.4.0.12.tar.bz2">
+<!ENTITY gdm-buildsize "34.8 MB">
+<!ENTITY gdm-version "2.4.1.3">
+<!ENTITY gdm-download-http "http://ftp.gnome.org/pub/GNOME/sources/gdm/2.4/gdm-2.4.1.3.tar.bz2">
+<!ENTITY gdm-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gdm/2.4/gdm-2.4.1.3.tar.bz2">
 <!ENTITY gdm-size "1.7 MB">
Index: xsoft/graphweb/galeon.xml
===================================================================
--- xsoft/graphweb/galeon.xml	(revision 1c931a156e59673f50232f3f36ab967a6ace1576)
+++ xsoft/graphweb/galeon.xml	(revision a513a179f79820f374d446a845bf77d1cd2511c8)
@@ -5,5 +5,4 @@
 &galeon-intro;
 &galeon-inst;
-&galeon-exp;
 &galeon-config;
 &galeon-desc;
Index: xsoft/graphweb/galeon/galeon-inst.xml
===================================================================
--- xsoft/graphweb/galeon/galeon-inst.xml	(revision 1c931a156e59673f50232f3f36ab967a6ace1576)
+++ xsoft/graphweb/galeon/galeon-inst.xml	(revision a513a179f79820f374d446a845bf77d1cd2511c8)
@@ -5,19 +5,14 @@
 optimization settings that were used on mozilla.</para>
 
-<para>Before installing galeon, you need to download
-<filename>galeon.patch</filename>
-from <ulink url="&ffile-root;"/> and place it into your source
-directory.</para>
-
-
 <para>Install galeon by running the following commands:</para>
 
-<para><screen><userinput>patch -Np0 -i ../galeon.patch &amp;&amp;
-./configure --prefix=/opt/gnome --with-mozilla-snapshot=1.0 \
---with-mozilla-libs=/usr/lib/mozilla \
---with-mozilla-includes=/usr/include/mozilla/ --disable-werror &amp;&amp;
+<para><screen><userinput>./configure --prefix=$GNOME_PREFIX &amp;&amp;
 make &amp;&amp;
 make install</userinput></screen></para>
 
+<warning><para>These instructions do not work yet.  It appears that they may
+work if mozilla is installed with the gtk toolkit installed in addition
+to what we already install.  Galeon tries to link to -lgtksuperwin, but that library isn't built under the gtk2 toolkit, just the gtk toolkit.</para></warning>
+
 </sect2>
 
Index: xsoft/graphweb/galeon/galeon-intro.xml
===================================================================
--- xsoft/graphweb/galeon/galeon-intro.xml	(revision 1c931a156e59673f50232f3f36ab967a6ace1576)
+++ xsoft/graphweb/galeon/galeon-intro.xml	(revision a513a179f79820f374d446a845bf77d1cd2511c8)
@@ -13,9 +13,5 @@
 
 <screen>galeon depends on:
-<xref linkend="gnome-libs"/>, <xref linkend="oaf"/>, <xref
-linkend="GConf1"/>, <xref linkend="gnome-vfs1"/>, <xref
-linkend="libxml"/>, libglade-0.17 (see <xref linkend="libglade"/>)
-<xref linkend="gdk"/>, <xref linkend="intltool"/> and <xref
-linkend="mozilla"/>
+<xref linkend="libgnomeui"/> and <xref linkend="mozilla"/>
 galeon will utilize:
 <ulink url="http://gtm.sourceforge.net">gtm > 0.4.10</ulink></screen>
Index: xsoft/graphweb/galeon/galeon.ent
===================================================================
--- xsoft/graphweb/galeon/galeon.ent	(revision 1c931a156e59673f50232f3f36ab967a6ace1576)
+++ xsoft/graphweb/galeon/galeon.ent	(revision a513a179f79820f374d446a845bf77d1cd2511c8)
@@ -6,6 +6,6 @@
 <!ENTITY galeon-config SYSTEM "galeon-config.xml">
 <!ENTITY galeon-buildsize "19.4 MB">
-<!ENTITY galeon-version "1.2.6">
-<!ENTITY galeon-download-http "http://telia.dl.sourceforge.net/sourceforge/galeon/galeon-1.2.6.tar.gz">
+<!ENTITY galeon-version "1.3.1">
+<!ENTITY galeon-download-http "http://telia.dl.sourceforge.net/sourceforge/galeon/galeon-1.3.1.tar.gz">
 <!ENTITY galeon-download-ftp "">
 <!ENTITY galeon-size "4 MB">
