Index: general.ent
===================================================================
--- general.ent	(revision 3a0d3cf8c4c24658157000110971448d48d6043a)
+++ general.ent	(revision 19bf3801687ff9268e8364c9dd6bdf3a1f8e34ee)
@@ -95,5 +95,5 @@
 <!ENTITY lcms-version                 "1.14">
 <!ENTITY freetype2-version            "2.1.9">
-<!ENTITY fontconfig-version           "2.2.3">
+<!ENTITY fontconfig-version           "2.3.1">
 <!ENTITY libart_lgpl-version          "2.3.16">
 <!ENTITY librsvg-version              "2.8.1">
Index: general/graphlib/fontconfig.xml
===================================================================
--- general/graphlib/fontconfig.xml	(revision 3a0d3cf8c4c24658157000110971448d48d6043a)
+++ general/graphlib/fontconfig.xml	(revision 19bf3801687ff9268e8364c9dd6bdf3a1f8e34ee)
@@ -6,9 +6,10 @@
 
 <!ENTITY fontconfig-download-http "http://fontconfig.org/release/fontconfig-&fontconfig-version;.tar.gz">
-<!ENTITY fontconfig-download-ftp "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/fontconfig-&fontconfig-version;.tar.gz">
-<!ENTITY fontconfig-md5sum "2466a797d645cda5eb466080fdaec416">
-<!ENTITY fontconfig-size "747 KB">
-<!ENTITY fontconfig-buildsize "10 MB">
-<!ENTITY fontconfig-time "0.18 SBU">
+<!-- <!ENTITY fontconfig-download-ftp "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/fontconfig-&fontconfig-version;.tar.gz"> -->
+<!ENTITY fontconfig-download-ftp " ">
+<!ENTITY fontconfig-md5sum "d5e42a27ad2f22bc5ec45f15533fc5d1">
+<!ENTITY fontconfig-size "962 KB">
+<!ENTITY fontconfig-buildsize "10.5 MB">
+<!ENTITY fontconfig-time "0.19 SBU">
 ]>
 
@@ -20,4 +21,6 @@
 <?dbhtml filename="fontconfig.html"?>
 <title>Fontconfig-&fontconfig-version;</title>
+<indexterm zone="fontconfig">
+<primary sortas="a-Fontconfig">Fontconfig</primary></indexterm>
 
 <sect2>
@@ -42,7 +45,6 @@
 <note><para>The numbering system of <application>Fontconfig</application> is 
 unusual. The beta versions of the package are numbered with a 9x in the last 
-portion of the release number. This means that 2.2.96 is a beta release and 
-the most current release is of the form 2.2.3</para></note>
-
+portion of the release number. This means that 2.3.90 is a beta release and 
+the most current release is of the form 2.3.1</para></note>
 </sect3>
 
@@ -67,6 +69,9 @@
 <screen><userinput><command>./configure --prefix=/usr \
     --sysconfdir=/etc --disable-docs &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
+make</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make install</command></userinput></screen>
 </sect2>
 
@@ -91,6 +96,10 @@
 <title>Configuring <application>Fontconfig</application></title>
 
-<sect3><title>Config files</title>
-<para><filename>/etc/fonts/*</filename></para>
+<sect3 id="fontconfig-config"><title>Config files</title>
+<para><filename>/etc/fonts/* and /etc/fonts/conf.d/*</filename></para>
+<indexterm zone="fontconfig fontconfig-config">
+<primary sortas="e-etc-fonts">/etc/fonts/*</primary></indexterm>
+<indexterm zone="fontconfig fontconfig-config">
+<primary sortas="e-etc-fonts-conf.d">/etc/fonts/conf.d/*</primary></indexterm>
 </sect3>
 
@@ -99,7 +108,8 @@
 <para>The configuration file for <application>Fontconfig</application> is 
 <filename>/etc/fonts/fonts.conf</filename>. Generally you do not want to edit 
-this file. To put a new font directory in the configuration, update the 
-<filename>/etc/fonts/local.conf</filename> file with your local information. 
-The default location of fonts in <application>Fontconfig</application> is:
+this file. To put a new font directory in the configuration, create (or 
+update) the <filename>/etc/fonts/local.conf</filename> file with your local 
+information. The default location of fonts in 
+<application>Fontconfig</application> is:
 </para>
 
@@ -108,11 +118,15 @@
 <listitem><para>~/.fonts</para></listitem>
 </itemizedlist>
+<indexterm zone="fontconfig fontconfig-config">
+<primary sortas="g-usr-share-fonts">/usr/share/fonts</primary></indexterm>
+<indexterm zone="fontconfig fontconfig-config">
+<primary sortas="g-AA.fonts">~/.fonts</primary></indexterm>
 
 <note><para><application>X</application> also includes an internal (and
 older) version of <application>Fontconfig</application> and unless it is 
-explicitly disabled when building <application>XFree86</application>, the 
-internal version is created leaving two slightly incompatible libraries on 
-your system. It is recommended that you only install one version.</para></note>
-
+explicitly disabled when building <application>Xorg</application> or 
+<application>XFree86</application>, the internal version is created leaving 
+two slightly incompatible libraries on your system. It is recommended that 
+you only install one version.</para></note>
 </sect3>
 
@@ -122,18 +136,55 @@
 <title>Contents</title>
 
-<para>The <application>Fontconfig</application> package contains the
-<filename class='libraryfile'>libfontconfig</filename> library,
-<command>fc-cache</command>, and <command>fc-list</command>.</para>
+<segmentedlist>
+<segtitle>Installed Programs</segtitle>
+<segtitle>Installed Library</segtitle>
+<segtitle>Installed Directories</segtitle>
 
-</sect2>
+<seglistitem>
+<seg>fc-cache, fc-list and fc-match</seg>
+<seg>libfontconfig.[so,a]</seg>
+<seg>/etc/fonts and /usr/include/fontconfig</seg>
+</seglistitem>
+</segmentedlist>
 
-<sect2><title>Description</title>
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
 
-<sect3><title>fc-cache</title>
-<para><command>fc-cache</command> is a command to create font information
-caches.</para></sect3>
+<varlistentry id="fc-cache">
+<term><command>fc-cache</command></term>
+<listitem><para>is used to create font information caches.</para>
+<indexterm zone="fontconfig fc-cache">
+<primary sortas="b-fc-cache">fc-cache</primary>
+</indexterm></listitem>
+</varlistentry>
 
-<sect3><title>fc-list</title>
-<para><command>fc-list</command> is a command to list fonts.</para></sect3>
+<varlistentry id="fc-list">
+<term><command>fc-list</command></term>
+<listitem><para>is used to create font lists.</para>
+<indexterm zone="fontconfig fc-list">
+<primary sortas="b-fc-list">fc-list</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="fc-match">
+<term><command>fc-match</command></term>
+<listitem><para>is used to match available fonts, or find fonts that match 
+a given pattern.</para>
+<indexterm zone="fontconfig fc-match">
+<primary sortas="b-fc-match">fc-match</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="libfontconfig">
+<term><filename class='libraryfile'>libfontconfig.[so,a]</filename></term>
+<listitem><para>contains functions used by the 
+<application>Fontconfig</application> programs and also by other programs to 
+configure or customize font access.</para>
+<indexterm zone="fontconfig libfontconfig">
+<primary sortas="c-libfontconfig">libfontconfig.[so,a]</primary>
+</indexterm></listitem>
+</varlistentry>
+</variablelist>
 
 </sect2>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 3a0d3cf8c4c24658157000110971448d48d6043a)
+++ introduction/welcome/changelog.xml	(revision 19bf3801687ff9268e8364c9dd6bdf3a1f8e34ee)
@@ -23,6 +23,6 @@
 <itemizedlist>
 
-<listitem><para>March 24th, 2005 [randy]: Updated to 
-Sysstat-5.1.5</para></listitem>
+<listitem><para>March 24th, 2005 [randy]: Updated to Sysstat-5.1.5 and 
+Fontconfig-2.3.1.</para></listitem>
 
 <listitem><para>March 23rd, 2005 [randy]: Updated to Shadow-4.0.7; added 
Index: x/installing/x-setup.xml
===================================================================
--- x/installing/x-setup.xml	(revision 3a0d3cf8c4c24658157000110971448d48d6043a)
+++ x/installing/x-setup.xml	(revision 19bf3801687ff9268e8364c9dd6bdf3a1f8e34ee)
@@ -175,5 +175,6 @@
 <para>Ensure you have the following directory entries in
 <filename>/etc/fonts/local.conf</filename>, inside the fontconfig
-tags:</para>
+tags. Create <filename>/etc/fonts/local.conf</filename> using the 
+following commands:</para>
 
 <indexterm zone="x-setup fonts">
@@ -181,7 +182,21 @@
 </indexterm>
 
+<screen><userinput><command>cat &gt; /etc/fonts/local.conf &lt;&lt; "EOF"</command>
+&lt;?xml version="1.0"?&gt;
+&lt;!DOCTYPE fontconfig SYSTEM "fonts.dtd"&gt;
+&lt;!-- /etc/fonts/local.conf file for local customizations --&gt;
+
+&lt;fontconfig&gt;
+&lt;dir&gt;/usr/X11R6/lib/X11/fonts/TTF&lt;/dir&gt;
+&lt;dir&gt;/usr/X11R6/lib/X11/fonts/Type1&lt;/dir&gt;
+&lt;/fontconfig&gt;
+
+<command>EOF</command></userinput></screen>
+
+<!-- 
 <screen><userinput><command>sed -i -e '/^&lt;\/fontconfig&gt;/i\
 &lt;dir&gt;/usr/X11R6/lib/X11/fonts/TTF&lt;/dir&gt;\
 &lt;dir&gt;/usr/X11R6/lib/X11/fonts/Type1&lt;/dir&gt;' /etc/fonts/local.conf</command></userinput></screen>
+ -->
 
 <para>The <command>fc-cache</command> program will automatically search
