doc/xsltproc.xml //bugzilla.gnome.org/show_bug.cgi?id=97891

Thu Nov  7 11:18:42 MST 2002 John Fleck <jfleck@inkstain.net>

	* doc/xsltproc.xml
	* doc/xsltproc.1
	clarifying --catalog option and xsltproc's use of
	XML_CATALOG_FILES and /etc/xml/catalog. fixes
	http://bugzilla.gnome.org/show_bug.cgi?id=97891

diff --git a/ChangeLog b/ChangeLog
index 1a95c7e..6894b6e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Nov  7 11:18:42 MST 2002 John Fleck <jfleck@inkstain.net>
+
+       * doc/xsltproc.xml
+       * doc/xsltproc.1
+       clarifying --catalog option and xsltproc's use of 
+       XML_CATALOG_FILES and /etc/xml/catalog. fixes
+       http://bugzilla.gnome.org/show_bug.cgi?id=97891
+       
 Mon Nov  4 06:55:36 CET 2002 Daniel Veillard <daniel@veillard.com>
 
        * xsltproc/xsltproc.c: remove the use of snprintf, and use

diff --git a/doc/xsltproc.1 b/doc/xsltproc.1
index 00d0b0f..24cc7b4 100644 (file)
--- a/doc/xsltproc.1
+++ b/doc/xsltproc.1
@@ -27,9 +27,9 @@ xsltproc \- command line xslt processor
          | \fB--debug\fR | \fB--novalid\fR | \fB--noout\fR | \fB--maxdepth \fIval\fR\fR
          | \fB--html\fR | \fB--docbook\fR | \fB--param \fIname\fR \fIvalue\fR\fR
          | \fB--stringparam \fIname\fR \fIvalue\fR\fR | \fB--nonet\fR | \fB--catalogs\fR
-         | \fB--xinclude\fR | \fB--profile\fR | \fB--dumpextensions\fR] [\fBstylesheet\fR]
-         | \fB--nowrite\fR | \fB--nomkdir\fR
-         [\fIfile1\fR] [\fIfile2\fR] [\fI....\fR]
+         | \fB--xinclude\fR | \fB--profile\fR | \fB--dumpextensions\fR | \fB--nowrite\fR
+         | \fB--nomkdir\fR] [\fBstylesheet\fR] [\fIfile1\fR] [\fIfile2\fR] [\fI....\fR]
+        
 .fi
 
 .SH "INTRODUCTION"
@@ -106,7 +106,7 @@ Do not use the Internet to fetch DTD's or entities.
 
 .TP
 \fB--catalogs\fR
-Use catalogs to resolve the location of external entities. This speeds DTD resolution. By having a catalog file point to a local version of the DTD, xsltproc does not have to use the Internet to fetch the DTD. xsltproc uses the catalog identified by the environmental variable \fBSGML_CATALOG_FILES\fR.
+Use the SGML catalog specified in \fBSGML_CATALOG_FILES\fR to resolve the location of external entities. By default, xsltproc looks for the catalog specified in \fBXML_CATALOG_FILES\fR. If that is not specified, it uses \fI/etc/xml/catalog\fR.
 
 .TP
 \fB--xinclude\fR

diff --git a/doc/xsltproc.xml b/doc/xsltproc.xml
index 9a09be8..2612397 100644 (file)
--- a/doc/xsltproc.xml
+++ b/doc/xsltproc.xml
@@ -256,13 +256,12 @@
        <term>
       <option>--catalogs</option></term>
        <listitem>
-         <simpara>Use catalogs to resolve the location of
-      external entities. This speeds DTD resolution. By having a
-      catalog file point to a local version of the DTD,
-      <application>xsltproc</application> does not have to use the
-      Internet to fetch the DTD. <application>xsltproc</application>
-      uses the catalog identified by the environmental variable
-      <envar>SGML_CATALOG_FILES</envar>.
+         <simpara>Use the <acronym>SGML</acronym> catalog specified in
+      <envar>SGML_CATALOG_FILES</envar> to resolve the location of
+           external entities. By default, <application>xsltproc</application>
+           looks for the catalog specified in
+      <envar>XML_CATALOG_FILES</envar>. If that is not specified, it uses
+      <filename>/etc/xml/catalog</filename>.
     </simpara>
        </listitem>
       </varlistentry>