Index: x/installing/xorg7.xml
===================================================================
--- x/installing/xorg7.xml	(revision 2eb3bfa59255bba6d1ef48ef5ed25ef2d4d90506)
+++ x/installing/xorg7.xml	(revision a413a013636ff0ba904b5b2c16f7bbc3b981735a)
@@ -162,5 +162,5 @@
       <para><application>Xorg</application> Proto packages can be downloaded
       individually from <ulink
-      url="http://xorg.freedesktop.org/releases/X11R7.0/src/proto/"/>.</para>
+      url="http://xorg.freedesktop.org/releases/individual/proto/"/>.</para>
 
     <sect3 role="installation">
@@ -195,5 +195,5 @@
       <para><application>Xorg</application> Utility packages can be downloaded
       individually from <ulink
-      url="http://xorg.freedesktop.org/releases/X11R7.0/src/util/"/>.</para>
+      url="http://xorg.freedesktop.org/releases/individual/util/"/>.</para>
 
     <sect3 role="installation">
@@ -253,5 +253,5 @@
       <para><application>Xorg</application> Library packages can be downloaded
       individually from <ulink
-      url="http://xorg.freedesktop.org/releases/X11R7.0/src/lib/"/>.</para>
+      url="http://xorg.freedesktop.org/releases/individual/lib/"/>.</para>
 
     <sect3>
@@ -261,21 +261,21 @@
       to cover the dependencies of the other library packages:</para>
 
-<screen>xtrans-X11R7.0-1.0.0.tar.bz2
-libXau-X11R7.0-1.0.0.tar.bz2
-libXdmcp-X11R7.0-1.0.0.tar.bz2
-libX11-X11R7.0-1.0.0.tar.bz2
-libXext-X11R7.0-1.0.0.tar.bz2
-libICE-X11R7.0-1.0.0.tar.bz2
-libSM-X11R7.0-1.0.0.tar.bz2
-libXt-X11R7.0-1.0.0.tar.bz2
-libXmu-X11R7.0-1.0.0.tar.bz2
-libXpm-X11R7.0-3.5.4.2.tar.bz2
-libXp-X11R7.0-1.0.0.tar.bz2
-libXfixes-X11R7.0-3.0.1.2.tar.bz2
-libXrender-X11R7.0-0.9.0.2.tar.bz2
-libfontenc-X11R7.0-1.0.1.tar.bz2
-libxkbfile-X11R7.0-1.0.1.tar.bz2
-libXprintUtil-X11R7.0-1.0.1.tar.bz2
-libXv-X11R7.0-1.0.1.tar.bz2</screen>
+<screen>xtrans-1.0.0
+libXau-1.0.0
+libXdmcp-1.0.0
+libX11-1.0.0
+libXext-1.0.0
+libICE-1.0.0
+libSM-1.0.0
+libXt-1.0.0
+libXmu-1.0.0
+libXpm-3.5.4.2
+libXp-1.0.0
+libXfixes-3.0.1.2
+libXrender-0.9.0.2
+libfontenc-1.0.1
+libxkbfile-1.0.2
+libXprintUtil-1.0.1
+libXv-1.0.1</screen>
 
     </sect3>
@@ -332,5 +332,5 @@
       <para><application>Xorg</application> Data packages can be downloaded
       individually from <ulink
-      url="http://xorg.freedesktop.org/releases/X11R7.0/src/data/"/>.</para>
+      url="http://xorg.freedesktop.org/releases/individual/data/"/>.</para>
 
     <sect3 role="installation">
@@ -377,5 +377,5 @@
       <para><application>Xorg</application> applications can be downloaded
       individually from <ulink
-      url="http://xorg.freedesktop.org/releases/X11R7.0/src/app/"/>.</para>
+      url="http://xorg.freedesktop.org/releases/individual/app/"/>.</para>
 
     <sect3 role="installation">
@@ -442,5 +442,5 @@
       <para><application>Xorg</application> Font packages can be downloaded
       individually from <ulink
-      url="http://xorg.freedesktop.org/releases/X11R7.0/src/font/"/>.</para>
+      url="http://xorg.freedesktop.org/releases/individual/font/"/>.</para>
 
     <sect3 role="installation">
@@ -482,5 +482,5 @@
 
       <para>The Xorg Server is a single download.  Get it from
-      <ulink url="http://xorg.freedesktop.org/releases/X11R7.0/src/xserver/xorg-server-X11R7.0-1.0.1.tar.bz2"/>.</para>
+      <ulink url="http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-X11R7.0-1.0.2.tar.bz2"/>.</para>
 
     <sect3 role="installation">
@@ -495,10 +495,7 @@
       <para>Install the server by running the following commands:</para>
 
-<screen><userinput>sed -i "s@*/@*/\n#include &lt;linux/types.h&gt;\n@" \
-    hw/xfree86/os-support/linux/lnx_agp.c &amp;&amp;
-./configure --prefix=$XORG_PREFIX --sysconfdir=/etc \
-    --localstatedir=/var \
+<screen><userinput>./configure $XORG_CONFIG \
     --with-mesa-source='../../Mesa-&mesalib-version;' \
-    --with-fontdir=/usr/share/fonts \
+    --with-fontdir=$XORG_PREFIX/lib/X11/fonts \
     --with-module-dir=$XORG_PREFIX/lib/X11/modules &amp;&amp;
 make</userinput></screen>
@@ -525,5 +522,5 @@
       <para><application>Xorg</application> Driver packages can be downloaded
       individually from <ulink
-      url="http://xorg.freedesktop.org/releases/X11R7.0/src/driver/"/>.</para>
+      url="http://xorg.freedesktop.org/releases/individual/driver/"/>.</para>
 
     <sect3 role="installation">
