Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 90d588e628f8cafd48b6de9bdccc3103b22f88f9)
+++ introduction/welcome/changelog.xml	(revision c51ade221a3fed0dec4ed0c83d48911a46d6ecd0)
@@ -46,4 +46,11 @@
       <itemizedlist>
         <listitem>
+          <para>[dnicholson] - Fixes for the X Window System Components page.
+          Add information for setting up DRI correctly. Thanks to Peter
+          Steiger for the alert.  Clarified the relationship between the Xft
+          font system and Fontconfig. Thanks to Archaic for reviewing the
+          previous contents.</para>
+        </listitem>
+        <listitem>
           <para>[dnicholson] - Simplified mv command and fixed the
           explanation of the --enable-xine option in GStreamer Plug-ins.
Index: x/installing/x-setup.xml
===================================================================
--- x/installing/x-setup.xml	(revision 90d588e628f8cafd48b6de9bdccc3103b22f88f9)
+++ x/installing/x-setup.xml	(revision c51ade221a3fed0dec4ed0c83d48911a46d6ecd0)
@@ -18,4 +18,7 @@
     <sect2 role="configuration" id='xconfig'>
     <title>Configuring The X Window System</title>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url='&blfs-wiki;/XWindowSystemComponents'/></para>
 
     <para>If you've installed the X Window System in any prefix other
@@ -74,5 +77,5 @@
       </listitem>
       <listitem>
-        <para>Section "Module". If you are going to install NVidia
+        <para>Section "Module". If you are going to install NVIDIA
         drivers, remove the "dri" line.</para>
       </listitem>
@@ -130,5 +133,5 @@
     <filename class="directory">/etc/X11</filename> with previous
     versions of <application>Xorg</application>.  This step is not needed
-    for users of Xorg-&xorg-version; or XFree86.  Exectute the following
+    for users of Xorg-&xorg-version; or XFree86.  Execute the following
     commands as the <systemitem class="username">root</systemitem> 
     user:</para>
@@ -211,5 +214,32 @@
     in a safe and efficient manner. It is installed in
     <application>X</application> by default if you have a supported video card.
-    To check if DRI is installed properly, check the log file
+    To enable direct rendering using the OpenGL implementation from
+    <xref linkend="mesalib"/> (built separately with <xref linkend="xorg7"/>
+    or included with <xref linkend="xorg"/> and <xref linkend="xfree86"/>),
+    the "glx" and "dri" modules must be loaded.  Additionally, the created
+    device nodes in <filename class="directory">/dev/dri</filename> must
+    have proper permissions for your users.  A sample
+    <filename>XF86config</filename> or <filename>xorg.conf</filename>
+    file might look like this:</para>
+
+<screen><literal>Section "Module"
+    ...
+    Load  "glx"
+    Load  "dri"
+    ...
+EndSection
+...
+Section "DRI"
+    Group "video"
+    Mode  0660
+EndSection</literal></screen>
+
+    <note><para>DRI configuration may differ if you are using alternate
+    drivers, such as those from
+    <ulink url="http://www.nvidia.com/page/home.html">NVIDIA</ulink> or
+    <ulink url="http://www.ati.com/">ATI</ulink>.</para>
+    </note>
+
+    <para>To check if DRI is installed properly, check the log file
     <filename>/var/log/XFree86.0.log</filename> or
     <filename>/var/log/Xorg.0.log</filename> for statements like:</para>
@@ -221,4 +251,8 @@
 
 <screen><computeroutput>direct rendering: Yes</computeroutput></screen>
+
+    <para>If direct rendering is not enabled, you can add verbosity by
+    running <command>LIBGL_DEBUG=verbose glxinfo</command>.  This will
+    show the drivers, device nodes and files used by the DRI system.</para>
 
     <para>You can also run the test program <command>glxgears</command>.
@@ -356,14 +390,6 @@
       client side using <application>Fontconfig</application>.  The default
       search path is <filename class="directory">/usr/share/fonts</filename>
-      and <filename class="directory">~/.fonts</filename>. 
-      When installing <application>X</application>, symlinks were created from
-      the <filename class="directory">OTF</filename> and <filename
-      class="directory">TTF</filename> <application>X</application> font
-      directories to <filename
-      class="directory">/usr/share/fonts/X11-{OTF,TTF}</filename>.  This
-      prevents <application>Fontconfig</application> from using the poorly
-      rendered Type1 fonts or the non-scalable bitmapped fonts.</para>
-
-      <para><application>Fontconfig</application> searches directories in its
+      and <filename class="directory">~/.fonts</filename>.
+      <application>Fontconfig</application> searches directories in its
       path recursively and maintains a cache of the font characteristics in
       <filename>fonts.cache-1</filename> files in each directory.  If the cache
@@ -371,5 +397,19 @@
       fetched from the fonts themselves.  This cache
       can be regenerated using the <command>fc-cache</command> command at any
-      time.</para>
+      time. You can see the list of fonts known by
+      <application>Fontconfig</application> by running the command
+      <command>fc-list</command>.</para>
+
+      <para>The <application>X</application> fonts were not installed in a
+      location known to <application>Fontconfig</application>. This prevents
+      <application>Fontconfig</application> from using the poorly rendered
+      Type 1 fonts or the non-scalable bitmapped fonts. Symlinks were created
+      from the <filename class="directory">OTF</filename> and <filename
+      class="directory">TTF</filename> <application>X</application> font
+      directories to <filename
+      class="directory">/usr/share/fonts/X11-{OTF,TTF}</filename>. This allows
+      <application>Fontconfig</application> to use the OpenType and TrueType
+      fonts provided by <application>X</application> (which are scalable and
+      of higher quality).</para>
 
       <para><application>Fontconfig</application> uses names such as
@@ -379,5 +419,7 @@
       has all characters that cover the orthography of the language indicated
       by the locale settings.  Knowledge of these font names is included in
-      <filename>/etc/fonts/fonts.conf</filename>.</para>
+      <filename>/etc/fonts/fonts.conf</filename>. Fonts that are not listed
+      in this file are still usable by <application>Fontconfig</application>,
+      but they will not be accessible by the generic family names.</para>
 
       <para>Standard scalable fonts that come with <application>X</application>
@@ -400,6 +442,6 @@
           - These fonts are replacements for the Bitstream Vera fonts and
           provide Latin-based scripts with accents and Cyrillic glyphs.
-          <application>Fontconfig</application> does not know about the DejaVu
-          fonts by default, so <filename>/etc/fonts/fonts.conf</filename> will
+          The DejaVu fonts by are not aliased to the generic family names
+          by default, so <filename>/etc/fonts/fonts.conf</filename> will
           have to be edited for it to be recognized by the generic names such
           as "Sans".  This will be described below.</para>
@@ -417,13 +459,13 @@
           - These fonts provide slightly worse Unicode coverage than FreeFont,
           but are better hinted.  Be sure to read the license before using
-          them.  <application>Fontconfig</application> knows about them by
-          default.</para>
+          them. These fonts are listed in the
+          <filename>/etc/fonts/fonts.conf</filename> aliases by default.</para>
         </listitem>
         <listitem>
           <para><ulink
           url="http://cle.linux.org.tw/fonts/FireFly">Firefly New Sung font</ulink>
-          - This font provides Chinese coverage.  However,
-          <application>Fontconfig</application> does not know about this font
-          by default.</para>
+          - This font provides Chinese coverage. This font is not listed in
+          the <filename>/etc/fonts/fonts.conf</filename> aliases by default.
+          </para>
         </listitem>
         <listitem>
@@ -431,20 +473,20 @@
           url="http://cle.linux.org.tw/fonts/Arphic">Arphic fonts</ulink> -
           A similar set of Chinese fonts to the Firefly New Sung font.
-          <application>Fontconfig</application> knows about these fonts by
-          default and will substitute them for generic family names.</para>
+          These fonts are listed in the 
+          <filename>/etc/fonts/fonts.conf</filename> aliases by default.
+          </para>
         </listitem>
         <listitem>
           <para><ulink
           url="http://sourceforge.jp/projects/efont/">Kochi fonts</ulink> -
-          These provide Japanese characters, and
-          <application>Fontconfig</application> knows about these fonts by
-          default.</para>
+          These provide Japanese characters, and they are listed in the aliases
+          in <filename>/etc/fonts/fonts.conf</filename> by default.</para>
         </listitem>
         <listitem>
           <para><ulink
           url="http://kldp.net/projects/baekmuk/">Baekmuk fonts</ulink>
-          - These fonts provide Korean coverage, and
-          <application>Fontconfig</application> knows about these fonts by
-          default.</para>
+          - These fonts provide Korean coverage, and they are listed in the
+          aliases in <filename>/etc/fonts/fonts.conf</filename> by default.
+          </para>
         </listitem>
       </itemizedlist>
@@ -466,7 +508,8 @@
       DejaVu is a replacement for Bitstream Vera fonts, it can be substituted
       for that family.  Visually inspect the <filename>fonts.conf</filename> to
-      see how fonts are grouped together under the generic family names and a
-      preference list is created.  To replace Bitstream Vera with DejaVu, as the
-      <systemitem class="username">root</systemitem> user:</para>
+      see how fonts are grouped together under the generic family names within
+      &lt;alias&gt; tags and a preference list is created within &lt;prefer&gt;
+      tags. To replace Bitstream Vera with DejaVu, run the following command as
+      the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>sed -i 's/&lt;family&gt;Bitstream Vera/&lt;family&gt;DejaVu/' /etc/fonts/fonts.conf</userinput></screen>
@@ -478,6 +521,8 @@
  -->
 
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url='&blfs-wiki;/XWindowSystemComponents'/></para>
+    <para>To see which fonts will be used as the generic fonts in your locale,
+    run the command <command>fc-match monospace</command>. Substitute "sans" or
+    "serif" to see the fonts that will be used for those aliases.
+    </para>
 
     </sect3>
