Index: general.ent
===================================================================
--- general.ent	(revision d9dc1e9d1d8ea488736d65463b1e69341cbb5c21)
+++ general.ent	(revision e2571012ff77f6ffa30681f9b37dffdd075dbe16)
@@ -1,3 +1,3 @@
-<!ENTITY day          "09">                   <!-- Always 2 digits -->
+<!ENTITY day          "10">                   <!-- Always 2 digits -->
 <!ENTITY month        "05">                   <!-- Always 2 digits -->
 <!ENTITY year         "2006">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision d9dc1e9d1d8ea488736d65463b1e69341cbb5c21)
+++ introduction/welcome/changelog.xml	(revision e2571012ff77f6ffa30681f9b37dffdd075dbe16)
@@ -42,4 +42,19 @@
 -->
 
+
+   <listitem>
+      <para>May 9th, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Added sed for additional xorg-6.9.0 security
+          vulnerability.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Udated dependencies for Xorg-7.0.0 section and 
+          corrected text.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>May 9th, 2006</para>
Index: x/installing/x-setup.xml
===================================================================
--- x/installing/x-setup.xml	(revision d9dc1e9d1d8ea488736d65463b1e69341cbb5c21)
+++ x/installing/x-setup.xml	(revision e2571012ff77f6ffa30681f9b37dffdd075dbe16)
@@ -140,11 +140,13 @@
 
     <note>
-      <para>The default configuration for <application>Xorg</application> 
-      includes <application>xterm</application>.  
-      <application>Xorg</application>'s modular distribution no longer includes 
+      <para>Both the default, and the BLFS configuration for 
+      <application>Xorg</application> include <application>xterm</application>.
+      <application>Xorg</application>'s modular distribution no longer includes
       <application>xterm</application>, and 
       as a result, the <command>startx</command> command will fail if you have 
       not installed <xref linkend="xterm2"/> when using the modular X Window
-      System.</para>
+      System.  You can remove the <application>xterm</application> line in the 
+      above config file to test the xserver, or install one of the other 
+      terminal emulators and make appropriate changes.</para>
     </note>
 
Index: x/installing/x7app.xml
===================================================================
--- x/installing/x7app.xml	(revision d9dc1e9d1d8ea488736d65463b1e69341cbb5c21)
+++ x/installing/x7app.xml	(revision e2571012ff77f6ffa30681f9b37dffdd075dbe16)
@@ -65,5 +65,6 @@
 
   <bridgehead renderas="sect4">Required</bridgehead>
-  <para role="required"><xref linkend="xbitmaps"/></para>
+  <para role="required"><xref linkend="xbitmaps"/> and
+  <xref linkend="libpng"/></para>
 
   <bridgehead renderas="sect4">Recommended</bridgehead>
@@ -71,5 +72,5 @@
 
   <sect2>
-    <title>Downloading Xorg Applicatons</title>
+    <title>Downloading Xorg Applications</title>
 
     <para>To download the needed files using <application>wget</application>,
Index: x/installing/x7font.xml
===================================================================
--- x/installing/x7font.xml	(revision d9dc1e9d1d8ea488736d65463b1e69341cbb5c21)
+++ x/installing/x7font.xml	(revision e2571012ff77f6ffa30681f9b37dffdd075dbe16)
@@ -62,5 +62,6 @@
 
   <bridgehead renderas="sect4">Required</bridgehead>
-  <para role="required"><xref linkend="xorg7-data"/></para>
+  <para role="required"><xref linkend="xorg7-data"/> and
+  <xref linkend="xorg7-app"/></para>
 
   <sect2>
Index: x/installing/x7lib.xml
===================================================================
--- x/installing/x7lib.xml	(revision d9dc1e9d1d8ea488736d65463b1e69341cbb5c21)
+++ x/installing/x7lib.xml	(revision e2571012ff77f6ffa30681f9b37dffdd075dbe16)
@@ -66,5 +66,4 @@
   <para role="required"><xref linkend="ed"/>,
   <xref linkend="fontconfig"/>,
-  <xref linkend="libpng"/>,
   <xref linkend="pkgconfig"/>, and
   <xref linkend="xorg7-proto"/></para>
Index: x/installing/x7server.xml
===================================================================
--- x/installing/x7server.xml	(revision d9dc1e9d1d8ea488736d65463b1e69341cbb5c21)
+++ x/installing/x7server.xml	(revision e2571012ff77f6ffa30681f9b37dffdd075dbe16)
@@ -115,4 +115,16 @@
     setuid when the build is done by an unprivileged user.</para>
 
+    <para><parameter>--disable-glx</parameter>: Disable building of the GLX
+    extension.  This is required if building without 
+    <application>Mesa</application>.</para>
+
+    <para><parameter>--disable-dri</parameter>: Disable building of the DRI
+    extension.  This is required if building without
+    <application>Mesa</application>.</para>
+
+    <para><parameter>--disable-xprint</parameter>: Disable building of
+    the <application>Xprint</application>  extension and server.  This is 
+    required if building without <application>Mesa</application>.</para>
+
   </sect2>
 
Index: x/installing/x7util.xml
===================================================================
--- x/installing/x7util.xml	(revision d9dc1e9d1d8ea488736d65463b1e69341cbb5c21)
+++ x/installing/x7util.xml	(revision e2571012ff77f6ffa30681f9b37dffdd075dbe16)
@@ -67,5 +67,6 @@
 
   <bridgehead renderas="sect4">Required</bridgehead>
-  <para role="required"><xref linkend="pkgconfig"/></para>
+  <para role="required"><xref linkend="pkgconfig"/> and
+  <xref linkend="xorg7-proto"/></para>
 
   <sect2>
Index: x/installing/xorg.xml
===================================================================
--- x/installing/xorg.xml	(revision d9dc1e9d1d8ea488736d65463b1e69341cbb5c21)
+++ x/installing/xorg.xml	(revision e2571012ff77f6ffa30681f9b37dffdd075dbe16)
@@ -203,11 +203,12 @@
       order to avoid a race condition with the <application>luit</application>
       program.  Additionally, the server portion of
-      <application>Xorg</application> contains a <ulink
-      url="http://wiki.x.org/wiki/SecurityPage">security vulnerability</ulink>.
+      <application>Xorg</application> contains 2   
+      <ulink url="http://wiki.x.org/wiki/SecurityPage">security vulnerabilities</ulink>.
       Fix these issues with the following commands:</para>
 
 <screen><userinput>patch -Np1 -i ../xorg-&xorg-version;-luit_race-1.patch &amp;&amp;
 sed -i 's/geteuid /geteuid() /' \
-    programs/Xserver/hw/xfree86/common/xf86Init.c</userinput></screen>
+    programs/Xserver/hw/xfree86/common/xf86Init.c &amp;&amp;
+sed -i 's/ntri &amp; sizeof/ntri * sizeof/' programs/Xserver/render/mitri.c</userinput></screen>
 
 <!-- To be removed if/when proposed glibc patch is added to LFS SVN
Index: x/installing/xorg7.xml
===================================================================
--- x/installing/xorg7.xml	(revision d9dc1e9d1d8ea488736d65463b1e69341cbb5c21)
+++ x/installing/xorg7.xml	(revision e2571012ff77f6ffa30681f9b37dffdd075dbe16)
@@ -42,5 +42,5 @@
   Instructions</bridgehead>
 
-  <para>Xorg-7.0.0 introduced a completly auto-tooled, modular build system.
+  <para>Xorg-7.0.0 introduced a completely auto-tooled, modular build system.
   The code is otherwise identical to that in the Xorg-6.9.0 release.
   With the new modular build system, it is no longer possible to download
@@ -64,5 +64,5 @@
     should download the wget file lists and use the package versions in the
     file.  Newer packages are likely intended for the next release of
-    <application>Xorg</application> and have already proven to be
+    <application>Xorg</application> and have already proved to be
     incompatible with the current version of
     <application>GTK+</application>.  The installed size of 
