aboutsummaryrefslogtreecommitdiff
path: root/fontconfig/doc
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-03-13 08:34:09 +0100
committermarha <marha@users.sourceforge.net>2012-03-13 08:34:09 +0100
commit7d894e32566b710952c44cbc71939ad1d9e2fa8d (patch)
tree2c324c18b71f48bcb8bb2c4c35fa0fce1b02a5fb /fontconfig/doc
parent96276c847a5c266f9f51f3ec4ece8fe3f1381c96 (diff)
parentfc72edebf875378459368c5383d9023730cbca54 (diff)
downloadvcxsrv-7d894e32566b710952c44cbc71939ad1d9e2fa8d.tar.gz
vcxsrv-7d894e32566b710952c44cbc71939ad1d9e2fa8d.tar.bz2
vcxsrv-7d894e32566b710952c44cbc71939ad1d9e2fa8d.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'fontconfig/doc')
-rw-r--r--fontconfig/doc/fontconfig-user.sgml21
1 files changed, 11 insertions, 10 deletions
diff --git a/fontconfig/doc/fontconfig-user.sgml b/fontconfig/doc/fontconfig-user.sgml
index 217feb97a..d5da6c03a 100644
--- a/fontconfig/doc/fontconfig-user.sgml
+++ b/fontconfig/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 ``~/.fonts.cache-<literal>&lt;version&gt;</literal>'', where <literal>&lt;version&gt;</literal> is the font configuration
-file version number (currently 2).
+ <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
@@ -686,7 +687,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>