[Fontconfig] fontconfig: Branch 'master' - 2 commits

Behdad Esfahbod behdad at kemper.freedesktop.org
Mon Jul 27 12:09:56 PDT 2009


 doc/confdir.sgml.in      |    3 ++-
 doc/fontconfig-user.sgml |    7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 273e22c71f78281ade1c5c30a25ef10d214d7ea6
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Jul 27 15:07:12 2009 -0400

    Hardcode /etc/fonts instead of @CONFDIR@ in docs (#22911)
    
    We distribute the docs, so it makes little sense to distribute with
    @CONFDIR@ replaced.  Until we find a better solution, I've hardcoded
    /etc/fonts now.

diff --git a/doc/confdir.sgml.in b/doc/confdir.sgml.in
index 6dc6526..291b26b 100644
--- a/doc/confdir.sgml.in
+++ b/doc/confdir.sgml.in
@@ -22,4 +22,5 @@
    PERFORMANCE OF THIS SOFTWARE.
 -->
 <!-- this is filled in at make time -->
- at CONFDIR@
+<!-- at CONFDIR@-->
+/etc/fonts
commit 21384990ffd045cc0f8379a325612aba6d810359
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Jul 27 14:50:44 2009 -0400

    [doc] Add ~/fonts.conf.d to user docs

diff --git a/doc/fontconfig-user.sgml b/doc/fontconfig-user.sgml
index 86d8d59..298f8d5 100644
--- a/doc/fontconfig-user.sgml
+++ b/doc/fontconfig-user.sgml
@@ -37,6 +37,7 @@
    &confdir;/fonts.conf
    &confdir;/fonts.dtd
    &confdir;/conf.d
+   ~/.fonts.conf.d
    ~/.fonts.conf
 </synopsis>
 </refsynopsisdiv>
@@ -662,6 +663,12 @@ format.  The master fonts.conf file references this directory in an
 is a DTD that describes the format of the configuration files.
   </para>
   <para>
+<emphasis>~/.fonts.conf.d</emphasis>
+is the conventional name for a per-user directory of (typically
+auto-generated) configuration files, although the
+actual location is specified in the global fonts.conf file.
+  </para>
+  <para>
 <emphasis>~/.fonts.conf</emphasis>
 is the conventional location for per-user font configuration, although the
 actual location is specified in the global fonts.conf file.


More information about the Fontconfig mailing list