applied a cleanup patch from Peter Breitenlohner removed a doc build
* Makefile.am catalog.c configure.in: applied a cleanup patch
from Peter Breitenlohner
* tree.c: removed a doc build warning by fixing a param comment
* doc/* : rebuilt the docs
Daniel
diff --git a/ChangeLog b/ChangeLog
index 272f2cf..7dabc25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Feb 25 13:57:25 CET 2004 Daniel Veillard <daniel@veillard.com>
+
+ * Makefile.am catalog.c configure.in: applied a cleanup patch
+ from Peter Breitenlohner
+ * tree.c: removed a doc build warning by fixing a param comment
+ * doc/* : rebuilt the docs
+
Wed Feb 25 13:33:07 CET 2004 Daniel Veillard <daniel@veillard.com>
* valid.c HTMLparser.c: avoid ID error message if using
diff --git a/Makefile.am b/Makefile.am
index bb1b3af..693e5ad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -901,6 +901,15 @@
## the value NONE in configure if the user doesn't specify them (this
## is an autoconf feature, not a bug).
+xml2Conf.sh: xml2Conf.sh.in Makefile
+## Use sed and then mv to avoid problems if the user interrupts.
+ sed -e 's?\@XML_LIBDIR\@?$(XML_LIBDIR)?g' \
+ -e 's?\@XML_INCLUDEDIR\@?$(XML_INCLUDEDIR)?g' \
+ -e 's?\@VERSION\@?$(VERSION)?g' \
+ -e 's?\@XML_LIBS\@?$(XML_LIBS)?g' \
+ < $(srcdir)/xml2Conf.sh.in > xml2Conf.tmp \
+ && mv xml2Conf.tmp xml2Conf.sh
+
CLEANFILES=xml2Conf.sh
confexecdir=$(libdir)
diff --git a/catalog.c b/catalog.c
index 86df2eb..602e16b 100644
--- a/catalog.c
+++ b/catalog.c
@@ -392,7 +392,7 @@
/**
* xmlFreeCatalog:
- * @catal: a Catalog entry
+ * @catal: a Catalog
*
* Free the memory allocated to a Catalog
*/
@@ -417,7 +417,7 @@
#ifdef LIBXML_OUTPUT_ENABLED
/**
* xmlCatalogDumpEntry:
- * @entry: the
+ * @entry: the catalog entry
* @out: the file.
*
* Serialize an SGML Catalog entry
@@ -960,7 +960,7 @@
*
* lookup the internal type associated to an XML catalog entry name
*
- * Returns the type associate with that name
+ * Returns the type associated with that name
*/
static xmlCatalogEntryType
xmlGetXMLCatalogEntryType(const xmlChar *name) {
@@ -1469,8 +1469,8 @@
/**
* xmlCatalogXMLResolve:
* @catal: a catalog list
- * @pubId: the public ID string
- * @sysId: the system ID string
+ * @pubID: the public ID string
+ * @sysID: the system ID string
*
* Do a complete resolution lookup of an External Identifier for a
* list of catalog entries.
@@ -1700,7 +1700,7 @@
* xmlCatalogXMLResolveURI:
* @catal: a catalog list
* @URI: the URI
- * @sysId: the system ID string
+ * @sysID: the system ID string
*
* Do a complete resolution lookup of an External Identifier for a
* list of catalog entries.
@@ -1835,8 +1835,8 @@
/**
* xmlCatalogListXMLResolve:
* @catal: a catalog list
- * @pubId: the public ID string
- * @sysId: the system ID string
+ * @pubID: the public ID string
+ * @sysID: the system ID string
*
* Do a complete resolution lookup of an External Identifier for a
* list of catalogs
@@ -2355,11 +2355,11 @@
/**
* xmlCatalogGetSGMLPublic:
* @catal: an SGML catalog hash
- * @pubId: the public ID string
+ * @pubID: the public ID string
*
- * Try to lookup the system ID associated to a public ID
+ * Try to lookup the catalog local reference associated to a public ID
*
- * Returns the system ID if found or NULL otherwise.
+ * Returns the local resource if found or NULL otherwise.
*/
static const xmlChar *
xmlCatalogGetSGMLPublic(xmlHashTablePtr catal, const xmlChar *pubID) {
@@ -2379,7 +2379,7 @@
/**
* xmlCatalogGetSGMLSystem:
* @catal: an SGML catalog hash
- * @sysId: the public ID string
+ * @sysID: the system ID string
*
* Try to lookup the catalog local reference for a system ID
*
@@ -2403,8 +2403,8 @@
/**
* xmlCatalogSGMLResolve:
* @catal: the SGML catalog
- * @pubId: the public ID string
- * @sysId: the system ID string
+ * @pubID: the public ID string
+ * @sysID: the system ID string
*
* Do a complete resolution lookup of an External Identifier
*
@@ -2576,11 +2576,11 @@
/**
* xmlACatalogResolveSystem:
* @catal: a Catalog
- * @sysID: the public ID string
+ * @sysID: the system ID string
*
* Try to lookup the catalog resource for a system ID
*
- * Returns the system ID if found or NULL otherwise, the value returned
+ * Returns the resource if found or NULL otherwise, the value returned
* must be freed by the caller.
*/
xmlChar *
@@ -2613,9 +2613,9 @@
* @catal: a Catalog
* @pubID: the public ID string
*
- * Try to lookup the system ID associated to a public ID in that catalog
+ * Try to lookup the catalog local reference associated to a public ID in that catalog
*
- * Returns the system ID if found or NULL otherwise, the value returned
+ * Returns the local resource if found or NULL otherwise, the value returned
* must be freed by the caller.
*/
xmlChar *
@@ -3063,11 +3063,11 @@
/**
* xmlCatalogResolveSystem:
- * @sysID: the public ID string
+ * @sysID: the system ID string
*
* Try to lookup the catalog resource for a system ID
*
- * Returns the system ID if found or NULL otherwise, the value returned
+ * Returns the resource if found or NULL otherwise, the value returned
* must be freed by the caller.
*/
xmlChar *
@@ -3085,9 +3085,9 @@
* xmlCatalogResolvePublic:
* @pubID: the public ID string
*
- * Try to lookup the system ID associated to a public ID
+ * Try to lookup the catalog reference associated to a public ID
*
- * Returns the system ID if found or NULL otherwise, the value returned
+ * Returns the resource if found or NULL otherwise, the value returned
* must be freed by the caller.
*/
xmlChar *
@@ -3502,10 +3502,10 @@
* xmlCatalogGetSystem:
* @sysID: the system ID string
*
- * Try to lookup the system ID associated to a public ID
+ * Try to lookup the catalog reference associated to a system ID
* DEPRECATED, use xmlCatalogResolveSystem()
*
- * Returns the system ID if found or NULL otherwise.
+ * Returns the resource if found or NULL otherwise.
*/
const xmlChar *
xmlCatalogGetSystem(const xmlChar *sysID) {
@@ -3546,10 +3546,10 @@
* xmlCatalogGetPublic:
* @pubID: the public ID string
*
- * Try to lookup the system ID associated to a public ID
+ * Try to lookup the catalog reference associated to a public ID
* DEPRECATED, use xmlCatalogResolvePublic()
*
- * Returns the system ID if found or NULL otherwise.
+ * Returns the resource if found or NULL otherwise.
*/
const xmlChar *
xmlCatalogGetPublic(const xmlChar *pubID) {
diff --git a/configure.in b/configure.in
index c808a26..6acc92d 100644
--- a/configure.in
+++ b/configure.in
@@ -1054,6 +1054,6 @@
ln -s Copyright COPYING
# keep on one line for cygwin c.f. #130896
-AC_OUTPUT(libxml2.spec:libxml.spec.in Makefile include/Makefile include/libxml/Makefile doc/Makefile doc/examples/Makefile example/Makefile python/Makefile python/tests/Makefile include/libxml/xmlversion.h xml2-config libxml-2.0.pc libxml-2.0-uninstalled.pc xml2Conf.sh python/setup.py)
+AC_OUTPUT(libxml2.spec:libxml.spec.in Makefile include/Makefile include/libxml/Makefile doc/Makefile doc/examples/Makefile example/Makefile python/Makefile python/tests/Makefile include/libxml/xmlversion.h xml2-config libxml-2.0.pc libxml-2.0-uninstalled.pc python/setup.py)
-chmod +x xml2-config xml2Conf.sh python/setup.py
+chmod +x xml2-config python/setup.py
diff --git a/doc/APIchunk12.html b/doc/APIchunk12.html
index cd55cf9..d50869a 100644
--- a/doc/APIchunk12.html
+++ b/doc/APIchunk12.html
@@ -179,7 +179,6 @@
<a href="html/libxml-catalog.html#xmlCatalogAdd">xmlCatalogAdd</a><br />
<a href="html/libxml-catalog.html#xmlCatalogAddLocal">xmlCatalogAddLocal</a><br />
<a href="html/libxml-catalog.html#xmlCatalogRemove">xmlCatalogRemove</a><br />
-<a href="html/libxml-catalog.html#xmlFreeCatalog">xmlFreeCatalog</a><br />
<a href="html/libxml-hash.html#xmlHashUpdateEntry">xmlHashUpdateEntry</a><br />
<a href="html/libxml-hash.html#xmlHashUpdateEntry2">xmlHashUpdateEntry2</a><br />
<a href="html/libxml-hash.html#xmlHashUpdateEntry3">xmlHashUpdateEntry3</a><br />
diff --git a/doc/APIchunk16.html b/doc/APIchunk16.html
index 973c0e4..6669752 100644
--- a/doc/APIchunk16.html
+++ b/doc/APIchunk16.html
@@ -282,32 +282,6 @@
</dd><dt>loadsubset</dt><dd><a href="html/libxml-parser.html#XML_COMPLETE_ATTRS">XML_COMPLETE_ATTRS</a><br />
<a href="html/libxml-parser.html#XML_DETECT_IDS">XML_DETECT_IDS</a><br />
<a href="html/libxml-parser.html#XML_SKIP_IDS">XML_SKIP_IDS</a><br />
-</dd><dt>local</dt><dd><a href="html/libxml-tree.html#_xmlNs">_xmlNs</a><br />
-<a href="html/libxml-parser.html#endElementNsSAX2Func">endElementNsSAX2Func</a><br />
-<a href="html/libxml-parser.html#startElementNsSAX2Func">startElementNsSAX2Func</a><br />
-<a href="html/libxml-catalog.html#xmlCatalogAddLocal">xmlCatalogAddLocal</a><br />
-<a href="html/libxml-parserInternals.html#xmlNamespaceParseQName">xmlNamespaceParseQName</a><br />
-<a href="html/libxml-xmlIO.html#xmlNoNetExternalEntityLoader">xmlNoNetExternalEntityLoader</a><br />
-<a href="html/libxml-xmlIO.html#xmlOutputBufferCreateFilename">xmlOutputBufferCreateFilename</a><br />
-<a href="html/libxml-SAX2.html#xmlSAX2EndElementNs">xmlSAX2EndElementNs</a><br />
-<a href="html/libxml-SAX2.html#xmlSAX2StartElementNs">xmlSAX2StartElementNs</a><br />
-<a href="html/libxml-parserInternals.html#xmlSplitQName">xmlSplitQName</a><br />
-<a href="html/libxml-tree.html#xmlSplitQName2">xmlSplitQName2</a><br />
-<a href="html/libxml-xmlreader.html#xmlTextReaderConstLocalName">xmlTextReaderConstLocalName</a><br />
-<a href="html/libxml-xmlreader.html#xmlTextReaderConstName">xmlTextReaderConstName</a><br />
-<a href="html/libxml-xmlreader.html#xmlTextReaderGetAttributeNs">xmlTextReaderGetAttributeNs</a><br />
-<a href="html/libxml-xmlreader.html#xmlTextReaderLocalName">xmlTextReaderLocalName</a><br />
-<a href="html/libxml-xmlreader.html#xmlTextReaderMoveToAttributeNs">xmlTextReaderMoveToAttributeNs</a><br />
-<a href="html/libxml-xmlreader.html#xmlTextReaderName">xmlTextReaderName</a><br />
-<a href="html/libxml-xmlwriter.html#xmlTextWriterStartAttributeNS">xmlTextWriterStartAttributeNS</a><br />
-<a href="html/libxml-xmlwriter.html#xmlTextWriterStartElementNS">xmlTextWriterStartElementNS</a><br />
-<a href="html/libxml-xmlwriter.html#xmlTextWriterWriteAttributeNS">xmlTextWriterWriteAttributeNS</a><br />
-<a href="html/libxml-xmlwriter.html#xmlTextWriterWriteElementNS">xmlTextWriterWriteElementNS</a><br />
-<a href="html/libxml-xmlwriter.html#xmlTextWriterWriteFormatAttributeNS">xmlTextWriterWriteFormatAttributeNS</a><br />
-<a href="html/libxml-xmlwriter.html#xmlTextWriterWriteFormatElementNS">xmlTextWriterWriteFormatElementNS</a><br />
-<a href="html/libxml-xmlwriter.html#xmlTextWriterWriteVFormatAttributeNS">xmlTextWriterWriteVFormatAttributeNS</a><br />
-<a href="html/libxml-xmlwriter.html#xmlTextWriterWriteVFormatElementNS">xmlTextWriterWriteVFormatElementNS</a><br />
-<a href="html/libxml-xpathInternals.html#xmlXPathLocalNameFunction">xmlXPathLocalNameFunction</a><br />
</dd><dt>local-name</dt><dd><a href="html/libxml-xpathInternals.html#xmlXPathLocalNameFunction">xmlXPathLocalNameFunction</a><br />
</dd><dt>localname</dt><dd><a href="html/libxml-parser.html#startElementNsSAX2Func">startElementNsSAX2Func</a><br />
<a href="html/libxml-SAX2.html#xmlSAX2StartElementNs">xmlSAX2StartElementNs</a><br />
diff --git a/doc/html/libxml-catalog.html b/doc/html/libxml-catalog.html
index 199f42b..f4817b9 100644
--- a/doc/html/libxml-catalog.html
+++ b/doc/html/libxml-catalog.html
@@ -76,10 +76,10 @@
<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>catal</tt></i>:</span></td><td>a Catalog</td></tr><tr><td><span class="term"><i><tt>value</tt></i>:</span></td><td>the value to remove</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the number of entries removed if successful, -1 otherwise</td></tr></tbody></table></div><h3><a name="xmlACatalogResolve" id="xmlACatalogResolve"></a>Function: xmlACatalogResolve</h3><pre class="programlisting"><a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * xmlACatalogResolve (<a href="libxml-catalog.html#xmlCatalogPtr">xmlCatalogPtr</a> catal, <br /> const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * pubID, <br /> const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * sysID)<br />
</pre><p>Do a complete resolution lookup of an External Identifier</p>
<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>catal</tt></i>:</span></td><td>a Catalog</td></tr><tr><td><span class="term"><i><tt>pubID</tt></i>:</span></td><td>the public ID string</td></tr><tr><td><span class="term"><i><tt>sysID</tt></i>:</span></td><td>the system ID string</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the URI of the resource or NULL if not found, it must be freed by the caller.</td></tr></tbody></table></div><h3><a name="xmlACatalogResolvePublic" id="xmlACatalogResolvePublic"></a>Function: xmlACatalogResolvePublic</h3><pre class="programlisting"><a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * xmlACatalogResolvePublic (<a href="libxml-catalog.html#xmlCatalogPtr">xmlCatalogPtr</a> catal, <br /> const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * pubID)<br />
-</pre><p>Try to lookup the system ID associated to a public ID in that catalog</p>
-<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>catal</tt></i>:</span></td><td>a Catalog</td></tr><tr><td><span class="term"><i><tt>pubID</tt></i>:</span></td><td>the public ID string</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the system ID if found or NULL otherwise, the value returned must be freed by the caller.</td></tr></tbody></table></div><h3><a name="xmlACatalogResolveSystem" id="xmlACatalogResolveSystem"></a>Function: xmlACatalogResolveSystem</h3><pre class="programlisting"><a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * xmlACatalogResolveSystem (<a href="libxml-catalog.html#xmlCatalogPtr">xmlCatalogPtr</a> catal, <br /> const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * sysID)<br />
+</pre><p>Try to lookup the catalog local <a href="libxml-SAX.html#reference">reference</a> associated to a public ID in that catalog</p>
+<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>catal</tt></i>:</span></td><td>a Catalog</td></tr><tr><td><span class="term"><i><tt>pubID</tt></i>:</span></td><td>the public ID string</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the local resource if found or NULL otherwise, the value returned must be freed by the caller.</td></tr></tbody></table></div><h3><a name="xmlACatalogResolveSystem" id="xmlACatalogResolveSystem"></a>Function: xmlACatalogResolveSystem</h3><pre class="programlisting"><a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * xmlACatalogResolveSystem (<a href="libxml-catalog.html#xmlCatalogPtr">xmlCatalogPtr</a> catal, <br /> const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * sysID)<br />
</pre><p>Try to lookup the catalog resource for a system ID</p>
-<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>catal</tt></i>:</span></td><td>a Catalog</td></tr><tr><td><span class="term"><i><tt>sysID</tt></i>:</span></td><td>the public ID string</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the system ID if found or NULL otherwise, the value returned must be freed by the caller.</td></tr></tbody></table></div><h3><a name="xmlACatalogResolveURI" id="xmlACatalogResolveURI"></a>Function: xmlACatalogResolveURI</h3><pre class="programlisting"><a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * xmlACatalogResolveURI (<a href="libxml-catalog.html#xmlCatalogPtr">xmlCatalogPtr</a> catal, <br /> const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * URI)<br />
+<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>catal</tt></i>:</span></td><td>a Catalog</td></tr><tr><td><span class="term"><i><tt>sysID</tt></i>:</span></td><td>the system ID string</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the resource if found or NULL otherwise, the value returned must be freed by the caller.</td></tr></tbody></table></div><h3><a name="xmlACatalogResolveURI" id="xmlACatalogResolveURI"></a>Function: xmlACatalogResolveURI</h3><pre class="programlisting"><a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * xmlACatalogResolveURI (<a href="libxml-catalog.html#xmlCatalogPtr">xmlCatalogPtr</a> catal, <br /> const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * URI)<br />
</pre><p>Do a complete resolution lookup of an URI</p>
<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>catal</tt></i>:</span></td><td>a Catalog</td></tr><tr><td><span class="term"><i><tt>URI</tt></i>:</span></td><td>the URI</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the URI of the resource or NULL if not found, it must be freed by the caller.</td></tr></tbody></table></div><h3><a name="xmlCatalogAdd" id="xmlCatalogAdd"></a>Function: xmlCatalogAdd</h3><pre class="programlisting">int xmlCatalogAdd (const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * type, <br /> const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * orig, <br /> const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * replace)<br />
</pre><p>Add an entry in the catalog, it may overwrite existing but different entries. If called before any other catalog routine, allows to override the default shared catalog put in place by xmlInitializeCatalog();</p>
@@ -96,10 +96,10 @@
<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>catalogs</tt></i>:</span></td><td>a document's list of catalogs</td></tr></tbody></table></div><h3><a name="xmlCatalogGetDefaults" id="xmlCatalogGetDefaults"></a>Function: xmlCatalogGetDefaults</h3><pre class="programlisting"><a href="libxml-catalog.html#xmlCatalogAllow">xmlCatalogAllow</a> xmlCatalogGetDefaults (void)<br />
</pre><p>Used to get the user preference w.r.t. to what catalogs should be accepted</p>
<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the current <a href="libxml-catalog.html#xmlCatalogAllow">xmlCatalogAllow</a> value</td></tr></tbody></table></div><h3><a name="xmlCatalogGetPublic" id="xmlCatalogGetPublic"></a>Function: xmlCatalogGetPublic</h3><pre class="programlisting">const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * xmlCatalogGetPublic (const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * pubID)<br />
-</pre><p>Try to lookup the system ID associated to a public ID DEPRECATED, use xmlCatalogResolvePublic()</p>
-<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>pubID</tt></i>:</span></td><td>the public ID string</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the system ID if found or NULL otherwise.</td></tr></tbody></table></div><h3><a name="xmlCatalogGetSystem" id="xmlCatalogGetSystem"></a>Function: xmlCatalogGetSystem</h3><pre class="programlisting">const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * xmlCatalogGetSystem (const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * sysID)<br />
-</pre><p>Try to lookup the system ID associated to a public ID DEPRECATED, use xmlCatalogResolveSystem()</p>
-<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>sysID</tt></i>:</span></td><td>the system ID string</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the system ID if found or NULL otherwise.</td></tr></tbody></table></div><h3><a name="xmlCatalogIsEmpty" id="xmlCatalogIsEmpty"></a>Function: xmlCatalogIsEmpty</h3><pre class="programlisting">int xmlCatalogIsEmpty (<a href="libxml-catalog.html#xmlCatalogPtr">xmlCatalogPtr</a> catal)<br />
+</pre><p>Try to lookup the catalog <a href="libxml-SAX.html#reference">reference</a> associated to a public ID DEPRECATED, use xmlCatalogResolvePublic()</p>
+<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>pubID</tt></i>:</span></td><td>the public ID string</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the resource if found or NULL otherwise.</td></tr></tbody></table></div><h3><a name="xmlCatalogGetSystem" id="xmlCatalogGetSystem"></a>Function: xmlCatalogGetSystem</h3><pre class="programlisting">const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * xmlCatalogGetSystem (const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * sysID)<br />
+</pre><p>Try to lookup the catalog <a href="libxml-SAX.html#reference">reference</a> associated to a system ID DEPRECATED, use xmlCatalogResolveSystem()</p>
+<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>sysID</tt></i>:</span></td><td>the system ID string</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the resource if found or NULL otherwise.</td></tr></tbody></table></div><h3><a name="xmlCatalogIsEmpty" id="xmlCatalogIsEmpty"></a>Function: xmlCatalogIsEmpty</h3><pre class="programlisting">int xmlCatalogIsEmpty (<a href="libxml-catalog.html#xmlCatalogPtr">xmlCatalogPtr</a> catal)<br />
</pre><p>Check is a catalog is empty</p>
<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>catal</tt></i>:</span></td><td>should this create an SGML catalog</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>1 if the catalog is empty, 0 if not, amd -1 in case of error.</td></tr></tbody></table></div><h3><a name="xmlCatalogLocalResolve" id="xmlCatalogLocalResolve"></a>Function: xmlCatalogLocalResolve</h3><pre class="programlisting"><a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * xmlCatalogLocalResolve (void * catalogs, <br /> const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * pubID, <br /> const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * sysID)<br />
</pre><p>Do a complete resolution lookup of an External Identifier using a document's private catalog list</p>
@@ -110,10 +110,10 @@
<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>value</tt></i>:</span></td><td>the value to remove</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the number of entries removed if successful, -1 otherwise</td></tr></tbody></table></div><h3><a name="xmlCatalogResolve" id="xmlCatalogResolve"></a>Function: xmlCatalogResolve</h3><pre class="programlisting"><a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * xmlCatalogResolve (const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * pubID, <br /> const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * sysID)<br />
</pre><p>Do a complete resolution lookup of an External Identifier</p>
<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>pubID</tt></i>:</span></td><td>the public ID string</td></tr><tr><td><span class="term"><i><tt>sysID</tt></i>:</span></td><td>the system ID string</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the URI of the resource or NULL if not found, it must be freed by the caller.</td></tr></tbody></table></div><h3><a name="xmlCatalogResolvePublic" id="xmlCatalogResolvePublic"></a>Function: xmlCatalogResolvePublic</h3><pre class="programlisting"><a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * xmlCatalogResolvePublic (const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * pubID)<br />
-</pre><p>Try to lookup the system ID associated to a public ID</p>
-<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>pubID</tt></i>:</span></td><td>the public ID string</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the system ID if found or NULL otherwise, the value returned must be freed by the caller.</td></tr></tbody></table></div><h3><a name="xmlCatalogResolveSystem" id="xmlCatalogResolveSystem"></a>Function: xmlCatalogResolveSystem</h3><pre class="programlisting"><a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * xmlCatalogResolveSystem (const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * sysID)<br />
+</pre><p>Try to lookup the catalog <a href="libxml-SAX.html#reference">reference</a> associated to a public ID</p>
+<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>pubID</tt></i>:</span></td><td>the public ID string</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the resource if found or NULL otherwise, the value returned must be freed by the caller.</td></tr></tbody></table></div><h3><a name="xmlCatalogResolveSystem" id="xmlCatalogResolveSystem"></a>Function: xmlCatalogResolveSystem</h3><pre class="programlisting"><a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * xmlCatalogResolveSystem (const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * sysID)<br />
</pre><p>Try to lookup the catalog resource for a system ID</p>
-<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>sysID</tt></i>:</span></td><td>the public ID string</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the system ID if found or NULL otherwise, the value returned must be freed by the caller.</td></tr></tbody></table></div><h3><a name="xmlCatalogResolveURI" id="xmlCatalogResolveURI"></a>Function: xmlCatalogResolveURI</h3><pre class="programlisting"><a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * xmlCatalogResolveURI (const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * URI)<br />
+<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>sysID</tt></i>:</span></td><td>the system ID string</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the resource if found or NULL otherwise, the value returned must be freed by the caller.</td></tr></tbody></table></div><h3><a name="xmlCatalogResolveURI" id="xmlCatalogResolveURI"></a>Function: xmlCatalogResolveURI</h3><pre class="programlisting"><a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * xmlCatalogResolveURI (const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * URI)<br />
</pre><p>Do a complete resolution lookup of an URI</p>
<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>URI</tt></i>:</span></td><td>the URI</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the URI of the resource or NULL if not found, it must be freed by the caller.</td></tr></tbody></table></div><h3><a name="xmlCatalogSetDebug" id="xmlCatalogSetDebug"></a>Function: xmlCatalogSetDebug</h3><pre class="programlisting">int xmlCatalogSetDebug (int level)<br />
</pre><p>Used to set the debug level for catalog operation, 0 disable debugging, 1 enable it</p>
@@ -125,7 +125,7 @@
</pre><p>Convert all the SGML catalog entries as XML ones</p>
<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>catal</tt></i>:</span></td><td>the catalog</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the number of entries converted if successful, -1 otherwise</td></tr></tbody></table></div><h3><a name="xmlFreeCatalog" id="xmlFreeCatalog"></a>Function: xmlFreeCatalog</h3><pre class="programlisting">void xmlFreeCatalog (<a href="libxml-catalog.html#xmlCatalogPtr">xmlCatalogPtr</a> catal)<br />
</pre><p>Free the memory allocated to a Catalog</p>
-<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>catal</tt></i>:</span></td><td>a Catalog entry</td></tr></tbody></table></div><h3><a name="xmlInitializeCatalog" id="xmlInitializeCatalog"></a>Function: xmlInitializeCatalog</h3><pre class="programlisting">void xmlInitializeCatalog (void)<br />
+<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>catal</tt></i>:</span></td><td>a Catalog</td></tr></tbody></table></div><h3><a name="xmlInitializeCatalog" id="xmlInitializeCatalog"></a>Function: xmlInitializeCatalog</h3><pre class="programlisting">void xmlInitializeCatalog (void)<br />
</pre><p>Do the catalog initialization. this function is not thread safe, catalog initialization should preferably be done once at startup</p>
<h3><a name="xmlLoadACatalog" id="xmlLoadACatalog"></a>Function: xmlLoadACatalog</h3><pre class="programlisting"><a href="libxml-catalog.html#xmlCatalogPtr">xmlCatalogPtr</a> xmlLoadACatalog (const char * filename)<br />
</pre><p>Load the catalog and build the associated data structures. This can be either an XML Catalog or an SGML Catalog It will recurse in SGML CATALOG entries. On the other hand XML Catalogs are not handled recursively.</p>
diff --git a/doc/html/libxml-tree.html b/doc/html/libxml-tree.html
index 301c8a4..676e5cc 100644
--- a/doc/html/libxml-tree.html
+++ b/doc/html/libxml-tree.html
@@ -602,7 +602,7 @@
</pre><p>Add a new element @elem to the list of siblings of @cur merging adjacent TEXT nodes (@elem may be freed) If the new element was already inserted in a document it is first unlinked from its existing context.</p>
<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>cur</tt></i>:</span></td><td>the child node</td></tr><tr><td><span class="term"><i><tt>elem</tt></i>:</span></td><td>the new node</td></tr><tr><td><span class="term"><i><tt>Returns</tt></i>:</span></td><td>the new element or NULL in case of error.</td></tr></tbody></table></div><h3><a name="xmlAttrSerializeTxtContent" id="xmlAttrSerializeTxtContent"></a>Function: xmlAttrSerializeTxtContent</h3><pre class="programlisting">void xmlAttrSerializeTxtContent (<a href="libxml-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br /> <a href="libxml-tree.html#xmlDocPtr">xmlDocPtr</a> doc, <br /> <a href="libxml-tree.html#xmlAttrPtr">xmlAttrPtr</a> attr, <br /> const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * string)<br />
</pre><p>Serialize text <a href="libxml-SAX.html#attribute">attribute</a> values to an xml simple buffer</p>
-<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>buf</tt></i>:</span></td><td>the XML buffer output</td></tr><tr><td><span class="term"><i><tt>doc</tt></i>:</span></td><td>the document</td></tr><tr><td><span class="term"><i><tt>attr</tt></i>:</span></td><td>the <a href="libxml-SAX.html#attribute">attribute</a> node</td></tr><tr><td><span class="term"><i><tt>string</tt></i>:</span></td><td></td></tr></tbody></table></div><h3><a name="xmlBufferAdd" id="xmlBufferAdd"></a>Function: xmlBufferAdd</h3><pre class="programlisting">void xmlBufferAdd (<a href="libxml-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br /> const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * str, <br /> int len)<br />
+<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>buf</tt></i>:</span></td><td>the XML buffer output</td></tr><tr><td><span class="term"><i><tt>doc</tt></i>:</span></td><td>the document</td></tr><tr><td><span class="term"><i><tt>attr</tt></i>:</span></td><td>the <a href="libxml-SAX.html#attribute">attribute</a> node</td></tr><tr><td><span class="term"><i><tt>string</tt></i>:</span></td><td>the text content</td></tr></tbody></table></div><h3><a name="xmlBufferAdd" id="xmlBufferAdd"></a>Function: xmlBufferAdd</h3><pre class="programlisting">void xmlBufferAdd (<a href="libxml-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br /> const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * str, <br /> int len)<br />
</pre><p>Add a string range to an XML buffer. if len == -1, the length of str is recomputed.</p>
<div class="variablelist"><table border="0"><col align="left" /><tbody><tr><td><span class="term"><i><tt>buf</tt></i>:</span></td><td>the buffer to dump</td></tr><tr><td><span class="term"><i><tt>str</tt></i>:</span></td><td>the #xmlChar string</td></tr><tr><td><span class="term"><i><tt>len</tt></i>:</span></td><td>the number of #xmlChar to add</td></tr></tbody></table></div><h3><a name="xmlBufferAddHead" id="xmlBufferAddHead"></a>Function: xmlBufferAddHead</h3><pre class="programlisting">void xmlBufferAddHead (<a href="libxml-tree.html#xmlBufferPtr">xmlBufferPtr</a> buf, <br /> const <a href="libxml-xmlstring.html#xmlChar">xmlChar</a> * str, <br /> int len)<br />
</pre><p>Add a string range to the beginning of an XML buffer. if len == -1, the length of @str is recomputed.</p>
diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml
index 2b69a2d..e6108a6 100644
--- a/doc/libxml2-api.xml
+++ b/doc/libxml2-api.xml
@@ -6518,16 +6518,16 @@
<arg name='sysID' type='const xmlChar *' info='the system ID string'/>
</function>
<function name='xmlACatalogResolvePublic' file='catalog'>
- <info>Try to lookup the system ID associated to a public ID in that catalog</info>
- <return type='xmlChar *' info='the system ID if found or NULL otherwise, the value returned must be freed by the caller.'/>
+ <info>Try to lookup the catalog local reference associated to a public ID in that catalog</info>
+ <return type='xmlChar *' info='the local resource if found or NULL otherwise, the value returned must be freed by the caller.'/>
<arg name='catal' type='xmlCatalogPtr' info='a Catalog'/>
<arg name='pubID' type='const xmlChar *' info='the public ID string'/>
</function>
<function name='xmlACatalogResolveSystem' file='catalog'>
<info>Try to lookup the catalog resource for a system ID</info>
- <return type='xmlChar *' info='the system ID if found or NULL otherwise, the value returned must be freed by the caller.'/>
+ <return type='xmlChar *' info='the resource if found or NULL otherwise, the value returned must be freed by the caller.'/>
<arg name='catal' type='xmlCatalogPtr' info='a Catalog'/>
- <arg name='sysID' type='const xmlChar *' info='the public ID string'/>
+ <arg name='sysID' type='const xmlChar *' info='the system ID string'/>
</function>
<function name='xmlACatalogResolveURI' file='catalog'>
<info>Do a complete resolution lookup of an URI</info>
@@ -6654,7 +6654,7 @@
<arg name='buf' type='xmlBufferPtr' info='the XML buffer output'/>
<arg name='doc' type='xmlDocPtr' info='the document'/>
<arg name='attr' type='xmlAttrPtr' info='the attribute node'/>
- <arg name='string' type='const xmlChar *' info=''/>
+ <arg name='string' type='const xmlChar *' info='the text content'/>
</function>
<function name='xmlAutomataCompile' file='xmlautomata'>
<info>Compile the automata into a Reg Exp ready for being executed. The automata should be free after this point.</info>
@@ -6984,13 +6984,13 @@
<return type='xmlCatalogAllow' info='the current xmlCatalogAllow value'/>
</function>
<function name='xmlCatalogGetPublic' file='catalog'>
- <info>Try to lookup the system ID associated to a public ID DEPRECATED, use xmlCatalogResolvePublic()</info>
- <return type='const xmlChar *' info='the system ID if found or NULL otherwise.'/>
+ <info>Try to lookup the catalog reference associated to a public ID DEPRECATED, use xmlCatalogResolvePublic()</info>
+ <return type='const xmlChar *' info='the resource if found or NULL otherwise.'/>
<arg name='pubID' type='const xmlChar *' info='the public ID string'/>
</function>
<function name='xmlCatalogGetSystem' file='catalog'>
- <info>Try to lookup the system ID associated to a public ID DEPRECATED, use xmlCatalogResolveSystem()</info>
- <return type='const xmlChar *' info='the system ID if found or NULL otherwise.'/>
+ <info>Try to lookup the catalog reference associated to a system ID DEPRECATED, use xmlCatalogResolveSystem()</info>
+ <return type='const xmlChar *' info='the resource if found or NULL otherwise.'/>
<arg name='sysID' type='const xmlChar *' info='the system ID string'/>
</function>
<function name='xmlCatalogIsEmpty' file='catalog'>
@@ -7023,14 +7023,14 @@
<arg name='sysID' type='const xmlChar *' info='the system ID string'/>
</function>
<function name='xmlCatalogResolvePublic' file='catalog'>
- <info>Try to lookup the system ID associated to a public ID</info>
- <return type='xmlChar *' info='the system ID if found or NULL otherwise, the value returned must be freed by the caller.'/>
+ <info>Try to lookup the catalog reference associated to a public ID</info>
+ <return type='xmlChar *' info='the resource if found or NULL otherwise, the value returned must be freed by the caller.'/>
<arg name='pubID' type='const xmlChar *' info='the public ID string'/>
</function>
<function name='xmlCatalogResolveSystem' file='catalog'>
<info>Try to lookup the catalog resource for a system ID</info>
- <return type='xmlChar *' info='the system ID if found or NULL otherwise, the value returned must be freed by the caller.'/>
- <arg name='sysID' type='const xmlChar *' info='the public ID string'/>
+ <return type='xmlChar *' info='the resource if found or NULL otherwise, the value returned must be freed by the caller.'/>
+ <arg name='sysID' type='const xmlChar *' info='the system ID string'/>
</function>
<function name='xmlCatalogResolveURI' file='catalog'>
<info>Do a complete resolution lookup of an URI</info>
@@ -7773,7 +7773,7 @@
<function name='xmlFreeCatalog' file='catalog'>
<info>Free the memory allocated to a Catalog</info>
<return type='void'/>
- <arg name='catal' type='xmlCatalogPtr' info='a Catalog entry'/>
+ <arg name='catal' type='xmlCatalogPtr' info='a Catalog'/>
</function>
<function name='xmlFreeDoc' file='tree'>
<info>Free up all the structures used by a document, tree included.</info>
diff --git a/doc/libxml2-refs.xml b/doc/libxml2-refs.xml
index 7d9e3e0..007642c 100644
--- a/doc/libxml2-refs.xml
+++ b/doc/libxml2-refs.xml
@@ -18832,7 +18832,6 @@
<ref name='xmlCatalogAdd'/>
<ref name='xmlCatalogAddLocal'/>
<ref name='xmlCatalogRemove'/>
- <ref name='xmlFreeCatalog'/>
<ref name='xmlHashUpdateEntry'/>
<ref name='xmlHashUpdateEntry2'/>
<ref name='xmlHashUpdateEntry3'/>
@@ -21033,34 +21032,6 @@
<ref name='XML_DETECT_IDS'/>
<ref name='XML_SKIP_IDS'/>
</word>
- <word name='local'>
- <ref name='_xmlNs'/>
- <ref name='endElementNsSAX2Func'/>
- <ref name='startElementNsSAX2Func'/>
- <ref name='xmlCatalogAddLocal'/>
- <ref name='xmlNamespaceParseQName'/>
- <ref name='xmlNoNetExternalEntityLoader'/>
- <ref name='xmlOutputBufferCreateFilename'/>
- <ref name='xmlSAX2EndElementNs'/>
- <ref name='xmlSAX2StartElementNs'/>
- <ref name='xmlSplitQName'/>
- <ref name='xmlSplitQName2'/>
- <ref name='xmlTextReaderConstLocalName'/>
- <ref name='xmlTextReaderConstName'/>
- <ref name='xmlTextReaderGetAttributeNs'/>
- <ref name='xmlTextReaderLocalName'/>
- <ref name='xmlTextReaderMoveToAttributeNs'/>
- <ref name='xmlTextReaderName'/>
- <ref name='xmlTextWriterStartAttributeNS'/>
- <ref name='xmlTextWriterStartElementNS'/>
- <ref name='xmlTextWriterWriteAttributeNS'/>
- <ref name='xmlTextWriterWriteElementNS'/>
- <ref name='xmlTextWriterWriteFormatAttributeNS'/>
- <ref name='xmlTextWriterWriteFormatElementNS'/>
- <ref name='xmlTextWriterWriteVFormatAttributeNS'/>
- <ref name='xmlTextWriterWriteVFormatElementNS'/>
- <ref name='xmlXPathLocalNameFunction'/>
- </word>
<word name='local-name'>
<ref name='xmlXPathLocalNameFunction'/>
</word>
diff --git a/tree.c b/tree.c
index 12a83ce..8429081 100644
--- a/tree.c
+++ b/tree.c
@@ -7007,7 +7007,7 @@
* @buf: the XML buffer output
* @doc: the document
* @attr: the attribute node
- * @value: the text content
+ * @string: the text content
*
* Serialize text attribute values to an xml simple buffer
*/