doc/xmlcatalog_man.xml, xmlcatalog.1 Docs patch from Ville Skytta,
Wed Jun 23 20:18:19 MDT 2004 John Fleck <jfleck@inkstain.net>
* doc/xmlcatalog_man.xml, xmlcatalog.1
Docs patch from Ville Skytta, bugzilla #144841
diff --git a/ChangeLog b/ChangeLog
index 4a340ed..6aa8c8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun 23 20:18:19 MDT 2004 John Fleck <jfleck@inkstain.net>
+
+ * doc/xmlcatalog_man.xml, xmlcatalog.1
+ Docs patch from Ville Skytta, bugzilla #144841
+
Sat Jun 19 18:34:11 MDT 2004 John Fleck <jfleck@inkstain.net>
* doc/xmllint.xml, xmllint.html, xmllint.1
diff --git a/doc/xmlcatalog.1 b/doc/xmlcatalog.1
index 0f3af71..ff31fb7 100644
--- a/doc/xmlcatalog.1
+++ b/doc/xmlcatalog.1
@@ -48,17 +48,17 @@
.TP
\fB\-\-add\fR \fI'type'\fR \fI'orig'\fR \fI'replace'\fR \fIfilename\fR
-Add an entry to catalog file \fIfilename\fR\&. \fItype\fR indicates the type of entry\&. Possible types are 'public', 'system', 'rewriteSystem', 'delegatePublic', 'delegateSystem'amd 'rewriteURI'\&. \fI'orig'\fR is the original reference to be replaced, and \fI'replace'\fR is the URI of the replacement entity to be used\&. The \fB\-\-add\fR option will not overwrite \fIfilename\fR, outputing to stdout, unless \fB\-\-noout\fR is used\&. The \fB\-\-add\fR will always take three parameters even if some of the XML catalog constructs will have only a single argument\&.
+Add an entry to catalog file \fIfilename\fR\&. \fItype\fR indicates the type of entry\&. Possible types are 'public', 'system', 'rewriteSystem', 'rewriteURI', 'delegatePublic', 'delegateSystem', and 'nextCatalog'\&. \fI'orig'\fR is the original reference to be replaced, and \fI'replace'\fR is the URI of the replacement entity to be used\&. The \fB\-\-add\fR option will not overwrite \fIfilename\fR, outputting to stdout, unless \fB\-\-noout\fR is used\&. The \fB\-\-add\fR will always take three parameters even if some of the XML catalog constructs will have only a single argument\&.
If the \fB\-\-add\fR option is used following the \fB\-\-sgml\fR option, only a single argument, a \fIfilename\fR, is used\&. This is used to add the name of a catalog file to an SGML supercatalog, a file that contains references to other included SGML catalog files\&.
.TP
\fB\-\-del\fR \fI'values'\fR \fIfilename\fR
-Remove entries from the catalog file \fIfilename\fR matching \fI'values'\fR\&. The \fB\-\-del\fR option will not overwrite \fIfilename\fR, outputing to stdout, unless \fB\-\-noout\fR is used\&.
+Remove entries from the catalog file \fIfilename\fR matching \fI'values'\fR\&. The \fB\-\-del\fR option will not overwrite \fIfilename\fR, outputting to stdout, unless \fB\-\-noout\fR is used\&.
.TP
\fB\-\-noout\fR
-Save output to the named file rather than outputing to stdout\&.
+Save output to the named file rather than outputting to stdout\&.
.TP
\fB\-\-sgml\fR
@@ -83,7 +83,7 @@
.TP
\fBadd \fR \fI'type'\fR \fI'orig'\fR \fI'replace'\fR
-Add an entry to the catalog file\&. \fItype\fR indicates the type of entry\&. Possible types are 'public', 'system', 'rewriteSystem', 'delegatePublic' and 'delegateSystem'\&. \fI'orig'\fR is the original reference to be replaced, and \fI'replace'\fR is the URI of the replacement entity to be used\&.
+Add an entry to the catalog file\&. \fItype\fR indicates the type of entry\&. Possible types are 'public', 'system', 'rewriteSystem', 'rewriteURI', 'delegatePublic', 'delegateSystem', and 'nextCatalog'\&. \fI'orig'\fR is the original reference to be replaced, and \fI'replace'\fR is the URI of the replacement entity to be used\&.
.TP
\fBdel\fR \fI'values'\fR
@@ -136,13 +136,13 @@
libxml web page: \fIhttp://www.xmlsoft.org/\fR
.PP
-libxml catalog support web page:: \fIhttp://www.xmlsoft.org/catalog.html\fR
+libxml catalog support web page: \fIhttp://www.xmlsoft.org/catalog.html\fR
.PP
-James Clark's SGML catalog page:: \fIhttp://www.jclark.com/sp/catalog.htm\fR
+James Clark's SGML catalog page: \fIhttp://www.jclark.com/sp/catalog.htm\fR
.PP
-OASIS XML catalog specification: : \fIhttp://www.oasis-open.org/committees/entity/spec.html\fR
+OASIS XML catalog specification: \fIhttp://www.oasis-open.org/committees/entity/spec.html\fR
.SH AUTHOR
John Fleck.
diff --git a/doc/xmlcatalog_man.xml b/doc/xmlcatalog_man.xml
index 47ef084..b35002f 100644
--- a/doc/xmlcatalog_man.xml
+++ b/doc/xmlcatalog_man.xml
@@ -98,12 +98,12 @@
Add an entry to catalog file
<filename>filename</filename>. <replaceable>type</replaceable>
indicates the type of entry. Possible types are 'public', 'system',
- 'rewriteSystem', 'delegatePublic', 'delegateSystem'amd
- 'rewriteURI'. <replaceable>'orig'</replaceable> is the original
+ 'rewriteSystem', 'rewriteURI', 'delegatePublic', 'delegateSystem',
+ and 'nextCatalog'. <replaceable>'orig'</replaceable> is the original
reference to be replaced, and <replaceable>'replace'</replaceable>
is the <acronym>URI</acronym> of the replacement entity to be
used. The <option>--add</option> option will not overwrite
- <replaceable>filename</replaceable>, outputing to stdout, unless
+ <replaceable>filename</replaceable>, outputting to stdout, unless
<option>--noout</option> is used. The <option>--add</option> will
always take three parameters even if some of the
<acronym>XML</acronym> catalog constructs will have only a single
@@ -129,7 +129,7 @@
Remove entries from the catalog file
<replaceable>filename</replaceable> matching
<replaceable>'values'</replaceable>. The <option>--del</option> option
- will not overwrite <replaceable>filename</replaceable>, outputing to
+ will not overwrite <replaceable>filename</replaceable>, outputting to
stdout, unless <option>--noout</option> is used.
</simpara>
</listitem>
@@ -139,7 +139,7 @@
<listitem>
<simpara>
Save output to the named file rather than
- outputing to stdout.
+ outputting to stdout.
</simpara>
</listitem>
</varlistentry>
@@ -203,7 +203,8 @@
Add an entry to the catalog
file. <replaceable>type</replaceable> indicates the type of
entry. Possible types are 'public', 'system', 'rewriteSystem',
- 'delegatePublic' and 'delegateSystem'. <replaceable>'orig'</replaceable>
+ 'rewriteURI', 'delegatePublic', 'delegateSystem', and
+ 'nextCatalog'. <replaceable>'orig'</replaceable>
is the original reference to be replaced, and
<replaceable>'replace'</replaceable> is the <acronym>URI</acronym> of the
replacement entity to be used.
@@ -284,14 +285,14 @@
<para><ulink url="http://www.xmlsoft.org/">libxml web page</ulink></para>
<para><ulink url="http://www.xmlsoft.org/catalog.html"><application>libxml</application>
- catalog support web page:</ulink></para>
+ catalog support web page</ulink></para>
<para><ulink url="http://www.jclark.com/sp/catalog.htm">James Clark's
- <acronym>SGML</acronym> catalog page:</ulink></para>
+ <acronym>SGML</acronym> catalog page</ulink></para>
<para><ulink
url="http://www.oasis-open.org/committees/entity/spec.html"><acronym>OASIS</acronym>
- <acronym>XML</acronym> catalog specification: </ulink></para>
+ <acronym>XML</acronym> catalog specification</ulink></para>
</refsect1>