Index: x/installing/installing.xml
===================================================================
--- x/installing/installing.xml	(revision f138b41e62dd0d3109d254624675297da6f18ff9)
+++ x/installing/installing.xml	(revision 75eb07d63ce6c8b36d4c17c6bc135a2a0201e853)
@@ -4,6 +4,5 @@
 
 &xfree86;
-&x-installing-truetype;
-&x-installing-dri;
+&x-setup;
 
 </chapter>
Index: x/installing/xfree86-setup.xml
===================================================================
--- x/installing/xfree86-setup.xml	(revision 75eb07d63ce6c8b36d4c17c6bc135a2a0201e853)
+++ x/installing/xfree86-setup.xml	(revision 75eb07d63ce6c8b36d4c17c6bc135a2a0201e853)
@@ -0,0 +1,176 @@
+<sect1 id="x-setup">
+<?dbhtml filename="xfree86-setup.html" dir="x"?>
+<title>Setting up XFree86 Components</title>
+
+<sect2>
+<title>Checking Direct Rendering Infrastructure (DRI) Installation</title>
+<para>DRI is a framework for allowing software to access graphics hardware
+in a safe and effecient manner.  It is installed in XFree86 by default if 
+you have a supported video card.  To check if DRI is installed properly, 
+check the log file <filename>/var/log/XFree86.0.log</filename> for statements
+like:</para>
+
+<para><screen>(II) R128(0): Direct rendering enabled</screen></para>
+
+<para>From an xterm, run <userinput>glxinfo</userinput> and look for the phrase:</para> 
+<para><screen>direct rendering: Yes</screen></para>
+
+<para>You can also run the test program <userinput>glxgears</userinput>.
+This program brings up a window with three gears turning.  The
+<filename>xterm</filename> will display how many frames were drawn every
+five seconds so this is a reasonable benchmark.  The window is scalable, and
+the frames drawn per second is highly dependent on the size of
+the window.</para>
+ 
+<para>For troubleshooting problems, check the DRI Users Guide at
+<userinput><ulink url="http://dri.sourceforge.net/doc/DRIuserguide.html"/></userinput>.
+</para>
+</sect2>
+
+<!-- ================================================== -->
+
+<sect2>
+<title>Adding TrueType fonts to XFree86</title>
+
+<para>TrueType font support is built into XFree86.  The following items need to 
+be completed to make the fonts available.</para>
+
+<itemizedlist>
+
+<listitem><para>Establish a directory for the fonts and move any 
+TrueType fonts you want into that directory.</para></listitem>
+
+<listitem><para>Create the <filename>fonts.scale</filename> and 
+<filename>fonts.dir</filename> files in the TrueType font 
+directory.</para></listitem>
+
+<listitem><para>Ensure the truetype module is loaded in 
+<filename>XF86Config</filename>.</para></listitem>
+
+<listitem><para>Ensure the <parameter>FontPath</parameter> in 
+<filename>XF86Config</filename> contains the TrueType font 
+directory.</para></listitem>
+
+</itemizedlist>
+
+<sect3><title>Establish a TrueType font directory</title>
+
+<para>The build of XFree86 as given above automatically creates a TrueType
+font directory: <filename>/usr/X11R6/lib/X11/fonts/TTF</filename>.  This
+directory already has some TrueType fonts and is set up correctly.
+If this directory is satisfactory, copy any other TrueType fonts you want
+into that directory.  If not, create a new directory, preferably in
+the <filename>/usr/X11R6/lib/X11/fonts/</filename> directory and put 
+your TrueType fonts there.</para></sect3>
+
+<sect3><title>Create <filename>fonts.scale</filename> and 
+<filename>fonts.dir</filename></title>
+
+<para>Now change to the directory where you have your TrueType fonts and run
+<screen>mkfontscale &amp;&amp;
+mkfontdir</screen></para></sect3>
+
+<sect3><title>Ensure TrueType is loaded in <filename>XF86Config</filename></title> 
+<para>The "Module" section should look like:
+<screen>Section "Module"
+        ...
+        Load  "freetype"
+        ...
+EndSection</screen></para></sect3>
+
+<sect3><title>Ensure the <parameter>FontPath</parameter> in
+<filename>XF86Config</filename> points to the TrueType font directory</title>
+<para>The "Files" section should look like
+<screen>Section "Files"
+        ...
+        FontPath     "/usr/X11R6/lib/X11/fonts/&lt;TruetypeDir&gt;/"
+        ...
+EndSection</screen></para>
+
+<para>XFree86 will now be able to use TrueType fonts when it is restarted.
+You can check to see if the new fonts are available with the
+<userinput>xlsfonts</userinput>  or <userinput>xfontsel</userinput> 
+program.</para></sect3>
+</sect2>
+
+<!-- ================================================== -->
+<sect2>
+<title>Setting up keyboards</title>
+<para>In this version of XFree86, it has been reported that non-latin
+keyboard layouts do not include latin configurations as was previous
+practice. To set up a keyboard for latin and non-latin input, 
+change the XkbLayout keyboard driver option in the InputDevice section
+of the <filename>XF86Config</filename> file.  For example:</para>
+
+<para><screen>   Section "InputDevice"
+     Identifier         "Keyboard0"
+     Driver             "Keyboard"
+     Option "XkbModel"  "pc104"
+     Option "XkbLayout" "en_US,ru"
+   EndSection</screen></para>
+</sect2>
+
+<!-- ================================================== -->
+<sect2>
+<title>Setting up xdm</title>
+<para><filename>xdm</filename> provides a graphical logon capability and is
+normally set up in <filename>/etc/inittab</filename>.  Most of the information 
+you need to customize <filename>xdm</filename> is found in its man page.  To 
+execute xdm during bootup, change the initdefault level to 5 and 
+add the following lines to 
+<filename>/etc/inittab</filename>:</para>
+
+<para><screen># Run xdm as a separate service
+x:5:respawn:/usr/X11R6/bin/xdm -nodaemon</screen></para>
+</sect2>
+
+<!-- ================================================== -->
+<sect2>
+<title>Using XFree86 Resources</title>
+<para>There are many options that can be set in XFree86 and X clients via
+resources.  Typically resources are set in the <filename>~/.Xresources</filename>
+file.</para>
+
+<para>The layout of the <filename>~/.Xresources</filename> file consists
+if a list of specifications in the form of</para>
+
+<para><screen>object.subobject[.subobject...].attribute: value</screen></para>
+
+<para>Typically, components of a resource specification are linked together 
+by either <emphasis>tight</emphasis>, represented bu a dot (.),
+or <emphasis>loose</emphasis>, represented by an asterisk (*),  bindings.
+A tight binding indicates that the components on either side of the dot must
+be directly next to each other as defined in a specific implementation.  An
+asterisk is a wildcard character that means that any number of levels in
+a defined hierarchy can be between the components. 
+For example, XFree86 offers two new cursors: redglass and whiteglass.  To
+use one of these resources, you need to add the following line:</para>
+
+<para><screen>Xcursor.theme: whiteglass</screen></para>
+
+<para>However, you can specify the backgound for all clients with:</para>
+
+<para><screen>*background: blue</screen></para>
+
+<para>More specific resource variables will override less specific names. </para>
+
+<para>Resource definitions can be found in the man pages for each
+respective client.</para>
+
+<para>In order to load your resources, the <filename>xrdb</filename> 
+program must be
+called with the appropriate parameters.  Typically, the first time 
+resources are loaded, you use:</para>
+
+<para><screen>xrdb -load &lt;filename&gt;</screen></para>
+
+<para>To add resources to XFree86's database in memory use:</para>
+<para><screen>xrdb -merge &lt;filename&gt;</screen></para>
+
+<para>The <filename>xrdb</filename> instruction is usually placed in 
+<filename>~/.xinitrc</filename> or <filename>~/.xsession</filename>.
+To get more information, see the <filename>xrdb</filename> man page.</para>
+</sect2>
+
+</sect1>
+
Index: x/installing/xfree86/xfree86-config.xml
===================================================================
--- x/installing/xfree86/xfree86-config.xml	(revision f138b41e62dd0d3109d254624675297da6f18ff9)
+++ x/installing/xfree86/xfree86-config.xml	(revision 75eb07d63ce6c8b36d4c17c6bc135a2a0201e853)
@@ -4,5 +4,5 @@
 <para>Edit <filename>/etc/ld.so.conf</filename> and add 
 <filename>/usr/X11R6/lib</filename>.
-Run <screen>ldconfig</screen></para>
+Run <screen><userinput>ldconfig</userinput></screen></para>
 
 <para>Add <filename>/usr/X11R6/bin</filename> to your PATH environment 
@@ -13,5 +13,5 @@
 
 <para>Run
-<screen>source ~/.bash_profile</screen></para>
+<screen><userinput>source ~/.bash_profile</userinput></screen></para>
 
 <para>Set up your mouse:
Index: x/installing/xfree86/xfree86-exp.xml
===================================================================
--- x/installing/xfree86/xfree86-exp.xml	(revision f138b41e62dd0d3109d254624675297da6f18ff9)
+++ x/installing/xfree86/xfree86-exp.xml	(revision 75eb07d63ce6c8b36d4c17c6bc135a2a0201e853)
@@ -2,6 +2,7 @@
 <title>Command explanations</title>
 
-<para><userinput>make World 2&gt;&amp;1 | tee xfree-compile.log &amp;&amp;</userinput>: 
-This command runs multiple makefiles to completely rebuild the system.  
+<para><userinput>WORLDOPTS="" make World 2&gt;&amp;1 | tee xfree-compile.log</userinput>: 
+This command runs multiple makefiles to completely rebuild the system. 
+WORLDOPTS="" disables the default setting to continue after encountering an error.
 <userinput>2&gt;&amp;1</userinput> redirects error messages to the same location
 as normal output. The <userinput>tee</userinput> command allows viewing of 
Index: x/installing/xfree86/xfree86-inst.xml
===================================================================
--- x/installing/xfree86/xfree86-inst.xml	(revision f138b41e62dd0d3109d254624675297da6f18ff9)
+++ x/installing/xfree86/xfree86-inst.xml	(revision 75eb07d63ce6c8b36d4c17c6bc135a2a0201e853)
@@ -20,7 +20,13 @@
 <para>In the "Character Devices" section, <emphasis>disable</emphasis> Direct 
 Rendering Manager unless you have a Direct Rendering Infrastructure (DRI) 
-supported video card.  See the DRI section below for a list.  If you do
-enable DRI here, make sure you select the video card(s) you want to support
-as a <emphasis>module</emphasis>.</para>
+supported video card.  A complete list of DRI supported video cards can
+be found at <ulink url="http://dri.sourceforge.net" /> in the Status section.  
+Currently,
+supported cards include those from 3dfx (Voodoo, Banshee), 3Dlabs, 
+ATI (Rage Pro, Rage 128,
+Radeon 7X00, Radeon 2), Intel (i810, i815), and Matrox (G200, G400, G450). 
+Additionally NVidia provides their own closed source binary drivers.
+If you do enable DRI here, make sure you select the video card(s) you want 
+to support as a <emphasis>module</emphasis>.</para>
 
 <para>If you made any changes to the kernel configuration, recompile with
@@ -34,5 +40,8 @@
 <filename>/usr/src/linux/System.map</filename> to
 <filename>/boot</filename>, edit <filename>/etc/lilo.conf</filename>
-appropriately and run <userinput>lilo</userinput>.</para>
+appropriately and run <filename>lilo</filename>. If you use 
+<filename>grub</filename>, edit <filename>/boot/grub/grub.conf</filename> 
+and add the new kernel to the boot menu.
+</para>
 
 <note><para>If you build XFree86 in a chroot environment, make sure the kernel 
@@ -66,5 +75,5 @@
  * You can uncomment them if you want to make sure. ************************/
  
-/* #define HasMTRRSupport      YES  */ /* Enabled in kernel see kernel docs */
+/* #define HasMTRRSupport      YES  */ /* Enabled in kernel see kernel docs*/
 /* #define HasMMXSupport        NO  */ /* Any i586 or above */
 /* #define HasKatmaiSupport     NO  */ /* PIII SSE instuctions */
@@ -82,45 +91,54 @@
  * you can delete the drivers you do not want. *****************************/ 
 
-#define XF86CardDrivers mga glint nv tga s3virge rendition \
-                        cirrus vmware tseng chips apm \
-                        fbdev i128 \
-                        ati AgpGartDrivers DevelDrivers ark cyrix \
-                        vesa vga XF86OSCardDrivers
+
+#define XF86CardDrivers  mga glint nv tga s3 s3virge sis rendition \
+                         neomagic i740 tdfx savage \
+                         cirrus vmware tseng trident chips apm \
+                         GlideDriver fbdev i128 nsc \
+                         ati i810 AgpGartDrivers DevelDrivers ark \
+                         cyrix siliconmotion \
+                         vesa vga \
+                         dummy XF86OSCardDrivers XF86ExtraCardDrivers
+
 
 /* FONT SERVER AND LIBRARY SETTINGS ****************************************/
 
-/* These setting should be set by default, but we are making sure. *********/
+/* These settings are the defaults   ***************************************/
 
-#define BuildFontServer          YES  /* Need for GhostScript Print Server */
-#define SharedLibFont            YES  
-#define CompressAllFonts         YES
-#define GzipFontCompression      YES
+/* #define BuildFontServer          YES  */ /* For GhostScript Print Server*/
+/* #define SharedLibFont            YES  */
+/* #define CompressAllFonts         YES  */
+/* #define GzipFontCompression      YES  */
 
-/* These setting ensure we use the proper version of freetype **************/
+/* These settings ensure we use our libraries ******************************/
 #define HasFreetype2             YES
-#define BuildFreetype2Library     NO
-#define Freetype2Dir            /usr
+#define HasExpat                 YES
+#define HasLibpng                YES
+#define HasZlib                  YES
 
 /* The font path can be redefined in the XF86Config file *******************/
 
+/*
 #define DefaultFontPath                $(FONTDIR)/misc/,$(FONTDIR)/75dpi/,\
 $(FONTDIR)/100dpi/,$(FONTDIR)/Type1,$(FONTDIR)/local,\
 $(FONTDIR)/TrueType,$(FONTDIR)/CID,$(FONTDIR)/Speedo
+*/
+
 
 /* INTERNATIONAL FONTS.  Change to YES if you need any of them.  These  are
  * the defaults. ***********************************************************/
 
-#define BuildCyrillicFonts            NO
-#define BuildArabicFonts              NO
-#define BuildISO8859_6Fonts           NO
-#define BuildGreekFonts               NO
-#define BuildISO8859_7Fonts           NO
-#define BuildHebrewFonts              NO
-#define BuildISO8859_8Fonts           NO
-#define BuildKOI8_RFonts              NO
-#define BuildJapaneseFonts            NO
-#define BuildJISX0201Fonts            NO
-#define BuildKoreanFonts              NO
-#define BuildChineseFonts             NO
+/* #define BuildCyrillicFonts            NO  */
+/* #define BuildArabicFonts              NO  */
+/* #define BuildISO8859_6Fonts           NO  */
+/* #define BuildGreekFonts               NO  */
+/* #define BuildISO8859_7Fonts           NO  */
+/* #define BuildHebrewFonts              NO  */
+/* #define BuildISO8859_8Fonts           NO  */
+/* #define BuildKOI8_RFonts              NO  */
+/* #define BuildJapaneseFonts            NO  */
+/* #define BuildJISX0201Fonts            NO  */
+/* #define BuildKoreanFonts              NO  */
+/* #define BuildChineseFonts             NO  */
 
 /* DOCUMENTATION SETTINGS **************************************************/
@@ -128,17 +146,13 @@
 /* These setting are the defaults. *****************************************/
 
-#define BuildLinuxDocHtml             NO    /* X Docs in Html format */
-#define BuildLinuxDocPS               NO    /* X Docs in PostScript format */
-#define BuildAllSpecsDocs             NO    /* Various docs */
-#define BuildHtmlManPages             NO
-
-/* Linux Distribution Information - Not essential that it is totally right.*/
-
-#define LinuxDistribution         LFS 
+/* #define BuildLinuxDocHtml             NO  */  /* X Docs in Html format */
+/* #define BuildLinuxDocPS               NO  */  /* PostScript format */
+/* #define BuildAllSpecsDocs             NO  */  /* Various docs */
+/* #define BuildHtmlManPages             NO  */
 
 /* GENERAL SETTINGS: You generally want to leave these alone when
  * building X on an LFS system *********************************************/
 
-#define GccWarningOptions         -pipe
+#define GccWarningOptions         -pipe /* Speed up compiles */
 #define TermcapLibrary            -lncurses
 #define XprtServer                YES /* Needed by realplayer */
@@ -149,8 +163,6 @@
 #define FSUseSyslog               YES
 #define ThreadedX                 YES
-#define HasZlib                   YES
-#define HasNCurses                YES
 #define HasPam                     NO        
-#define SystemManDirectory        /usr/share/man
+#define SystemManDirectory        /usr/share/man  /* Instead of /usr/man */
 #define HasLibCrypt               YES
 #define InstallXinitConfig        YES
@@ -171,6 +183,5 @@
 
 
-<para><screen><userinput>patch -Np1 -i ../4.2.0-4.2.1.diff &amp;&amp;
-make World 2&gt;&amp;1 | tee xfree-compile.log &amp;&amp;
+<para><screen><userinput>WORLDOPTS="" make World 2&gt;&amp;1 | tee xfree-compile.log &amp;&amp;
 make install &amp;&amp;
 make install.man &amp;&amp;
Index: x/installing/xfree86/xfree86-intro.xml
===================================================================
--- x/installing/xfree86/xfree86-intro.xml	(revision f138b41e62dd0d3109d254624675297da6f18ff9)
+++ x/installing/xfree86/xfree86-intro.xml	(revision 75eb07d63ce6c8b36d4c17c6bc135a2a0201e853)
@@ -6,7 +6,7 @@
 Package size:                   &xfree86-size;
 Estimated Disk space required:  &xfree86-buildsize;
-Estimated build time:           63m (667 MHz)</screen>
+Estimated build time:           75m (667 MHz)</screen>
 
-<para><screen>XFree86 depends on: <xref linkend="freetype2"/></screen></para>
+<para><screen>XFree86 depends on: <xref linkend="freetype2"/>, <xref linkend="expat"/>, and <xref linkend="libpng"/>.</screen></para>
 
 <para>XFree86 is a freely redistributable open-source implementation of the 
@@ -17,9 +17,27 @@
 
 <para>There are several files that need to be fetched from the download location:
-<screen>X420src-1.tgz 25354 KB 
-X420src-2.tgz 22683 KB   
-X420src-3.tgz  9089 KB</screen></para>
+<screen>X430src-1.tgz 10736 KB 
+X430src-2.tgz  7776 KB   
+X430src-3.tgz 12077 KB   
+X430src-4.tgz 12604 KB   
+X430src-5.tgz  4286 KB   
+X430src-6.tgz  7886 KB   
+X430src-7.tgz  9099 KB</screen></para>
 
-<para>In addition, the following file will be needed:
-<screen><ulink url="ftp://ftp.xfree86.org/pub/XFree86/4.2.1/patches/4.2.0-4.2.1.diff.gz"/></screen></para>
+<para>The first three packages are the XFree86 programs, the fourth and fifth are fonts, 
+the sixth is normal documantation, and the seventh is hardcopy documentation.
+There are also two packages <filename>doctools-1.3.1.tgz</filename>,  which 
+contain programs to regenerate hardcopy documentation, and 
+<filename>utils-1.1.0.tgz</filename>, which contain <filename>gnutar</filename>
+and <filename>zlib</filename> which are already installed on an LFS system.
+</para>
+
+<para>To check your downloads for integrity, download the <filename>SUMS.md5sum</filename>
+file.  Then:
+<screen>md5sum X430src* &gt; md5sums &amp;&amp;
+diff md5sums SUMS.md5sum</screen>
+The only differences you should see are for <filename>README</filename>, 
+<filename>doctools-1.3.1.tgz</filename>, and utils-1.1.0.tgz files if you did
+not downlaod them.
+</para>
 </sect2>
Index: x/installing/xfree86/xfree86.ent
===================================================================
--- x/installing/xfree86/xfree86.ent	(revision f138b41e62dd0d3109d254624675297da6f18ff9)
+++ x/installing/xfree86/xfree86.ent	(revision 75eb07d63ce6c8b36d4c17c6bc135a2a0201e853)
@@ -5,7 +5,7 @@
 <!ENTITY xfree86-desc SYSTEM "xfree86-desc.xml">
 <!ENTITY xfree86-config SYSTEM "xfree86-config.xml">
-<!ENTITY xfree86-buildsize "535 MB">
-<!ENTITY xfree86-version "4.2.1">
-<!ENTITY xfree86-download "ftp://ftp.xfree86.org/pub/XFree86/4.2.0/source/">
-<!ENTITY xfree86-size "108 MB">
+<!ENTITY xfree86-buildsize "633 MB">
+<!ENTITY xfree86-version "4.3.0">
+<!ENTITY xfree86-download "ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/">
+<!ENTITY xfree86-size "137 MB">
 <!ENTITY xfree86-time "56.24 SBU">
