[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 doc/fontconfig-user.sgml |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

New commits:
commit 765b7b32d862474eb631b47bbdbd34ffba507392
Author: Akira TAGOH <akira at tagoh.org>
Date:   Mon Mar 12 19:02:27 2012 +0900

    [doc] Update for cachedir.
    
    <cache> element is now obsoletes and no longer used. get rid of it
    from the doc and add <cachedir> instead.

diff --git a/doc/fontconfig-user.sgml b/doc/fontconfig-user.sgml
index e19cac7..d5da6c0 100644
--- a/doc/fontconfig-user.sgml
+++ b/doc/fontconfig-user.sgml
@@ -297,20 +297,21 @@ following structure:
   </para>
 <refsect2><title><literal>&lt;fontconfig&gt;</literal></title><para>
 This is the top level element for a font configuration and can contain
-<literal>&lt;dir&gt;</literal>, <literal>&lt;cache&gt;</literal>, <literal>&lt;include&gt;</literal>, <literal>&lt;match&gt;</literal> and <literal>&lt;alias&gt;</literal> elements in any order.
+<literal>&lt;dir&gt;</literal>, <literal>&lt;cachedir&gt;</literal>, <literal>&lt;include&gt;</literal>, <literal>&lt;match&gt;</literal> and <literal>&lt;alias&gt;</literal> elements in any order.
   </para></refsect2>
   <refsect2><title><literal>&lt;dir&gt;</literal></title><para>
 This element contains a directory name which will be scanned for font files
 to include in the set of available fonts.
   </para></refsect2>
-  <refsect2><title><literal>&lt;cache&gt;</literal></title><para>
-This element contains a file name for the per-user cache of font
-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 ``~/.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).
+  <refsect2><title><literal>&lt;cachedir&gt;</literal></title><para>
+This element contains a directory name that is supposed to be stored or read
+the cache of font information.  If multiple elements are specified in
+the configuration file, the directory that can be accessed first in the list
+will be used to store the cache files.  If it starts with '~', it refers to
+a directory in the users home directory.  The default directory is ``~/.fontconfig''
+and it contains the cache files named ``<literal>&lt;hash value&gt;</literal>-<literal>&lt;architecture&gt;</literal>.cache-<literal>&lt;version</literal>'',
+where <literal>&lt;version&gt;</literal> is the font configureation 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