Index: general.ent
===================================================================
--- general.ent	(revision bea96f1bffc8ddceccfeadd6564566220f385058)
+++ general.ent	(revision fdf8b786a711eb2bb8c6d18ac41f68389d12266b)
@@ -4,5 +4,5 @@
 -->
 
-<!ENTITY day          "27">                   <!-- Always 2 digits -->
+<!ENTITY day          "29">                   <!-- Always 2 digits -->
 <!ENTITY month        "04">                   <!-- Always 2 digits -->
 <!ENTITY year         "2007">
@@ -137,5 +137,5 @@
 <!ENTITY libmng-version               "1.0.9">
 <!ENTITY freetype2-version            "2.3.4">
-<!ENTITY fontconfig-version           "2.3.2">
+<!ENTITY fontconfig-version           "2.4.2">
 <!ENTITY libart_lgpl-version          "2.3.19">
 <!ENTITY librsvg-version              "2.16.1">
Index: general/graphlib/fontconfig.xml
===================================================================
--- general/graphlib/fontconfig.xml	(revision bea96f1bffc8ddceccfeadd6564566220f385058)
+++ general/graphlib/fontconfig.xml	(revision fdf8b786a711eb2bb8c6d18ac41f68389d12266b)
@@ -7,7 +7,7 @@
   <!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        "7354f9f125ea78a8f2851cb9c31d4866">
-  <!ENTITY fontconfig-size          "942 KB">
-  <!ENTITY fontconfig-buildsize     "13.0 MB">
+  <!ENTITY fontconfig-md5sum        "108f9a03fa9ed9dd779cc7ca236da557">
+  <!ENTITY fontconfig-size          "1.2 MB">
+  <!ENTITY fontconfig-buildsize     "11.3 MB">
   <!ENTITY fontconfig-time          "0.2 SBU">
 ]>
@@ -55,4 +55,6 @@
     </itemizedlist>
 
+    <!-- Since fontconfig is at 2.4.x, obviously it's more current
+         than 2.3.92. Uncomment when 2.4.9x is released
     <note>
       <para>The numbering system of <application>Fontconfig</application> is
@@ -62,9 +64,12 @@
       &fontconfig-version;</para>
     </note>
+    -->
 
     <bridgehead renderas="sect3">Fontconfig Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="freetype2"/> and <xref linkend="expat"/></para>
+    <para role="required"><xref linkend="freetype2"/> and
+    <xref linkend="expat"/> or <xref linkend="libxml2"/> (requires
+    <xref linkend="pkgconfig"/>)</para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -90,5 +95,6 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc \
+<screen><userinput>./configure --prefix=/usr \
+    --sysconfdir=/etc --localstatedir=/var \
     --disable-docs --without-add-fonts \
     --with-docdir=/usr/share/doc/fontconfig-&fontconfig-version; &amp;&amp;
@@ -114,4 +120,8 @@
     <title>Command Explanations</title>
 
+    <para><parameter>--localstatedir=/var</parameter>: This switch places
+    the system font cache files in <filename
+    class='directory'>/var/cache/fontconfig</filename>.</para>
+
     <para><parameter>--disable-docs</parameter>: This switch avoids building
     the documentation (the release tarball includes pre-generated
@@ -138,5 +148,6 @@
       <title>Config Files</title>
 
-      <para><filename>/etc/fonts/* and /etc/fonts/conf.d/*</filename></para>
+      <para><filename>/etc/fonts/*, /etc/fonts/conf.avail/*, and
+      /etc/fonts/conf.d/*</filename></para>
 
       <indexterm zone="fontconfig fontconfig-config">
@@ -146,4 +157,8 @@
       <indexterm zone="fontconfig fontconfig-config">
         <primary sortas="e-etc-fonts-conf.d">/etc/fonts/conf.d/*</primary>
+      </indexterm>
+
+      <indexterm zone="fontconfig fontconfig-config">
+        <primary sortas="e-etc-fonts-conf.avail">/etc/fonts/conf.avail/*</primary>
       </indexterm>
 
@@ -153,10 +168,13 @@
       <title>Configuration Information</title>
 
-      <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, create
+      <para>The main configuration file for <application>Fontconfig</application>
+      is <filename>/etc/fonts/fonts.conf</filename>. Generally you do not want
+      to edit this file. It will also read <filename>/etc/fonts/local.conf</filename>
+      and any files in <filename class='directory'>/etc/fonts/conf.d</filename>.
+      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>
+      local information or add a new file in
+      <filename class='directory'>/etc/fonts/conf.d</filename>. The default
+      location of fonts in <application>Fontconfig</application> is:</para>
 
       <itemizedlist spacing='compact'>
@@ -168,4 +186,12 @@
         </listitem>
       </itemizedlist>
+
+      <para><application>Fontconfig</application> also ships many example
+      configuration files in the <filename
+      class='directory'>/etc/fonts/conf.avail</filename> directory. Symlinking
+      to specific files from <filename class='directory'>/etc/fonts/conf.d</filename>
+      will enable them. The default setup is generally good enough for most
+      users. See <filename>/etc/fonts/conf.avail/README</filename> for a
+      description of the configuration files.</para>
 
       <indexterm zone="fontconfig fontconfig-config">
@@ -179,18 +205,14 @@
       <para>More information about configuring
       <application>Fontconfig</application> can be found in the user's manual
-      at <ulink url="http://fontconfig.org/fontconfig-user.html"/>.  There are
-      additional configuration files shipped with
-      <application>Fontconfig</application> in <filename
-      class="directory">/etc/fonts/conf.d</filename> that will be enabled
-      if their names begin with 2 numbers, e.g.,
-      <filename>/etc/fonts/conf.d/10-autohint.conf</filename>.</para>
+      in <ulink
+      url="file:///usr/share/doc/fontconfig-&fontconfig-version;/fontconfig-user.html"/>.
+      </para>
 
       <note>
-        <para><application>X</application> also includes an internal (and
+        <para><application>XFree86</application> also includes an internal (and
         older) version of <application>Fontconfig</application> and unless it
-        is 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>
+        is explicitly disabled, the internal version is created leaving two
+        slightly incompatible libraries on your system. It is recommended that
+        you only install one version.</para>
       </note>
 
@@ -208,5 +230,5 @@
 
       <seglistitem>
-        <seg>fc-cache, fc-list, and fc-match</seg>
+        <seg>fc-cache, fc-cat, fc-list, and fc-match</seg>
         <seg>libfontconfig.{so,a}</seg>
         <seg>/etc/fonts, /usr/include/fontconfig and
@@ -230,4 +252,14 @@
       </varlistentry>
 
+      <varlistentry id="fc-cat">
+        <term><command>fc-cat</command></term>
+        <listitem>
+          <para>is used to read font information caches.</para>
+          <indexterm zone="fontconfig fc-cat">
+            <primary sortas="b-fc-cat">fc-cat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="fc-list">
         <term><command>fc-list</command></term>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision bea96f1bffc8ddceccfeadd6564566220f385058)
+++ introduction/welcome/changelog.xml	(revision fdf8b786a711eb2bb8c6d18ac41f68389d12266b)
@@ -43,4 +43,14 @@
 
     <listitem>
+      <para>April 29th, 2007</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dnicholson] - Updated to Fontconfig-2.4.2. Fixes ticket
+          #2134.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>April 27th, 2007</para>
       <itemizedlist>
