[Commit] fontconfig/doc Makefile.am,1.10,1.11 fontconfig-user.sgml,1.6,1.7

[commit@keithp.com]

Committed by: nlevitt

Update of /local/src/CVS/fontconfig/doc
In directory home.keithp.com:/tmp/cvs-serv9006/doc

Modified Files:
	Makefile.am fontconfig-user.sgml 
Log Message:
Testing syncmail yet again.


Index: Makefile.am
===================================================================
RCS file: /local/src/CVS/fontconfig/doc/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile.am	8 Apr 2003 05:00:25 -0000	1.10
+++ Makefile.am	22 Apr 2003 23:34:50 -0000	1.11
@@ -105,7 +105,7 @@
 
 $(man_MANS): func.refs
 
-func.refs: fontconfig-devel.sgml $(DOC_FUNCS_SGML) version.sgml
+func.refs: fontconfig-devel.sgml $(DOC_FUNCS_SGML) version.sgml confdir.sgml
 	$(RM) func.refs
 	$(DOC2MAN) fontconfig-devel.sgml
 	mv manpage.refs func.refs
@@ -113,7 +113,7 @@
 
 $(DOC_FUNCS_SGML): edit-sgml $(FNCS_TMPL)
 
-fonts-conf.5: fontconfig-user.sgml version.sgml
+fonts-conf.5: fontconfig-user.sgml version.sgml confdir.sgml
 	$(RM) file.refs
 	$(DOC2MAN) fontconfig-user.sgml
 	$(RM) manpage.refs manpage.links
@@ -124,16 +124,16 @@
 	$(RM) $(man_MANS) $(DOC_FILES) $(DOC_FUNCS_SGML) func.refs
 	$(RM) -r $(DOC_DIRS)
 
-fontconfig-devel: fontconfig-devel.sgml $(DOCS_FUNCS_SGML) version.sgml
+fontconfig-devel: fontconfig-devel.sgml $(DOCS_FUNCS_SGML) version.sgml confdir.sgml
 	$(RM) -r fontconfig-devel
 	$(DOC2HTML) -o fontconfig-devel fontconfig-devel.sgml
 
-fontconfig-devel.txt: fontconfig-devel.sgml version.sgml
+fontconfig-devel.txt: fontconfig-devel.sgml version.sgml confdir.sgml
 
-fontconfig-user.html: fontconfig-user.sgml version.sgml
+fontconfig-user.html: fontconfig-user.sgml version.sgml confdir.sgml
 	$(DOC2HTML) -u fontconfig-user.sgml
 
-fontconfig-user.txt:  fontconfig-user.sgml version.sgml
+fontconfig-user.txt:  fontconfig-user.sgml version.sgml confdir.sgml
 else
 all-local:
 clean-local:

Index: fontconfig-user.sgml
===================================================================
RCS file: /local/src/CVS/fontconfig/doc/fontconfig-user.sgml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- fontconfig-user.sgml	20 Mar 2003 02:00:54 -0000	1.6
+++ fontconfig-user.sgml	22 Apr 2003 23:34:50 -0000	1.7
@@ -1,5 +1,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
 <!ENTITY version SYSTEM "version.sgml">
+<!ENTITY confdir SYSTEM "confdir.sgml">
 ]>
 <!--
     $Id$
@@ -35,8 +36,8 @@
 </refnamediv>
 <refsynopsisdiv>
 <synopsis>
-   /etc/fonts/fonts.conf
-   /etc/fonts/fonts.dtd
+   &confdir;/fonts.conf
+   &confdir;/fonts.dtd
    ~/.fonts.conf
 </synopsis>
 </refsynopsisdiv>
@@ -231,7 +232,7 @@
   </para><para>
 The fontconfig document type definition resides in the external entity
 "fonts.dtd"; this is normally stored in the default font configuration
-directory (/etc/fonts).  Each configuration file should contain the
+directory (&confdir;).  Each configuration file should contain the
 following structure:
     <programlisting>
 	&lt;?xml version="1.0"?&gt;
@@ -404,7 +405,7 @@
     <programlisting>
 &lt;?xml version="1.0"?&gt;
 &lt;!DOCTYPE fontconfig SYSTEM "fonts.dtd"&gt;
-&lt;!-- /etc/fonts/fonts.conf file to configure system font access --&gt;
+&lt;!-- &confdir;/fonts.conf file to configure system font access --&gt;
 &lt;fontconfig&gt;
 &lt;!-- 
 	Find fonts in these directories