[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 doc/fontconfig-user.sgml |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e8bdc6df2ed329a38c2152b3592bf4ded8f27ce7
Author: Akira TAGOH <akira at tagoh.org>
Date:   Mon Mar 12 17:58:00 2012 +0900

    [doc] Update the path for cache files and the version.

diff --git a/doc/fontconfig-user.sgml b/doc/fontconfig-user.sgml
index 217feb9..e19cac7 100644
--- a/doc/fontconfig-user.sgml
+++ b/doc/fontconfig-user.sgml
@@ -309,8 +309,8 @@ information.  If it starts with '~', it refers to a file in the users
 home directory.  This file is used to hold information about fonts that
 isn't present in the per-directory cache files.  It is automatically
 maintained by the fontconfig library.  The default for this file 
-is ``~/.fonts.cache-<literal>&lt;version&gt;</literal>'', where <literal>&lt;version&gt;</literal> is the font configuration
-file version number (currently 2).
+is ``~/.fontconfig/&lt;hash value&gt;-&lt;architecture&gt;.cache-<literal>&lt;version&gt;</literal>'', where <literal>&lt;version&gt;</literal> is the font configuration
+file version number (currently 3).
   </para></refsect2>
   <refsect2><title><literal>&lt;include ignore_missing="no"&gt;</literal></title><para>
 This element contains the name of an additional configuration file or
@@ -686,7 +686,7 @@ is the conventional location for per-user font configuration, although the
 actual location is specified in the global fonts.conf file.
   </para>
   <para>
-<emphasis> ~/.fonts.cache-*</emphasis>
+<emphasis> ~/.fontconfig/*.cache-*</emphasis>
 is the conventional repository of font information that isn't found in the
 per-directory caches.  This file is automatically maintained by fontconfig.
   </para>