[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 doc/fontconfig-user.sgml |    2 +-
 fc-cache/fc-cache.sgml   |    2 +-
 fc-cat/fc-cat.sgml       |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 78ed920e2be4dca04ff64ba98cf6935fc40cc758
Author: Akira TAGOH <akira at tagoh.org>
Date:   Mon Jan 19 19:48:50 2015 +0900

    Fix a typo in docs

diff --git a/doc/fontconfig-user.sgml b/doc/fontconfig-user.sgml
index decd620..ac9d807 100644
--- a/doc/fontconfig-user.sgml
+++ b/doc/fontconfig-user.sgml
@@ -321,7 +321,7 @@ 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.  If 'prefix' is set to "xdg", the value in the XDG_CACHE_HOME environment variable will be added as the path prefix. please see XDG Base Directory Specification for more details.
 The default directory is ``$XDG_CACHE_HOME/fontconfig'' and it contains the cache files
-named ``<literal><hash value></literal>-<literal><architecture></literal>.cache-<literal><version</literal>'',
+named ``<literal><hash value></literal>-<literal><architecture></literal>.cache-<literal><version></literal>'',
 where <literal><version></literal> is the font configureation file
 version number (currently 3).
   </para></refsect2>
diff --git a/fc-cache/fc-cache.sgml b/fc-cache/fc-cache.sgml
index 7e5159b..5ae0107 100644
--- a/fc-cache/fc-cache.sgml
+++ b/fc-cache/fc-cache.sgml
@@ -195,7 +195,7 @@ manpage.1: manpage.sgml
     <title>FILES</title>
     <variablelist>
       <varlistentry>
-        <term><filename><replaceable>%cachdir%</replaceable>/*-<replaceable>%arch%</replaceable>.cache-2</filename></term>
+        <term><filename><replaceable>%cachedir%</replaceable>/*-<replaceable>%arch%</replaceable>.cache-%version%</filename></term>
 	<listitem>
 	  <para>These files are generated by <command>&dhpackage;</command>
             and contain maps from file names to font properties. They are
diff --git a/fc-cat/fc-cat.sgml b/fc-cat/fc-cat.sgml
index ce4736d..a513254 100644
--- a/fc-cat/fc-cat.sgml
+++ b/fc-cat/fc-cat.sgml
@@ -70,7 +70,7 @@ manpage.1: manpage.sgml
       <arg><option>--help</option></arg>
       <sbr>
       <group rep="repeat">
-          <arg><option><replaceable>fonts-cache-2-files</replaceable></option></arg>
+          <arg><option><replaceable>fonts-cache-%version%-files</replaceable></option></arg>
           <arg><option><replaceable>dirs</replaceable></option></arg>
       </group>