[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 doc/fcconfig.fncs |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 94c2cc58a091138aa8c507d6239eca69520b65f0
Author: Akira TAGOH <akira at tagoh.org>
Date:   Mon Apr 16 20:25:52 2012 +0900

    doc: Fix a typo of the environment variable name.

diff --git a/doc/fcconfig.fncs b/doc/fcconfig.fncs
index fb55ade..9b9f66e 100644
--- a/doc/fcconfig.fncs
+++ b/doc/fcconfig.fncs
@@ -350,11 +350,11 @@ references into filename form.
     </para><para>
 A null or empty <parameter>name</parameter> indicates that the default configuration file should
 be used; which file this references can be overridden with the
-FC_CONFIG_FILE environment variable.  Next, if the name starts with <parameter>~</parameter>, it
+FONTCONFIG_FILE environment variable.  Next, if the name starts with <parameter>~</parameter>, it
 refers to a file in the current users home directory.  Otherwise if the name
 doesn't start with '/', it refers to a file in the default configuration
 directory; the built-in default directory can be overridden with the
-FC_CONFIG_DIR environment variable.
+FONTCONFIG_PATH environment variable.
 @@
 
 @RET@		FcBool