Index: general/general.ent
===================================================================
--- general/general.ent	(revision 207a6b9a8b2496c96a0df92a3a5e34e598865bc8)
+++ general/general.ent	(revision db1463824085915321d458f394d136ed44447d08)
@@ -21,5 +21,4 @@
 <!ENTITY % gwrap SYSTEM "genlib/gwrap/gwrap.ent">
 <!ENTITY % STLport SYSTEM "genlib/stlport/stlport.ent">
-<!ENTITY % fontconfig SYSTEM "genlib/fontconfig/fontconfig.ent">
 %openssl;
 %pcre;
@@ -40,5 +39,4 @@
 %gwrap;
 %STLport;
-%fontconfig;
 
 <!-- Graphics Libraries -->
Index: neral/genlib/fontconfig.xml
===================================================================
--- general/genlib/fontconfig.xml	(revision 207a6b9a8b2496c96a0df92a3a5e34e598865bc8)
+++ 	(revision )
@@ -1,9 +1,0 @@
-<sect1 id="fontconfig" xreflabel="fontconfig-&fontconfig-version;">
-<?dbhtml filename="fontconfig.html" dir="general"?>
-<title>fontconfig-&fontconfig-version;</title>
-
-&fontconfig-intro;
-&fontconfig-inst;
-&fontconfig-desc;
-
-</sect1>
Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision 207a6b9a8b2496c96a0df92a3a5e34e598865bc8)
+++ general/genlib/genlib.xml	(revision db1463824085915321d458f394d136ed44447d08)
@@ -53,4 +53,3 @@
 &gwrap;
 &STLport;
-&fontconfig;
 </chapter>
Index: index.xml
===================================================================
--- index.xml	(revision 207a6b9a8b2496c96a0df92a3a5e34e598865bc8)
+++ index.xml	(revision db1463824085915321d458f394d136ed44447d08)
@@ -3,6 +3,6 @@
 			"/usr/share/docbook/docbookx.dtd" [
 
-<!ENTITY version "20030813">
-<!ENTITY releasedate "August 13th, 2003">
+<!ENTITY version "20030815">
+<!ENTITY releasedate "August 15th, 2003">
 
 <!ENTITY % book SYSTEM "book/book.ent">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 207a6b9a8b2496c96a0df92a3a5e34e598865bc8)
+++ introduction/welcome/changelog.xml	(revision db1463824085915321d458f394d136ed44447d08)
@@ -10,4 +10,10 @@
 
 <itemizedlist>
+
+<listitem><para>August 15th, 2003 [bdubbs]: Updated XFree86 instructions
+and added patch file.</para></listitem>
+
+<listitem><para>August 15th, 2003 [bdubbs]: Updated fontconfig config
+instructions and moved to X library chapter.</para></listitem>
 
 <listitem><para>August 13th, 2003 [tushar]: Fixed nas typo.</para></listitem>
Index: x/installing/xfree86/xfree86-inst.xml
===================================================================
--- x/installing/xfree86/xfree86-inst.xml	(revision 207a6b9a8b2496c96a0df92a3a5e34e598865bc8)
+++ x/installing/xfree86/xfree86-inst.xml	(revision db1463824085915321d458f394d136ed44447d08)
@@ -57,4 +57,11 @@
 is recommended for customizing the installation. Start from 
 the <filename>xc</filename> directory.</para>
+
+<note><para>The <filename>host.def</filename> file is a c file, not the 
+usual configuration file.  If you make any changes, be sure the comment characters
+(<userinput>/*</userinput> and <userinput>*/</userinput>) 
+are balanced.  Most of the entries in the file below are
+commented out with the default settings shown.
+</para></note>
 
 <para><screen><userinput>cat &gt; config/cf/host.def &lt;&lt; "EOF"
Index: x/installing/xfree86/xfree86-intro.xml
===================================================================
--- x/installing/xfree86/xfree86-intro.xml	(revision 207a6b9a8b2496c96a0df92a3a5e34e598865bc8)
+++ x/installing/xfree86/xfree86-intro.xml	(revision db1463824085915321d458f394d136ed44447d08)
@@ -16,6 +16,16 @@
 application interface (API).</para>
 
-<screen>XFree86 depends on:
-<xref linkend="freetype2"/>, <xref linkend="fontconfig"/>, <xref linkend="expat"/> and <xref linkend="libpng"/></screen>
+<para><screen>XFree86 depends on:
+<xref linkend="libpng"/></screen></para>
+
+<para>The following packages are included in the XFree86 package, however they
+are updated more often than the XFree86 package and are highly recommended:
+<screen><xref linkend="expat"/>, <xref linkend="freetype2"/> and <xref linkend="fontconfig"/></screen>
+</para>
+
+<note><para>If you choose to not install these separate packages, the 
+<filename>host.def</filename> file below will have to be modified to 
+instruct XFree86 build them.</para></note>
+
 
 <para>There are several files that need to be fetched from the download location:
@@ -27,4 +37,7 @@
 X430src-6.tgz  7886 KB   
 X430src-7.tgz  9099 KB</screen></para>
+
+<para>You should also download the patch file:
+<ulink url="ftp://ftp.xfree86.org/pub/XFree86/4.3.0/fixes/4.3.0-4.3.0.1.diff.gz" /></para>
 
 <para>The first three packages are the XFree86 programs, the fourth and fifth are fonts, 
@@ -45,3 +58,13 @@
 not download them.
 </para>
+
+<para>The fixes subdirectory also has a SUMS.md5sum and this can be checked against
+the patch file:
+<screen>md5sum 4.3.0-4.3.0.1.diff.gz</screen></para>
+
+<para>After unpacking the <filename>X430src-?.tgz</filename> files, change to the 
+<filename>xc</filename> directory and run:
+<screen>bunzip2 4.3.0-4.3.0.1.diff.gz &amp;&amp;
+patch -Np1 -i 4.3.0-4.3.0.1.diff</screen></para>
+
 </sect2>
Index: x/lib/fontconfig.xml
===================================================================
--- x/lib/fontconfig.xml	(revision db1463824085915321d458f394d136ed44447d08)
+++ x/lib/fontconfig.xml	(revision db1463824085915321d458f394d136ed44447d08)
@@ -0,0 +1,10 @@
+<sect1 id="fontconfig" xreflabel="fontconfig-&fontconfig-version;">
+<?dbhtml filename="fontconfig.html" dir="general"?>
+<title>fontconfig-&fontconfig-version;</title>
+
+&fontconfig-intro;
+&fontconfig-inst;
+&fontconfig-config;
+&fontconfig-desc;
+
+</sect1>
Index: x/lib/lib.xml
===================================================================
--- x/lib/lib.xml	(revision 207a6b9a8b2496c96a0df92a3a5e34e598865bc8)
+++ x/lib/lib.xml	(revision db1463824085915321d458f394d136ed44447d08)
@@ -3,6 +3,6 @@
 <title>X Libraries</title>
 
-&lesstif;
 &freetype2;
+&fontconfig;
 &qt;
 &GTK;
@@ -10,4 +10,5 @@
 &ATK;
 &GTK2;
+&lesstif;
 &startup-notification;
 
Index: x/x.ent
===================================================================
--- x/x.ent	(revision 207a6b9a8b2496c96a0df92a3a5e34e598865bc8)
+++ x/x.ent	(revision db1463824085915321d458f394d136ed44447d08)
@@ -10,4 +10,5 @@
 <!ENTITY x-lib SYSTEM "lib/lib.xml">
 <!ENTITY % freetype SYSTEM "lib/freetype2/freetype2.ent">
+<!ENTITY % fontconfig SYSTEM "lib/fontconfig/fontconfig.ent">
 <!ENTITY % lesstif SYSTEM "lib/lesstif/lesstif.ent">
 <!ENTITY % qt SYSTEM "lib/qt/qt.ent">
@@ -18,4 +19,5 @@
 <!ENTITY % startup-notification SYSTEM "lib/notification/startup-notification.ent">
 %freetype;
+%fontconfig;
 %lesstif;
 %qt;
