Index: general.ent
===================================================================
--- general.ent	(revision ba2ac602af7c02b28d50c8b07cc650c4e6373831)
+++ general.ent	(revision 2d006066adaa3b50c615fc6d14d1d57eb98283e3)
@@ -383,9 +383,9 @@
 <!-- Chapter 25 -->
 <!ENTITY xfree86-version              "4.6.0">
-<!ENTITY xorg7-version                "7.1">
+<!ENTITY xorg7-version                "7.2">
 <!ENTITY luit-version                 "1.0.2">
 <!ENTITY xkeyboard-config-version     "0.9">
 <!ENTITY xbitmaps-version             "1.0.1">
-<!ENTITY xorg-server-version          "1.1.1">
+<!ENTITY xorg-server-version          "1.2.0">
 <!ENTITY libdrm-version               "2.3.0">
 <!ENTITY mesalib-version              "6.5.2">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision ba2ac602af7c02b28d50c8b07cc650c4e6373831)
+++ introduction/welcome/changelog.xml	(revision 2d006066adaa3b50c615fc6d14d1d57eb98283e3)
@@ -55,4 +55,7 @@
           <para>[dnicholson] - Updated to MesaLib-6.5.2.</para>
         </listitem>
+        <listitem>
+          <para>[dnicholson] - Updated to Xorg-7.2.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
Index: x/installing/x7app.xml
===================================================================
--- x/installing/x7app.xml	(revision ba2ac602af7c02b28d50c8b07cc650c4e6373831)
+++ x/installing/x7app.xml	(revision 2d006066adaa3b50c615fc6d14d1d57eb98283e3)
@@ -8,5 +8,5 @@
   <!ENTITY x7apps-download-ftp  "ftp://ftp.x.org/pub/individual/app/">
   <!ENTITY x7apps-md5sum        "&files-anduin;/xorg/md5sums-&xorg7-version;">
-  <!ENTITY x7apps-size          "9.1 MB">
+  <!ENTITY x7apps-size          "9.0 MB">
   <!ENTITY x7apps-buildsize     "30.7 MB">
   <!ENTITY x7apps-time          "2.9 SBU">
@@ -102,5 +102,8 @@
     <title>Installation of Xorg Applications</title>
 
-    <para>A <ulink url='http://wiki.x.org/wiki/SecurityPage'>security
+    <warning><para>The <application>mkcfm</application> package is
+    deprecated and should not be installed.</para></warning>
+
+    <para>A <ulink url='http://wiki.x.org/wiki/Development/Security'>security
     vulnerability</ulink> has been identified in the xload package.
     Before building this package with the commands
Index: x/installing/x7data.xml
===================================================================
--- x/installing/x7data.xml	(revision ba2ac602af7c02b28d50c8b07cc650c4e6373831)
+++ x/installing/x7data.xml	(revision 2d006066adaa3b50c615fc6d14d1d57eb98283e3)
@@ -8,5 +8,5 @@
   <!ENTITY x7data-download-ftp  "ftp://ftp.x.org/pub/individual/data/">
   <!ENTITY x7data-md5sum        "&files-anduin;/xorg/md5sums-&xorg7-version;">
-  <!ENTITY x7data-size          "2.5 MB">
+  <!ENTITY x7data-size          "2.4 MB">
   <!ENTITY x7data-buildsize     "19.5 MB">
   <!ENTITY x7data-time          "0.1 SBU">
Index: x/installing/x7driver.xml
===================================================================
--- x/installing/x7driver.xml	(revision ba2ac602af7c02b28d50c8b07cc650c4e6373831)
+++ x/installing/x7driver.xml	(revision 2d006066adaa3b50c615fc6d14d1d57eb98283e3)
@@ -8,5 +8,5 @@
   <!ENTITY x7drivers-download-ftp  "ftp://ftp.x.org/pub/individual/driver/">
   <!ENTITY x7drivers-md5sum        "&files-anduin;/xorg/md5sums-&xorg7-version;">
-  <!ENTITY x7drivers-size          "18.7 MB">
+  <!ENTITY x7drivers-size          "18.3 MB">
   <!ENTITY x7drivers-buildsize     "60.3 MB">
   <!ENTITY x7drivers-time          "6.9 SBU">
Index: x/installing/x7font.xml
===================================================================
--- x/installing/x7font.xml	(revision ba2ac602af7c02b28d50c8b07cc650c4e6373831)
+++ x/installing/x7font.xml	(revision 2d006066adaa3b50c615fc6d14d1d57eb98283e3)
@@ -8,5 +8,5 @@
   <!ENTITY x7fonts-download-ftp  "ftp://ftp.x.org/pub/individual/font/">
   <!ENTITY x7fonts-md5sum        "&files-anduin;/xorg/md5sums-&xorg7-version;">
-  <!ENTITY x7fonts-size          "13.3 MB">
+  <!ENTITY x7fonts-size          "13.0 MB">
   <!ENTITY x7fonts-buildsize     "100 MB">
   <!ENTITY x7fonts-time          "2.0 SBU">
Index: x/installing/x7lib.xml
===================================================================
--- x/installing/x7lib.xml	(revision ba2ac602af7c02b28d50c8b07cc650c4e6373831)
+++ x/installing/x7lib.xml	(revision 2d006066adaa3b50c615fc6d14d1d57eb98283e3)
@@ -8,5 +8,5 @@
   <!ENTITY x7libs-download-ftp  "ftp://ftp.x.org/pub/individual/lib/">
   <!ENTITY x7libs-md5sum        "&files-anduin;/xorg/md5sums-&xorg7-version;">
-  <!ENTITY x7libs-size          "12 MB">
+  <!ENTITY x7libs-size          "11.7 MB">
   <!ENTITY x7libs-buildsize     "186 MB">
   <!ENTITY x7libs-time          "6.6 SBU">
@@ -56,11 +56,15 @@
     </itemizedlist>
 
-    <!-- Following patch is security related and has been
-        fixed for Xorg-7.2 -->
+    <!-- Following patches are security related and should be
+        fixed for Xorg-7.3 -->
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
         <para>Required patch: <ulink
-        url="&patch-root;/libXfont-1.1.0-cidfonts-1.patch"/></para>
+        url="&patch-root;/libX11-1.1.1-xinitimage-1.patch"/></para>
+      </listitem>
+      <listitem>
+        <para>Required patch: <ulink
+        url="&patch-root;/libXfont-1.2.7-bdf_fontsdir-1.patch"/></para>
       </listitem>
     </itemizedlist>
@@ -74,4 +78,8 @@
     <xref linkend="xorg7-proto"/></para>
 
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><ulink
+    url="http://xcb.freedesktop.org/wiki/">XCB</ulink></para>
+
     <para condition="html" role="usernotes">User Notes:
     <ulink url='&blfs-wiki;/Xorg7Libraries'/></para>
@@ -96,15 +104,22 @@
     <title>Installation of Xorg Libraries</title>
 
-    <para><ulink url='http://wiki.x.org/wiki/SecurityPage'>Security
-    vulnerabilities</ulink> have been identified in the libXfont package.
-    Before building this package with the commands shown below, be sure
-    to apply the supplied patch by issuing the following command:</para>
-
-<screen><userinput>patch -Np1 -i ../libXfont-1.1.0-cidfonts-1.patch</userinput></screen>
+    <para><ulink url='http://wiki.x.org/wiki/Development/Security'>Security
+    vulnerabilities</ulink> have been identified in the
+    <application>libX11</application> and <application>libXfont</application>
+    packages. Before building these packages with the commands shown below,
+    be sure to apply the supplied patches. For <application>libX11</application>,
+    this can be done by issuing the following command:</para>
+
+<screen><userinput>patch -Np1 -i ../libX11-1.1.1-xinitimage-1.patch</userinput></screen>
+
+    <para>For <application>libXfont</application>, the patch can be applied
+    with the following command:</para>
+
+<screen><userinput>patch -Np1 -i ../libXfont-1.2.7-bdf_fontsdir-1.patch</userinput></screen>
 
     <para>Install the libraries by running the following commands for each
     of the chosen packages:</para>
 
-<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
+<screen><userinput>./configure $XORG_CONFIG --without-xcb &amp;&amp;
 make</userinput></screen>
 
@@ -116,4 +131,14 @@
 <screen role="root"><userinput>make install &amp;&amp;
 ldconfig</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><parameter>--without-xcb</parameter>: <application>libX11</application>
+    will try to use <ulink url="http://xcb.freedesktop.org/wiki/">XCB</ulink>
+    for it's transport layer unless this parameter is supplied. This parameter
+    will be ignored for other packages.</para>
 
   </sect2>
Index: x/installing/x7proto.xml
===================================================================
--- x/installing/x7proto.xml	(revision ba2ac602af7c02b28d50c8b07cc650c4e6373831)
+++ x/installing/x7proto.xml	(revision 2d006066adaa3b50c615fc6d14d1d57eb98283e3)
@@ -8,5 +8,5 @@
   <!ENTITY x7proto-download-ftp  "ftp://ftp.x.org/pub/individual/proto/">
   <!ENTITY x7proto-md5sum        "&files-anduin;/xorg/md5sums-&xorg7-version;">
-  <!ENTITY x7proto-size          "1.5 MB">
+  <!ENTITY x7proto-size          "1.4 MB">
 <!-- Editors note:  Because we recommend a scripted build that removes
      the source directories after installation, the xorg buildsizes are
Index: x/installing/x7server.xml
===================================================================
--- x/installing/x7server.xml	(revision ba2ac602af7c02b28d50c8b07cc650c4e6373831)
+++ x/installing/x7server.xml	(revision 2d006066adaa3b50c615fc6d14d1d57eb98283e3)
@@ -7,8 +7,8 @@
   <!ENTITY xorg-server-download-http "http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-&xorg-server-version;.tar.bz2">
   <!ENTITY xorg-server-download-ftp  "ftp://ftp.x.org/pub/individual/xserver/xorg-server-&xorg-server-version;.tar.bz2">
-  <!ENTITY xorg-server-md5sum        "a8ed678677af8ebb2fba5624602f6b2e">
-  <!ENTITY xorg-server-size          "6.0 MB">
-  <!ENTITY xorg-server-buildsize     "424 MB">
-  <!ENTITY xorg-server-time          "5.6 SBU">
+  <!ENTITY xorg-server-md5sum        "ea291c89e68832d570d9d5e007218bd6">
+  <!ENTITY xorg-server-size          "5.7 MB">
+  <!ENTITY xorg-server-buildsize     "425 MB">
+  <!ENTITY xorg-server-time          "4.9 SBU">
 
 ]>
@@ -57,10 +57,10 @@
 
     <!-- Following patch is security related and should be
-        fixed for Xorg-7.2 -->
+        fixed for Xorg-7.3 -->
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
         <para>Required patch: <ulink
-        url="&patch-root;/xorg-server-&xorg-server-version;-security-1.patch"/></para>
+        url="&patch-root;/xorg-server-&xorg-server-version;-xcmisc-1.patch"/></para>
       </listitem>
     </itemizedlist>
@@ -73,6 +73,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="mesalib"/> and
-    <xref linkend="luit"/></para>
+    <para role="optional"><xref linkend="mesalib"/></para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -91,21 +90,15 @@
     </note>
 
-    <para>A <ulink url='http://wiki.x.org/wiki/SecurityPage'>security
+    <para>A <ulink url='http://wiki.x.org/wiki/Development/Security'>security
     vulnerability</ulink> have been identified in the xorg-server
     package. Apply a patch to fix this vulnerability with the following
     command:</para>
 
-<screen><userinput>patch -Np1 -i ../xorg-server-&xorg-server-version;-security-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../xorg-server-&xorg-server-version;-xcmisc-1.patch</userinput></screen>
 
     <para>Install the server by running the following commands:</para>
 
-<screen><userinput>sed -i \
-    's@-I$(top_builddir)/include@-I$(top_builddir)/GL/mesa/main@8' \
-    GL/glx/Makefile.in &amp;&amp;
-sed -i \
-    's@-I$(top_builddir)/include@-I$(top_builddir)/GL/mesa/glapi@7' \
-    GL/glx/Makefile.in &amp;&amp;
-./configure $XORG_CONFIG \
-    --with-mesa-source='<replaceable>&lt;/path/to&gt;</replaceable>/Mesa-&mesalib-version;' \
+<screen><userinput>./configure $XORG_CONFIG \
+    --with-mesa-source='<replaceable>&lt;/full/path/to&gt;</replaceable>/Mesa-&mesalib-version;' \
     --with-module-dir=$XORG_PREFIX/lib/X11/modules \
     --with-dri-driver-path=$XORG_PREFIX/lib/X11/modules/dri \
@@ -125,13 +118,8 @@
     <title>Command Explanations</title>
 
-    <para><command>sed -i '...' GL/glx/Makefile.in</command>: These commands
-    correct the search path for the <application>Mesa</application> headers.
-    The 8th and 7th instance of '-I$(top_builddir)' in the existing search
-    search path are replaced with <application>Mesa</application> paths.</para>
-
     <para><parameter>--with-mesa-source=...</parameter>: This switch directs
     the build system to the location of the <application>Mesa</application>
-    source directory.  If you wish to build without
-    <application>Mesa</application>, omit this switch.</para>
+    source directory.  This must be an absolute path. If you wish to build
+    without <application>Mesa</application>, omit this switch.</para>
 
     <para><parameter>--with-module-dir=...</parameter>:  This parameter
Index: x/installing/x7util.xml
===================================================================
--- x/installing/x7util.xml	(revision ba2ac602af7c02b28d50c8b07cc650c4e6373831)
+++ x/installing/x7util.xml	(revision 2d006066adaa3b50c615fc6d14d1d57eb98283e3)
@@ -8,5 +8,5 @@
   <!ENTITY x7utils-download-ftp  "ftp://ftp.x.org/pub/individual/util/">
   <!ENTITY x7utils-md5sum        "&files-anduin;/xorg/md5sums-&xorg7-version;">
-  <!ENTITY x7utils-size          "664 KB">
+  <!ENTITY x7utils-size          "659 KB">
   <!ENTITY x7utils-buildsize     "5.2 MB">
   <!ENTITY x7utils-time          "0.1 SBU">
Index: x/installing/xbitmaps.xml
===================================================================
--- x/installing/xbitmaps.xml	(revision ba2ac602af7c02b28d50c8b07cc650c4e6373831)
+++ x/installing/xbitmaps.xml	(revision 2d006066adaa3b50c615fc6d14d1d57eb98283e3)
@@ -8,7 +8,7 @@
   <!ENTITY xbitmaps-download-ftp  "ftp://ftp.x.org/pub/individual/data/xbitmaps-&xbitmaps-version;.tar.bz2">
   <!ENTITY xbitmaps-md5sum        "b28a9840cde3c38d7c09716372fea257">
-  <!ENTITY xbitmaps-size          "56 KB">
+  <!ENTITY xbitmaps-size          "54 KB">
   <!ENTITY xbitmaps-buildsize     "1.7 MB">
-  <!ENTITY xbitmaps-time          "0.01 SBU">
+  <!ENTITY xbitmaps-time          "less than 0.1 SBU">
 
 ]>
