added documentation about Catalog support, misses an API description * doc/catalog.html doc/xml.html: added documentation about Catalog support, misses an API description * doc/html/*: reextracted the API pages Daniel

commit: e7ead2d2379fa933b064e4a138a267313d40988e [log] [tgz]
author: Daniel Veillard <veillard@src.gnome.org> Wed Aug 22 23:44:09 2001 +0000
committer: Daniel Veillard <veillard@src.gnome.org> Wed Aug 22 23:44:09 2001 +0000
tree: 269c2c833822b2acbf2307bbc2a810b0f6ca0d27
parent: dc2cee29d094958139f409e30209f68953c9cb67 [diff]
diff --git a/doc/catalog.html b/doc/catalog.html
new file mode 100644
index 0000000..a93d2f2
--- /dev/null
+++ b/doc/catalog.html

@@ -0,0 +1,315 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title>Libxml Catalog support</title>
+  <meta name="GENERATOR" content="amaya V5.0">
+  <meta http-equiv="Content-Type" content="text/html">
+</head>
+
+<body bgcolor="#ffffff">
+<h1 align="center">Libxml Catalog support</h1>
+
+<p>Location: <a
+href="http://xmlsoft.org/catalog.html">http://xmlsoft.org/catalog.html</a></p>
+
+<p>Libxml home page: <a href="http://xmlsoft.org/">http://xmlsoft.org/</a></p>
+
+<p>Mailing-list archive:  <a
+href="http://mail.gnome.org/archives/xml/">http://mail.gnome.org/archives/xml/</a></p>
+
+<p>Version: $Revision:$</p>
+
+<p>Table of Content:</p>
+<ol>
+  <li><a href="#General">General overview</a></li>
+  <li><a href="#definition">The definition</a></li>
+  <li><a href="#Simple">Using catalogs</a></li>
+  <li><a href="#Some">Some examples</a></li>
+  <li><a href="#reference">How to tune  catalog usage</a></li>
+  <li><a href="#validate">How to debug catalog processing</a></li>
+  <li><a href="#Declaring">How to create and maintain catalogs</a></li>
+  <li><a href="#implemento">The implementor corner quick review of the
+  API</a></li>
+  <li><a href="#Other">Other resources</a></li>
+</ol>
+
+<h2><a name="General">General overview</a></h2>
+
+<p>What is a catalog ? Basically it's a lookup mechanism which is used when
+an entity (a file or a remote resource) reference another entity. The catalog
+lookup is inserted between the moment the reference is recognized by the
+software (XML parser, stylesheet processing, or even images referenced for
+inclusion in a rendering) and the time where loading that resource is
+actually started. </p>
+
+<p>It is basically used for 3 things:</p>
+<ul>
+  <li>mapping from "logical" names, the public identifiers and a more
+    concrete name usable for download (and URI). For example it can associate
+    the logical name 
+    <p>"-//OASIS//DTD DocBook XML V4.1.2//EN"  </p>
+    <p>of the DocBook 4.1.2 XML DTD with the actual URL where it can be
+    downloaded</p>
+    <p>http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd  </p>
+  </li>
+  <li>remapping from a given URL to another one, like an HTTP indirection
+    saying that
+    <p>"http://www.oasis-open.org/committes/tr.xsl"</p>
+    <p>should really be looked at</p>
+    <p>"http://www.oasis-open.org/committes/entity/stylesheets/base/tr.xsl" 
+    </p>
+  </li>
+  <li>providing a local cache mechanism allowing to load the entities
+    associated to public identifiers or remote resources, this is a really
+    important feature for any significant deployment of XML or SGML since it
+    allows to avoid the aleas and delays associated to fetching remore
+    resources.</li>
+</ul>
+
+<h2><a name="definition">The definitions</a></h2>
+
+<p>Libxml, as of 2.4.3 implements 2 kind of catalogs:</p>
+<ul>
+  <li>the older SGML catalogs, the official spec is  SGML Open Technical
+    Resolution TR9401:1997, but is better understood by reading <a
+    href="http://www.jclark.com/sp/catalog.htm">the SP Catalog page</a> from
+    James Clark. This is relatively old and not the preferred mode of
+    operation of libxml.</li>
+  <li><a href="http://www.oasis-open.org/committees/entity/spec.html">XML
+    Catalogs</a> is far more flexible, more recent, uses an XML syntax and
+    should scale quite better. This is the default option of libxml.</li>
+</ul>
+
+<p></p>
+
+<h2><a name="Simple">Using catalog</a></h2>
+
+<p>In a normal environment libxml will by default check the presence of a
+catalog in /etc/xml/catalog, and assuming it has been correctly populated,
+the processing is completely transparent to the document user. To take a
+concrete example, suppose you are authoring a DocBook document, this one
+starts with the following DOCTYPE definition:</p>
+<pre>&lt;?xml version='1.0'?&gt;
+&lt;!DOCTYPE book PUBLIC "-//Norman Walsh//DTD DocBk XML V3.1.4//EN"
+                         "http://nwalsh.com/docbook/xml/3.1.4/db3xml.dtd"&gt;
+
+</pre>
+
+<p>When validating the document with libxml, the catalog will be
+automatically consulted to lookup the public identifier "-//Norman Walsh//DTD
+DocBk XML V3.1.4//EN" and the system identifier
+"http://nwalsh.com/docbook/xml/3.1.4/db3xml.dtd", and if these entities have
+been installed on your system and the catalogs actually point to them, libxml
+will fetch them from the local disk.</p>
+
+<p style="font-size: 10pt"><strong>Note</strong>: Really don't use this
+DOCTYPE example it's a really old version, but is fine as an example.</p>
+
+<p>Libxml will check the catalog each time that it is requested to load an
+entity, this include DTD, external parsed entities, stylesheets, etc ... If
+your system is correctly configured all the authoring phase and processing
+should use only local files, even if your document stay portable because it
+uses the canonical public and system ID, referencing the remote document.</p>
+
+<h2><a name="Some">Some examples:</a></h2>
+
+<p>Here is a couple of fragments from XML Catalogs used in libxml early
+regression tests in <code>test/catalogs</code> :</p>
+<pre>&lt;?xml version="1.0"?&gt;
+&lt;!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+       "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd"&gt;
+&lt;catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"&gt;
+    &lt;public publicId="-//OASIS//DTD DocBook XML V4.1.2//EN"
+            uri="http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"/&gt;
+...</pre>
+
+<p>This is the beginning of a catalog for DocBook 4.1.2, XML Catalogs are
+written in XML,  there is a specific namespace for catalog elements
+"urn:oasis:names:tc:entity:xmlns:xml:catalog". The first entry in this
+catalog is a <code>public</code> mapping it allows to associate a Public
+Identifier with an URI. </p>
+<pre>...
+    &lt;rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/"
+                   rewritePrefix="file:///usr/share/xml/docbook/"/&gt;
+...</pre>
+
+<p>A <code>rewriteSystem</code> is a very powerful instruction, it says that
+any URI starting with a given prefix should be looked at another  URI
+constructed by replacing the prefix with an new one. In effect this acts like
+a cache system for a full area of the Web. In practice it is extremely useful
+with a file prefix if you have installed a copy of those resources on your
+local system. </p>
+<pre>...
+&lt;delegatePublic publicIdStartString="-//OASIS//DTD XML Catalog //"
+                catalog="file:///usr/share/xml/docbook.xml"/&gt;
+&lt;delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook XML"
+                catalog="file:///usr/share/xml/docbook.xml"/&gt;
+&lt;delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML"
+                catalog="file:///usr/share/xml/docbook.xml"/&gt;
+&lt;delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/"
+                catalog="file:///usr/share/xml/docbook.xml"/&gt;
+&lt;delegateURI uriStartString="http://www.oasis-open.org/docbook/"
+                catalog="file:///usr/share/xml/docbook.xml"/&gt;
+...</pre>
+
+<p>Delegation is the core features which allows to build a tree of catalogs,
+easier to maintain than a single catalog, based on Public Identifier, System
+Identifier or URI prefixes it instruct the catalog software to lookup entries
+in another resource. This feature allow to build hierarchies of catalogs, the
+set of entries presented should be sufficient to redirect the resolution of
+all DocBook references to the  specific catalog in
+<code>/usr/share/xml/docbook.xml</code> this one in turn could delegate all
+references for DocBook 4.2.1 to a specific catalog installed at the same time
+as the DocBook resources on the local machine.</p>
+
+<h2><a name="reference">How to tune catalog usage:</a></h2>
+
+<p>The user can change the default catalog behaviour by redirecting queries
+to its own set of catalogs, this can be done by setting the
+<code>XML_CATALOG_FILES</code> environment variable to a list of catalogs, an
+empty one should desactivate loading the default
+<code>/etc/xml/catalog</code> default catalog.</p>
+
+<p>@@More options are likely to be provided in the future@@</p>
+
+<h2><a name="validate">How to debug catalog processing:</a></h2>
+
+<p>Setting up the <code>XML_DEBUG_CATALOG</code> environment variable will
+make libxml output debugging informations for each catalog operations, for
+example:</p>
+<pre>orchis:~/XML -&gt; xmllint --memory --noout test/ent2
+warning: failed to load external entity "title.xml"
+orchis:~/XML -&gt; export XML_DEBUG_CATALOG=
+orchis:~/XML -&gt; xmllint --memory --noout test/ent2
+Failed to parse catalog /etc/xml/catalog
+Failed to parse catalog /etc/xml/catalog
+warning: failed to load external entity "title.xml"
+Catalogs cleanup
+orchis:~/XML -&gt; </pre>
+
+<p>The test/ent2 references an entity, running the parser from memory makes
+the base URI unavailable and the the "title.xml" entity cannot be loaded.
+Setting up the debug environment variable allows to detect that an attempt is
+made to load the <code>/etc/xml/catalog</code> but since it's not present the
+resolution fails.  </p>
+
+<p>But the most advanced way to debug XML catalog processing is to use the
+<strong>xmlcatalog</strong> command shipped with libxml2, it allows to load
+catalogs and make resolution queries to see what is going on. This is also
+used for the regression tests:</p>
+<pre>orchis:~/XML -&gt; ./xmlcatalog test/catalogs/docbook.xml "-//OASIS//DTD DocBook XML V4.1.2//EN"
+http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd
+orchis:~/XML -&gt; </pre>
+
+<p>For debugging what is going on, adding one -v flags increase the verbosity
+level to indicate the processing done (adding a second flag also indicate
+what elements are recognized at parsing):</p>
+<pre>orchis:~/XML -&gt; ./xmlcatalog -v test/catalogs/docbook.xml "-//OASIS//DTD DocBook XML V4.1.2//EN"
+Parsing catalog test/catalogs/docbook.xml's content
+Found public match -//OASIS//DTD DocBook XML V4.1.2//EN
+http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd
+Catalogs cleanup
+orchis:~/XML -&gt; </pre>
+
+<p>A shell interface is also available to debug and process multiple queries
+(and for regression tests):</p>
+<pre>orchis:~/XML -&gt; ./xmlcatalog -shell test/catalogs/docbook.xml "-//OASIS//DTD DocBook XML V4.1.2//EN"
+&gt; help   
+Commands available:
+public PublicID: make a PUBLIC identifier lookup
+system SystemID: make a SYSTEM identifier lookup
+resolve PublicID SystemID: do a full resolver lookup
+add 'type' 'orig' 'replace' : add an entry
+del 'values' : remove values
+dump: print the current catalog state
+debug: increase the verbosity level
+quiet: decrease the verbosity level
+exit:  quit the shell
+&gt; public "-//OASIS//DTD DocBook XML V4.1.2//EN"
+http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd
+&gt; quit
+orchis:~/XML -&gt; </pre>
+
+<p>This should be sufficient for most debugging purpose, this was actually
+used heavilly to debug the XML Catalog implementation itself.</p>
+
+<h2><a name="Declaring">How to create and maintain</a> catalogs:</h2>
+
+<p>Basically XML Catalogs are XML files, you can either use XML tools to
+manage them or use  <strong>xmlcatalog</strong> for this. The basic step is
+to create a catalog the -create option provide this facility:</p>
+<pre>orchis:~/XML -&gt; ./xmlcatalog --create tst.xml
+&lt;?xml version="1.0"?&gt;
+&lt;!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+         "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd"&gt;
+&lt;catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"/&gt;
+orchis:~/XML -&gt; </pre>
+
+<p>By default xmlcatalog does not overwrite the original catalog and save the
+result on the standard output, this can be overrident using the -noout
+option. The <code>-add</code> command allows to add entries in the
+catalog:</p>
+<pre>orchis:~/XML -&gt; ./xmlcatalog --noout --create --add "public" "-//OASIS//DTD DocBook XML V4.1.2//EN" http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd tst.xml
+orchis:~/XML -&gt; cat tst.xml
+&lt;?xml version="1.0"?&gt;
+&lt;!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd"&gt;
+&lt;catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"&gt;
+&lt;public publicId="-//OASIS//DTD DocBook XML V4.1.2//EN"
+        uri="http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"/&gt;
+&lt;/catalog&gt;
+orchis:~/XML -&gt; </pre>
+
+<p>The <code>-add</code> option will always take 3 parameters even if some of
+the XML Catalog constructs (like nextCatalog) will have only a single
+argument, just pass a third empty string, it will be ignored.</p>
+
+<p>Similary the <code>-del</code> option remove matching entries from the
+catalog:</p>
+<pre>orchis:~/XML -&gt; ./xmlcatalog --del "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" tst.xml
+&lt;?xml version="1.0"?&gt;
+&lt;!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd"&gt;
+&lt;catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"/&gt;
+orchis:~/XML -&gt; </pre>
+
+<p>The catalog is now empty. Note that the maching of <code>-del</code> is
+exact and would have worked in a similar fashion with the Public ID
+string.</p>
+
+<p> This is rudimentary but should be sufficient to manage a not too complex
+catalog tree of resources. </p>
+
+<h2><a name="implemento">The implementor corner quick review of the
+API:</a></h2>
+
+<p>@@TODO@@</p>
+
+<h2><a name="Other">Other resources</a></h2>
+
+<p>The XML Catalog specification is relatively recent so there isn't much
+litterature to point at:</p>
+<ul>
+  <li>You can find an good rant from Norm Walsh about <a
+    href="http://www.arbortext.com/Think_Tank/XML_Resources/Issue_Three/issue_three.html">the
+    need for catalogs</a>, it provides a lot of context informations even if
+    I don't agree with everything presented.</li>
+  <li>An <a href="http://home.ccil.org/~cowan/XML/XCatalog.html">old XML
+    catalog proposal</a> from John Cowan</li>
+  <li>The <a href="http://www.rddl.org/">Resource Directory Description
+    Language</a> (RDDL) another catalog system but more oriented toward
+    providing metadata for XML namespaces.</li>
+  <li>the page from the OASIS Technical <a
+    href="http://www.oasis-open.org/committees/entity/">Committee on Entity
+    Resolution</a> who maintains XML Catalog, you will find pointers to the
+    specification update, some background and pointers to others tools
+    providing XML Catalog support</li>
+</ul>
+
+<p>If you have suggestions for corrections or additions, simply contact
+me:</p>
+
+<p><a href="mailto:daniel@veillard.com">Daniel Veillard</a></p>
+
+<p>$Id:$</p>
+</body>
+</html>

diff --git a/doc/html/index.sgml b/doc/html/index.sgml
index dea1ad8..016ec7e 100644
--- a/doc/html/index.sgml
+++ b/doc/html/index.sgml

@@ -73,6 +73,7 @@
 <ANCHOR id ="XMLKEEPBLANKSDEFAULT" href="libxml/libxml-parser.html#XMLKEEPBLANKSDEFAULT">
 <ANCHOR id ="XMLSTOPPARSER" href="libxml/libxml-parser.html#XMLSTOPPARSER">
 <ANCHOR id ="XMLPEDANTICPARSERDEFAULT" href="libxml/libxml-parser.html#XMLPEDANTICPARSERDEFAULT">
+<ANCHOR id ="XMLLINENUMBERSDEFAULT" href="libxml/libxml-parser.html#XMLLINENUMBERSDEFAULT">
 <ANCHOR id ="XMLRECOVERDOC" href="libxml/libxml-parser.html#XMLRECOVERDOC">
 <ANCHOR id ="XMLRECOVERMEMORY" href="libxml/libxml-parser.html#XMLRECOVERMEMORY">
 <ANCHOR id ="XMLRECOVERFILE" href="libxml/libxml-parser.html#XMLRECOVERFILE">
@@ -188,6 +189,8 @@
 <ANCHOR id ="XMLBUFFERPTR" href="libxml/libxml-tree.html#XMLBUFFERPTR">
 <ANCHOR id ="XMLNODE" href="libxml/libxml-tree.html#XMLNODE">
 <ANCHOR id ="XMLNODEPTR" href="libxml/libxml-tree.html#XMLNODEPTR">
+<ANCHOR id ="XML-GET-CONTENT-CAPS" href="libxml/libxml-tree.html#XML-GET-CONTENT-CAPS">
+<ANCHOR id ="XML-GET-LINE-CAPS" href="libxml/libxml-tree.html#XML-GET-LINE-CAPS">
 <ANCHOR id ="XMLDOC" href="libxml/libxml-tree.html#XMLDOC">
 <ANCHOR id ="XMLDOCPTR" href="libxml/libxml-tree.html#XMLDOCPTR">
 <ANCHOR id ="XMLCHILDRENNODE" href="libxml/libxml-tree.html#XMLCHILDRENNODE">
@@ -207,7 +210,6 @@
 <ANCHOR id ="XMLBUFFERGROW" href="libxml/libxml-tree.html#XMLBUFFERGROW">
 <ANCHOR id ="XMLBUFFEREMPTY" href="libxml/libxml-tree.html#XMLBUFFEREMPTY">
 <ANCHOR id ="XMLBUFFERCONTENT" href="libxml/libxml-tree.html#XMLBUFFERCONTENT">
-<ANCHOR id ="XMLBUFFERUSE" href="libxml/libxml-tree.html#XMLBUFFERUSE">
 <ANCHOR id ="XMLBUFFERSETALLOCATIONSCHEME" href="libxml/libxml-tree.html#XMLBUFFERSETALLOCATIONSCHEME">
 <ANCHOR id ="XMLBUFFERLENGTH" href="libxml/libxml-tree.html#XMLBUFFERLENGTH">
 <ANCHOR id ="XMLCREATEINTSUBSET" href="libxml/libxml-tree.html#XMLCREATEINTSUBSET">
@@ -295,7 +297,6 @@
 <ANCHOR id ="XMLNODEGETBASE" href="libxml/libxml-tree.html#XMLNODEGETBASE">
 <ANCHOR id ="XMLNODESETBASE" href="libxml/libxml-tree.html#XMLNODESETBASE">
 <ANCHOR id ="XMLREMOVEPROP" href="libxml/libxml-tree.html#XMLREMOVEPROP">
-<ANCHOR id ="XMLREMOVENODE" href="libxml/libxml-tree.html#XMLREMOVENODE">
 <ANCHOR id ="XMLUNSETPROP" href="libxml/libxml-tree.html#XMLUNSETPROP">
 <ANCHOR id ="XMLUNSETNSPROP" href="libxml/libxml-tree.html#XMLUNSETNSPROP">
 <ANCHOR id ="XMLBUFFERWRITEXMLCHAR" href="libxml/libxml-tree.html#XMLBUFFERWRITEXMLCHAR">
@@ -360,6 +361,7 @@
 <ANCHOR id ="XMLNEWELEMENTCONTENT" href="libxml/libxml-valid.html#XMLNEWELEMENTCONTENT">
 <ANCHOR id ="XMLCOPYELEMENTCONTENT" href="libxml/libxml-valid.html#XMLCOPYELEMENTCONTENT">
 <ANCHOR id ="XMLFREEELEMENTCONTENT" href="libxml/libxml-valid.html#XMLFREEELEMENTCONTENT">
+<ANCHOR id ="XMLSNPRINTFELEMENTCONTENT" href="libxml/libxml-valid.html#XMLSNPRINTFELEMENTCONTENT">
 <ANCHOR id ="XMLSPRINTFELEMENTCONTENT" href="libxml/libxml-valid.html#XMLSPRINTFELEMENTCONTENT">
 <ANCHOR id ="XMLADDELEMENTDECL" href="libxml/libxml-valid.html#XMLADDELEMENTDECL">
 <ANCHOR id ="XMLCOPYELEMENTTABLE" href="libxml/libxml-valid.html#XMLCOPYELEMENTTABLE">
@@ -400,7 +402,9 @@
 <ANCHOR id ="XMLVALIDATENOTATIONUSE" href="libxml/libxml-valid.html#XMLVALIDATENOTATIONUSE">
 <ANCHOR id ="XMLISMIXEDELEMENT" href="libxml/libxml-valid.html#XMLISMIXEDELEMENT">
 <ANCHOR id ="XMLGETDTDATTRDESC" href="libxml/libxml-valid.html#XMLGETDTDATTRDESC">
+<ANCHOR id ="XMLGETDTDQATTRDESC" href="libxml/libxml-valid.html#XMLGETDTDQATTRDESC">
 <ANCHOR id ="XMLGETDTDNOTATIONDESC" href="libxml/libxml-valid.html#XMLGETDTDNOTATIONDESC">
+<ANCHOR id ="XMLGETDTDQELEMENTDESC" href="libxml/libxml-valid.html#XMLGETDTDQELEMENTDESC">
 <ANCHOR id ="XMLGETDTDELEMENTDESC" href="libxml/libxml-valid.html#XMLGETDTDELEMENTDESC">
 <ANCHOR id ="XMLVALIDGETVALIDELEMENTS" href="libxml/libxml-valid.html#XMLVALIDGETVALIDELEMENTS">
 <ANCHOR id ="XMLVALIDGETPOTENTIALCHILDREN" href="libxml/libxml-valid.html#XMLVALIDGETPOTENTIALCHILDREN">
@@ -504,6 +508,8 @@
 <ANCHOR id ="XMLXPATHCOMPEXPR" href="libxml/libxml-xpath.html#XMLXPATHCOMPEXPR">
 <ANCHOR id ="XMLXPATHCOMPEXPRPTR" href="libxml/libxml-xpath.html#XMLXPATHCOMPEXPRPTR">
 <ANCHOR id ="XMLXPATHFUNCTION" href="libxml/libxml-xpath.html#XMLXPATHFUNCTION">
+<ANCHOR id ="XMLXPATHISNAN" href="libxml/libxml-xpath.html#XMLXPATHISNAN">
+<ANCHOR id ="XMLXPATHISINF" href="libxml/libxml-xpath.html#XMLXPATHISINF">
 <ANCHOR id ="XMLXPATHNODESETGETLENGTH" href="libxml/libxml-xpath.html#XMLXPATHNODESETGETLENGTH">
 <ANCHOR id ="XMLXPATHNODESETITEM" href="libxml/libxml-xpath.html#XMLXPATHNODESETITEM">
 <ANCHOR id ="XMLXPATHNODESETISEMPTY" href="libxml/libxml-xpath.html#XMLXPATHNODESETISEMPTY">
@@ -575,9 +581,12 @@
 <ANCHOR id ="CAST-TO-BOOLEAN-CAPS" href="libxml/libxml-xpathinternals.html#CAST-TO-BOOLEAN-CAPS">
 <ANCHOR id ="XMLXPATHVARIABLELOOKUPFUNC" href="libxml/libxml-xpathinternals.html#XMLXPATHVARIABLELOOKUPFUNC">
 <ANCHOR id ="XMLXPATHREGISTERVARIABLELOOKUP" href="libxml/libxml-xpathinternals.html#XMLXPATHREGISTERVARIABLELOOKUP">
+<ANCHOR id ="XMLXPATHFUNCTION" href="libxml/libxml-xpathinternals.html#XMLXPATHFUNCTION">
+<ANCHOR id ="XMLXPATHREGISTERFUNCLOOKUP" href="libxml/libxml-xpathinternals.html#XMLXPATHREGISTERFUNCLOOKUP">
 <ANCHOR id ="XMLXPATHERROR" href="libxml/libxml-xpathinternals.html#XMLXPATHERROR">
 <ANCHOR id ="XMLXPATHDEBUGDUMPOBJECT" href="libxml/libxml-xpathinternals.html#XMLXPATHDEBUGDUMPOBJECT">
 <ANCHOR id ="XMLXPATHDEBUGDUMPCOMPEXPR" href="libxml/libxml-xpathinternals.html#XMLXPATHDEBUGDUMPCOMPEXPR">
+<ANCHOR id ="XMLXPATHNODESETCONTAINS" href="libxml/libxml-xpathinternals.html#XMLXPATHNODESETCONTAINS">
 <ANCHOR id ="XMLXPATHDIFFERENCE" href="libxml/libxml-xpathinternals.html#XMLXPATHDIFFERENCE">
 <ANCHOR id ="XMLXPATHINTERSECTION" href="libxml/libxml-xpathinternals.html#XMLXPATHINTERSECTION">
 <ANCHOR id ="XMLXPATHDISTINCTSORTED" href="libxml/libxml-xpathinternals.html#XMLXPATHDISTINCTSORTED">
@@ -790,16 +799,35 @@
 <ANCHOR id ="XMLOUTPUTBUFFERCLOSE" href="libxml/libxml-xmlio.html#XMLOUTPUTBUFFERCLOSE">
 <ANCHOR id ="XMLREGISTEROUTPUTCALLBACKS" href="libxml/libxml-xmlio.html#XMLREGISTEROUTPUTCALLBACKS">
 <ANCHOR id ="XMLIOHTTPOPENW" href="libxml/libxml-xmlio.html#XMLIOHTTPOPENW">
+<ANCHOR id ="XMLREGISTERHTTPPOSTCALLBACKS" href="libxml/libxml-xmlio.html#XMLREGISTERHTTPPOSTCALLBACKS">
 <ANCHOR id ="XMLSAVEFILETO" href="libxml/libxml-xmlio.html#XMLSAVEFILETO">
 <ANCHOR id ="XMLSAVEFORMATFILETO" href="libxml/libxml-xmlio.html#XMLSAVEFORMATFILETO">
 <ANCHOR id ="XMLNODEDUMPOUTPUT" href="libxml/libxml-xmlio.html#XMLNODEDUMPOUTPUT">
 <ANCHOR id ="HTMLDOCCONTENTDUMPOUTPUT" href="libxml/libxml-xmlio.html#HTMLDOCCONTENTDUMPOUTPUT">
 <ANCHOR id ="LIBXML-CATALOG" href="libxml/libxml-catalog.html">
 <ANCHOR id ="XML-CATALOGS-NAMESPACE-CAPS" href="libxml/libxml-catalog.html#XML-CATALOGS-NAMESPACE-CAPS">
+<ANCHOR id ="XML-CATALOG-PI-CAPS" href="libxml/libxml-catalog.html#XML-CATALOG-PI-CAPS">
+<ANCHOR id ="XMLCATALOGPREFER" href="libxml/libxml-catalog.html#XMLCATALOGPREFER">
+<ANCHOR id ="XMLCATALOGALLOW" href="libxml/libxml-catalog.html#XMLCATALOGALLOW">
+<ANCHOR id ="XMLINITIALIZECATALOG" href="libxml/libxml-catalog.html#XMLINITIALIZECATALOG">
 <ANCHOR id ="XMLLOADCATALOG" href="libxml/libxml-catalog.html#XMLLOADCATALOG">
 <ANCHOR id ="XMLLOADCATALOGS" href="libxml/libxml-catalog.html#XMLLOADCATALOGS">
 <ANCHOR id ="XMLCATALOGCLEANUP" href="libxml/libxml-catalog.html#XMLCATALOGCLEANUP">
 <ANCHOR id ="XMLCATALOGDUMP" href="libxml/libxml-catalog.html#XMLCATALOGDUMP">
+<ANCHOR id ="XMLCATALOGRESOLVE" href="libxml/libxml-catalog.html#XMLCATALOGRESOLVE">
+<ANCHOR id ="XMLCATALOGRESOLVESYSTEM" href="libxml/libxml-catalog.html#XMLCATALOGRESOLVESYSTEM">
+<ANCHOR id ="XMLCATALOGRESOLVEPUBLIC" href="libxml/libxml-catalog.html#XMLCATALOGRESOLVEPUBLIC">
+<ANCHOR id ="XMLCATALOGRESOLVEURI" href="libxml/libxml-catalog.html#XMLCATALOGRESOLVEURI">
+<ANCHOR id ="XMLCATALOGADD" href="libxml/libxml-catalog.html#XMLCATALOGADD">
+<ANCHOR id ="XMLCATALOGREMOVE" href="libxml/libxml-catalog.html#XMLCATALOGREMOVE">
+<ANCHOR id ="XMLCATALOGFREELOCAL" href="libxml/libxml-catalog.html#XMLCATALOGFREELOCAL">
+<ANCHOR id ="XMLCATALOGADDLOCAL" href="libxml/libxml-catalog.html#XMLCATALOGADDLOCAL">
+<ANCHOR id ="XMLCATALOGLOCALRESOLVE" href="libxml/libxml-catalog.html#XMLCATALOGLOCALRESOLVE">
+<ANCHOR id ="XMLCATALOGLOCALRESOLVEURI" href="libxml/libxml-catalog.html#XMLCATALOGLOCALRESOLVEURI">
+<ANCHOR id ="XMLCATALOGSETDEBUG" href="libxml/libxml-catalog.html#XMLCATALOGSETDEBUG">
+<ANCHOR id ="XMLCATALOGSETDEFAULTPREFER" href="libxml/libxml-catalog.html#XMLCATALOGSETDEFAULTPREFER">
+<ANCHOR id ="XMLCATALOGSETDEFAULTS" href="libxml/libxml-catalog.html#XMLCATALOGSETDEFAULTS">
+<ANCHOR id ="XMLCATALOGGETDEFAULTS" href="libxml/libxml-catalog.html#XMLCATALOGGETDEFAULTS">
 <ANCHOR id ="XMLCATALOGGETSYSTEM" href="libxml/libxml-catalog.html#XMLCATALOGGETSYSTEM">
 <ANCHOR id ="XMLCATALOGGETPUBLIC" href="libxml/libxml-catalog.html#XMLCATALOGGETPUBLIC">
 <ANCHOR id ="LIBXML-DOCBPARSER" href="libxml/libxml-docbparser.html">

diff --git a/doc/html/libxml-catalog.html b/doc/html/libxml-catalog.html
index 6d97a4b..af6005c 100644
--- a/doc/html/libxml-catalog.html
+++ b/doc/html/libxml-catalog.html

@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN18337"
+NAME="AEN18687"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN18340"
+NAME="AEN18690"
 ></A
 ><H2
 >Synopsis</H2
@@ -149,6 +149,22 @@
 HREF="libxml-catalog.html#XML-CATALOGS-NAMESPACE-CAPS"
 >XML_CATALOGS_NAMESPACE</A
 >
+#define     <A
+HREF="libxml-catalog.html#XML-CATALOG-PI-CAPS"
+>XML_CATALOG_PI</A
+>
+enum        <A
+HREF="libxml-catalog.html#XMLCATALOGPREFER"
+>xmlCatalogPrefer</A
+>;
+enum        <A
+HREF="libxml-catalog.html#XMLCATALOGALLOW"
+>xmlCatalogAllow</A
+>;
+void        <A
+HREF="libxml-catalog.html#XMLINITIALIZECATALOG"
+>xmlInitializeCatalog</A
+>            (void);
 int         <A
 HREF="libxml-catalog.html#XMLLOADCATALOG"
 >xmlLoadCatalog</A
@@ -168,6 +184,138 @@
 HREF="FILE-CAPS"
 >FILE</GTKDOCLINK
 > *out);
+<A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+>*    <A
+HREF="libxml-catalog.html#XMLCATALOGRESOLVE"
+>xmlCatalogResolve</A
+>               (const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *pubID,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *sysID);
+<A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+>*    <A
+HREF="libxml-catalog.html#XMLCATALOGRESOLVESYSTEM"
+>xmlCatalogResolveSystem</A
+>         (const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *sysID);
+<A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+>*    <A
+HREF="libxml-catalog.html#XMLCATALOGRESOLVEPUBLIC"
+>xmlCatalogResolvePublic</A
+>         (const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *pubID);
+<A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+>*    <A
+HREF="libxml-catalog.html#XMLCATALOGRESOLVEURI"
+>xmlCatalogResolveURI</A
+>            (const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *URI);
+int         <A
+HREF="libxml-catalog.html#XMLCATALOGADD"
+>xmlCatalogAdd</A
+>                   (const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *type,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *orig,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *replace);
+int         <A
+HREF="libxml-catalog.html#XMLCATALOGREMOVE"
+>xmlCatalogRemove</A
+>                (const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *value);
+void        <A
+HREF="libxml-catalog.html#XMLCATALOGFREELOCAL"
+>xmlCatalogFreeLocal</A
+>             (void *catalogs);
+void*       <A
+HREF="libxml-catalog.html#XMLCATALOGADDLOCAL"
+>xmlCatalogAddLocal</A
+>              (void *catalogs,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *URL);
+<A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+>*    <A
+HREF="libxml-catalog.html#XMLCATALOGLOCALRESOLVE"
+>xmlCatalogLocalResolve</A
+>          (void *catalogs,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *pubID,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *sysID);
+<A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+>*    <A
+HREF="libxml-catalog.html#XMLCATALOGLOCALRESOLVEURI"
+>xmlCatalogLocalResolveURI</A
+>       (void *catalogs,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *URI);
+int         <A
+HREF="libxml-catalog.html#XMLCATALOGSETDEBUG"
+>xmlCatalogSetDebug</A
+>              (int level);
+<A
+HREF="libxml-catalog.html#XMLCATALOGPREFER"
+>xmlCatalogPrefer</A
+> <A
+HREF="libxml-catalog.html#XMLCATALOGSETDEFAULTPREFER"
+>xmlCatalogSetDefaultPrefer</A
+> (<A
+HREF="libxml-catalog.html#XMLCATALOGPREFER"
+>xmlCatalogPrefer</A
+> prefer);
+void        <A
+HREF="libxml-catalog.html#XMLCATALOGSETDEFAULTS"
+>xmlCatalogSetDefaults</A
+>           (<A
+HREF="libxml-catalog.html#XMLCATALOGALLOW"
+>xmlCatalogAllow</A
+> allow);
+<A
+HREF="libxml-catalog.html#XMLCATALOGALLOW"
+>xmlCatalogAllow</A
+> <A
+HREF="libxml-catalog.html#XMLCATALOGGETDEFAULTS"
+>xmlCatalogGetDefaults</A
+>       (void);
 const <A
 HREF="libxml-tree.html#XMLCHAR"
 >xmlChar</A
@@ -195,7 +343,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN18355"
+NAME="AEN18746"
 ></A
 ><H2
 >Description</H2
@@ -205,14 +353,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN18358"
+NAME="AEN18749"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18360"
+NAME="AEN18751"
 ></A
 ><H3
 ><A
@@ -233,12 +381,131 @@
 ></TR
 ></TABLE
 ><P
+>The namespace for the XML Catalogs elements</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18365"
+NAME="AEN18757"
+></A
+><H3
+><A
+NAME="XML-CATALOG-PI-CAPS"
+></A
+>XML_CATALOG_PI</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>#define     XML_CATALOG_PI</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN18762"
+></A
+><H3
+><A
+NAME="XMLCATALOGPREFER"
+></A
+>enum xmlCatalogPrefer</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef enum {
+    XML_CATA_PREFER_NONE = 0,
+    XML_CATA_PREFER_PUBLIC = 1,
+    XML_CATA_PREFER_SYSTEM
+} xmlCatalogPrefer;</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN18767"
+></A
+><H3
+><A
+NAME="XMLCATALOGALLOW"
+></A
+>enum xmlCatalogAllow</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef enum {
+    XML_CATA_ALLOW_NONE = 0,
+    XML_CATA_ALLOW_GLOBAL = 1,
+    XML_CATA_ALLOW_DOCUMENT = 2,
+    XML_CATA_ALLOW_ALL = 3
+} xmlCatalogAllow;</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN18772"
+></A
+><H3
+><A
+NAME="XMLINITIALIZECATALOG"
+></A
+>xmlInitializeCatalog ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlInitializeCatalog            (void);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Do the catalog initialization.
+TODO: this function is not thread safe, catalog initialization should
+preferably be done once at startup</P
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN18778"
 ></A
 ><H3
 ><A
@@ -262,13 +529,13 @@
 >Load the catalog and makes its definitions effective for the default
 external entity loader. It will recuse in CATALOG entries.
 TODO: this function is not thread safe, catalog initialization should
-be done once at startup</P
+preferably be done once at startup</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18371"
+NAME="AEN18784"
 ></A
 ><P
 ></P
@@ -321,7 +588,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18384"
+NAME="AEN18797"
 ></A
 ><H3
 ><A
@@ -345,13 +612,13 @@
 >Load the catalogs and makes their definitions effective for the default
 external entity loader.
 TODO: this function is not thread safe, catalog initialization should
-be done once at startup</P
+preferably be done once at startup</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18390"
+NAME="AEN18803"
 ></A
 ><P
 ></P
@@ -389,7 +656,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18399"
+NAME="AEN18812"
 ></A
 ><H3
 ><A
@@ -417,7 +684,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18405"
+NAME="AEN18818"
 ></A
 ><H3
 ><A
@@ -447,7 +714,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18412"
+NAME="AEN18825"
 ></A
 ><P
 ></P
@@ -485,13 +752,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18421"
+NAME="AEN18834"
 ></A
 ><H3
 ><A
-NAME="XMLCATALOGGETSYSTEM"
+NAME="XMLCATALOGRESOLVE"
 ></A
->xmlCatalogGetSystem ()</H3
+>xmlCatalogResolve ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -501,10 +768,14 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->const <A
+><A
 HREF="libxml-tree.html#XMLCHAR"
 >xmlChar</A
->* xmlCatalogGetSystem          (const <A
+>*    xmlCatalogResolve               (const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *pubID,
+                                             const <A
 HREF="libxml-tree.html#XMLCHAR"
 >xmlChar</A
 > *sysID);</PRE
@@ -512,13 +783,13 @@
 ></TR
 ></TABLE
 ><P
->Try to lookup the resource associated to a system ID</P
+>Do a complete resolution lookup of an External Identifier</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18429"
+NAME="AEN18843"
 ></A
 ><P
 ></P
@@ -538,6 +809,23 @@
 ><TT
 CLASS="PARAMETER"
 ><I
+>pubID</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the public ID string</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
 >sysID</I
 ></TT
 >&nbsp;:</TD
@@ -560,7 +848,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the resource name if found or NULL otherwise.</TD
+>the URI of the resource or NULL if not found, it must be freed
+by the caller.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -571,7 +860,1256 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18442"
+NAME="AEN18860"
+></A
+><H3
+><A
+NAME="XMLCATALOGRESOLVESYSTEM"
+></A
+>xmlCatalogResolveSystem ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+>*    xmlCatalogResolveSystem         (const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *sysID);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Try to lookup the catalog resource for a system ID</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN18868"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>sysID</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the public ID string</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the system ID if found or NULL otherwise, the value returned
+must be freed by the caller.</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN18881"
+></A
+><H3
+><A
+NAME="XMLCATALOGRESOLVEPUBLIC"
+></A
+>xmlCatalogResolvePublic ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+>*    xmlCatalogResolvePublic         (const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *pubID);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Try to lookup the system ID associated to a public ID</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN18889"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>pubID</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the public ID string</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the system ID if found or NULL otherwise, the value returned
+must be freed by the caller.</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN18902"
+></A
+><H3
+><A
+NAME="XMLCATALOGRESOLVEURI"
+></A
+>xmlCatalogResolveURI ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+>*    xmlCatalogResolveURI            (const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *URI);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Do a complete resolution lookup of an URI</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN18910"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>URI</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the URI of the resource or NULL if not found, it must be freed
+by the caller.</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN18923"
+></A
+><H3
+><A
+NAME="XMLCATALOGADD"
+></A
+>xmlCatalogAdd ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlCatalogAdd                   (const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *type,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *orig,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *replace);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Add an entry in the catalog, it may overwrite existing but
+different entries.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN18932"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>type</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the type of record to add to the catalog</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>orig</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the system, public or prefix to match </TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>replace</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the replacement value for the match</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>0 if successful, -1 otherwise</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN18953"
+></A
+><H3
+><A
+NAME="XMLCATALOGREMOVE"
+></A
+>xmlCatalogRemove ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlCatalogRemove                (const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *value);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Remove an entry from the catalog</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN18960"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>value</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the value to remove</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>0 if successful, -1 otherwise</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN18973"
+></A
+><H3
+><A
+NAME="XMLCATALOGFREELOCAL"
+></A
+>xmlCatalogFreeLocal ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlCatalogFreeLocal             (void *catalogs);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Free up the memory associated to the catalog list</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN18979"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>catalogs</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  a document's list of catalogs</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN18988"
+></A
+><H3
+><A
+NAME="XMLCATALOGADDLOCAL"
+></A
+>xmlCatalogAddLocal ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void*       xmlCatalogAddLocal              (void *catalogs,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *URL);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Add the new entry to the catalog list</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN18995"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>catalogs</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  a document's list of catalogs</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>URL</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the URL to a new local catalog</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN19008"
+></A
+><H3
+><A
+NAME="XMLCATALOGLOCALRESOLVE"
+></A
+>xmlCatalogLocalResolve ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+>*    xmlCatalogLocalResolve          (void *catalogs,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *pubID,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *sysID);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Do a complete resolution lookup of an External Identifier using a 
+document's private catalog list</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN19017"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>catalogs</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  a document's list of catalogs</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>pubID</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the public ID string</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>sysID</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the system ID string</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the URI of the resource or NULL if not found, it must be freed
+by the caller.</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN19038"
+></A
+><H3
+><A
+NAME="XMLCATALOGLOCALRESOLVEURI"
+></A
+>xmlCatalogLocalResolveURI ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+>*    xmlCatalogLocalResolveURI       (void *catalogs,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *URI);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Do a complete resolution lookup of an URI using a 
+document's private catalog list</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN19046"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>catalogs</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  a document's list of catalogs</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>URI</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the URI of the resource or NULL if not found, it must be freed
+by the caller.</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN19063"
+></A
+><H3
+><A
+NAME="XMLCATALOGSETDEBUG"
+></A
+>xmlCatalogSetDebug ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlCatalogSetDebug              (int level);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Used to set the debug level for catalog operation, 0 disable
+debugging, 1 enable it</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN19069"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>level</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the debug level of catalogs required</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the previous value of the catalog debugging level</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN19082"
+></A
+><H3
+><A
+NAME="XMLCATALOGSETDEFAULTPREFER"
+></A
+>xmlCatalogSetDefaultPrefer ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-catalog.html#XMLCATALOGPREFER"
+>xmlCatalogPrefer</A
+> xmlCatalogSetDefaultPrefer (<A
+HREF="libxml-catalog.html#XMLCATALOGPREFER"
+>xmlCatalogPrefer</A
+> prefer);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Allows to set the preference between public and system for deletion
+in XML Catalog resolution. C.f. section 4.1.1 of the spec
+Values accepted are XML_CATA_PREFER_PUBLIC or XML_CATA_PREFER_SYSTEM</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN19090"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>prefer</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the default preference for delegation</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the previous value of the default preference for delegation</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN19103"
+></A
+><H3
+><A
+NAME="XMLCATALOGSETDEFAULTS"
+></A
+>xmlCatalogSetDefaults ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlCatalogSetDefaults           (<A
+HREF="libxml-catalog.html#XMLCATALOGALLOW"
+>xmlCatalogAllow</A
+> allow);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Used to set the user preference w.r.t. to what catalogs should
+be accepted</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN19110"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>allow</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN19119"
+></A
+><H3
+><A
+NAME="XMLCATALOGGETDEFAULTS"
+></A
+>xmlCatalogGetDefaults ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-catalog.html#XMLCATALOGALLOW"
+>xmlCatalogAllow</A
+> xmlCatalogGetDefaults       (void);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Used to get the user preference w.r.t. to what catalogs should
+be accepted</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN19126"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the current xmlCatalogAllow value</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN19135"
+></A
+><H3
+><A
+NAME="XMLCATALOGGETSYSTEM"
+></A
+>xmlCatalogGetSystem ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+>* xmlCatalogGetSystem          (const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *sysID);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Try to lookup the system ID associated to a public ID
+DEPRECATED, use <A
+HREF="libxml-catalog.html#XMLCATALOGRESOLVESYSTEM"
+>xmlCatalogResolveSystem</A
+>()</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN19144"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>sysID</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the system ID if found or NULL otherwise.</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN19157"
 ></A
 ><H3
 ><A
@@ -598,13 +2136,17 @@
 ></TR
 ></TABLE
 ><P
->Try to lookup the system ID associated to a public ID</P
+>Try to lookup the system ID associated to a public ID
+DEPRECATED, use <A
+HREF="libxml-catalog.html#XMLCATALOGRESOLVEPUBLIC"
+>xmlCatalogResolvePublic</A
+>()</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18450"
+NAME="AEN19166"
 ></A
 ><P
 ></P

diff --git a/doc/html/libxml-debugxml.html b/doc/html/libxml-debugxml.html
index 869ba95..6f9e5c4 100644
--- a/doc/html/libxml-debugxml.html
+++ b/doc/html/libxml-debugxml.html

@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN22337"
+NAME="AEN23127"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN22340"
+NAME="AEN23130"
 ></A
 ><H2
 >Synopsis</H2
@@ -311,7 +311,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN22384"
+NAME="AEN23174"
 ></A
 ><H2
 >Description</H2
@@ -321,14 +321,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN22387"
+NAME="AEN23177"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22389"
+NAME="AEN23179"
 ></A
 ><H3
 ><A
@@ -362,7 +362,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22397"
+NAME="AEN23187"
 ></A
 ><P
 ></P
@@ -417,7 +417,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22410"
+NAME="AEN23200"
 ></A
 ><H3
 ><A
@@ -452,7 +452,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22418"
+NAME="AEN23208"
 ></A
 ><P
 ></P
@@ -524,7 +524,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22435"
+NAME="AEN23225"
 ></A
 ><H3
 ><A
@@ -559,7 +559,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22443"
+NAME="AEN23233"
 ></A
 ><P
 ></P
@@ -631,7 +631,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22460"
+NAME="AEN23250"
 ></A
 ><H3
 ><A
@@ -666,7 +666,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22468"
+NAME="AEN23258"
 ></A
 ><P
 ></P
@@ -738,7 +738,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22485"
+NAME="AEN23275"
 ></A
 ><H3
 ><A
@@ -773,7 +773,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22493"
+NAME="AEN23283"
 ></A
 ><P
 ></P
@@ -845,7 +845,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22510"
+NAME="AEN23300"
 ></A
 ><H3
 ><A
@@ -880,7 +880,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22518"
+NAME="AEN23308"
 ></A
 ><P
 ></P
@@ -952,7 +952,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22535"
+NAME="AEN23325"
 ></A
 ><H3
 ><A
@@ -986,7 +986,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22543"
+NAME="AEN23333"
 ></A
 ><P
 ></P
@@ -1041,7 +1041,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22556"
+NAME="AEN23346"
 ></A
 ><H3
 ><A
@@ -1075,7 +1075,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22564"
+NAME="AEN23354"
 ></A
 ><P
 ></P
@@ -1130,7 +1130,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22577"
+NAME="AEN23367"
 ></A
 ><H3
 ><A
@@ -1164,7 +1164,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22585"
+NAME="AEN23375"
 ></A
 ><P
 ></P
@@ -1219,7 +1219,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22598"
+NAME="AEN23388"
 ></A
 ><H3
 ><A
@@ -1253,7 +1253,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22606"
+NAME="AEN23396"
 ></A
 ><P
 ></P
@@ -1308,7 +1308,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22619"
+NAME="AEN23409"
 ></A
 ><H3
 ><A
@@ -1329,11 +1329,13 @@
 ></TR
 ></TABLE
 ><P
+>This is a generic signature for the XML shell input function</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22624"
+NAME="AEN23415"
 ></A
 ><P
 ></P
@@ -1360,7 +1362,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a string prompt</TD
 ></TR
 ><TR
 ><TD
@@ -1375,7 +1377,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a string which will be freed by the Shell</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1386,7 +1388,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22637"
+NAME="AEN23428"
 ></A
 ><H3
 ><A
@@ -1415,12 +1417,15 @@
 ></TR
 ></TABLE
 ><P
+>A debugging shell context
+TODO: add the defined function tables.</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22642"
+NAME="AEN23434"
 ></A
 ><H3
 ><A
@@ -1446,7 +1451,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22647"
+NAME="AEN23439"
 ></A
 ><H3
 ><A
@@ -1479,11 +1484,13 @@
 ></TR
 ></TABLE
 ><P
+>This is a generic signature for the XML shell functions</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22655"
+NAME="AEN23448"
 ></A
 ><P
 ></P
@@ -1510,7 +1517,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a shell context</TD
 ></TR
 ><TR
 ><TD
@@ -1527,7 +1534,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a string argument</TD
 ></TR
 ><TR
 ><TD
@@ -1544,7 +1551,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a first node</TD
 ></TR
 ><TR
 ><TD
@@ -1561,7 +1568,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a second node</TD
 ></TR
 ><TR
 ><TD
@@ -1576,7 +1583,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>an int, negative returns indicating errors</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1587,7 +1594,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22680"
+NAME="AEN23473"
 ></A
 ><H3
 ><A
@@ -1628,7 +1635,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22689"
+NAME="AEN23482"
 ></A
 ><P
 ></P

diff --git a/doc/html/libxml-docbparser.html b/doc/html/libxml-docbparser.html
index 5551127..99fa21e 100644
--- a/doc/html/libxml-docbparser.html
+++ b/doc/html/libxml-docbparser.html

@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN18468"
+NAME="AEN19184"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN18471"
+NAME="AEN19187"
 ></A
 ><H2
 >Synopsis</H2
@@ -294,7 +294,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN18508"
+NAME="AEN19224"
 ></A
 ><H2
 >Description</H2
@@ -304,14 +304,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN18511"
+NAME="AEN19227"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18513"
+NAME="AEN19229"
 ></A
 ><H3
 ><A
@@ -337,7 +337,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18518"
+NAME="AEN19234"
 ></A
 ><H3
 ><A
@@ -363,7 +363,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18523"
+NAME="AEN19239"
 ></A
 ><H3
 ><A
@@ -389,7 +389,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18528"
+NAME="AEN19244"
 ></A
 ><H3
 ><A
@@ -415,7 +415,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18533"
+NAME="AEN19249"
 ></A
 ><H3
 ><A
@@ -441,7 +441,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18538"
+NAME="AEN19254"
 ></A
 ><H3
 ><A
@@ -467,7 +467,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18543"
+NAME="AEN19259"
 ></A
 ><H3
 ><A
@@ -493,7 +493,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18548"
+NAME="AEN19264"
 ></A
 ><H3
 ><A
@@ -519,7 +519,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18553"
+NAME="AEN19269"
 ></A
 ><H3
 ><A
@@ -545,7 +545,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18558"
+NAME="AEN19274"
 ></A
 ><H3
 ><A
@@ -577,7 +577,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18564"
+NAME="AEN19280"
 ></A
 ><P
 ></P
@@ -721,7 +721,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18597"
+NAME="AEN19313"
 ></A
 ><H3
 ><A
@@ -762,7 +762,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18606"
+NAME="AEN19322"
 ></A
 ><P
 ></P
@@ -866,7 +866,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18631"
+NAME="AEN19347"
 ></A
 ><H3
 ><A
@@ -900,7 +900,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18639"
+NAME="AEN19355"
 ></A
 ><P
 ></P
@@ -970,7 +970,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18656"
+NAME="AEN19372"
 ></A
 ><H3
 ><A
@@ -1009,7 +1009,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18664"
+NAME="AEN19380"
 ></A
 ><P
 ></P
@@ -1113,7 +1113,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18689"
+NAME="AEN19405"
 ></A
 ><H3
 ><A
@@ -1146,7 +1146,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18696"
+NAME="AEN19412"
 ></A
 ><P
 ></P
@@ -1216,7 +1216,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18713"
+NAME="AEN19429"
 ></A
 ><H3
 ><A
@@ -1247,7 +1247,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18720"
+NAME="AEN19436"
 ></A
 ><P
 ></P
@@ -1285,7 +1285,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18729"
+NAME="AEN19445"
 ></A
 ><H3
 ><A
@@ -1339,7 +1339,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18740"
+NAME="AEN19456"
 ></A
 ><P
 ></P
@@ -1477,7 +1477,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18773"
+NAME="AEN19489"
 ></A
 ><H3
 ><A
@@ -1510,7 +1510,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18780"
+NAME="AEN19496"
 ></A
 ><P
 ></P
@@ -1614,7 +1614,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18805"
+NAME="AEN19521"
 ></A
 ><H3
 ><A
@@ -1647,7 +1647,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18812"
+NAME="AEN19528"
 ></A
 ><P
 ></P
@@ -1717,7 +1717,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18829"
+NAME="AEN19545"
 ></A
 ><H3
 ><A
@@ -1748,7 +1748,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18836"
+NAME="AEN19552"
 ></A
 ><P
 ></P

diff --git a/doc/html/libxml-encoding.html b/doc/html/libxml-encoding.html
index e751e1d..424bb8a 100644
--- a/doc/html/libxml-encoding.html
+++ b/doc/html/libxml-encoding.html

@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN21633"
+NAME="AEN22411"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN21636"
+NAME="AEN22414"
 ></A
 ><H2
 >Synopsis</H2
@@ -381,7 +381,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN21696"
+NAME="AEN22474"
 ></A
 ><H2
 >Description</H2
@@ -391,14 +391,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN21699"
+NAME="AEN22477"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21701"
+NAME="AEN22479"
 ></A
 ><H3
 ><A
@@ -444,12 +444,27 @@
 ></TR
 ></TABLE
 ><P
+>Predefined values for some standard encodings
+Libxml don't do beforehand translation on UTF8, ISOLatinX
+It also support UTF16 (LE and BE) by default.</P
+><P
+>Anything else would have to be translated to UTF8 before being
+given to the parser itself. The BOM for UTF16 and the encoding
+declaration are looked at and a converter is looked for at that
+point. If not found the parser stops here as asked by the XML REC
+Converter can be registered by the user using xmlRegisterCharEncodingHandler
+but the currentl form doesn't allow stateful transcoding (a serious
+problem agreed !). If iconv has been found it will be used
+automatically and allow stateful transcoding, the simplest is then
+to be sure to enable icon and to provide iconv libs for the encoding
+support needed.</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21706"
+NAME="AEN22486"
 ></A
 ><H3
 ><A
@@ -473,11 +488,14 @@
 ></TR
 ></TABLE
 ><P
+>Take a block of chars in the original encoding and try to convert
+it to an UTF-8 block of chars out.</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21711"
+NAME="AEN22492"
 ></A
 ><P
 ></P
@@ -504,7 +522,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer ot an array of bytes to store the UTF-8 result</TD
 ></TR
 ><TR
 ><TD
@@ -521,7 +539,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the lenght of <TT
+CLASS="PARAMETER"
+><I
+>out</I
+></TT
+></TD
 ></TR
 ><TR
 ><TD
@@ -538,7 +561,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer ot an array of chars in the original encoding</TD
 ></TR
 ><TR
 ><TD
@@ -555,7 +578,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the lenght of <TT
+CLASS="PARAMETER"
+><I
+>in</I
+></TT
+></TD
 ></TR
 ><TR
 ><TD
@@ -570,7 +598,21 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of byte written, or -1 by lack of space, or -2
+if the transcoding failed.
+The value of <TT
+CLASS="PARAMETER"
+><I
+>inlen</I
+></TT
+> after return is the number of octets consumed
+as the return value is positive, else unpredictiable.
+The value of <TT
+CLASS="PARAMETER"
+><I
+>outlen</I
+></TT
+> after return is the number of ocetes consumed.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -581,7 +623,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21736"
+NAME="AEN22521"
 ></A
 ><H3
 ><A
@@ -605,11 +647,16 @@
 ></TR
 ></TABLE
 ><P
+>Take a block of UTF-8 chars in and try to convert it to an other
+encoding.
+Note: a first call designed to produce heading info is called with
+in = NULL. If stateful this should also initialize the encoder state</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21741"
+NAME="AEN22527"
 ></A
 ><P
 ></P
@@ -636,7 +683,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer ot an array of bytes to store the result</TD
 ></TR
 ><TR
 ><TD
@@ -653,7 +700,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the lenght of <TT
+CLASS="PARAMETER"
+><I
+>out</I
+></TT
+></TD
 ></TR
 ><TR
 ><TD
@@ -670,7 +722,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a pointer ot an array of UTF-8 chars</TD
 ></TR
 ><TR
 ><TD
@@ -687,7 +739,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the lenght of <TT
+CLASS="PARAMETER"
+><I
+>in</I
+></TT
+></TD
 ></TR
 ><TR
 ><TD
@@ -702,7 +759,21 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of byte written, or -1 by lack of space, or -2
+if the transcoding failed.
+The value of <TT
+CLASS="PARAMETER"
+><I
+>inlen</I
+></TT
+> after return is the number of octets consumed
+as the return value is positive, else unpredictiable.
+The value of <TT
+CLASS="PARAMETER"
+><I
+>outlen</I
+></TT
+> after return is the number of ocetes consumed.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -713,7 +784,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21766"
+NAME="AEN22556"
 ></A
 ><H3
 ><A
@@ -747,7 +818,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21771"
+NAME="AEN22561"
 ></A
 ><H3
 ><A
@@ -773,7 +844,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21776"
+NAME="AEN22566"
 ></A
 ><H3
 ><A
@@ -804,7 +875,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21782"
+NAME="AEN22572"
 ></A
 ><H3
 ><A
@@ -833,7 +904,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21788"
+NAME="AEN22578"
 ></A
 ><H3
 ><A
@@ -863,7 +934,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21795"
+NAME="AEN22585"
 ></A
 ><P
 ></P
@@ -901,7 +972,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21804"
+NAME="AEN22594"
 ></A
 ><H3
 ><A
@@ -935,7 +1006,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21812"
+NAME="AEN22602"
 ></A
 ><P
 ></P
@@ -988,7 +1059,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21825"
+NAME="AEN22615"
 ></A
 ><H3
 ><A
@@ -1019,7 +1090,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21832"
+NAME="AEN22622"
 ></A
 ><P
 ></P
@@ -1072,7 +1143,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21845"
+NAME="AEN22635"
 ></A
 ><H3
 ><A
@@ -1111,7 +1182,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21853"
+NAME="AEN22643"
 ></A
 ><P
 ></P
@@ -1181,7 +1252,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21870"
+NAME="AEN22660"
 ></A
 ><H3
 ><A
@@ -1213,7 +1284,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21877"
+NAME="AEN22667"
 ></A
 ><P
 ></P
@@ -1266,7 +1337,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21890"
+NAME="AEN22680"
 ></A
 ><H3
 ><A
@@ -1293,7 +1364,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21896"
+NAME="AEN22686"
 ></A
 ><P
 ></P
@@ -1346,7 +1417,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21909"
+NAME="AEN22699"
 ></A
 ><H3
 ><A
@@ -1374,7 +1445,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21915"
+NAME="AEN22705"
 ></A
 ><H3
 ><A
@@ -1406,7 +1477,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21922"
+NAME="AEN22712"
 ></A
 ><P
 ></P
@@ -1460,7 +1531,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21935"
+NAME="AEN22725"
 ></A
 ><H3
 ><A
@@ -1495,7 +1566,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21943"
+NAME="AEN22733"
 ></A
 ><P
 ></P
@@ -1548,7 +1619,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21956"
+NAME="AEN22746"
 ></A
 ><H3
 ><A
@@ -1580,7 +1651,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21963"
+NAME="AEN22753"
 ></A
 ><P
 ></P
@@ -1651,7 +1722,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21980"
+NAME="AEN22770"
 ></A
 ><H3
 ><A
@@ -1699,7 +1770,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21990"
+NAME="AEN22780"
 ></A
 ><P
 ></P
@@ -1789,7 +1860,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22011"
+NAME="AEN22801"
 ></A
 ><H3
 ><A
@@ -1827,7 +1898,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22020"
+NAME="AEN22810"
 ></A
 ><P
 ></P
@@ -1917,7 +1988,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22041"
+NAME="AEN22831"
 ></A
 ><H3
 ><A
@@ -1956,7 +2027,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22050"
+NAME="AEN22840"
 ></A
 ><P
 ></P
@@ -2046,7 +2117,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22071"
+NAME="AEN22861"
 ></A
 ><H3
 ><A
@@ -2076,7 +2147,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22078"
+NAME="AEN22868"
 ></A
 ><P
 ></P
@@ -2129,7 +2200,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22091"
+NAME="AEN22881"
 ></A
 ><H3
 ><A
@@ -2160,7 +2231,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22097"
+NAME="AEN22887"
 ></A
 ><P
 ></P
@@ -2287,7 +2358,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22126"
+NAME="AEN22916"
 ></A
 ><H3
 ><A
@@ -2318,7 +2389,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22132"
+NAME="AEN22922"
 ></A
 ><P
 ></P
@@ -2445,7 +2516,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22161"
+NAME="AEN22951"
 ></A
 ><H3
 ><A
@@ -2487,7 +2558,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22169"
+NAME="AEN22959"
 ></A
 ><P
 ></P
@@ -2545,7 +2616,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22183"
+NAME="AEN22973"
 ></A
 ><H3
 ><A
@@ -2576,7 +2647,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22190"
+NAME="AEN22980"
 ></A
 ><P
 ></P
@@ -2647,7 +2718,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22207"
+NAME="AEN22997"
 ></A
 ><H3
 ><A
@@ -2681,7 +2752,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22215"
+NAME="AEN23005"
 ></A
 ><P
 ></P
@@ -2756,7 +2827,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22233"
+NAME="AEN23023"
 ></A
 ><H3
 ><A
@@ -2791,7 +2862,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22241"
+NAME="AEN23031"
 ></A
 ><P
 ></P
@@ -2861,7 +2932,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22258"
+NAME="AEN23048"
 ></A
 ><H3
 ><A
@@ -2895,7 +2966,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22266"
+NAME="AEN23056"
 ></A
 ><P
 ></P
@@ -2966,7 +3037,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22283"
+NAME="AEN23073"
 ></A
 ><H3
 ><A
@@ -3001,7 +3072,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22291"
+NAME="AEN23081"
 ></A
 ><P
 ></P
@@ -3089,7 +3160,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22312"
+NAME="AEN23102"
 ></A
 ><H3
 ><A
@@ -3120,7 +3191,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22319"
+NAME="AEN23109"
 ></A
 ><P
 ></P

diff --git a/doc/html/libxml-entities.html b/doc/html/libxml-entities.html
index 3a19bf2..cc53fd0 100644
--- a/doc/html/libxml-entities.html
+++ b/doc/html/libxml-entities.html

@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN7475"
+NAME="AEN7540"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN7478"
+NAME="AEN7543"
 ></A
 ><H2
 >Synopsis</H2
@@ -370,7 +370,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN7541"
+NAME="AEN7606"
 ></A
 ><H2
 >Description</H2
@@ -380,14 +380,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN7544"
+NAME="AEN7609"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7546"
+NAME="AEN7611"
 ></A
 ><H3
 ><A
@@ -420,7 +420,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7551"
+NAME="AEN7616"
 ></A
 ><H3
 ><A
@@ -466,7 +466,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7556"
+NAME="AEN7621"
 ></A
 ><H3
 ><A
@@ -492,7 +492,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7561"
+NAME="AEN7626"
 ></A
 ><H3
 ><A
@@ -518,7 +518,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7566"
+NAME="AEN7631"
 ></A
 ><H3
 ><A
@@ -546,7 +546,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7572"
+NAME="AEN7637"
 ></A
 ><H3
 ><A
@@ -596,7 +596,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7584"
+NAME="AEN7649"
 ></A
 ><P
 ></P
@@ -734,7 +734,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7617"
+NAME="AEN7682"
 ></A
 ><H3
 ><A
@@ -784,7 +784,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7629"
+NAME="AEN7694"
 ></A
 ><P
 ></P
@@ -922,7 +922,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7662"
+NAME="AEN7727"
 ></A
 ><H3
 ><A
@@ -955,7 +955,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7670"
+NAME="AEN7735"
 ></A
 ><P
 ></P
@@ -1008,7 +1008,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7683"
+NAME="AEN7748"
 ></A
 ><H3
 ><A
@@ -1047,7 +1047,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7692"
+NAME="AEN7757"
 ></A
 ><P
 ></P
@@ -1117,7 +1117,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7709"
+NAME="AEN7774"
 ></A
 ><H3
 ><A
@@ -1155,7 +1155,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7718"
+NAME="AEN7783"
 ></A
 ><P
 ></P
@@ -1225,7 +1225,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7735"
+NAME="AEN7800"
 ></A
 ><H3
 ><A
@@ -1263,7 +1263,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7744"
+NAME="AEN7809"
 ></A
 ><P
 ></P
@@ -1333,7 +1333,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7761"
+NAME="AEN7826"
 ></A
 ><H3
 ><A
@@ -1377,7 +1377,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7772"
+NAME="AEN7837"
 ></A
 ><P
 ></P
@@ -1447,7 +1447,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7789"
+NAME="AEN7854"
 ></A
 ><H3
 ><A
@@ -1487,7 +1487,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7798"
+NAME="AEN7863"
 ></A
 ><P
 ></P
@@ -1557,7 +1557,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7815"
+NAME="AEN7880"
 ></A
 ><H3
 ><A
@@ -1595,7 +1595,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7824"
+NAME="AEN7889"
 ></A
 ><P
 ></P
@@ -1665,7 +1665,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7841"
+NAME="AEN7906"
 ></A
 ><H3
 ><A
@@ -1695,7 +1695,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7848"
+NAME="AEN7913"
 ></A
 ><P
 ></P
@@ -1731,7 +1731,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7857"
+NAME="AEN7922"
 ></A
 ><H3
 ><A
@@ -1764,7 +1764,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7865"
+NAME="AEN7930"
 ></A
 ><P
 ></P
@@ -1817,7 +1817,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7878"
+NAME="AEN7943"
 ></A
 ><H3
 ><A
@@ -1847,7 +1847,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7885"
+NAME="AEN7950"
 ></A
 ><P
 ></P
@@ -1885,7 +1885,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7894"
+NAME="AEN7959"
 ></A
 ><H3
 ><A
@@ -1919,7 +1919,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7902"
+NAME="AEN7967"
 ></A
 ><P
 ></P
@@ -1974,7 +1974,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7915"
+NAME="AEN7980"
 ></A
 ><H3
 ><A
@@ -2008,7 +2008,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7923"
+NAME="AEN7988"
 ></A
 ><P
 ></P
@@ -2063,7 +2063,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7936"
+NAME="AEN8001"
 ></A
 ><H3
 ><A

diff --git a/doc/html/libxml-htmlparser.html b/doc/html/libxml-htmlparser.html
index 9b315fb..e512ba2 100644
--- a/doc/html/libxml-htmlparser.html
+++ b/doc/html/libxml-htmlparser.html

@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN10190"
+NAME="AEN10363"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN10193"
+NAME="AEN10366"
 ></A
 ><H2
 >Synopsis</H2
@@ -198,33 +198,32 @@
 >htmlEntityDescPtr</A
 >;
 const <A
-HREF="libxml-htmlparser.html#HTMLELEMDESCPTR"
->htmlElemDescPtr</A
-> <A
+HREF="libxml-htmlparser.html#HTMLELEMDESC"
+>htmlElemDesc</A
+>* <A
 HREF="libxml-htmlparser.html#HTMLTAGLOOKUP"
 >htmlTagLookup</A
->         (const <A
+>           (const <A
 HREF="libxml-tree.html#XMLCHAR"
 >xmlChar</A
 > *tag);
 const <A
-HREF="libxml-htmlparser.html#HTMLENTITYDESCPTR"
->htmlEntityDescPtr</A
-> <A
+HREF="libxml-htmlparser.html#HTMLENTITYDESC"
+>htmlEntityDesc</A
+>* <A
 HREF="libxml-htmlparser.html#HTMLENTITYLOOKUP"
 >htmlEntityLookup</A
->    (const <A
+>      (const <A
 HREF="libxml-tree.html#XMLCHAR"
 >xmlChar</A
 > *name);
 const <A
-HREF="libxml-htmlparser.html#HTMLENTITYDESCPTR"
->htmlEntityDescPtr</A
-> <A
+HREF="libxml-htmlparser.html#HTMLENTITYDESC"
+>htmlEntityDesc</A
+>* <A
 HREF="libxml-htmlparser.html#HTMLENTITYVALUELOOKUP"
 >htmlEntityValueLookup</A
->
-                                            (unsigned int value);
+> (unsigned int value);
 int         <A
 HREF="libxml-htmlparser.html#HTMLISAUTOCLOSED"
 >htmlIsAutoClosed</A
@@ -251,13 +250,13 @@
 HREF="libxml-htmlparser.html#HTMLNODEPTR"
 >htmlNodePtr</A
 > elem);
-<A
-HREF="libxml-htmlparser.html#HTMLENTITYDESCPTR"
->htmlEntityDescPtr</A
-> <A
+const <A
+HREF="libxml-htmlparser.html#HTMLENTITYDESC"
+>htmlEntityDesc</A
+>* <A
 HREF="libxml-htmlparser.html#HTMLPARSEENTITYREF"
 >htmlParseEntityRef</A
->        (<A
+>    (<A
 HREF="libxml-htmlparser.html#HTMLPARSERCTXTPTR"
 >htmlParserCtxtPtr</A
 > ctxt,
@@ -395,7 +394,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10257"
+NAME="AEN10430"
 ></A
 ><H2
 >Description</H2
@@ -405,14 +404,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10260"
+NAME="AEN10433"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10262"
+NAME="AEN10435"
 ></A
 ><H3
 ><A
@@ -438,7 +437,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10267"
+NAME="AEN10440"
 ></A
 ><H3
 ><A
@@ -464,7 +463,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10272"
+NAME="AEN10445"
 ></A
 ><H3
 ><A
@@ -490,7 +489,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10277"
+NAME="AEN10450"
 ></A
 ><H3
 ><A
@@ -516,7 +515,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10282"
+NAME="AEN10455"
 ></A
 ><H3
 ><A
@@ -542,7 +541,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10287"
+NAME="AEN10460"
 ></A
 ><H3
 ><A
@@ -568,7 +567,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10292"
+NAME="AEN10465"
 ></A
 ><H3
 ><A
@@ -594,7 +593,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10297"
+NAME="AEN10470"
 ></A
 ><H3
 ><A
@@ -620,7 +619,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10302"
+NAME="AEN10475"
 ></A
 ><H3
 ><A
@@ -646,7 +645,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10307"
+NAME="AEN10480"
 ></A
 ><H3
 ><A
@@ -682,7 +681,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10312"
+NAME="AEN10485"
 ></A
 ><H3
 ><A
@@ -708,7 +707,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10317"
+NAME="AEN10490"
 ></A
 ><H3
 ><A
@@ -738,7 +737,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10322"
+NAME="AEN10495"
 ></A
 ><H3
 ><A
@@ -764,7 +763,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10327"
+NAME="AEN10500"
 ></A
 ><H3
 ><A
@@ -781,9 +780,9 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 >const <A
-HREF="libxml-htmlparser.html#HTMLELEMDESCPTR"
->htmlElemDescPtr</A
-> htmlTagLookup         (const <A
+HREF="libxml-htmlparser.html#HTMLELEMDESC"
+>htmlElemDesc</A
+>* htmlTagLookup           (const <A
 HREF="libxml-tree.html#XMLCHAR"
 >xmlChar</A
 > *tag);</PRE
@@ -797,7 +796,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10335"
+NAME="AEN10508"
 ></A
 ><P
 ></P
@@ -850,7 +849,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10348"
+NAME="AEN10521"
 ></A
 ><H3
 ><A
@@ -867,9 +866,9 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 >const <A
-HREF="libxml-htmlparser.html#HTMLENTITYDESCPTR"
->htmlEntityDescPtr</A
-> htmlEntityLookup    (const <A
+HREF="libxml-htmlparser.html#HTMLENTITYDESC"
+>htmlEntityDesc</A
+>* htmlEntityLookup      (const <A
 HREF="libxml-tree.html#XMLCHAR"
 >xmlChar</A
 > *name);</PRE
@@ -885,7 +884,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10357"
+NAME="AEN10530"
 ></A
 ><P
 ></P
@@ -938,7 +937,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10370"
+NAME="AEN10543"
 ></A
 ><H3
 ><A
@@ -955,10 +954,9 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 >const <A
-HREF="libxml-htmlparser.html#HTMLENTITYDESCPTR"
->htmlEntityDescPtr</A
-> htmlEntityValueLookup
-                                            (unsigned int value);</PRE
+HREF="libxml-htmlparser.html#HTMLENTITYDESC"
+>htmlEntityDesc</A
+>* htmlEntityValueLookup (unsigned int value);</PRE
 ></TD
 ></TR
 ></TABLE
@@ -971,7 +969,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10378"
+NAME="AEN10551"
 ></A
 ><P
 ></P
@@ -1024,7 +1022,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10391"
+NAME="AEN10564"
 ></A
 ><H3
 ><A
@@ -1060,7 +1058,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10399"
+NAME="AEN10572"
 ></A
 ><P
 ></P
@@ -1130,7 +1128,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10416"
+NAME="AEN10589"
 ></A
 ><H3
 ><A
@@ -1171,7 +1169,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10425"
+NAME="AEN10598"
 ></A
 ><P
 ></P
@@ -1258,7 +1256,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10446"
+NAME="AEN10619"
 ></A
 ><H3
 ><A
@@ -1274,10 +1272,10 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
-><A
-HREF="libxml-htmlparser.html#HTMLENTITYDESCPTR"
->htmlEntityDescPtr</A
-> htmlParseEntityRef        (<A
+>const <A
+HREF="libxml-htmlparser.html#HTMLENTITYDESC"
+>htmlEntityDesc</A
+>* htmlParseEntityRef    (<A
 HREF="libxml-htmlparser.html#HTMLPARSERCTXTPTR"
 >htmlParserCtxtPtr</A
 > ctxt,
@@ -1297,7 +1295,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10456"
+NAME="AEN10629"
 ></A
 ><P
 ></P
@@ -1368,7 +1366,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10473"
+NAME="AEN10646"
 ></A
 ><H3
 ><A
@@ -1404,7 +1402,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10482"
+NAME="AEN10655"
 ></A
 ><P
 ></P
@@ -1457,7 +1455,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10495"
+NAME="AEN10668"
 ></A
 ><H3
 ><A
@@ -1491,7 +1489,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10504"
+NAME="AEN10677"
 ></A
 ><P
 ></P
@@ -1529,7 +1527,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10513"
+NAME="AEN10686"
 ></A
 ><H3
 ><A
@@ -1570,7 +1568,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10522"
+NAME="AEN10695"
 ></A
 ><P
 ></P
@@ -1675,7 +1673,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10547"
+NAME="AEN10720"
 ></A
 ><H3
 ><A
@@ -1709,7 +1707,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10555"
+NAME="AEN10728"
 ></A
 ><P
 ></P
@@ -1779,7 +1777,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10572"
+NAME="AEN10745"
 ></A
 ><H3
 ><A
@@ -1818,7 +1816,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10580"
+NAME="AEN10753"
 ></A
 ><P
 ></P
@@ -1923,7 +1921,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10605"
+NAME="AEN10778"
 ></A
 ><H3
 ><A
@@ -1955,7 +1953,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10612"
+NAME="AEN10785"
 ></A
 ><P
 ></P
@@ -2025,7 +2023,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10629"
+NAME="AEN10802"
 ></A
 ><H3
 ><A
@@ -2056,7 +2054,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10635"
+NAME="AEN10808"
 ></A
 ><P
 ></P
@@ -2183,7 +2181,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10664"
+NAME="AEN10837"
 ></A
 ><H3
 ><A
@@ -2215,7 +2213,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10670"
+NAME="AEN10843"
 ></A
 ><P
 ></P
@@ -2359,7 +2357,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10703"
+NAME="AEN10876"
 ></A
 ><H3
 ><A
@@ -2389,7 +2387,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10710"
+NAME="AEN10883"
 ></A
 ><P
 ></P
@@ -2442,7 +2440,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10723"
+NAME="AEN10896"
 ></A
 ><H3
 ><A
@@ -2469,7 +2467,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10729"
+NAME="AEN10902"
 ></A
 ><P
 ></P
@@ -2522,7 +2520,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10742"
+NAME="AEN10915"
 ></A
 ><H3
 ><A
@@ -2553,7 +2551,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10749"
+NAME="AEN10922"
 ></A
 ><P
 ></P
@@ -2591,7 +2589,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10758"
+NAME="AEN10931"
 ></A
 ><H3
 ><A
@@ -2645,7 +2643,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10769"
+NAME="AEN10942"
 ></A
 ><P
 ></P
@@ -2783,7 +2781,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10802"
+NAME="AEN10975"
 ></A
 ><H3
 ><A
@@ -2816,7 +2814,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10809"
+NAME="AEN10982"
 ></A
 ><P
 ></P

diff --git a/doc/html/libxml-htmltree.html b/doc/html/libxml-htmltree.html
index 6db31b8..7781fc1 100644
--- a/doc/html/libxml-htmltree.html
+++ b/doc/html/libxml-htmltree.html

@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN10839"
+NAME="AEN11012"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN10842"
+NAME="AEN11015"
 ></A
 ><H2
 >Synopsis</H2
@@ -318,7 +318,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10888"
+NAME="AEN11061"
 ></A
 ><H2
 >Description</H2
@@ -328,14 +328,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10891"
+NAME="AEN11064"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10893"
+NAME="AEN11066"
 ></A
 ><H3
 ><A
@@ -356,12 +356,15 @@
 ></TR
 ></TABLE
 ><P
+>Macro, a text node in a HTML document is really implemented
+the same way as a text node in an XML document.</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10898"
+NAME="AEN11072"
 ></A
 ><H3
 ><A
@@ -382,12 +385,15 @@
 ></TR
 ></TABLE
 ><P
+>Macro, an entity reference in a HTML document is really implemented
+the same way as an entity reference in an XML document.</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10903"
+NAME="AEN11078"
 ></A
 ><H3
 ><A
@@ -408,12 +414,15 @@
 ></TR
 ></TABLE
 ><P
+>Macro, a comment in a HTML document is really implemented
+the same way as a comment in an XML document.</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10908"
+NAME="AEN11084"
 ></A
 ><H3
 ><A
@@ -434,12 +443,15 @@
 ></TR
 ></TABLE
 ><P
+>Macro, a preserved node in a HTML document is really implemented
+the same way as a CDATA section in an XML document.</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10913"
+NAME="AEN11090"
 ></A
 ><H3
 ><A
@@ -460,12 +472,15 @@
 ></TR
 ></TABLE
 ><P
+>Macro, a processing instruction in a HTML document is really implemented
+the same way as a processing instruction in an XML document.</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10918"
+NAME="AEN11096"
 ></A
 ><H3
 ><A
@@ -502,7 +517,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10927"
+NAME="AEN11105"
 ></A
 ><P
 ></P
@@ -572,7 +587,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10944"
+NAME="AEN11122"
 ></A
 ><H3
 ><A
@@ -620,7 +635,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10955"
+NAME="AEN11133"
 ></A
 ><P
 ></P
@@ -690,7 +705,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10972"
+NAME="AEN11150"
 ></A
 ><H3
 ><A
@@ -723,7 +738,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10980"
+NAME="AEN11158"
 ></A
 ><P
 ></P
@@ -776,7 +791,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10993"
+NAME="AEN11171"
 ></A
 ><H3
 ><A
@@ -812,7 +827,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11001"
+NAME="AEN11179"
 ></A
 ><P
 ></P
@@ -882,7 +897,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11018"
+NAME="AEN11196"
 ></A
 ><H3
 ><A
@@ -918,7 +933,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11026"
+NAME="AEN11204"
 ></A
 ><P
 ></P
@@ -990,7 +1005,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11043"
+NAME="AEN11221"
 ></A
 ><H3
 ><A
@@ -1024,7 +1039,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11051"
+NAME="AEN11229"
 ></A
 ><P
 ></P
@@ -1094,7 +1109,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11068"
+NAME="AEN11246"
 ></A
 ><H3
 ><A
@@ -1131,7 +1146,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11076"
+NAME="AEN11254"
 ></A
 ><P
 ></P
@@ -1201,7 +1216,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11093"
+NAME="AEN11271"
 ></A
 ><H3
 ><A
@@ -1240,7 +1255,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11102"
+NAME="AEN11280"
 ></A
 ><P
 ></P
@@ -1312,7 +1327,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11119"
+NAME="AEN11297"
 ></A
 ><H3
 ><A
@@ -1351,7 +1366,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11128"
+NAME="AEN11306"
 ></A
 ><P
 ></P
@@ -1423,7 +1438,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11145"
+NAME="AEN11323"
 ></A
 ><H3
 ><A
@@ -1465,7 +1480,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11155"
+NAME="AEN11333"
 ></A
 ><P
 ></P
@@ -1586,7 +1601,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11184"
+NAME="AEN11362"
 ></A
 ><H3
 ><A
@@ -1619,7 +1634,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11191"
+NAME="AEN11369"
 ></A
 ><P
 ></P
@@ -1706,7 +1721,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11212"
+NAME="AEN11390"
 ></A
 ><H3
 ><A
@@ -1739,7 +1754,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11219"
+NAME="AEN11397"
 ></A
 ><P
 ></P

diff --git a/doc/html/libxml-nanoftp.html b/doc/html/libxml-nanoftp.html
index fd6d698..3c71715 100644
--- a/doc/html/libxml-nanoftp.html
+++ b/doc/html/libxml-nanoftp.html

@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN16760"
+NAME="AEN17099"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN16763"
+NAME="AEN17102"
 ></A
 ><H2
 >Synopsis</H2
@@ -282,7 +282,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN16792"
+NAME="AEN17131"
 ></A
 ><H2
 >Description</H2
@@ -292,14 +292,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN16795"
+NAME="AEN17134"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16797"
+NAME="AEN17136"
 ></A
 ><H3
 ><A
@@ -334,11 +334,14 @@
 ></TR
 ></TABLE
 ><P
+>A callback for the xmlNanoFTPList command
+Note that only one of year and day:minute are specified</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16803"
+NAME="AEN17143"
 ></A
 ><P
 ></P
@@ -365,7 +368,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  user provided data for the callback</TD
 ></TR
 ><TR
 ><TD
@@ -382,7 +385,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the file name (including "-&gt;" when links are shown)</TD
 ></TR
 ><TR
 ><TD
@@ -399,7 +402,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute string</TD
 ></TR
 ><TR
 ><TD
@@ -416,7 +419,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the owner string</TD
 ></TR
 ><TR
 ><TD
@@ -433,7 +436,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the group string</TD
 ></TR
 ><TR
 ><TD
@@ -450,7 +453,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the file size</TD
 ></TR
 ><TR
 ><TD
@@ -467,7 +470,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the link count</TD
 ></TR
 ><TR
 ><TD
@@ -484,7 +487,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the year</TD
 ></TR
 ><TR
 ><TD
@@ -501,7 +504,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the month</TD
 ></TR
 ><TR
 ><TD
@@ -518,7 +521,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the day</TD
 ></TR
 ><TR
 ><TD
@@ -535,7 +538,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the hour</TD
 ></TR
 ><TR
 ><TD
@@ -552,7 +555,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the minute</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -563,7 +566,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16856"
+NAME="AEN17196"
 ></A
 ><H3
 ><A
@@ -586,11 +589,13 @@
 ></TR
 ></TABLE
 ><P
+>A callback for the xmlNanoFTPGet command</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16861"
+NAME="AEN17202"
 ></A
 ><P
 ></P
@@ -617,7 +622,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the user provided context</TD
 ></TR
 ><TR
 ><TD
@@ -634,7 +639,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the data received</TD
 ></TR
 ><TR
 ><TD
@@ -651,7 +656,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> its size in bytes</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -662,7 +667,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16878"
+NAME="AEN17219"
 ></A
 ><H3
 ><A
@@ -692,7 +697,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16884"
+NAME="AEN17225"
 ></A
 ><H3
 ><A
@@ -720,7 +725,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16890"
+NAME="AEN17231"
 ></A
 ><H3
 ><A
@@ -747,7 +752,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16896"
+NAME="AEN17237"
 ></A
 ><P
 ></P
@@ -785,7 +790,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16905"
+NAME="AEN17246"
 ></A
 ><H3
 ><A
@@ -812,7 +817,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16911"
+NAME="AEN17252"
 ></A
 ><P
 ></P
@@ -850,7 +855,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16920"
+NAME="AEN17261"
 ></A
 ><H3
 ><A
@@ -878,7 +883,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16926"
+NAME="AEN17267"
 ></A
 ><P
 ></P
@@ -933,7 +938,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16939"
+NAME="AEN17280"
 ></A
 ><H3
 ><A
@@ -960,7 +965,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16945"
+NAME="AEN17286"
 ></A
 ><P
 ></P
@@ -998,7 +1003,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16954"
+NAME="AEN17295"
 ></A
 ><H3
 ><A
@@ -1025,7 +1030,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16960"
+NAME="AEN17301"
 ></A
 ><P
 ></P
@@ -1078,7 +1083,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16973"
+NAME="AEN17314"
 ></A
 ><H3
 ><A
@@ -1105,7 +1110,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16979"
+NAME="AEN17320"
 ></A
 ><P
 ></P
@@ -1158,7 +1163,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16992"
+NAME="AEN17333"
 ></A
 ><H3
 ><A
@@ -1185,7 +1190,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16998"
+NAME="AEN17339"
 ></A
 ><P
 ></P
@@ -1238,7 +1243,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17011"
+NAME="AEN17352"
 ></A
 ><H3
 ><A
@@ -1268,7 +1273,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17017"
+NAME="AEN17358"
 ></A
 ><P
 ></P
@@ -1306,7 +1311,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17026"
+NAME="AEN17367"
 ></A
 ><H3
 ><A
@@ -1339,7 +1344,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17032"
+NAME="AEN17373"
 ></A
 ><P
 ></P
@@ -1450,7 +1455,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17058"
+NAME="AEN17399"
 ></A
 ><H3
 ><A
@@ -1482,7 +1487,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17064"
+NAME="AEN17405"
 ></A
 ><P
 ></P
@@ -1552,7 +1557,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17081"
+NAME="AEN17422"
 ></A
 ><H3
 ><A
@@ -1579,7 +1584,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17087"
+NAME="AEN17428"
 ></A
 ><P
 ></P
@@ -1632,7 +1637,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17100"
+NAME="AEN17441"
 ></A
 ><H3
 ><A
@@ -1659,7 +1664,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17106"
+NAME="AEN17447"
 ></A
 ><P
 ></P
@@ -1712,7 +1717,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17119"
+NAME="AEN17460"
 ></A
 ><H3
 ><A
@@ -1740,7 +1745,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17125"
+NAME="AEN17466"
 ></A
 ><P
 ></P
@@ -1810,7 +1815,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17142"
+NAME="AEN17483"
 ></A
 ><H3
 ><A
@@ -1838,7 +1843,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17148"
+NAME="AEN17489"
 ></A
 ><P
 ></P
@@ -1891,7 +1896,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17161"
+NAME="AEN17502"
 ></A
 ><H3
 ><A
@@ -1918,7 +1923,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17167"
+NAME="AEN17508"
 ></A
 ><P
 ></P
@@ -1971,7 +1976,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17180"
+NAME="AEN17521"
 ></A
 ><H3
 ><A
@@ -2005,7 +2010,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17187"
+NAME="AEN17528"
 ></A
 ><P
 ></P
@@ -2109,7 +2114,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17212"
+NAME="AEN17553"
 ></A
 ><H3
 ><A
@@ -2137,7 +2142,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17218"
+NAME="AEN17559"
 ></A
 ><P
 ></P
@@ -2207,7 +2212,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17235"
+NAME="AEN17576"
 ></A
 ><H3
 ><A
@@ -2241,7 +2246,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17242"
+NAME="AEN17583"
 ></A
 ><P
 ></P
@@ -2345,7 +2350,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17267"
+NAME="AEN17608"
 ></A
 ><H3
 ><A
@@ -2385,7 +2390,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17275"
+NAME="AEN17616"
 ></A
 ><P
 ></P

diff --git a/doc/html/libxml-nanohttp.html b/doc/html/libxml-nanohttp.html
index 1bd21bb..e6e22cf 100644
--- a/doc/html/libxml-nanohttp.html
+++ b/doc/html/libxml-nanohttp.html

@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN16454"
+NAME="AEN16793"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN16457"
+NAME="AEN16796"
 ></A
 ><H2
 >Synopsis</H2
@@ -223,7 +223,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN16473"
+NAME="AEN16812"
 ></A
 ><H2
 >Description</H2
@@ -233,14 +233,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN16476"
+NAME="AEN16815"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16478"
+NAME="AEN16817"
 ></A
 ><H3
 ><A
@@ -269,7 +269,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16484"
+NAME="AEN16823"
 ></A
 ><H3
 ><A
@@ -297,7 +297,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16490"
+NAME="AEN16829"
 ></A
 ><H3
 ><A
@@ -327,7 +327,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16496"
+NAME="AEN16835"
 ></A
 ><P
 ></P
@@ -354,7 +354,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The proxy URL used to initialize the proxy context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -365,7 +365,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16505"
+NAME="AEN16844"
 ></A
 ><H3
 ><A
@@ -395,7 +395,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16511"
+NAME="AEN16850"
 ></A
 ><P
 ></P
@@ -422,7 +422,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The URL to load</TD
 ></TR
 ><TR
 ><TD
@@ -439,7 +439,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename where the content should be saved</TD
 ></TR
 ><TR
 ><TD
@@ -456,7 +456,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  if available the Content-Type information will be
+returned at that location</TD
 ></TR
 ><TR
 ><TD
@@ -471,7 +472,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>-1 in case of failure, 0 incase of success. The contentType,
+if provided must be freed by the caller</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -482,7 +484,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16532"
+NAME="AEN16871"
 ></A
 ><H3
 ><A
@@ -521,7 +523,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16539"
+NAME="AEN16878"
 ></A
 ><P
 ></P
@@ -548,7 +550,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The URL to load</TD
 ></TR
 ><TR
 ><TD
@@ -565,7 +567,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the HTTP method to use</TD
 ></TR
 ><TR
 ><TD
@@ -582,7 +584,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the input string if any</TD
 ></TR
 ><TR
 ><TD
@@ -599,7 +601,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the Content-Type information IN and OUT</TD
 ></TR
 ><TR
 ><TD
@@ -616,7 +618,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the extra headers</TD
 ></TR
 ><TR
 ><TD
@@ -644,7 +646,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16568"
+NAME="AEN16907"
 ></A
 ><H3
 ><A
@@ -684,7 +686,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16575"
+NAME="AEN16914"
 ></A
 ><P
 ></P
@@ -711,7 +713,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The URL to load</TD
 ></TR
 ><TR
 ><TD
@@ -728,7 +730,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the HTTP method to use</TD
 ></TR
 ><TR
 ><TD
@@ -745,7 +747,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the input string if any</TD
 ></TR
 ><TR
 ><TD
@@ -762,7 +764,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the Content-Type information IN and OUT</TD
 ></TR
 ><TR
 ><TD
@@ -779,7 +781,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the redirected URL OUT</TD
 ></TR
 ><TR
 ><TD
@@ -796,7 +798,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the extra headers</TD
 ></TR
 ><TR
 ><TD
@@ -824,7 +826,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16608"
+NAME="AEN16947"
 ></A
 ><H3
 ><A
@@ -853,7 +855,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16614"
+NAME="AEN16953"
 ></A
 ><P
 ></P
@@ -880,7 +882,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The URL to load</TD
 ></TR
 ><TR
 ><TD
@@ -897,7 +899,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  if available the Content-Type information will be
+returned at that location</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -908,7 +911,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16627"
+NAME="AEN16966"
 ></A
 ><H3
 ><A
@@ -938,7 +941,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16633"
+NAME="AEN16972"
 ></A
 ><P
 ></P
@@ -965,7 +968,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The URL to load</TD
 ></TR
 ><TR
 ><TD
@@ -982,7 +985,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  if available the Content-Type information will be
+returned at that location</TD
 ></TR
 ><TR
 ><TD
@@ -999,7 +1003,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> if availble the redirected URL will be returned</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1010,7 +1014,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16650"
+NAME="AEN16989"
 ></A
 ><H3
 ><A
@@ -1031,13 +1035,13 @@
 ></TR
 ></TABLE
 ><P
-></P
+>Get the latest HTTP return code received</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16656"
+NAME="AEN16995"
 ></A
 ><P
 ></P
@@ -1064,7 +1068,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the HTTP context</TD
 ></TR
 ><TR
 ><TD
@@ -1079,7 +1083,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the HTTP return code for the request.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1090,7 +1094,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16669"
+NAME="AEN17008"
 ></A
 ><H3
 ><A
@@ -1111,13 +1115,13 @@
 ></TR
 ></TABLE
 ><P
-></P
+>Get the authentication header of an HTTP context</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16675"
+NAME="AEN17014"
 ></A
 ><P
 ></P
@@ -1144,7 +1148,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the HTTP context</TD
 ></TR
 ><TR
 ><TD
@@ -1159,7 +1163,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the stashed value of the WWW-Authenticate or Proxy-Authenticate
+header.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1170,7 +1175,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16688"
+NAME="AEN17027"
 ></A
 ><H3
 ><A
@@ -1210,7 +1215,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16696"
+NAME="AEN17035"
 ></A
 ><P
 ></P
@@ -1237,7 +1242,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the HTTP context</TD
 ></TR
 ><TR
 ><TD
@@ -1254,7 +1259,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a buffer</TD
 ></TR
 ><TR
 ><TD
@@ -1271,7 +1276,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer length</TD
 ></TR
 ><TR
 ><TD
@@ -1286,7 +1291,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of byte read. 0 is an indication of an end of connection.
+-1 indicates a parameter error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1297,7 +1303,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16717"
+NAME="AEN17056"
 ></A
 ><H3
 ><A
@@ -1326,7 +1332,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16723"
+NAME="AEN17062"
 ></A
 ><P
 ></P
@@ -1353,7 +1359,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the HTTP context</TD
 ></TR
 ><TR
 ><TD
@@ -1370,7 +1376,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename where the content should be saved</TD
 ></TR
 ><TR
 ><TD
@@ -1385,7 +1391,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>-1 in case of failure, 0 incase of success.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1396,7 +1402,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16740"
+NAME="AEN17079"
 ></A
 ><H3
 ><A
@@ -1424,7 +1430,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16746"
+NAME="AEN17085"
 ></A
 ><P
 ></P
@@ -1451,7 +1457,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the HTTP context</TD
 ></TR
 ></TBODY
 ></TABLE

diff --git a/doc/html/libxml-parser.html b/doc/html/libxml-parser.html
index 344c0db..5f6caca 100644
--- a/doc/html/libxml-parser.html
+++ b/doc/html/libxml-parser.html

@@ -750,7 +750,7 @@
 >   <A
 HREF="libxml-parser.html#XMLPARSEMEMORY"
 >xmlParseMemory</A
->                  (char *buffer,
+>                  (const char *buffer,
                                              int size);
 <A
 HREF="libxml-tree.html#XMLDOCPTR"
@@ -778,6 +778,10 @@
 HREF="libxml-parser.html#XMLPEDANTICPARSERDEFAULT"
 >xmlPedanticParserDefault</A
 >        (int val);
+int         <A
+HREF="libxml-parser.html#XMLLINENUMBERSDEFAULT"
+>xmlLineNumbersDefault</A
+>           (int val);
 <A
 HREF="libxml-tree.html#XMLDOCPTR"
 >xmlDocPtr</A
@@ -794,7 +798,7 @@
 >   <A
 HREF="libxml-parser.html#XMLRECOVERMEMORY"
 >xmlRecoverMemory</A
->                (char *buffer,
+>                (const char *buffer,
                                              int size);
 <A
 HREF="libxml-tree.html#XMLDOCPTR"
@@ -861,7 +865,7 @@
 HREF="libxml-parser.html#XMLSAXHANDLERPTR"
 >xmlSAXHandlerPtr</A
 > sax,
-                                             char *buffer,
+                                             const char *buffer,
                                              int size,
                                              int recovery);
 <A
@@ -964,7 +968,7 @@
                                              <A
 HREF="libxml-tree.html#XMLNODEPTR"
 >xmlNodePtr</A
-> *list);
+> *lst);
 int         <A
 HREF="libxml-parser.html#XMLPARSEEXTERNALENTITY"
 >xmlParseExternalEntity</A
@@ -989,7 +993,7 @@
                                              <A
 HREF="libxml-tree.html#XMLNODEPTR"
 >xmlNodePtr</A
-> *list);
+> *lst);
 int         <A
 HREF="libxml-parser.html#XMLPARSECTXTEXTERNALENTITY"
 >xmlParseCtxtExternalEntity</A
@@ -1008,7 +1012,7 @@
                                              <A
 HREF="libxml-tree.html#XMLNODEPTR"
 >xmlNodePtr</A
-> *list);
+> *lst);
 void        <A
 HREF="libxml-parser.html#XMLDEFAULTSAXHANDLERINIT"
 >xmlDefaultSAXHandlerInit</A
@@ -1237,7 +1241,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN315"
+NAME="AEN316"
 ></A
 ><H2
 >Description</H2
@@ -1247,14 +1251,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN318"
+NAME="AEN319"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN320"
+NAME="AEN321"
 ></A
 ><H3
 ><A
@@ -1275,12 +1279,14 @@
 ></TR
 ></TABLE
 ><P
+>The default version of XML used: 1.0</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN325"
+NAME="AEN327"
 ></A
 ><H3
 ><A
@@ -1308,7 +1314,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN331"
+NAME="AEN333"
 ></A
 ><P
 ></P
@@ -1346,7 +1352,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN340"
+NAME="AEN342"
 ></A
 ><H3
 ><A
@@ -1384,12 +1390,19 @@
 ></TR
 ></TABLE
 ><P
+>an xmlParserInput is an input flow for the XML processor.
+Each entity parsed is associated an xmlParserInput (except the
+few predefined ones). This is the case both for internal entities
+- in which case the flow is already completely in memory - or
+external entities - in which case we use the buf structure for
+progressive reading and I18N conversions to the internal UTF-8 format.</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN345"
+NAME="AEN348"
 ></A
 ><H3
 ><A
@@ -1415,7 +1428,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN350"
+NAME="AEN353"
 ></A
 ><H3
 ><A
@@ -1443,12 +1456,16 @@
 ></TR
 ></TABLE
 ><P
+>the parser can be asked to collect Node informations, i.e. at what
+place in the file they were detected. 
+NOTE: This is off by default and not very well tested.</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN355"
+NAME="AEN359"
 ></A
 ><H3
 ><A
@@ -1474,7 +1491,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN360"
+NAME="AEN364"
 ></A
 ><H3
 ><A
@@ -1504,7 +1521,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN365"
+NAME="AEN369"
 ></A
 ><H3
 ><A
@@ -1530,7 +1547,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN370"
+NAME="AEN374"
 ></A
 ><H3
 ><A
@@ -1569,12 +1586,15 @@
 ></TR
 ></TABLE
 ><P
+>The parser is now working also as a state based parser
+The recursive one use the stagte info for entities processing</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN375"
+NAME="AEN380"
 ></A
 ><H3
 ><A
@@ -1595,12 +1615,15 @@
 ></TR
 ></TABLE
 ><P
+>Bit in the loadsubset context field to tell to do ID/REFs lookups
+Use it to initialize xmlLoadExtDtdDefaultValue</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN380"
+NAME="AEN386"
 ></A
 ><H3
 ><A
@@ -1621,12 +1644,16 @@
 ></TR
 ></TABLE
 ><P
+>Bit in the loadsubset context field to tell to do complete the
+elements attributes lists with the ones defaulted from the DTDs
+Use it to initialize xmlLoadExtDtdDefaultValue</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN385"
+NAME="AEN392"
 ></A
 ><H3
 ><A
@@ -1714,17 +1741,28 @@
     void              *_private;      /* For user data, libxml won't touch it */
 
     int                loadsubset;    /* should the external subset be loaded */
+    int                linenumbers;   /* set line number in element content */
+    void              *catalogs;       /* document's own catalog */
 };</PRE
 ></TD
 ></TR
 ></TABLE
 ><P
+>The parser context.
+NOTE This doesn't completely defines the parser state, the (current ?)
+design of the parser uses recursive function calls since this allow
+and easy mapping from the production rules of the specification
+to the actual code. The drawback is that the actual function call
+also reflect the parser state. However most of the parsing routines
+takes as the only argument the parser context pointer, so migrating
+to a state based parser for progressive parsing shouldn't be too hard.</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN390"
+NAME="AEN398"
 ></A
 ><H3
 ><A
@@ -1750,7 +1788,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN395"
+NAME="AEN403"
 ></A
 ><H3
 ><A
@@ -1776,12 +1814,14 @@
 ></TR
 ></TABLE
 ><P
+>a SAX Locator.</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN400"
+NAME="AEN409"
 ></A
 ><H3
 ><A
@@ -1807,7 +1847,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN405"
+NAME="AEN414"
 ></A
 ><H3
 ><A
@@ -1843,7 +1883,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN413"
+NAME="AEN422"
 ></A
 ><P
 ></P
@@ -1930,7 +1970,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN434"
+NAME="AEN443"
 ></A
 ><H3
 ><A
@@ -1967,7 +2007,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN442"
+NAME="AEN451"
 ></A
 ><P
 ></P
@@ -2056,7 +2096,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN463"
+NAME="AEN472"
 ></A
 ><H3
 ><A
@@ -2093,7 +2133,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN471"
+NAME="AEN480"
 ></A
 ><P
 ></P
@@ -2182,7 +2222,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN492"
+NAME="AEN501"
 ></A
 ><H3
 ><A
@@ -2214,7 +2254,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN499"
+NAME="AEN508"
 ></A
 ><P
 ></P
@@ -2284,7 +2324,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN516"
+NAME="AEN525"
 ></A
 ><H3
 ><A
@@ -2316,7 +2356,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN523"
+NAME="AEN532"
 ></A
 ><P
 ></P
@@ -2386,7 +2426,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN540"
+NAME="AEN549"
 ></A
 ><H3
 ><A
@@ -2428,7 +2468,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN549"
+NAME="AEN558"
 ></A
 ><P
 ></P
@@ -2551,7 +2591,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN578"
+NAME="AEN587"
 ></A
 ><H3
 ><A
@@ -2588,7 +2628,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN586"
+NAME="AEN595"
 ></A
 ><P
 ></P
@@ -2677,7 +2717,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN607"
+NAME="AEN616"
 ></A
 ><H3
 ><A
@@ -2720,7 +2760,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN616"
+NAME="AEN625"
 ></A
 ><P
 ></P
@@ -2860,7 +2900,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN649"
+NAME="AEN658"
 ></A
 ><H3
 ><A
@@ -2894,7 +2934,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN656"
+NAME="AEN665"
 ></A
 ><P
 ></P
@@ -2983,7 +3023,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN677"
+NAME="AEN686"
 ></A
 ><H3
 ><A
@@ -3024,7 +3064,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN686"
+NAME="AEN695"
 ></A
 ><P
 ></P
@@ -3130,7 +3170,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN711"
+NAME="AEN720"
 ></A
 ><H3
 ><A
@@ -3159,7 +3199,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN717"
+NAME="AEN726"
 ></A
 ><P
 ></P
@@ -3214,7 +3254,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN730"
+NAME="AEN739"
 ></A
 ><H3
 ><A
@@ -3239,7 +3279,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN735"
+NAME="AEN744"
 ></A
 ><P
 ></P
@@ -3277,7 +3317,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN744"
+NAME="AEN753"
 ></A
 ><H3
 ><A
@@ -3302,7 +3342,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN749"
+NAME="AEN758"
 ></A
 ><P
 ></P
@@ -3340,7 +3380,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN758"
+NAME="AEN767"
 ></A
 ><H3
 ><A
@@ -3373,7 +3413,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN765"
+NAME="AEN774"
 ></A
 ><P
 ></P
@@ -3445,7 +3485,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN782"
+NAME="AEN791"
 ></A
 ><H3
 ><A
@@ -3474,7 +3514,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN788"
+NAME="AEN797"
 ></A
 ><P
 ></P
@@ -3529,7 +3569,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN801"
+NAME="AEN810"
 ></A
 ><H3
 ><A
@@ -3562,7 +3602,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN808"
+NAME="AEN817"
 ></A
 ><P
 ></P
@@ -3634,7 +3674,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN825"
+NAME="AEN834"
 ></A
 ><H3
 ><A
@@ -3663,7 +3703,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN831"
+NAME="AEN840"
 ></A
 ><P
 ></P
@@ -3718,7 +3758,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN844"
+NAME="AEN853"
 ></A
 ><H3
 ><A
@@ -3748,7 +3788,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN850"
+NAME="AEN859"
 ></A
 ><P
 ></P
@@ -3820,7 +3860,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN867"
+NAME="AEN876"
 ></A
 ><H3
 ><A
@@ -3850,7 +3890,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN873"
+NAME="AEN882"
 ></A
 ><P
 ></P
@@ -3922,7 +3962,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN890"
+NAME="AEN899"
 ></A
 ><H3
 ><A
@@ -3955,7 +3995,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN897"
+NAME="AEN906"
 ></A
 ><P
 ></P
@@ -4027,7 +4067,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN914"
+NAME="AEN923"
 ></A
 ><H3
 ><A
@@ -4056,7 +4096,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN920"
+NAME="AEN929"
 ></A
 ><P
 ></P
@@ -4111,7 +4151,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN933"
+NAME="AEN942"
 ></A
 ><H3
 ><A
@@ -4141,7 +4181,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN939"
+NAME="AEN948"
 ></A
 ><P
 ></P
@@ -4213,7 +4253,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN956"
+NAME="AEN965"
 ></A
 ><H3
 ><A
@@ -4240,7 +4280,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN961"
+NAME="AEN970"
 ></A
 ><P
 ></P
@@ -4312,7 +4352,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN978"
+NAME="AEN987"
 ></A
 ><H3
 ><A
@@ -4339,7 +4379,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN983"
+NAME="AEN992"
 ></A
 ><P
 ></P
@@ -4411,7 +4451,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1000"
+NAME="AEN1009"
 ></A
 ><H3
 ><A
@@ -4438,7 +4478,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1005"
+NAME="AEN1014"
 ></A
 ><P
 ></P
@@ -4510,7 +4550,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1022"
+NAME="AEN1031"
 ></A
 ><H3
 ><A
@@ -4535,7 +4575,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1027"
+NAME="AEN1036"
 ></A
 ><P
 ></P
@@ -4588,7 +4628,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1040"
+NAME="AEN1049"
 ></A
 ><H3
 ><A
@@ -4613,7 +4653,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1045"
+NAME="AEN1054"
 ></A
 ><P
 ></P
@@ -4666,7 +4706,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1058"
+NAME="AEN1067"
 ></A
 ><H3
 ><A
@@ -4691,7 +4731,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1063"
+NAME="AEN1072"
 ></A
 ><P
 ></P
@@ -4744,7 +4784,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1076"
+NAME="AEN1085"
 ></A
 ><H3
 ><A
@@ -4793,12 +4833,15 @@
 ></TR
 ></TABLE
 ><P
+>a SAX handler is bunch of callbacks called by the parser when processing
+of the input generate data or structure informations.</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1081"
+NAME="AEN1091"
 ></A
 ><H3
 ><A
@@ -4824,7 +4867,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1086"
+NAME="AEN1096"
 ></A
 ><H3
 ><A
@@ -4854,11 +4897,13 @@
 ></TR
 ></TABLE
 ><P
+>External entity loaders types</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1093"
+NAME="AEN1104"
 ></A
 ><P
 ></P
@@ -4885,7 +4930,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The System ID of the resource requested</TD
 ></TR
 ><TR
 ><TD
@@ -4902,7 +4947,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> The Public ID of the resource requested</TD
 ></TR
 ><TR
 ><TD
@@ -4945,7 +4990,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1114"
+NAME="AEN1125"
 ></A
 ><H3
 ><A
@@ -4966,12 +5011,14 @@
 ></TR
 ></TABLE
 ><P
+>global variable controlling the entity substitution default behaviour</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1119"
+NAME="AEN1131"
 ></A
 ><H3
 ><A
@@ -5001,7 +5048,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1125"
+NAME="AEN1137"
 ></A
 ><H3
 ><A
@@ -5032,7 +5079,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1131"
+NAME="AEN1143"
 ></A
 ><H3
 ><A
@@ -5064,7 +5111,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1138"
+NAME="AEN1150"
 ></A
 ><P
 ></P
@@ -5135,7 +5182,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1155"
+NAME="AEN1167"
 ></A
 ><H3
 ><A
@@ -5167,7 +5214,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1162"
+NAME="AEN1174"
 ></A
 ><P
 ></P
@@ -5238,7 +5285,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1179"
+NAME="AEN1191"
 ></A
 ><H3
 ><A
@@ -5273,7 +5320,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1187"
+NAME="AEN1199"
 ></A
 ><P
 ></P
@@ -5326,7 +5373,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1200"
+NAME="AEN1212"
 ></A
 ><H3
 ><A
@@ -5360,7 +5407,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1208"
+NAME="AEN1220"
 ></A
 ><P
 ></P
@@ -5435,7 +5482,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1226"
+NAME="AEN1238"
 ></A
 ><H3
 ><A
@@ -5466,7 +5513,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1233"
+NAME="AEN1245"
 ></A
 ><P
 ></P
@@ -5541,7 +5588,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1251"
+NAME="AEN1263"
 ></A
 ><H3
 ><A
@@ -5571,7 +5618,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1258"
+NAME="AEN1270"
 ></A
 ><P
 ></P
@@ -5624,7 +5671,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1271"
+NAME="AEN1283"
 ></A
 ><H3
 ><A
@@ -5659,7 +5706,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1279"
+NAME="AEN1291"
 ></A
 ><P
 ></P
@@ -5746,7 +5793,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1300"
+NAME="AEN1312"
 ></A
 ><H3
 ><A
@@ -5783,7 +5830,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1309"
+NAME="AEN1321"
 ></A
 ><P
 ></P
@@ -5853,7 +5900,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1326"
+NAME="AEN1338"
 ></A
 ><H3
 ><A
@@ -5890,7 +5937,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1335"
+NAME="AEN1347"
 ></A
 ><P
 ></P
@@ -5960,7 +6007,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1352"
+NAME="AEN1364"
 ></A
 ><H3
 ><A
@@ -5997,7 +6044,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1361"
+NAME="AEN1373"
 ></A
 ><P
 ></P
@@ -6067,7 +6114,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1378"
+NAME="AEN1390"
 ></A
 ><H3
 ><A
@@ -6101,7 +6148,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1386"
+NAME="AEN1398"
 ></A
 ><P
 ></P
@@ -6171,7 +6218,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1403"
+NAME="AEN1415"
 ></A
 ><H3
 ><A
@@ -6206,7 +6253,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1411"
+NAME="AEN1423"
 ></A
 ><P
 ></P
@@ -6293,7 +6340,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1432"
+NAME="AEN1444"
 ></A
 ><H3
 ><A
@@ -6327,7 +6374,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1440"
+NAME="AEN1452"
 ></A
 ><P
 ></P
@@ -6397,7 +6444,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1457"
+NAME="AEN1469"
 ></A
 ><H3
 ><A
@@ -6432,7 +6479,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1465"
+NAME="AEN1477"
 ></A
 ><P
 ></P
@@ -6519,7 +6566,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1486"
+NAME="AEN1498"
 ></A
 ><H3
 ><A
@@ -6557,7 +6604,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1495"
+NAME="AEN1507"
 ></A
 ><P
 ></P
@@ -6627,7 +6674,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1512"
+NAME="AEN1524"
 ></A
 ><H3
 ><A
@@ -6657,7 +6704,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1519"
+NAME="AEN1531"
 ></A
 ><P
 ></P
@@ -6710,7 +6757,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1532"
+NAME="AEN1544"
 ></A
 ><H3
 ><A
@@ -6749,7 +6796,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1541"
+NAME="AEN1553"
 ></A
 ><P
 ></P
@@ -6819,7 +6866,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1558"
+NAME="AEN1570"
 ></A
 ><H3
 ><A
@@ -6863,7 +6910,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1568"
+NAME="AEN1580"
 ></A
 ><P
 ></P
@@ -6961,7 +7008,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1591"
+NAME="AEN1603"
 ></A
 ><H3
 ><A
@@ -6994,7 +7041,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1599"
+NAME="AEN1611"
 ></A
 ><P
 ></P
@@ -7047,7 +7094,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1612"
+NAME="AEN1624"
 ></A
 ><H3
 ><A
@@ -7066,7 +7113,7 @@
 ><A
 HREF="libxml-tree.html#XMLDOCPTR"
 >xmlDocPtr</A
->   xmlParseMemory                  (char *buffer,
+>   xmlParseMemory                  (const char *buffer,
                                              int size);</PRE
 ></TD
 ></TR
@@ -7078,7 +7125,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1619"
+NAME="AEN1631"
 ></A
 ><P
 ></P
@@ -7148,7 +7195,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1636"
+NAME="AEN1648"
 ></A
 ><H3
 ><A
@@ -7179,7 +7226,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1643"
+NAME="AEN1655"
 ></A
 ><P
 ></P
@@ -7232,7 +7279,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1656"
+NAME="AEN1668"
 ></A
 ><H3
 ><A
@@ -7267,7 +7314,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1663"
+NAME="AEN1675"
 ></A
 ><P
 ></P
@@ -7320,7 +7367,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1676"
+NAME="AEN1688"
 ></A
 ><H3
 ><A
@@ -7374,7 +7421,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1686"
+NAME="AEN1698"
 ></A
 ><P
 ></P
@@ -7427,7 +7474,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1699"
+NAME="AEN1711"
 ></A
 ><H3
 ><A
@@ -7457,7 +7504,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1706"
+NAME="AEN1718"
 ></A
 ><P
 ></P
@@ -7495,7 +7542,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1715"
+NAME="AEN1727"
 ></A
 ><H3
 ><A
@@ -7522,7 +7569,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1721"
+NAME="AEN1733"
 ></A
 ><P
 ></P
@@ -7575,7 +7622,88 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1734"
+NAME="AEN1746"
+></A
+><H3
+><A
+NAME="XMLLINENUMBERSDEFAULT"
+></A
+>xmlLineNumbersDefault ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlLineNumbersDefault           (int val);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Set and return the previous value for enabling line numbers in elements
+contents. This may break on old application and is turned off by default.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN1752"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>val</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  int 0 or 1 </TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the last value for 0 for no substitution, 1 for substitution.</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN1765"
 ></A
 ><H3
 ><A
@@ -7609,7 +7737,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1742"
+NAME="AEN1773"
 ></A
 ><P
 ></P
@@ -7662,7 +7790,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1755"
+NAME="AEN1786"
 ></A
 ><H3
 ><A
@@ -7681,7 +7809,7 @@
 ><A
 HREF="libxml-tree.html#XMLDOCPTR"
 >xmlDocPtr</A
->   xmlRecoverMemory                (char *buffer,
+>   xmlRecoverMemory                (const char *buffer,
                                              int size);</PRE
 ></TD
 ></TR
@@ -7694,7 +7822,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1762"
+NAME="AEN1793"
 ></A
 ><P
 ></P
@@ -7764,7 +7892,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1779"
+NAME="AEN1810"
 ></A
 ><H3
 ><A
@@ -7796,7 +7924,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1786"
+NAME="AEN1817"
 ></A
 ><P
 ></P
@@ -7849,7 +7977,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1799"
+NAME="AEN1830"
 ></A
 ><H3
 ><A
@@ -7884,7 +8012,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1808"
+NAME="AEN1839"
 ></A
 ><P
 ></P
@@ -7938,7 +8066,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1821"
+NAME="AEN1852"
 ></A
 ><H3
 ><A
@@ -7972,7 +8100,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1829"
+NAME="AEN1860"
 ></A
 ><P
 ></P
@@ -8026,7 +8154,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1842"
+NAME="AEN1873"
 ></A
 ><H3
 ><A
@@ -8066,7 +8194,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1851"
+NAME="AEN1882"
 ></A
 ><P
 ></P
@@ -8154,7 +8282,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1872"
+NAME="AEN1903"
 ></A
 ><H3
 ><A
@@ -8187,7 +8315,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1879"
+NAME="AEN1910"
 ></A
 ><P
 ></P
@@ -8274,7 +8402,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1900"
+NAME="AEN1931"
 ></A
 ><H3
 ><A
@@ -8308,7 +8436,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1907"
+NAME="AEN1938"
 ></A
 ><P
 ></P
@@ -8412,7 +8540,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1932"
+NAME="AEN1963"
 ></A
 ><H3
 ><A
@@ -8435,7 +8563,7 @@
 HREF="libxml-parser.html#XMLSAXHANDLERPTR"
 >xmlSAXHandlerPtr</A
 > sax,
-                                             char *buffer,
+                                             const char *buffer,
                                              int size,
                                              int recovery);</PRE
 ></TD
@@ -8450,7 +8578,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1940"
+NAME="AEN1971"
 ></A
 ><P
 ></P
@@ -8555,7 +8683,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1965"
+NAME="AEN1996"
 ></A
 ><H3
 ><A
@@ -8593,7 +8721,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN1973"
+NAME="AEN2004"
 ></A
 ><P
 ></P
@@ -8681,7 +8809,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN1994"
+NAME="AEN2025"
 ></A
 ><H3
 ><A
@@ -8721,7 +8849,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2004"
+NAME="AEN2035"
 ></A
 ><P
 ></P
@@ -8791,7 +8919,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2021"
+NAME="AEN2052"
 ></A
 ><H3
 ><A
@@ -8825,7 +8953,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2030"
+NAME="AEN2061"
 ></A
 ><P
 ></P
@@ -8878,7 +9006,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2043"
+NAME="AEN2074"
 ></A
 ><H3
 ><A
@@ -8915,7 +9043,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2052"
+NAME="AEN2083"
 ></A
 ><P
 ></P
@@ -8985,138 +9113,138 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2069"
-></A
-><H3
-><A
-NAME="XMLSAXPARSEDTD"
-></A
->xmlSAXParseDTD ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="libxml-tree.html#XMLDTDPTR"
->xmlDtdPtr</A
->   xmlSAXParseDTD                  (<A
-HREF="libxml-parser.html#XMLSAXHANDLERPTR"
->xmlSAXHandlerPtr</A
-> sax,
-                                             const <A
-HREF="libxml-tree.html#XMLCHAR"
->xmlChar</A
-> *ExternalID,
-                                             const <A
-HREF="libxml-tree.html#XMLCHAR"
->xmlChar</A
-> *SystemID);</PRE
-></TD
-></TR
-></TABLE
-><P
->Load and parse an external subset.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN2079"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->sax</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  the SAX handler block</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->ExternalID</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  a NAME* containing the External ID of the DTD</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->SystemID</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  a NAME* containing the URL to the DTD</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->the resulting xmlDtdPtr or NULL in case of error.</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
 NAME="AEN2100"
 ></A
 ><H3
 ><A
+NAME="XMLSAXPARSEDTD"
+></A
+>xmlSAXParseDTD ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-tree.html#XMLDTDPTR"
+>xmlDtdPtr</A
+>   xmlSAXParseDTD                  (<A
+HREF="libxml-parser.html#XMLSAXHANDLERPTR"
+>xmlSAXHandlerPtr</A
+> sax,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *ExternalID,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *SystemID);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Load and parse an external subset.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN2110"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>sax</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the SAX handler block</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ExternalID</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  a NAME* containing the External ID of the DTD</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>SystemID</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  a NAME* containing the URL to the DTD</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the resulting xmlDtdPtr or NULL in case of error.</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN2131"
+></A
+><H3
+><A
 NAME="XMLIOPARSEDTD"
 ></A
 >xmlIOParseDTD ()</H3
@@ -9154,7 +9282,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2110"
+NAME="AEN2141"
 ></A
 ><P
 ></P
@@ -9247,7 +9375,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2132"
+NAME="AEN2163"
 ></A
 ><H3
 ><A
@@ -9280,7 +9408,7 @@
                                              <A
 HREF="libxml-tree.html#XMLNODEPTR"
 >xmlNodePtr</A
-> *list);</PRE
+> *lst);</PRE
 ></TD
 ></TR
 ></TABLE
@@ -9296,7 +9424,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2143"
+NAME="AEN2174"
 ></A
 ><P
 ></P
@@ -9401,7 +9529,7 @@
 ><TT
 CLASS="PARAMETER"
 ><I
->list</I
+>lst</I
 ></TT
 >&nbsp;:</TD
 ><TD
@@ -9435,7 +9563,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2176"
+NAME="AEN2207"
 ></A
 ><H3
 ><A
@@ -9472,7 +9600,7 @@
                                              <A
 HREF="libxml-tree.html#XMLNODEPTR"
 >xmlNodePtr</A
-> *list);</PRE
+> *lst);</PRE
 ></TD
 ></TR
 ></TABLE
@@ -9487,7 +9615,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2188"
+NAME="AEN2219"
 ></A
 ><P
 ></P
@@ -9609,7 +9737,7 @@
 ><TT
 CLASS="PARAMETER"
 ><I
->list</I
+>lst</I
 ></TT
 >&nbsp;:</TD
 ><TD
@@ -9643,7 +9771,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2225"
+NAME="AEN2256"
 ></A
 ><H3
 ><A
@@ -9674,7 +9802,7 @@
                                              <A
 HREF="libxml-tree.html#XMLNODEPTR"
 >xmlNodePtr</A
-> *list);</PRE
+> *lst);</PRE
 ></TD
 ></TR
 ></TABLE
@@ -9689,7 +9817,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2236"
+NAME="AEN2267"
 ></A
 ><P
 ></P
@@ -9760,7 +9888,7 @@
 ><TT
 CLASS="PARAMETER"
 ><I
->list</I
+>lst</I
 ></TT
 >&nbsp;:</TD
 ><TD
@@ -9794,7 +9922,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2261"
+NAME="AEN2292"
 ></A
 ><H3
 ><A
@@ -9822,7 +9950,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2267"
+NAME="AEN2298"
 ></A
 ><H3
 ><A
@@ -9850,7 +9978,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2273"
+NAME="AEN2304"
 ></A
 ><H3
 ><A
@@ -9880,7 +10008,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2280"
+NAME="AEN2311"
 ></A
 ><P
 ></P
@@ -9918,7 +10046,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2289"
+NAME="AEN2320"
 ></A
 ><H3
 ><A
@@ -9948,7 +10076,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2296"
+NAME="AEN2327"
 ></A
 ><P
 ></P
@@ -9986,7 +10114,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2305"
+NAME="AEN2336"
 ></A
 ><H3
 ><A
@@ -10017,7 +10145,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2312"
+NAME="AEN2343"
 ></A
 ><P
 ></P
@@ -10055,7 +10183,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2321"
+NAME="AEN2352"
 ></A
 ><H3
 ><A
@@ -10092,7 +10220,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2329"
+NAME="AEN2360"
 ></A
 ><P
 ></P
@@ -10164,7 +10292,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2346"
+NAME="AEN2377"
 ></A
 ><H3
 ><A
@@ -10197,7 +10325,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2354"
+NAME="AEN2385"
 ></A
 ><P
 ></P
@@ -10250,7 +10378,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2367"
+NAME="AEN2398"
 ></A
 ><H3
 ><A
@@ -10288,7 +10416,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2375"
+NAME="AEN2406"
 ></A
 ><P
 ></P
@@ -10360,7 +10488,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2392"
+NAME="AEN2423"
 ></A
 ><H3
 ><A
@@ -10392,7 +10520,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2399"
+NAME="AEN2430"
 ></A
 ><P
 ></P
@@ -10479,7 +10607,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2420"
+NAME="AEN2451"
 ></A
 ><H3
 ><A
@@ -10511,7 +10639,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2427"
+NAME="AEN2458"
 ></A
 ><P
 ></P
@@ -10598,7 +10726,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2448"
+NAME="AEN2479"
 ></A
 ><H3
 ><A
@@ -10648,7 +10776,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2458"
+NAME="AEN2489"
 ></A
 ><P
 ></P
@@ -10769,7 +10897,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2487"
+NAME="AEN2518"
 ></A
 ><H3
 ><A
@@ -10802,7 +10930,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2494"
+NAME="AEN2525"
 ></A
 ><P
 ></P
@@ -10906,7 +11034,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2519"
+NAME="AEN2550"
 ></A
 ><H3
 ><A
@@ -10954,7 +11082,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2530"
+NAME="AEN2561"
 ></A
 ><P
 ></P
@@ -11092,7 +11220,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2563"
+NAME="AEN2594"
 ></A
 ><H3
 ><A
@@ -11139,7 +11267,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2574"
+NAME="AEN2605"
 ></A
 ><P
 ></P
@@ -11226,7 +11354,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2595"
+NAME="AEN2626"
 ></A
 ><H3
 ><A
@@ -11264,7 +11392,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2604"
+NAME="AEN2635"
 ></A
 ><P
 ></P
@@ -11334,7 +11462,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2621"
+NAME="AEN2652"
 ></A
 ><H3
 ><A
@@ -11364,7 +11492,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2628"
+NAME="AEN2659"
 ></A
 ><P
 ></P
@@ -11402,7 +11530,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2637"
+NAME="AEN2668"
 ></A
 ><H3
 ><A
@@ -11433,7 +11561,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2644"
+NAME="AEN2675"
 ></A
 ><P
 ></P
@@ -11471,7 +11599,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2653"
+NAME="AEN2684"
 ></A
 ><H3
 ><A
@@ -11509,7 +11637,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2662"
+NAME="AEN2693"
 ></A
 ><P
 ></P
@@ -11579,7 +11707,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2679"
+NAME="AEN2710"
 ></A
 ><H3
 ><A
@@ -11613,7 +11741,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2687"
+NAME="AEN2718"
 ></A
 ><P
 ></P
@@ -11668,7 +11796,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2700"
+NAME="AEN2731"
 ></A
 ><H3
 ><A
@@ -11698,7 +11826,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2707"
+NAME="AEN2738"
 ></A
 ><P
 ></P
@@ -11736,7 +11864,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2716"
+NAME="AEN2747"
 ></A
 ><H3
 ><A
@@ -11767,7 +11895,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2723"
+NAME="AEN2754"
 ></A
 ><P
 ></P
@@ -11803,7 +11931,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2732"
+NAME="AEN2763"
 ></A
 ><H3
 ><A
@@ -11840,7 +11968,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2740"
+NAME="AEN2771"
 ></A
 ><P
 ></P

diff --git a/doc/html/libxml-parserinternals.html b/doc/html/libxml-parserinternals.html
index 770810a..e506d20 100644
--- a/doc/html/libxml-parserinternals.html
+++ b/doc/html/libxml-parserinternals.html

@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN18854"
+NAME="AEN19570"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN18857"
+NAME="AEN19573"
 ></A
 ><H2
 >Synopsis</H2
@@ -1131,7 +1131,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN19132"
+NAME="AEN19848"
 ></A
 ><H2
 >Description</H2
@@ -1141,14 +1141,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN19135"
+NAME="AEN19851"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19137"
+NAME="AEN19853"
 ></A
 ><H3
 ><A
@@ -1169,12 +1169,15 @@
 ></TR
 ></TABLE
 ><P
+>Identifiers can be longer, but this will be more costly
+at runtime.</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19142"
+NAME="AEN19859"
 ></A
 ><H3
 ><A
@@ -1195,12 +1198,15 @@
 ></TR
 ></TABLE
 ><P
+>The parser tries to always have that amount of input ready
+one of the point is providing context when reporting errors</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19147"
+NAME="AEN19865"
 ></A
 ><H3
 ><A
@@ -1221,11 +1227,44 @@
 ></TR
 ></TABLE
 ><P
+>Macro to check the following production in the XML spec</P
+><P
+>[2] Char ::= <GTKDOCLINK
+HREF="X9"
+>x9</GTKDOCLINK
+> | <GTKDOCLINK
+HREF="XA"
+>xA</GTKDOCLINK
+> | <GTKDOCLINK
+HREF="XD"
+>xD</GTKDOCLINK
+> | [<GTKDOCLINK
+HREF="X20-"
+>x20-</GTKDOCLINK
+><GTKDOCLINK
+HREF="XD7FF"
+>xD7FF</GTKDOCLINK
+>] | [<GTKDOCLINK
+HREF="XE000-"
+>xE000-</GTKDOCLINK
+><GTKDOCLINK
+HREF="XFFFD"
+>xFFFD</GTKDOCLINK
+>]
+| [<GTKDOCLINK
+HREF="X10000-"
+>x10000-</GTKDOCLINK
+><GTKDOCLINK
+HREF="X10FFFF"
+>x10FFFF</GTKDOCLINK
+>]
+any Unicode character, excluding the surrogate blocks, FFFE, and FFFF.</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19152"
+NAME="AEN19881"
 ></A
 ><P
 ></P
@@ -1252,7 +1291,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an UNICODE value (int)</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1263,7 +1302,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19161"
+NAME="AEN19890"
 ></A
 ><H3
 ><A
@@ -1284,11 +1323,27 @@
 ></TR
 ></TABLE
 ><P
+>Macro to check the following production in the XML spec</P
+><P
+>[3] S ::= (<GTKDOCLINK
+HREF="X20"
+>x20</GTKDOCLINK
+> | <GTKDOCLINK
+HREF="X9"
+>x9</GTKDOCLINK
+> | <GTKDOCLINK
+HREF="XD"
+>xD</GTKDOCLINK
+> | <GTKDOCLINK
+HREF="XA"
+>xA</GTKDOCLINK
+>)+</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19166"
+NAME="AEN19901"
 ></A
 ><P
 ></P
@@ -1315,7 +1370,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an UNICODE value (int)</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1326,7 +1381,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19175"
+NAME="AEN19910"
 ></A
 ><H3
 ><A
@@ -1347,11 +1402,15 @@
 ></TR
 ></TABLE
 ><P
+>Macro to check the following production in the XML spec</P
+><P
+>[85] BaseChar ::= ... long list see REC ...</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19180"
+NAME="AEN19917"
 ></A
 ><P
 ></P
@@ -1378,7 +1437,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an UNICODE value (int)</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1389,7 +1448,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19189"
+NAME="AEN19926"
 ></A
 ><H3
 ><A
@@ -1410,11 +1469,15 @@
 ></TR
 ></TABLE
 ><P
+>Macro to check the following production in the XML spec</P
+><P
+>[88] Digit ::= ... long list see REC ...</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19194"
+NAME="AEN19933"
 ></A
 ><P
 ></P
@@ -1441,7 +1504,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an UNICODE value (int)</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1452,7 +1515,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19203"
+NAME="AEN19942"
 ></A
 ><H3
 ><A
@@ -1473,11 +1536,15 @@
 ></TR
 ></TABLE
 ><P
+>Macro to check the following production in the XML spec</P
+><P
+>[87] CombiningChar ::= ... long list see REC ...</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19208"
+NAME="AEN19949"
 ></A
 ><P
 ></P
@@ -1504,7 +1571,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an UNICODE value (int)</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1515,7 +1582,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19217"
+NAME="AEN19958"
 ></A
 ><H3
 ><A
@@ -1536,11 +1603,59 @@
 ></TR
 ></TABLE
 ><P
+>Macro to check the following production in the XML spec</P
+><P
+>[89] Extender ::= <GTKDOCLINK
+HREF="X00B7"
+>x00B7</GTKDOCLINK
+> | <GTKDOCLINK
+HREF="X02D0"
+>x02D0</GTKDOCLINK
+> | <GTKDOCLINK
+HREF="X02D1"
+>x02D1</GTKDOCLINK
+> | <GTKDOCLINK
+HREF="X0387"
+>x0387</GTKDOCLINK
+> | <GTKDOCLINK
+HREF="X0640"
+>x0640</GTKDOCLINK
+> |
+<GTKDOCLINK
+HREF="X0E46"
+>x0E46</GTKDOCLINK
+> | <GTKDOCLINK
+HREF="X0EC6"
+>x0EC6</GTKDOCLINK
+> | <GTKDOCLINK
+HREF="X3005"
+>x3005</GTKDOCLINK
+> | [<GTKDOCLINK
+HREF="X3031-"
+>x3031-</GTKDOCLINK
+><GTKDOCLINK
+HREF="X3035"
+>x3035</GTKDOCLINK
+>] |
+[<GTKDOCLINK
+HREF="X309D-"
+>x309D-</GTKDOCLINK
+><GTKDOCLINK
+HREF="X309E"
+>x309E</GTKDOCLINK
+>] | [<GTKDOCLINK
+HREF="X30FC-"
+>x30FC-</GTKDOCLINK
+><GTKDOCLINK
+HREF="X30FE"
+>x30FE</GTKDOCLINK
+>]</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19222"
+NAME="AEN19979"
 ></A
 ><P
 ></P
@@ -1567,7 +1682,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an UNICODE value (int)</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1578,7 +1693,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19231"
+NAME="AEN19988"
 ></A
 ><H3
 ><A
@@ -1599,11 +1714,30 @@
 ></TR
 ></TABLE
 ><P
+>Macro to check the following production in the XML spec</P
+><P
+>[86] Ideographic ::= [<GTKDOCLINK
+HREF="X4E00-"
+>x4E00-</GTKDOCLINK
+><GTKDOCLINK
+HREF="X9FA5"
+>x9FA5</GTKDOCLINK
+>] | <GTKDOCLINK
+HREF="X3007"
+>x3007</GTKDOCLINK
+> | [<GTKDOCLINK
+HREF="X3021-"
+>x3021-</GTKDOCLINK
+><GTKDOCLINK
+HREF="X3029"
+>x3029</GTKDOCLINK
+>]</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19236"
+NAME="AEN20000"
 ></A
 ><P
 ></P
@@ -1630,7 +1764,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an UNICODE value (int)</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1641,7 +1775,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19245"
+NAME="AEN20009"
 ></A
 ><H3
 ><A
@@ -1662,11 +1796,15 @@
 ></TR
 ></TABLE
 ><P
+>Macro to check the following production in the XML spec</P
+><P
+>[84] Letter ::= BaseChar | Ideographic</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19250"
+NAME="AEN20016"
 ></A
 ><P
 ></P
@@ -1693,7 +1831,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an UNICODE value (int)</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1704,7 +1842,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19259"
+NAME="AEN20025"
 ></A
 ><H3
 ><A
@@ -1725,11 +1863,24 @@
 ></TR
 ></TABLE
 ><P
+>Macro to check the following production in the XML spec</P
+><P
+>[13] PubidChar ::= <GTKDOCLINK
+HREF="X20"
+>x20</GTKDOCLINK
+> | <GTKDOCLINK
+HREF="XD"
+>xD</GTKDOCLINK
+> | <GTKDOCLINK
+HREF="XA"
+>xA</GTKDOCLINK
+> | [a-zA-Z0-9] | [-'()+,./:=?;!*#@$_%]</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19264"
+NAME="AEN20035"
 ></A
 ><P
 ></P
@@ -1756,7 +1907,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an UNICODE value (int)</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1767,7 +1918,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19273"
+NAME="AEN20044"
 ></A
 ><H3
 ><A
@@ -1788,11 +1939,13 @@
 ></TR
 ></TABLE
 ><P
+>Skips the end of line chars</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19278"
+NAME="AEN20050"
 ></A
 ><P
 ></P
@@ -1819,7 +1972,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  and UTF8 string pointer</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1830,7 +1983,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19287"
+NAME="AEN20059"
 ></A
 ><H3
 ><A
@@ -1851,11 +2004,13 @@
 ></TR
 ></TABLE
 ><P
+>Skips to the next '&gt;' char</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19292"
+NAME="AEN20065"
 ></A
 ><P
 ></P
@@ -1882,7 +2037,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  and UTF8 string pointer</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1893,7 +2048,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19301"
+NAME="AEN20074"
 ></A
 ><H3
 ><A
@@ -1914,11 +2069,13 @@
 ></TR
 ></TABLE
 ><P
+>Skips to the next '&lt;' char</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19306"
+NAME="AEN20080"
 ></A
 ><P
 ></P
@@ -1945,7 +2102,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  and UTF8 string pointer</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1956,7 +2113,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19315"
+NAME="AEN20089"
 ></A
 ><H3
 ><A
@@ -1998,7 +2155,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19325"
+NAME="AEN20099"
 ></A
 ><P
 ></P
@@ -2051,7 +2208,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19338"
+NAME="AEN20112"
 ></A
 ><H3
 ><A
@@ -2095,7 +2252,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19349"
+NAME="AEN20123"
 ></A
 ><P
 ></P
@@ -2148,7 +2305,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19362"
+NAME="AEN20136"
 ></A
 ><H3
 ><A
@@ -2185,7 +2342,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19371"
+NAME="AEN20145"
 ></A
 ><P
 ></P
@@ -2238,7 +2395,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19384"
+NAME="AEN20158"
 ></A
 ><H3
 ><A
@@ -2266,7 +2423,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19390"
+NAME="AEN20164"
 ></A
 ><P
 ></P
@@ -2319,7 +2476,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19403"
+NAME="AEN20177"
 ></A
 ><H3
 ><A
@@ -2347,7 +2504,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19409"
+NAME="AEN20183"
 ></A
 ><P
 ></P
@@ -2400,7 +2557,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19422"
+NAME="AEN20196"
 ></A
 ><H3
 ><A
@@ -2443,7 +2600,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19433"
+NAME="AEN20207"
 ></A
 ><P
 ></P
@@ -2496,7 +2653,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19446"
+NAME="AEN20220"
 ></A
 ><H3
 ><A
@@ -2524,7 +2681,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19452"
+NAME="AEN20226"
 ></A
 ><P
 ></P
@@ -2577,7 +2734,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19465"
+NAME="AEN20239"
 ></A
 ><H3
 ><A
@@ -2649,7 +2806,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19485"
+NAME="AEN20259"
 ></A
 ><P
 ></P
@@ -2702,7 +2859,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19498"
+NAME="AEN20272"
 ></A
 ><H3
 ><A
@@ -2763,7 +2920,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19514"
+NAME="AEN20288"
 ></A
 ><P
 ></P
@@ -2816,7 +2973,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19527"
+NAME="AEN20301"
 ></A
 ><H3
 ><A
@@ -2849,7 +3006,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19535"
+NAME="AEN20309"
 ></A
 ><P
 ></P
@@ -2902,7 +3059,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19548"
+NAME="AEN20322"
 ></A
 ><H3
 ><A
@@ -2934,7 +3091,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19555"
+NAME="AEN20329"
 ></A
 ><P
 ></P
@@ -2987,7 +3144,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19568"
+NAME="AEN20342"
 ></A
 ><H3
 ><A
@@ -3018,7 +3175,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19575"
+NAME="AEN20349"
 ></A
 ><P
 ></P
@@ -3088,7 +3245,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19592"
+NAME="AEN20366"
 ></A
 ><H3
 ><A
@@ -3118,7 +3275,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19599"
+NAME="AEN20373"
 ></A
 ><P
 ></P
@@ -3154,7 +3311,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19608"
+NAME="AEN20382"
 ></A
 ><H3
 ><A
@@ -3197,7 +3354,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19618"
+NAME="AEN20392"
 ></A
 ><P
 ></P
@@ -3284,7 +3441,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19639"
+NAME="AEN20413"
 ></A
 ><H3
 ><A
@@ -3319,7 +3476,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19647"
+NAME="AEN20421"
 ></A
 ><P
 ></P
@@ -3389,7 +3546,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19664"
+NAME="AEN20438"
 ></A
 ><H3
 ><A
@@ -3424,7 +3581,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19672"
+NAME="AEN20446"
 ></A
 ><P
 ></P
@@ -3494,7 +3651,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19689"
+NAME="AEN20463"
 ></A
 ><H3
 ><A
@@ -3525,7 +3682,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19696"
+NAME="AEN20470"
 ></A
 ><P
 ></P
@@ -3563,7 +3720,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19705"
+NAME="AEN20479"
 ></A
 ><H3
 ><A
@@ -3600,7 +3757,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19714"
+NAME="AEN20488"
 ></A
 ><P
 ></P
@@ -3655,7 +3812,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19727"
+NAME="AEN20501"
 ></A
 ><H3
 ><A
@@ -3692,7 +3849,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19736"
+NAME="AEN20510"
 ></A
 ><P
 ></P
@@ -3762,7 +3919,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19753"
+NAME="AEN20527"
 ></A
 ><H3
 ><A
@@ -3799,7 +3956,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19762"
+NAME="AEN20536"
 ></A
 ><P
 ></P
@@ -3869,7 +4026,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19779"
+NAME="AEN20553"
 ></A
 ><H3
 ><A
@@ -3904,7 +4061,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19787"
+NAME="AEN20561"
 ></A
 ><P
 ></P
@@ -3959,7 +4116,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19800"
+NAME="AEN20574"
 ></A
 ><H3
 ><A
@@ -3993,7 +4150,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19808"
+NAME="AEN20582"
 ></A
 ><P
 ></P
@@ -4046,7 +4203,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19821"
+NAME="AEN20595"
 ></A
 ><H3
 ><A
@@ -4076,7 +4233,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19828"
+NAME="AEN20602"
 ></A
 ><P
 ></P
@@ -4114,7 +4271,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19837"
+NAME="AEN20611"
 ></A
 ><H3
 ><A
@@ -4148,7 +4305,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19845"
+NAME="AEN20619"
 ></A
 ><P
 ></P
@@ -4218,7 +4375,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19862"
+NAME="AEN20636"
 ></A
 ><H3
 ><A
@@ -4251,7 +4408,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19870"
+NAME="AEN20644"
 ></A
 ><P
 ></P
@@ -4304,7 +4461,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19883"
+NAME="AEN20657"
 ></A
 ><H3
 ><A
@@ -4351,7 +4508,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19896"
+NAME="AEN20670"
 ></A
 ><P
 ></P
@@ -4439,7 +4596,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19917"
+NAME="AEN20691"
 ></A
 ><H3
 ><A
@@ -4480,7 +4637,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19928"
+NAME="AEN20702"
 ></A
 ><P
 ></P
@@ -4533,7 +4690,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19941"
+NAME="AEN20715"
 ></A
 ><H3
 ><A
@@ -4579,7 +4736,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19954"
+NAME="AEN20728"
 ></A
 ><P
 ></P
@@ -4650,7 +4807,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19971"
+NAME="AEN20745"
 ></A
 ><H3
 ><A
@@ -4690,7 +4847,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19982"
+NAME="AEN20756"
 ></A
 ><P
 ></P
@@ -4743,7 +4900,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19995"
+NAME="AEN20769"
 ></A
 ><H3
 ><A
@@ -4778,7 +4935,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20004"
+NAME="AEN20778"
 ></A
 ><P
 ></P
@@ -4831,7 +4988,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20017"
+NAME="AEN20791"
 ></A
 ><H3
 ><A
@@ -4869,7 +5026,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20027"
+NAME="AEN20801"
 ></A
 ><P
 ></P
@@ -4907,7 +5064,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20036"
+NAME="AEN20810"
 ></A
 ><H3
 ><A
@@ -4951,7 +5108,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20048"
+NAME="AEN20822"
 ></A
 ><P
 ></P
@@ -5004,7 +5161,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20061"
+NAME="AEN20835"
 ></A
 ><H3
 ><A
@@ -5044,7 +5201,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20072"
+NAME="AEN20846"
 ></A
 ><P
 ></P
@@ -5097,7 +5254,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20085"
+NAME="AEN20859"
 ></A
 ><H3
 ><A
@@ -5134,7 +5291,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20095"
+NAME="AEN20869"
 ></A
 ><P
 ></P
@@ -5187,7 +5344,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20108"
+NAME="AEN20882"
 ></A
 ><H3
 ><A
@@ -5227,7 +5384,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20118"
+NAME="AEN20892"
 ></A
 ><P
 ></P
@@ -5297,7 +5454,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20135"
+NAME="AEN20909"
 ></A
 ><H3
 ><A
@@ -5387,7 +5544,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20156"
+NAME="AEN20930"
 ></A
 ><P
 ></P
@@ -5440,7 +5597,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20169"
+NAME="AEN20943"
 ></A
 ><H3
 ><A
@@ -5475,7 +5632,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20178"
+NAME="AEN20952"
 ></A
 ><P
 ></P
@@ -5528,7 +5685,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20191"
+NAME="AEN20965"
 ></A
 ><H3
 ><A
@@ -5563,7 +5720,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20200"
+NAME="AEN20974"
 ></A
 ><P
 ></P
@@ -5616,7 +5773,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20213"
+NAME="AEN20987"
 ></A
 ><H3
 ><A
@@ -5655,7 +5812,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20222"
+NAME="AEN20996"
 ></A
 ><P
 ></P
@@ -5710,7 +5867,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20235"
+NAME="AEN21009"
 ></A
 ><H3
 ><A
@@ -5756,7 +5913,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20247"
+NAME="AEN21021"
 ></A
 ><P
 ></P
@@ -5846,7 +6003,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20268"
+NAME="AEN21042"
 ></A
 ><H3
 ><A
@@ -5880,7 +6037,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20276"
+NAME="AEN21050"
 ></A
 ><P
 ></P
@@ -5918,7 +6075,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20285"
+NAME="AEN21059"
 ></A
 ><H3
 ><A
@@ -5953,7 +6110,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20294"
+NAME="AEN21068"
 ></A
 ><P
 ></P
@@ -6006,7 +6163,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20307"
+NAME="AEN21081"
 ></A
 ><H3
 ><A
@@ -6040,7 +6197,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20316"
+NAME="AEN21090"
 ></A
 ><P
 ></P
@@ -6078,7 +6235,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20325"
+NAME="AEN21099"
 ></A
 ><H3
 ><A
@@ -6120,7 +6277,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20336"
+NAME="AEN21110"
 ></A
 ><P
 ></P
@@ -6158,7 +6315,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20345"
+NAME="AEN21119"
 ></A
 ><H3
 ><A
@@ -6203,7 +6360,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20359"
+NAME="AEN21133"
 ></A
 ><P
 ></P
@@ -6241,7 +6398,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20368"
+NAME="AEN21142"
 ></A
 ><H3
 ><A
@@ -6314,7 +6471,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20388"
+NAME="AEN21162"
 ></A
 ><P
 ></P
@@ -6385,7 +6542,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20405"
+NAME="AEN21179"
 ></A
 ><H3
 ><A
@@ -6426,7 +6583,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20416"
+NAME="AEN21190"
 ></A
 ><P
 ></P
@@ -6479,7 +6636,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20429"
+NAME="AEN21203"
 ></A
 ><H3
 ><A
@@ -6518,7 +6675,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20439"
+NAME="AEN21213"
 ></A
 ><P
 ></P
@@ -6571,7 +6728,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20452"
+NAME="AEN21226"
 ></A
 ><H3
 ><A
@@ -6609,7 +6766,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20462"
+NAME="AEN21236"
 ></A
 ><P
 ></P
@@ -6679,7 +6836,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20479"
+NAME="AEN21253"
 ></A
 ><H3
 ><A
@@ -6758,7 +6915,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20500"
+NAME="AEN21274"
 ></A
 ><P
 ></P
@@ -6828,7 +6985,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20517"
+NAME="AEN21291"
 ></A
 ><H3
 ><A
@@ -6862,7 +7019,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20526"
+NAME="AEN21300"
 ></A
 ><P
 ></P
@@ -6900,7 +7057,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20535"
+NAME="AEN21309"
 ></A
 ><H3
 ><A
@@ -6950,7 +7107,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20548"
+NAME="AEN21322"
 ></A
 ><P
 ></P
@@ -7003,7 +7160,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20561"
+NAME="AEN21335"
 ></A
 ><H3
 ><A
@@ -7040,7 +7197,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20570"
+NAME="AEN21344"
 ></A
 ><P
 ></P
@@ -7094,7 +7251,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20583"
+NAME="AEN21357"
 ></A
 ><H3
 ><A
@@ -7148,7 +7305,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20596"
+NAME="AEN21370"
 ></A
 ><P
 ></P
@@ -7202,7 +7359,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20609"
+NAME="AEN21383"
 ></A
 ><H3
 ><A
@@ -7243,7 +7400,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20619"
+NAME="AEN21393"
 ></A
 ><P
 ></P
@@ -7330,7 +7487,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20640"
+NAME="AEN21414"
 ></A
 ><H3
 ><A
@@ -7365,7 +7522,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20649"
+NAME="AEN21423"
 ></A
 ><P
 ></P
@@ -7418,7 +7575,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20662"
+NAME="AEN21436"
 ></A
 ><H3
 ><A
@@ -7464,7 +7621,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20672"
+NAME="AEN21446"
 ></A
 ><P
 ></P
@@ -7502,7 +7659,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20681"
+NAME="AEN21455"
 ></A
 ><H3
 ><A
@@ -7542,7 +7699,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20691"
+NAME="AEN21465"
 ></A
 ><P
 ></P
@@ -7595,7 +7752,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20704"
+NAME="AEN21478"
 ></A
 ><H3
 ><A
@@ -7648,7 +7805,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20715"
+NAME="AEN21489"
 ></A
 ><P
 ></P
@@ -7701,7 +7858,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20728"
+NAME="AEN21502"
 ></A
 ><H3
 ><A
@@ -7742,7 +7899,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20738"
+NAME="AEN21512"
 ></A
 ><P
 ></P
@@ -7780,7 +7937,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20747"
+NAME="AEN21521"
 ></A
 ><H3
 ><A
@@ -7833,7 +7990,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20759"
+NAME="AEN21533"
 ></A
 ><P
 ></P
@@ -7871,7 +8028,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20768"
+NAME="AEN21542"
 ></A
 ><H3
 ><A
@@ -7908,7 +8065,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20777"
+NAME="AEN21551"
 ></A
 ><P
 ></P
@@ -7946,7 +8103,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20786"
+NAME="AEN21560"
 ></A
 ><H3
 ><A
@@ -8006,7 +8163,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20803"
+NAME="AEN21577"
 ></A
 ><P
 ></P
@@ -8076,7 +8233,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20820"
+NAME="AEN21594"
 ></A
 ><H3
 ><A
@@ -8128,7 +8285,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20835"
+NAME="AEN21609"
 ></A
 ><P
 ></P
@@ -8181,7 +8338,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20848"
+NAME="AEN21622"
 ></A
 ><H3
 ><A
@@ -8217,7 +8374,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20858"
+NAME="AEN21632"
 ></A
 ><P
 ></P
@@ -8255,7 +8412,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20867"
+NAME="AEN21641"
 ></A
 ><H3
 ><A
@@ -8293,7 +8450,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20878"
+NAME="AEN21652"
 ></A
 ><P
 ></P
@@ -8331,7 +8488,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20887"
+NAME="AEN21661"
 ></A
 ><H3
 ><A
@@ -8363,7 +8520,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20895"
+NAME="AEN21669"
 ></A
 ><P
 ></P
@@ -8401,7 +8558,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20904"
+NAME="AEN21678"
 ></A
 ><H3
 ><A
@@ -8450,7 +8607,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20914"
+NAME="AEN21688"
 ></A
 ><P
 ></P
@@ -8488,7 +8645,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20923"
+NAME="AEN21697"
 ></A
 ><H3
 ><A
@@ -8523,7 +8680,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20932"
+NAME="AEN21706"
 ></A
 ><P
 ></P
@@ -8576,7 +8733,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20945"
+NAME="AEN21719"
 ></A
 ><H3
 ><A
@@ -8613,7 +8770,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20955"
+NAME="AEN21729"
 ></A
 ><P
 ></P
@@ -8666,7 +8823,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20968"
+NAME="AEN21742"
 ></A
 ><H3
 ><A
@@ -8701,7 +8858,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20977"
+NAME="AEN21751"
 ></A
 ><P
 ></P
@@ -8754,7 +8911,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20990"
+NAME="AEN21764"
 ></A
 ><H3
 ><A
@@ -8791,7 +8948,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21000"
+NAME="AEN21774"
 ></A
 ><P
 ></P
@@ -8844,7 +9001,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21013"
+NAME="AEN21787"
 ></A
 ><H3
 ><A
@@ -8891,7 +9048,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21022"
+NAME="AEN21796"
 ></A
 ><P
 ></P
@@ -8944,7 +9101,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21035"
+NAME="AEN21809"
 ></A
 ><H3
 ><A
@@ -8976,7 +9133,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21043"
+NAME="AEN21817"
 ></A
 ><P
 ></P
@@ -9014,7 +9171,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21052"
+NAME="AEN21826"
 ></A
 ><H3
 ><A
@@ -9048,7 +9205,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21061"
+NAME="AEN21835"
 ></A
 ><P
 ></P
@@ -9086,7 +9243,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21070"
+NAME="AEN21844"
 ></A
 ><H3
 ><A
@@ -9118,7 +9275,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21078"
+NAME="AEN21852"
 ></A
 ><P
 ></P
@@ -9156,7 +9313,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21087"
+NAME="AEN21861"
 ></A
 ><H3
 ><A
@@ -9198,7 +9355,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21098"
+NAME="AEN21872"
 ></A
 ><P
 ></P
@@ -9270,7 +9427,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21115"
+NAME="AEN21889"
 ></A
 ><H3
 ><A
@@ -9291,12 +9448,14 @@
 ></TR
 ></TABLE
 ><P
+>If no entities need to be substitued</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21120"
+NAME="AEN21895"
 ></A
 ><H3
 ><A
@@ -9317,12 +9476,14 @@
 ></TR
 ></TABLE
 ><P
+>Whether general entities need to be substitued</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21125"
+NAME="AEN21901"
 ></A
 ><H3
 ><A
@@ -9343,12 +9504,14 @@
 ></TR
 ></TABLE
 ><P
+>Whether parameter entities need to be substitued</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21130"
+NAME="AEN21907"
 ></A
 ><H3
 ><A
@@ -9369,12 +9532,14 @@
 ></TR
 ></TABLE
 ><P
+>Both general and parameter entities need to be substitued</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21135"
+NAME="AEN21913"
 ></A
 ><H3
 ><A
@@ -9428,7 +9593,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21149"
+NAME="AEN21927"
 ></A
 ><P
 ></P
@@ -9567,7 +9732,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21182"
+NAME="AEN21960"
 ></A
 ><H3
 ><A
@@ -9621,7 +9786,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21196"
+NAME="AEN21974"
 ></A
 ><P
 ></P
@@ -9760,7 +9925,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21229"
+NAME="AEN22007"
 ></A
 ><H3
 ><A
@@ -9794,7 +9959,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21237"
+NAME="AEN22015"
 ></A
 ><P
 ></P
@@ -9864,7 +10029,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21254"
+NAME="AEN22032"
 ></A
 ><H3
 ><A
@@ -9897,7 +10062,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21262"
+NAME="AEN22040"
 ></A
 ><P
 ></P
@@ -9950,7 +10115,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21275"
+NAME="AEN22053"
 ></A
 ><H3
 ><A
@@ -9984,7 +10149,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21283"
+NAME="AEN22061"
 ></A
 ><P
 ></P
@@ -10054,7 +10219,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21300"
+NAME="AEN22078"
 ></A
 ><H3
 ><A
@@ -10087,7 +10252,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21308"
+NAME="AEN22086"
 ></A
 ><P
 ></P
@@ -10140,7 +10305,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21321"
+NAME="AEN22099"
 ></A
 ><H3
 ><A
@@ -10173,7 +10338,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21329"
+NAME="AEN22107"
 ></A
 ><P
 ></P
@@ -10226,7 +10391,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21342"
+NAME="AEN22120"
 ></A
 ><H3
 ><A
@@ -10260,7 +10425,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21350"
+NAME="AEN22128"
 ></A
 ><P
 ></P
@@ -10330,7 +10495,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21367"
+NAME="AEN22145"
 ></A
 ><H3
 ><A
@@ -10361,7 +10526,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21374"
+NAME="AEN22152"
 ></A
 ><P
 ></P
@@ -10414,7 +10579,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21387"
+NAME="AEN22165"
 ></A
 ><H3
 ><A
@@ -10450,7 +10615,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21395"
+NAME="AEN22173"
 ></A
 ><P
 ></P
@@ -10537,7 +10702,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21416"
+NAME="AEN22194"
 ></A
 ><H3
 ><A
@@ -10596,7 +10761,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21429"
+NAME="AEN22207"
 ></A
 ><P
 ></P
@@ -10634,7 +10799,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21438"
+NAME="AEN22216"
 ></A
 ><H3
 ><A
@@ -10691,7 +10856,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21453"
+NAME="AEN22231"
 ></A
 ><P
 ></P
@@ -10729,7 +10894,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21462"
+NAME="AEN22240"
 ></A
 ><H3
 ><A
@@ -10769,7 +10934,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21471"
+NAME="AEN22249"
 ></A
 ><P
 ></P
@@ -10822,7 +10987,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21484"
+NAME="AEN22262"
 ></A
 ><H3
 ><A
@@ -10876,7 +11041,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21496"
+NAME="AEN22274"
 ></A
 ><P
 ></P
@@ -10946,7 +11111,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21513"
+NAME="AEN22291"
 ></A
 ><H3
 ><A
@@ -10977,7 +11142,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21520"
+NAME="AEN22298"
 ></A
 ><P
 ></P
@@ -11047,7 +11212,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21537"
+NAME="AEN22315"
 ></A
 ><H3
 ><A
@@ -11079,7 +11244,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21544"
+NAME="AEN22322"
 ></A
 ><P
 ></P
@@ -11166,7 +11331,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21565"
+NAME="AEN22343"
 ></A
 ><H3
 ><A
@@ -11196,7 +11361,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21572"
+NAME="AEN22350"
 ></A
 ><P
 ></P
@@ -11234,7 +11399,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21581"
+NAME="AEN22359"
 ></A
 ><H3
 ><A
@@ -11264,7 +11429,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21588"
+NAME="AEN22366"
 ></A
 ><P
 ></P
@@ -11302,7 +11467,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21597"
+NAME="AEN22375"
 ></A
 ><H3
 ><A
@@ -11335,7 +11500,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21604"
+NAME="AEN22382"
 ></A
 ><H3
 ><A
@@ -11368,7 +11533,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21611"
+NAME="AEN22389"
 ></A
 ><P
 ></P

diff --git a/doc/html/libxml-sax.html b/doc/html/libxml-sax.html
index f7c7411..88b4b96 100644
--- a/doc/html/libxml-sax.html
+++ b/doc/html/libxml-sax.html

@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN2766"
+NAME="AEN2797"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN2769"
+NAME="AEN2800"
 ></A
 ><H2
 >Synopsis</H2
@@ -509,7 +509,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN2861"
+NAME="AEN2892"
 ></A
 ><H2
 >Description</H2
@@ -519,14 +519,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN2864"
+NAME="AEN2895"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2866"
+NAME="AEN2897"
 ></A
 ><H3
 ><A
@@ -556,7 +556,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2873"
+NAME="AEN2904"
 ></A
 ><P
 ></P
@@ -609,7 +609,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2886"
+NAME="AEN2917"
 ></A
 ><H3
 ><A
@@ -640,7 +640,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2893"
+NAME="AEN2924"
 ></A
 ><P
 ></P
@@ -693,7 +693,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2906"
+NAME="AEN2937"
 ></A
 ><H3
 ><A
@@ -725,7 +725,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2913"
+NAME="AEN2944"
 ></A
 ><P
 ></P
@@ -780,7 +780,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2926"
+NAME="AEN2957"
 ></A
 ><H3
 ><A
@@ -807,7 +807,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2932"
+NAME="AEN2963"
 ></A
 ><P
 ></P
@@ -860,7 +860,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2945"
+NAME="AEN2976"
 ></A
 ><H3
 ><A
@@ -887,7 +887,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2951"
+NAME="AEN2982"
 ></A
 ><P
 ></P
@@ -940,7 +940,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2964"
+NAME="AEN2995"
 ></A
 ><H3
 ><A
@@ -967,7 +967,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2970"
+NAME="AEN3001"
 ></A
 ><P
 ></P
@@ -1020,7 +1020,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2983"
+NAME="AEN3014"
 ></A
 ><H3
 ><A
@@ -1047,7 +1047,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2989"
+NAME="AEN3020"
 ></A
 ><P
 ></P
@@ -1100,7 +1100,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3002"
+NAME="AEN3033"
 ></A
 ><H3
 ><A
@@ -1127,7 +1127,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3008"
+NAME="AEN3039"
 ></A
 ><P
 ></P
@@ -1180,7 +1180,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3021"
+NAME="AEN3052"
 ></A
 ><H3
 ><A
@@ -1219,7 +1219,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3030"
+NAME="AEN3061"
 ></A
 ><P
 ></P
@@ -1308,7 +1308,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3051"
+NAME="AEN3082"
 ></A
 ><H3
 ><A
@@ -1347,7 +1347,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3060"
+NAME="AEN3091"
 ></A
 ><P
 ></P
@@ -1436,7 +1436,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3081"
+NAME="AEN3112"
 ></A
 ><H3
 ><A
@@ -1470,7 +1470,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3089"
+NAME="AEN3120"
 ></A
 ><P
 ></P
@@ -1540,7 +1540,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3106"
+NAME="AEN3137"
 ></A
 ><H3
 ><A
@@ -1574,7 +1574,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3114"
+NAME="AEN3145"
 ></A
 ><P
 ></P
@@ -1644,7 +1644,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3131"
+NAME="AEN3162"
 ></A
 ><H3
 ><A
@@ -1692,7 +1692,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3142"
+NAME="AEN3173"
 ></A
 ><P
 ></P
@@ -1779,7 +1779,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3163"
+NAME="AEN3194"
 ></A
 ><H3
 ><A
@@ -1823,7 +1823,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3173"
+NAME="AEN3204"
 ></A
 ><P
 ></P
@@ -1946,7 +1946,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3202"
+NAME="AEN3233"
 ></A
 ><H3
 ><A
@@ -1991,7 +1991,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3212"
+NAME="AEN3243"
 ></A
 ><P
 ></P
@@ -2131,7 +2131,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3245"
+NAME="AEN3276"
 ></A
 ><H3
 ><A
@@ -2167,7 +2167,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3253"
+NAME="AEN3284"
 ></A
 ><P
 ></P
@@ -2256,7 +2256,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3274"
+NAME="AEN3305"
 ></A
 ><H3
 ><A
@@ -2295,7 +2295,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3283"
+NAME="AEN3314"
 ></A
 ><P
 ></P
@@ -2384,7 +2384,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3304"
+NAME="AEN3335"
 ></A
 ><H3
 ><A
@@ -2427,7 +2427,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3314"
+NAME="AEN3345"
 ></A
 ><P
 ></P
@@ -2533,7 +2533,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3339"
+NAME="AEN3370"
 ></A
 ><H3
 ><A
@@ -2560,7 +2560,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3345"
+NAME="AEN3376"
 ></A
 ><P
 ></P
@@ -2598,7 +2598,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3354"
+NAME="AEN3385"
 ></A
 ><H3
 ><A
@@ -2625,7 +2625,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3360"
+NAME="AEN3391"
 ></A
 ><P
 ></P
@@ -2663,7 +2663,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3369"
+NAME="AEN3400"
 ></A
 ><H3
 ><A
@@ -2701,7 +2701,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3377"
+NAME="AEN3408"
 ></A
 ><P
 ></P
@@ -2773,7 +2773,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3394"
+NAME="AEN3425"
 ></A
 ><H3
 ><A
@@ -2808,7 +2808,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3402"
+NAME="AEN3433"
 ></A
 ><P
 ></P
@@ -2880,7 +2880,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3419"
+NAME="AEN3450"
 ></A
 ><H3
 ><A
@@ -2911,7 +2911,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3426"
+NAME="AEN3457"
 ></A
 ><P
 ></P
@@ -2966,7 +2966,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3439"
+NAME="AEN3470"
 ></A
 ><H3
 ><A
@@ -2997,7 +2997,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3446"
+NAME="AEN3477"
 ></A
 ><P
 ></P
@@ -3052,7 +3052,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3459"
+NAME="AEN3490"
 ></A
 ><H3
 ><A
@@ -3085,7 +3085,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3466"
+NAME="AEN3497"
 ></A
 ><P
 ></P
@@ -3157,7 +3157,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3483"
+NAME="AEN3514"
 ></A
 ><H3
 ><A
@@ -3190,7 +3190,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3490"
+NAME="AEN3521"
 ></A
 ><P
 ></P
@@ -3262,7 +3262,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3507"
+NAME="AEN3538"
 ></A
 ><H3
 ><A
@@ -3297,7 +3297,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3515"
+NAME="AEN3546"
 ></A
 ><P
 ></P
@@ -3369,7 +3369,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3532"
+NAME="AEN3563"
 ></A
 ><H3
 ><A
@@ -3404,7 +3404,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3540"
+NAME="AEN3571"
 ></A
 ><P
 ></P
@@ -3476,7 +3476,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3557"
+NAME="AEN3588"
 ></A
 ><H3
 ><A
@@ -3507,7 +3507,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3564"
+NAME="AEN3595"
 ></A
 ><P
 ></P
@@ -3562,7 +3562,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3577"
+NAME="AEN3608"
 ></A
 ><H3
 ><A
@@ -3592,7 +3592,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3584"
+NAME="AEN3615"
 ></A
 ><P
 ></P
@@ -3645,7 +3645,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3597"
+NAME="AEN3628"
 ></A
 ><H3
 ><A
@@ -3677,7 +3677,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3604"
+NAME="AEN3635"
 ></A
 ><P
 ></P
@@ -3747,7 +3747,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3621"
+NAME="AEN3652"
 ></A
 ><H3
 ><A
@@ -3782,7 +3782,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3629"
+NAME="AEN3660"
 ></A
 ><P
 ></P
@@ -3854,7 +3854,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3646"
+NAME="AEN3677"
 ></A
 ><H3
 ><A
@@ -3885,7 +3885,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3653"
+NAME="AEN3684"
 ></A
 ><P
 ></P
@@ -3940,7 +3940,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3666"
+NAME="AEN3697"
 ></A
 ><H3
 ><A
@@ -3972,7 +3972,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3673"
+NAME="AEN3704"
 ></A
 ><P
 ></P
@@ -4044,7 +4044,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3690"
+NAME="AEN3721"
 ></A
 ><H3
 ><A
@@ -4072,7 +4072,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3696"
+NAME="AEN3727"
 ></A
 ><H3
 ><A
@@ -4100,7 +4100,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3702"
+NAME="AEN3733"
 ></A
 ><H3
 ><A

diff --git a/doc/html/libxml-tree.html b/doc/html/libxml-tree.html
index 8076be7..aa980e7 100644
--- a/doc/html/libxml-tree.html
+++ b/doc/html/libxml-tree.html

@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN3713"
+NAME="AEN3744"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN3716"
+NAME="AEN3747"
 ></A
 ><H2
 >Synopsis</H2
@@ -289,6 +289,14 @@
 HREF="libxml-tree.html#XMLNODEPTR"
 >xmlNodePtr</A
 >;
+#define     <A
+HREF="libxml-tree.html#XML-GET-CONTENT-CAPS"
+>XML_GET_CONTENT</A
+>                 (n)
+#define     <A
+HREF="libxml-tree.html#XML-GET-LINE-CAPS"
+>XML_GET_LINE</A
+>                    (n)
 struct      <A
 HREF="libxml-tree.html#XMLDOC"
 >xmlDoc</A
@@ -439,13 +447,6 @@
 HREF="libxml-tree.html#XMLBUFFERPTR"
 >xmlBufferPtr</A
 > buf);
-int         <A
-HREF="libxml-tree.html#XMLBUFFERUSE"
->xmlBufferUse</A
->                    (const <A
-HREF="libxml-tree.html#XMLBUFFERPTR"
->xmlBufferPtr</A
-> buf);
 void        <A
 HREF="libxml-tree.html#XMLBUFFERSETALLOCATIONSCHEME"
 >xmlBufferSetAllocationScheme</A
@@ -1576,13 +1577,6 @@
 >xmlAttrPtr</A
 > attr);
 int         <A
-HREF="libxml-tree.html#XMLREMOVENODE"
->xmlRemoveNode</A
->                   (<A
-HREF="libxml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> node);
-int         <A
 HREF="libxml-tree.html#XMLUNSETPROP"
 >xmlUnsetProp</A
 >                    (<A
@@ -1821,7 +1815,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN4173"
+NAME="AEN4202"
 ></A
 ><H2
 >Description</H2
@@ -1831,14 +1825,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN4176"
+NAME="AEN4205"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4178"
+NAME="AEN4207"
 ></A
 ><H3
 ><A
@@ -1859,12 +1853,15 @@
 ></TR
 ></TABLE
 ><P
+>This is the namespace for the special xml: prefix predefined in the
+XML Namespace specification</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4183"
+NAME="AEN4213"
 ></A
 ><H3
 ><A
@@ -1914,20 +1911,37 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4188"
+NAME="AEN4218"
 ></A
 ><H3
 ><A
 NAME="XMLCHAR"
 ></A
 >xmlChar</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef unsigned char xmlChar;</PRE
+></TD
+></TR
+></TABLE
+><P
+>This is a basic byte in an UTF-8 encoded string.
+It's unsigned allowing to pinpoint case where char * are assigned
+to xmlChar * (possibly making serialization back impossible).</P
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4192"
+NAME="AEN4224"
 ></A
 ><H3
 ><A
@@ -1943,17 +1957,19 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     BAD_CAST</PRE
+>#define BAD_CAST (xmlChar *)</PRE
 ></TD
 ></TR
 ></TABLE
 ><P
+>Macro to cast a string to an xmlChar * when one know its safe.</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4197"
+NAME="AEN4230"
 ></A
 ><H3
 ><A
@@ -1978,25 +1994,40 @@
 ></TR
 ></TABLE
 ><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN4202"
-></A
-><H3
-><A
-NAME="XMLNOTATIONPTR"
-></A
->xmlNotationPtr</H3
+>a DTD Notation definition</P
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4206"
+NAME="AEN4236"
+></A
+><H3
+><A
+NAME="XMLNOTATIONPTR"
+></A
+>xmlNotationPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlNotation *xmlNotationPtr;</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN4241"
 ></A
 ><H3
 ><A
@@ -2028,12 +2059,14 @@
 ></TR
 ></TABLE
 ><P
+>a DTD Attribute type definition</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4211"
+NAME="AEN4247"
 ></A
 ><H3
 ><A
@@ -2059,12 +2092,14 @@
 ></TR
 ></TABLE
 ><P
+>a DTD Attribute default definition</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4216"
+NAME="AEN4253"
 ></A
 ><H3
 ><A
@@ -2088,25 +2123,40 @@
 ></TR
 ></TABLE
 ><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN4221"
-></A
-><H3
-><A
-NAME="XMLENUMERATIONPTR"
-></A
->xmlEnumerationPtr</H3
+>list structure used when there is an enumeration in DTDs</P
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4225"
+NAME="AEN4259"
+></A
+><H3
+><A
+NAME="XMLENUMERATIONPTR"
+></A
+>xmlEnumerationPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlEnumeration *xmlEnumerationPtr;</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN4264"
 ></A
 ><H3
 ><A
@@ -2145,25 +2195,40 @@
 ></TR
 ></TABLE
 ><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN4230"
-></A
-><H3
-><A
-NAME="XMLATTRIBUTEPTR"
-></A
->xmlAttributePtr</H3
+>an Attribute declaration in a DTD</P
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4234"
+NAME="AEN4270"
+></A
+><H3
+><A
+NAME="XMLATTRIBUTEPTR"
+></A
+>xmlAttributePtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlAttribute *xmlAttributePtr;</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN4275"
 ></A
 ><H3
 ><A
@@ -2189,12 +2254,14 @@
 ></TR
 ></TABLE
 ><P
+>Possible definitions of element content types</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4239"
+NAME="AEN4281"
 ></A
 ><H3
 ><A
@@ -2220,12 +2287,14 @@
 ></TR
 ></TABLE
 ><P
+>Possible definitions of element content occurences</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4244"
+NAME="AEN4287"
 ></A
 ><H3
 ><A
@@ -2253,25 +2322,41 @@
 ></TR
 ></TABLE
 ><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN4249"
-></A
-><H3
-><A
-NAME="XMLELEMENTCONTENTPTR"
-></A
->xmlElementContentPtr</H3
+>an XML Element content as stored after parsing an element definition
+in a DTD.</P
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4253"
+NAME="AEN4293"
+></A
+><H3
+><A
+NAME="XMLELEMENTCONTENTPTR"
+></A
+>xmlElementContentPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlElementContent *xmlElementContentPtr;</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN4298"
 ></A
 ><H3
 ><A
@@ -2298,12 +2383,14 @@
 ></TR
 ></TABLE
 ><P
+>the differnt possibility for an element content type</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4258"
+NAME="AEN4304"
 ></A
 ><H3
 ><A
@@ -2339,25 +2426,40 @@
 ></TR
 ></TABLE
 ><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN4263"
-></A
-><H3
-><A
-NAME="XMLELEMENTPTR"
-></A
->xmlElementPtr</H3
+>an XML Element declaration from a DTD</P
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4267"
+NAME="AEN4310"
+></A
+><H3
+><A
+NAME="XMLELEMENTPTR"
+></A
+>xmlElementPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlElement *xmlElementPtr;</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN4315"
 ></A
 ><H3
 ><A
@@ -2373,7 +2475,35 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     XML_LOCAL_NAMESPACE</PRE
+>#define XML_LOCAL_NAMESPACE XML_NAMESPACE_DECL</PRE
+></TD
+></TR
+></TABLE
+><P
+>A namespace declaration node</P
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN4321"
+></A
+><H3
+><A
+NAME="XMLNSTYPE"
+></A
+>xmlNsType</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlElementType xmlNsType;</PRE
 ></TD
 ></TR
 ></TABLE
@@ -2383,20 +2513,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4272"
-></A
-><H3
-><A
-NAME="XMLNSTYPE"
-></A
->xmlNsType</H3
-><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN4276"
+NAME="AEN4326"
 ></A
 ><H3
 ><A
@@ -2422,25 +2539,44 @@
 ></TR
 ></TABLE
 ><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN4281"
-></A
-><H3
-><A
-NAME="XMLNSPTR"
-></A
->xmlNsPtr</H3
+>An XML namespace.
+Note that prefix == NULL is valid, it defines the default namespace
+within the subtree (until overriden).</P
+><P
+>xmlNsType is unified with xmlElementType</P
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4285"
+NAME="AEN4333"
+></A
+><H3
+><A
+NAME="XMLNSPTR"
+></A
+>xmlNsPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlNs *xmlNsPtr;</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN4338"
 ></A
 ><H3
 ><A
@@ -2480,25 +2616,41 @@
 ></TR
 ></TABLE
 ><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN4290"
-></A
-><H3
-><A
-NAME="XMLDTDPTR"
-></A
->xmlDtdPtr</H3
+>An XML DtD, as defined by &lt;!DOCTYPE ... There is actually one for
+the internal subset and for the external subset</P
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4294"
+NAME="AEN4344"
+></A
+><H3
+><A
+NAME="XMLDTDPTR"
+></A
+>xmlDtdPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlDtd *xmlDtdPtr;</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN4349"
 ></A
 ><H3
 ><A
@@ -2531,25 +2683,40 @@
 ></TR
 ></TABLE
 ><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN4299"
-></A
-><H3
-><A
-NAME="XMLATTRPTR"
-></A
->xmlAttrPtr</H3
+>A attribute on an XML node.</P
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4303"
+NAME="AEN4355"
+></A
+><H3
+><A
+NAME="XMLATTRPTR"
+></A
+>xmlAttrPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlAttr *xmlAttrPtr;</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN4360"
 ></A
 ><H3
 ><A
@@ -2574,25 +2741,40 @@
 ></TR
 ></TABLE
 ><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN4308"
-></A
-><H3
-><A
-NAME="XMLIDPTR"
-></A
->xmlIDPtr</H3
+>An XML ID instance.</P
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4312"
+NAME="AEN4366"
+></A
+><H3
+><A
+NAME="XMLIDPTR"
+></A
+>xmlIDPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlID *xmlIDPtr;</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN4371"
 ></A
 ><H3
 ><A
@@ -2617,25 +2799,40 @@
 ></TR
 ></TABLE
 ><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN4317"
-></A
-><H3
-><A
-NAME="XMLREFPTR"
-></A
->xmlRefPtr</H3
+>An XML IDREF instance.</P
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4321"
+NAME="AEN4377"
+></A
+><H3
+><A
+NAME="XMLREFPTR"
+></A
+>xmlRefPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlRef *xmlRefPtr;</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN4382"
 ></A
 ><H3
 ><A
@@ -2659,12 +2856,15 @@
 ></TR
 ></TABLE
 ><P
+>A buffer allocation scheme can be defined to either match exactly the
+need or double it's allocated size each time it is found too small</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4326"
+NAME="AEN4388"
 ></A
 ><H3
 ><A
@@ -2690,25 +2890,40 @@
 ></TR
 ></TABLE
 ><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN4331"
-></A
-><H3
-><A
-NAME="XMLBUFFERPTR"
-></A
->xmlBufferPtr</H3
+>A buffer structure</P
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4335"
+NAME="AEN4394"
+></A
+><H3
+><A
+NAME="XMLBUFFERPTR"
+></A
+>xmlBufferPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlBuffer *xmlBufferPtr;</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN4399"
 ></A
 ><H3
 ><A
@@ -2749,25 +2964,170 @@
 ></TR
 ></TABLE
 ><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN4340"
-></A
-><H3
-><A
-NAME="XMLNODEPTR"
-></A
->xmlNodePtr</H3
+>A node in an XML tree.</P
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4344"
+NAME="AEN4405"
+></A
+><H3
+><A
+NAME="XMLNODEPTR"
+></A
+>xmlNodePtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlNode *xmlNodePtr;</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN4410"
+></A
+><H3
+><A
+NAME="XML-GET-CONTENT-CAPS"
+></A
+>XML_GET_CONTENT()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>#define     XML_GET_CONTENT(n)</PRE
+></TD
+></TR
+></TABLE
+><P
+>macro to extract the content pointer of a node</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN4416"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>n</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN4425"
+></A
+><H3
+><A
+NAME="XML-GET-LINE-CAPS"
+></A
+>XML_GET_LINE()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>#define     XML_GET_LINE(n)</PRE
+></TD
+></TR
+></TABLE
+><P
+>macro to extract the line number of an element node</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN4431"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>n</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN4440"
 ></A
 ><H3
 ><A
@@ -2812,25 +3172,40 @@
 ></TR
 ></TABLE
 ><P
-></P
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN4349"
-></A
-><H3
-><A
-NAME="XMLDOCPTR"
-></A
->xmlDocPtr</H3
+>An XML document.</P
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4353"
+NAME="AEN4446"
+></A
+><H3
+><A
+NAME="XMLDOCPTR"
+></A
+>xmlDocPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlDoc *xmlDocPtr;</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN4451"
 ></A
 ><H3
 ><A
@@ -2846,17 +3221,19 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     xmlChildrenNode</PRE
+>#define xmlChildrenNode children</PRE
 ></TD
 ></TR
 ></TABLE
 ><P
+>Macro for compatibility naming layer with libxml1</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4358"
+NAME="AEN4457"
 ></A
 ><H3
 ><A
@@ -2872,17 +3249,19 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define     xmlRootNode</PRE
+>#define xmlRootNode children</PRE
 ></TD
 ></TR
 ></TABLE
 ><P
+>Macro for compatibility naming layer with libxml1</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4363"
+NAME="AEN4463"
 ></A
 ><H3
 ><A
@@ -2915,7 +3294,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4370"
+NAME="AEN4470"
 ></A
 ><P
 ></P
@@ -2942,7 +3321,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  allocation method to use</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2953,7 +3332,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4379"
+NAME="AEN4479"
 ></A
 ><H3
 ><A
@@ -2987,7 +3366,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4386"
+NAME="AEN4486"
 ></A
 ><P
 ></P
@@ -3012,7 +3391,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the current allocation scheme</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3023,7 +3402,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4395"
+NAME="AEN4495"
 ></A
 ><H3
 ><A
@@ -3053,7 +3432,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4402"
+NAME="AEN4502"
 ></A
 ><P
 ></P
@@ -3078,7 +3457,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new structure.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3089,7 +3468,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4411"
+NAME="AEN4511"
 ></A
 ><H3
 ><A
@@ -3122,7 +3501,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4419"
+NAME="AEN4519"
 ></A
 ><P
 ></P
@@ -3149,7 +3528,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> initial size of buffer</TD
 ></TR
 ><TR
 ><TD
@@ -3164,7 +3543,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new structure.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3175,7 +3554,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4432"
+NAME="AEN4532"
 ></A
 ><H3
 ><A
@@ -3211,7 +3590,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4440"
+NAME="AEN4540"
 ></A
 ><P
 ></P
@@ -3238,7 +3617,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer to resize</TD
 ></TR
 ><TR
 ><TD
@@ -3255,7 +3634,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the desired size</TD
 ></TR
 ><TR
 ><TD
@@ -3270,7 +3649,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 in case of problems, 1 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3281,7 +3660,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4457"
+NAME="AEN4557"
 ></A
 ><H3
 ><A
@@ -3311,7 +3690,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4464"
+NAME="AEN4564"
 ></A
 ><P
 ></P
@@ -3338,7 +3717,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer to free</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3349,7 +3728,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4473"
+NAME="AEN4573"
 ></A
 ><H3
 ><A
@@ -3383,7 +3762,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4481"
+NAME="AEN4581"
 ></A
 ><P
 ></P
@@ -3410,7 +3789,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the file output</TD
 ></TR
 ><TR
 ><TD
@@ -3427,7 +3806,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer to dump</TD
 ></TR
 ><TR
 ><TD
@@ -3442,7 +3821,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of xmlChar written</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3453,7 +3832,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4498"
+NAME="AEN4598"
 ></A
 ><H3
 ><A
@@ -3489,7 +3868,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4506"
+NAME="AEN4606"
 ></A
 ><P
 ></P
@@ -3516,7 +3895,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer to dump</TD
 ></TR
 ><TR
 ><TD
@@ -3533,7 +3912,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlChar string</TD
 ></TR
 ><TR
 ><TD
@@ -3550,7 +3929,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of xmlChar to add</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3561,7 +3940,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4523"
+NAME="AEN4623"
 ></A
 ><H3
 ><A
@@ -3602,7 +3981,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4532"
+NAME="AEN4632"
 ></A
 ><P
 ></P
@@ -3629,7 +4008,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer</TD
 ></TR
 ><TR
 ><TD
@@ -3646,7 +4025,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlChar string</TD
 ></TR
 ><TR
 ><TD
@@ -3663,7 +4042,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of xmlChar to add</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3674,7 +4053,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4549"
+NAME="AEN4649"
 ></A
 ><H3
 ><A
@@ -3708,7 +4087,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4557"
+NAME="AEN4657"
 ></A
 ><P
 ></P
@@ -3735,7 +4114,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer to dump</TD
 ></TR
 ><TR
 ><TD
@@ -3752,7 +4131,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlChar string</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3763,7 +4142,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4570"
+NAME="AEN4670"
 ></A
 ><H3
 ><A
@@ -3794,7 +4173,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4577"
+NAME="AEN4677"
 ></A
 ><P
 ></P
@@ -3821,7 +4200,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer to dump</TD
 ></TR
 ><TR
 ><TD
@@ -3838,7 +4217,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the C char string</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3849,7 +4228,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4590"
+NAME="AEN4690"
 ></A
 ><H3
 ><A
@@ -3880,7 +4259,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4597"
+NAME="AEN4697"
 ></A
 ><P
 ></P
@@ -3907,7 +4286,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer to dump</TD
 ></TR
 ><TR
 ><TD
@@ -3924,7 +4303,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of xmlChar to remove</TD
 ></TR
 ><TR
 ><TD
@@ -3939,7 +4318,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of xmlChar removed, or -1 in case of failure.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3950,7 +4329,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4614"
+NAME="AEN4714"
 ></A
 ><H3
 ><A
@@ -3981,7 +4360,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4621"
+NAME="AEN4721"
 ></A
 ><P
 ></P
@@ -4008,7 +4387,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer</TD
 ></TR
 ><TR
 ><TD
@@ -4025,7 +4404,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the minimum free size to allocate</TD
 ></TR
 ><TR
 ><TD
@@ -4040,7 +4419,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new available space or -1 in case of error</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4051,7 +4430,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4638"
+NAME="AEN4738"
 ></A
 ><H3
 ><A
@@ -4081,7 +4460,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4645"
+NAME="AEN4745"
 ></A
 ><P
 ></P
@@ -4108,7 +4487,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4119,7 +4498,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4654"
+NAME="AEN4754"
 ></A
 ><H3
 ><A
@@ -4146,13 +4525,13 @@
 ></TR
 ></TABLE
 ><P
-></P
+>Function to extract the content of a buffer</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4662"
+NAME="AEN4762"
 ></A
 ><P
 ></P
@@ -4179,7 +4558,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer</TD
 ></TR
 ><TR
 ><TD
@@ -4194,7 +4573,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the internal content</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4205,88 +4584,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4675"
-></A
-><H3
-><A
-NAME="XMLBUFFERUSE"
-></A
->xmlBufferUse ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int         xmlBufferUse                    (const <A
-HREF="libxml-tree.html#XMLBUFFERPTR"
->xmlBufferPtr</A
-> buf);</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN4681"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->buf</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN4694"
+NAME="AEN4775"
 ></A
 ><H3
 ><A
@@ -4320,7 +4618,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4702"
+NAME="AEN4783"
 ></A
 ><P
 ></P
@@ -4347,7 +4645,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer to free</TD
 ></TR
 ><TR
 ><TD
@@ -4364,7 +4662,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  allocation scheme to use</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4375,7 +4673,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4715"
+NAME="AEN4796"
 ></A
 ><H3
 ><A
@@ -4399,13 +4697,13 @@
 ></TR
 ></TABLE
 ><P
-></P
+>Function to get the length of a buffer</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4722"
+NAME="AEN4803"
 ></A
 ><P
 ></P
@@ -4432,7 +4730,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the buffer </TD
 ></TR
 ><TR
 ><TD
@@ -4447,7 +4745,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the length of data in the internal content</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4458,7 +4756,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4735"
+NAME="AEN4816"
 ></A
 ><H3
 ><A
@@ -4503,7 +4801,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4746"
+NAME="AEN4827"
 ></A
 ><P
 ></P
@@ -4530,7 +4828,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document pointer</TD
 ></TR
 ><TR
 ><TD
@@ -4547,7 +4845,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the DTD name</TD
 ></TR
 ><TR
 ><TD
@@ -4564,7 +4862,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the external (PUBLIC) ID</TD
 ></TR
 ><TR
 ><TD
@@ -4581,7 +4879,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the system ID</TD
 ></TR
 ><TR
 ><TD
@@ -4596,7 +4894,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new DTD structure</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4607,7 +4905,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4771"
+NAME="AEN4852"
 ></A
 ><H3
 ><A
@@ -4656,7 +4954,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4783"
+NAME="AEN4864"
 ></A
 ><P
 ></P
@@ -4683,7 +4981,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document pointer</TD
 ></TR
 ><TR
 ><TD
@@ -4700,7 +4998,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the DTD name</TD
 ></TR
 ><TR
 ><TD
@@ -4717,7 +5015,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the external ID</TD
 ></TR
 ><TR
 ><TD
@@ -4734,7 +5032,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the system ID</TD
 ></TR
 ><TR
 ><TD
@@ -4749,7 +5047,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new DTD structure</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4760,7 +5058,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4808"
+NAME="AEN4889"
 ></A
 ><H3
 ><A
@@ -4793,7 +5091,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4816"
+NAME="AEN4897"
 ></A
 ><P
 ></P
@@ -4820,7 +5118,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document pointer</TD
 ></TR
 ><TR
 ><TD
@@ -4835,7 +5133,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the DTD structure or NULL if not found</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4846,7 +5144,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4829"
+NAME="AEN4910"
 ></A
 ><H3
 ><A
@@ -4876,7 +5174,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4836"
+NAME="AEN4917"
 ></A
 ><P
 ></P
@@ -4903,7 +5201,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the DTD structure to free up</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4914,7 +5212,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4845"
+NAME="AEN4926"
 ></A
 ><H3
 ><A
@@ -4957,7 +5255,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4855"
+NAME="AEN4936"
 ></A
 ><P
 ></P
@@ -4984,7 +5282,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document carrying the namespace</TD
 ></TR
 ><TR
 ><TD
@@ -5001,7 +5299,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the URI associated</TD
 ></TR
 ><TR
 ><TD
@@ -5018,7 +5316,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the prefix for the namespace</TD
 ></TR
 ><TR
 ><TD
@@ -5033,7 +5331,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>NULL this functionnality had been removed</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5044,7 +5342,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4876"
+NAME="AEN4957"
 ></A
 ><H3
 ><A
@@ -5089,7 +5387,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4886"
+NAME="AEN4967"
 ></A
 ><P
 ></P
@@ -5116,7 +5414,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the element carrying the namespace</TD
 ></TR
 ><TR
 ><TD
@@ -5133,7 +5431,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the URI associated</TD
 ></TR
 ><TR
 ><TD
@@ -5150,7 +5448,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the prefix for the namespace</TD
 ></TR
 ><TR
 ><TD
@@ -5165,7 +5463,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>returns a new namespace pointer or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5176,7 +5474,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4907"
+NAME="AEN4988"
 ></A
 ><H3
 ><A
@@ -5206,7 +5504,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4914"
+NAME="AEN4995"
 ></A
 ><P
 ></P
@@ -5233,7 +5531,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the namespace pointer</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5244,7 +5542,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4923"
+NAME="AEN5004"
 ></A
 ><H3
 ><A
@@ -5274,7 +5572,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4930"
+NAME="AEN5011"
 ></A
 ><P
 ></P
@@ -5301,7 +5599,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the first namespace pointer</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5312,7 +5610,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4939"
+NAME="AEN5020"
 ></A
 ><H3
 ><A
@@ -5339,13 +5637,13 @@
 ></TR
 ></TABLE
 ><P
-></P
+>Creates a new XML document</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4947"
+NAME="AEN5028"
 ></A
 ><P
 ></P
@@ -5372,7 +5670,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  xmlChar string giving the version of XML "1.0"</TD
 ></TR
 ><TR
 ><TD
@@ -5387,7 +5685,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a new document</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5398,7 +5696,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4960"
+NAME="AEN5041"
 ></A
 ><H3
 ><A
@@ -5428,7 +5726,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4967"
+NAME="AEN5048"
 ></A
 ><P
 ></P
@@ -5455,7 +5753,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  pointer to the document
+@:  </TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5466,7 +5765,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4976"
+NAME="AEN5057"
 ></A
 ><H3
 ><A
@@ -5507,7 +5806,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4986"
+NAME="AEN5067"
 ></A
 ><P
 ></P
@@ -5534,7 +5833,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -5551,7 +5850,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the name of the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -5568,7 +5867,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the value of the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -5583,7 +5882,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the attribute</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5594,7 +5893,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5007"
+NAME="AEN5088"
 ></A
 ><H3
 ><A
@@ -5635,7 +5934,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5017"
+NAME="AEN5098"
 ></A
 ><P
 ></P
@@ -5662,7 +5961,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the holding node</TD
 ></TR
 ><TR
 ><TD
@@ -5679,7 +5978,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the name of the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -5696,7 +5995,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the value of the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -5711,7 +6010,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the attribute</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5722,7 +6021,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5038"
+NAME="AEN5119"
 ></A
 ><H3
 ><A
@@ -5767,7 +6066,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5049"
+NAME="AEN5130"
 ></A
 ><P
 ></P
@@ -5794,7 +6093,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the holding node</TD
 ></TR
 ><TR
 ><TD
@@ -5811,7 +6110,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the namespace</TD
 ></TR
 ><TR
 ><TD
@@ -5828,7 +6127,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the name of the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -5845,7 +6144,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the value of the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -5860,7 +6159,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the attribute</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5871,7 +6170,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5074"
+NAME="AEN5155"
 ></A
 ><H3
 ><A
@@ -5901,7 +6200,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5081"
+NAME="AEN5162"
 ></A
 ><P
 ></P
@@ -5928,7 +6227,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the first property in the list</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -5939,7 +6238,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5090"
+NAME="AEN5171"
 ></A
 ><H3
 ><A
@@ -5969,7 +6268,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5097"
+NAME="AEN5178"
 ></A
 ><P
 ></P
@@ -5996,7 +6295,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an attribute</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6007,7 +6306,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5106"
+NAME="AEN5187"
 ></A
 ><H3
 ><A
@@ -6044,7 +6343,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5115"
+NAME="AEN5196"
 ></A
 ><P
 ></P
@@ -6071,7 +6370,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the element where the attribute will be grafted</TD
 ></TR
 ><TR
 ><TD
@@ -6088,7 +6387,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -6103,7 +6402,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> a new xmlAttrPtr, or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6114,7 +6413,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5132"
+NAME="AEN5213"
 ></A
 ><H3
 ><A
@@ -6151,7 +6450,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5141"
+NAME="AEN5222"
 ></A
 ><P
 ></P
@@ -6178,7 +6477,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the element where the attributes will be grafted</TD
 ></TR
 ><TR
 ><TD
@@ -6195,7 +6494,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the first attribute</TD
 ></TR
 ><TR
 ><TD
@@ -6210,7 +6509,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> a new xmlAttrPtr, or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6221,7 +6520,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5158"
+NAME="AEN5239"
 ></A
 ><H3
 ><A
@@ -6254,7 +6553,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5166"
+NAME="AEN5247"
 ></A
 ><P
 ></P
@@ -6281,7 +6580,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the dtd</TD
 ></TR
 ><TR
 ><TD
@@ -6296,7 +6595,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> a new xmlDtdPtr, or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6307,7 +6606,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5179"
+NAME="AEN5260"
 ></A
 ><H3
 ><A
@@ -6342,7 +6641,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5187"
+NAME="AEN5268"
 ></A
 ><P
 ></P
@@ -6369,7 +6668,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -6386,7 +6685,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  if 1 do a recursive copy.</TD
 ></TR
 ><TR
 ><TD
@@ -6401,7 +6700,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> a new xmlDocPtr, or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6412,7 +6711,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5204"
+NAME="AEN5285"
 ></A
 ><H3
 ><A
@@ -6483,7 +6782,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5220"
+NAME="AEN5301"
 ></A
 ><P
 ></P
@@ -6510,7 +6809,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -6527,7 +6826,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  namespace if any</TD
 ></TR
 ><TR
 ><TD
@@ -6544,7 +6843,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node name</TD
 ></TR
 ><TR
 ><TD
@@ -6561,7 +6860,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML text content if any</TD
 ></TR
 ><TR
 ><TD
@@ -6576,7 +6875,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6587,7 +6886,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5245"
+NAME="AEN5326"
 ></A
 ><H3
 ><A
@@ -6643,7 +6942,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5258"
+NAME="AEN5339"
 ></A
 ><P
 ></P
@@ -6670,7 +6969,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -6687,7 +6986,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  namespace if any</TD
 ></TR
 ><TR
 ><TD
@@ -6704,7 +7003,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node name</TD
 ></TR
 ><TR
 ><TD
@@ -6721,7 +7020,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the text content if any</TD
 ></TR
 ><TR
 ><TD
@@ -6736,7 +7035,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6747,7 +7046,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5283"
+NAME="AEN5364"
 ></A
 ><H3
 ><A
@@ -6789,7 +7088,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5293"
+NAME="AEN5374"
 ></A
 ><P
 ></P
@@ -6816,7 +7115,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  namespace if any</TD
 ></TR
 ><TR
 ><TD
@@ -6833,7 +7132,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node name</TD
 ></TR
 ><TR
 ><TD
@@ -6848,7 +7147,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -6859,7 +7158,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5310"
+NAME="AEN5391"
 ></A
 ><H3
 ><A
@@ -6936,7 +7235,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5327"
+NAME="AEN5408"
 ></A
 ><P
 ></P
@@ -6963,7 +7262,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the parent node</TD
 ></TR
 ><TR
 ><TD
@@ -6980,7 +7279,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a namespace if any</TD
 ></TR
 ><TR
 ><TD
@@ -6997,7 +7296,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the name of the child</TD
 ></TR
 ><TR
 ><TD
@@ -7014,7 +7313,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML content of the child if any.</TD
 ></TR
 ><TR
 ><TD
@@ -7029,7 +7328,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7040,7 +7339,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5352"
+NAME="AEN5433"
 ></A
 ><H3
 ><A
@@ -7102,7 +7401,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5366"
+NAME="AEN5447"
 ></A
 ><P
 ></P
@@ -7129,7 +7428,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the parent node</TD
 ></TR
 ><TR
 ><TD
@@ -7146,7 +7445,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a namespace if any</TD
 ></TR
 ><TR
 ><TD
@@ -7163,7 +7462,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the name of the child</TD
 ></TR
 ><TR
 ><TD
@@ -7180,7 +7479,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the text content of the child if any.</TD
 ></TR
 ><TR
 ><TD
@@ -7195,7 +7494,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7206,7 +7505,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5391"
+NAME="AEN5472"
 ></A
 ><H3
 ><A
@@ -7243,7 +7542,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5400"
+NAME="AEN5481"
 ></A
 ><P
 ></P
@@ -7270,7 +7569,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the document</TD
 ></TR
 ><TR
 ><TD
@@ -7287,7 +7586,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the text content</TD
 ></TR
 ><TR
 ><TD
@@ -7302,7 +7601,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7313,7 +7612,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5417"
+NAME="AEN5498"
 ></A
 ><H3
 ><A
@@ -7346,7 +7645,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5425"
+NAME="AEN5506"
 ></A
 ><P
 ></P
@@ -7373,7 +7672,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the text content</TD
 ></TR
 ><TR
 ><TD
@@ -7388,7 +7687,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7399,7 +7698,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5438"
+NAME="AEN5519"
 ></A
 ><H3
 ><A
@@ -7436,7 +7735,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5447"
+NAME="AEN5528"
 ></A
 ><P
 ></P
@@ -7463,7 +7762,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the processing instruction name</TD
 ></TR
 ><TR
 ><TD
@@ -7480,7 +7779,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the PI content</TD
 ></TR
 ><TR
 ><TD
@@ -7495,7 +7794,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7506,7 +7805,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5464"
+NAME="AEN5545"
 ></A
 ><H3
 ><A
@@ -7545,7 +7844,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5473"
+NAME="AEN5554"
 ></A
 ><P
 ></P
@@ -7572,7 +7871,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the document</TD
 ></TR
 ><TR
 ><TD
@@ -7589,7 +7888,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the text content</TD
 ></TR
 ><TR
 ><TD
@@ -7606,7 +7905,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the text len.</TD
 ></TR
 ><TR
 ><TD
@@ -7621,7 +7920,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7632,7 +7931,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5494"
+NAME="AEN5575"
 ></A
 ><H3
 ><A
@@ -7666,7 +7965,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5502"
+NAME="AEN5583"
 ></A
 ><P
 ></P
@@ -7693,7 +7992,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the text content</TD
 ></TR
 ><TR
 ><TD
@@ -7710,7 +8009,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the text len.</TD
 ></TR
 ><TR
 ><TD
@@ -7725,7 +8024,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7736,7 +8035,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5519"
+NAME="AEN5600"
 ></A
 ><H3
 ><A
@@ -7773,7 +8072,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5528"
+NAME="AEN5609"
 ></A
 ><P
 ></P
@@ -7800,7 +8099,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -7817,7 +8116,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the comment content</TD
 ></TR
 ><TR
 ><TD
@@ -7832,7 +8131,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7843,7 +8142,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5545"
+NAME="AEN5626"
 ></A
 ><H3
 ><A
@@ -7876,7 +8175,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5553"
+NAME="AEN5634"
 ></A
 ><P
 ></P
@@ -7903,7 +8202,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the comment content</TD
 ></TR
 ><TR
 ><TD
@@ -7918,7 +8217,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -7929,7 +8228,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5566"
+NAME="AEN5647"
 ></A
 ><H3
 ><A
@@ -7967,7 +8266,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5575"
+NAME="AEN5656"
 ></A
 ><P
 ></P
@@ -7994,7 +8293,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -8011,7 +8310,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the CData block content content</TD
 ></TR
 ><TR
 ><TD
@@ -8028,7 +8327,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the length of the block</TD
 ></TR
 ><TR
 ><TD
@@ -8043,7 +8342,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8054,7 +8353,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5596"
+NAME="AEN5677"
 ></A
 ><H3
 ><A
@@ -8091,7 +8390,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5605"
+NAME="AEN5686"
 ></A
 ><P
 ></P
@@ -8118,7 +8417,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the document</TD
 ></TR
 ><TR
 ><TD
@@ -8135,7 +8434,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the char ref string, starting with # or "&amp;# ... ;"</TD
 ></TR
 ><TR
 ><TD
@@ -8150,7 +8449,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8161,7 +8460,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5622"
+NAME="AEN5703"
 ></A
 ><H3
 ><A
@@ -8198,7 +8497,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5631"
+NAME="AEN5712"
 ></A
 ><P
 ></P
@@ -8225,7 +8524,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the document</TD
 ></TR
 ><TR
 ><TD
@@ -8242,7 +8541,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the reference name, or the reference string with &amp; and ;</TD
 ></TR
 ><TR
 ><TD
@@ -8257,7 +8556,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8268,7 +8567,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5648"
+NAME="AEN5729"
 ></A
 ><H3
 ><A
@@ -8302,7 +8601,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5656"
+NAME="AEN5737"
 ></A
 ><P
 ></P
@@ -8329,7 +8628,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ><TR
 ><TD
@@ -8346,7 +8645,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  if 1 do a recursive copy.</TD
 ></TR
 ><TR
 ><TD
@@ -8361,7 +8660,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> a new xmlNodePtr, or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8372,7 +8671,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5673"
+NAME="AEN5754"
 ></A
 ><H3
 ><A
@@ -8410,7 +8709,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5682"
+NAME="AEN5763"
 ></A
 ><P
 ></P
@@ -8437,7 +8736,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ><TR
 ><TD
@@ -8471,7 +8770,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  if 1 do a recursive copy.</TD
 ></TR
 ><TR
 ><TD
@@ -8486,7 +8785,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> a new xmlNodePtr, or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8497,7 +8796,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5703"
+NAME="AEN5784"
 ></A
 ><H3
 ><A
@@ -8530,7 +8829,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5711"
+NAME="AEN5792"
 ></A
 ><P
 ></P
@@ -8557,7 +8856,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the first node in the list.</TD
 ></TR
 ><TR
 ><TD
@@ -8572,7 +8871,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> a new xmlNodePtr, or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8583,7 +8882,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5724"
+NAME="AEN5805"
 ></A
 ><H3
 ><A
@@ -8616,7 +8915,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5732"
+NAME="AEN5813"
 ></A
 ><P
 ></P
@@ -8643,7 +8942,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document owning the fragment</TD
 ></TR
 ><TR
 ><TD
@@ -8658,7 +8957,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the new node object.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8669,7 +8968,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5745"
+NAME="AEN5826"
 ></A
 ><H3
 ><A
@@ -8703,7 +9002,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5753"
+NAME="AEN5834"
 ></A
 ><P
 ></P
@@ -8730,7 +9029,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -8745,7 +9044,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the xmlNodePtr for the root or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8756,7 +9055,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5766"
+NAME="AEN5847"
 ></A
 ><H3
 ><A
@@ -8789,7 +9088,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5774"
+NAME="AEN5855"
 ></A
 ><P
 ></P
@@ -8816,7 +9115,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the parent node</TD
 ></TR
 ><TR
 ><TD
@@ -8831,7 +9130,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the last child or NULL if none.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8842,7 +9141,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5787"
+NAME="AEN5868"
 ></A
 ><H3
 ><A
@@ -8872,7 +9171,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5794"
+NAME="AEN5875"
 ></A
 ><P
 ></P
@@ -8899,7 +9198,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ><TR
 ><TD
@@ -8914,7 +9213,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 yes, 0 no</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -8925,7 +9224,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5807"
+NAME="AEN5888"
 ></A
 ><H3
 ><A
@@ -8956,7 +9255,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5814"
+NAME="AEN5895"
 ></A
 ><P
 ></P
@@ -8983,7 +9282,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ><TR
 ><TD
@@ -8998,7 +9297,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 yes, 0 no</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9009,7 +9308,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5827"
+NAME="AEN5908"
 ></A
 ><H3
 ><A
@@ -9047,7 +9346,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5836"
+NAME="AEN5917"
 ></A
 ><P
 ></P
@@ -9074,7 +9373,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -9091,7 +9390,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the new document root element</TD
 ></TR
 ><TR
 ><TD
@@ -9106,7 +9405,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the old root element if any was found</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9117,7 +9416,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5853"
+NAME="AEN5934"
 ></A
 ><H3
 ><A
@@ -9151,7 +9450,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5861"
+NAME="AEN5942"
 ></A
 ><P
 ></P
@@ -9178,7 +9477,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node being changed</TD
 ></TR
 ><TR
 ><TD
@@ -9195,7 +9494,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the new tag name</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9206,7 +9505,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5874"
+NAME="AEN5955"
 ></A
 ><H3
 ><A
@@ -9254,7 +9553,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5885"
+NAME="AEN5966"
 ></A
 ><P
 ></P
@@ -9281,7 +9580,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the parent node</TD
 ></TR
 ><TR
 ><TD
@@ -9298,7 +9597,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the child node</TD
 ></TR
 ><TR
 ><TD
@@ -9313,7 +9612,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the child or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9324,7 +9623,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5902"
+NAME="AEN5983"
 ></A
 ><H3
 ><A
@@ -9367,7 +9666,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5912"
+NAME="AEN5993"
 ></A
 ><P
 ></P
@@ -9394,7 +9693,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the parent node</TD
 ></TR
 ><TR
 ><TD
@@ -9411,7 +9710,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the first node in the list</TD
 ></TR
 ><TR
 ><TD
@@ -9426,7 +9725,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the last child or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9437,7 +9736,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5929"
+NAME="AEN6010"
 ></A
 ><H3
 ><A
@@ -9476,7 +9775,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5938"
+NAME="AEN6019"
 ></A
 ><P
 ></P
@@ -9503,7 +9802,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the old node</TD
 ></TR
 ><TR
 ><TD
@@ -9520,7 +9819,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ><TR
 ><TD
@@ -9535,7 +9834,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the old node</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9546,7 +9845,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5955"
+NAME="AEN6036"
 ></A
 ><H3
 ><A
@@ -9601,7 +9900,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5967"
+NAME="AEN6048"
 ></A
 ><P
 ></P
@@ -9628,7 +9927,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the child node</TD
 ></TR
 ><TR
 ><TD
@@ -9645,7 +9944,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the new node</TD
 ></TR
 ><TR
 ><TD
@@ -9660,7 +9959,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new element or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9671,7 +9970,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5984"
+NAME="AEN6065"
 ></A
 ><H3
 ><A
@@ -9726,7 +10025,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5996"
+NAME="AEN6077"
 ></A
 ><P
 ></P
@@ -9753,7 +10052,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the child node</TD
 ></TR
 ><TR
 ><TD
@@ -9770,7 +10069,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the new node</TD
 ></TR
 ><TR
 ><TD
@@ -9785,7 +10084,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new element or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9796,7 +10095,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6013"
+NAME="AEN6094"
 ></A
 ><H3
 ><A
@@ -9851,7 +10150,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6025"
+NAME="AEN6106"
 ></A
 ><P
 ></P
@@ -9878,7 +10177,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the child node</TD
 ></TR
 ><TR
 ><TD
@@ -9895,7 +10194,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the new node</TD
 ></TR
 ><TR
 ><TD
@@ -9910,7 +10209,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new element or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9921,7 +10220,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6042"
+NAME="AEN6123"
 ></A
 ><H3
 ><A
@@ -9951,7 +10250,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6049"
+NAME="AEN6130"
 ></A
 ><P
 ></P
@@ -9978,7 +10277,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -9989,7 +10288,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6058"
+NAME="AEN6139"
 ></A
 ><H3
 ><A
@@ -10026,7 +10325,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6067"
+NAME="AEN6148"
 ></A
 ><P
 ></P
@@ -10053,7 +10352,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the first text node</TD
 ></TR
 ><TR
 ><TD
@@ -10070,7 +10369,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the second text node being merged</TD
 ></TR
 ><TR
 ><TD
@@ -10085,7 +10384,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the first text node augmented</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10096,7 +10395,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6084"
+NAME="AEN6165"
 ></A
 ><H3
 ><A
@@ -10131,7 +10430,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6092"
+NAME="AEN6173"
 ></A
 ><P
 ></P
@@ -10158,7 +10457,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ><TR
 ><TD
@@ -10175,7 +10474,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the content</TD
 ></TR
 ><TR
 ><TD
@@ -10192,7 +10491,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  <TT
+CLASS="PARAMETER"
+><I
+>content</I
+></TT
+> lenght</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10203,7 +10507,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6109"
+NAME="AEN6191"
 ></A
 ><H3
 ><A
@@ -10234,7 +10538,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6116"
+NAME="AEN6198"
 ></A
 ><P
 ></P
@@ -10261,7 +10565,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the first node in the list</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10272,7 +10576,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6125"
+NAME="AEN6207"
 ></A
 ><H3
 ><A
@@ -10306,7 +10610,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6133"
+NAME="AEN6215"
 ></A
 ><P
 ></P
@@ -10333,7 +10637,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10344,7 +10648,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6142"
+NAME="AEN6224"
 ></A
 ><H3
 ><A
@@ -10378,7 +10682,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6150"
+NAME="AEN6232"
 ></A
 ><P
 ></P
@@ -10405,7 +10709,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the top element</TD
 ></TR
 ><TR
 ><TD
@@ -10422,7 +10726,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10433,7 +10737,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6163"
+NAME="AEN6245"
 ></A
 ><H3
 ><A
@@ -10467,7 +10771,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6171"
+NAME="AEN6253"
 ></A
 ><P
 ></P
@@ -10511,7 +10815,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10522,7 +10826,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6184"
+NAME="AEN6266"
 ></A
 ><H3
 ><A
@@ -10574,7 +10878,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6195"
+NAME="AEN6277"
 ></A
 ><P
 ></P
@@ -10601,7 +10905,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -10618,7 +10922,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the current node</TD
 ></TR
 ><TR
 ><TD
@@ -10635,7 +10939,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the namespace prefix</TD
 ></TR
 ><TR
 ><TD
@@ -10650,7 +10954,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the namespace pointer or NULL.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10661,7 +10965,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6216"
+NAME="AEN6298"
 ></A
 ><H3
 ><A
@@ -10703,7 +11007,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6226"
+NAME="AEN6308"
 ></A
 ><P
 ></P
@@ -10730,7 +11034,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -10747,7 +11051,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the current node</TD
 ></TR
 ><TR
 ><TD
@@ -10764,7 +11068,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the namespace value</TD
 ></TR
 ><TR
 ><TD
@@ -10779,7 +11083,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the namespace pointer or NULL.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10790,7 +11094,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6247"
+NAME="AEN6329"
 ></A
 ><H3
 ><A
@@ -10827,7 +11131,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6256"
+NAME="AEN6338"
 ></A
 ><P
 ></P
@@ -10854,7 +11158,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -10871,7 +11175,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the current node</TD
 ></TR
 ><TR
 ><TD
@@ -10886,7 +11190,9 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>an NULL terminated array of all the xmlNsPtr found
+that need to be freed by the caller or NULL if no
+namespace if defined</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10897,7 +11203,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6273"
+NAME="AEN6355"
 ></A
 ><H3
 ><A
@@ -10931,7 +11237,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6281"
+NAME="AEN6363"
 ></A
 ><P
 ></P
@@ -10958,7 +11264,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a node in the document</TD
 ></TR
 ><TR
 ><TD
@@ -10975,7 +11281,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a namespace pointer</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -10986,7 +11292,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6294"
+NAME="AEN6376"
 ></A
 ><H3
 ><A
@@ -11019,7 +11325,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6302"
+NAME="AEN6384"
 ></A
 ><P
 ></P
@@ -11046,7 +11352,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the namespace</TD
 ></TR
 ><TR
 ><TD
@@ -11061,7 +11367,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> a new xmlNsPtr, or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11072,7 +11378,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6315"
+NAME="AEN6397"
 ></A
 ><H3
 ><A
@@ -11105,7 +11411,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6323"
+NAME="AEN6405"
 ></A
 ><P
 ></P
@@ -11132,7 +11438,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the first namespace</TD
 ></TR
 ><TR
 ><TD
@@ -11147,7 +11453,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> a new xmlNsPtr, or NULL in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11158,7 +11464,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6336"
+NAME="AEN6418"
 ></A
 ><H3
 ><A
@@ -11199,7 +11505,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6346"
+NAME="AEN6428"
 ></A
 ><P
 ></P
@@ -11226,7 +11532,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ><TR
 ><TD
@@ -11243,7 +11549,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute name</TD
 ></TR
 ><TR
 ><TD
@@ -11260,7 +11566,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute value</TD
 ></TR
 ><TR
 ><TD
@@ -11275,7 +11581,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the attribute pointer.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11286,7 +11592,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6367"
+NAME="AEN6449"
 ></A
 ><H3
 ><A
@@ -11329,7 +11635,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6377"
+NAME="AEN6459"
 ></A
 ><P
 ></P
@@ -11356,7 +11662,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ><TR
 ><TD
@@ -11373,7 +11679,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute name</TD
 ></TR
 ><TR
 ><TD
@@ -11388,7 +11694,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the attribute value or NULL if not found.
+It's up to the caller to free the memory.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11399,7 +11706,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6394"
+NAME="AEN6476"
 ></A
 ><H3
 ><A
@@ -11441,7 +11748,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6404"
+NAME="AEN6486"
 ></A
 ><P
 ></P
@@ -11468,7 +11775,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ><TR
 ><TD
@@ -11485,7 +11792,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute name</TD
 ></TR
 ><TR
 ><TD
@@ -11500,7 +11807,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the attribute or the attribute declaration or NULL if 
+neither was found.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11511,7 +11819,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6421"
+NAME="AEN6503"
 ></A
 ><H3
 ><A
@@ -11559,7 +11867,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6432"
+NAME="AEN6514"
 ></A
 ><P
 ></P
@@ -11586,7 +11894,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ><TR
 ><TD
@@ -11603,7 +11911,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute name</TD
 ></TR
 ><TR
 ><TD
@@ -11620,7 +11928,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the URI of the namespace</TD
 ></TR
 ><TR
 ><TD
@@ -11635,7 +11943,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the attribute or the attribute declaration or NULL
+if neither was found.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11646,7 +11955,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6453"
+NAME="AEN6535"
 ></A
 ><H3
 ><A
@@ -11692,7 +12001,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6464"
+NAME="AEN6546"
 ></A
 ><P
 ></P
@@ -11719,7 +12028,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ><TR
 ><TD
@@ -11736,7 +12045,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the namespace definition</TD
 ></TR
 ><TR
 ><TD
@@ -11753,7 +12062,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute name</TD
 ></TR
 ><TR
 ><TD
@@ -11770,7 +12079,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute value</TD
 ></TR
 ><TR
 ><TD
@@ -11785,7 +12094,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the attribute pointer.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11796,7 +12105,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6489"
+NAME="AEN6571"
 ></A
 ><H3
 ><A
@@ -11844,7 +12153,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6500"
+NAME="AEN6582"
 ></A
 ><P
 ></P
@@ -11871,7 +12180,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ><TR
 ><TD
@@ -11888,7 +12197,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute name</TD
 ></TR
 ><TR
 ><TD
@@ -11905,7 +12214,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the URI of the namespace</TD
 ></TR
 ><TR
 ><TD
@@ -11920,7 +12229,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the attribute value or NULL if not found.
+It's up to the caller to free the memory.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -11931,7 +12241,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6521"
+NAME="AEN6603"
 ></A
 ><H3
 ><A
@@ -11969,7 +12279,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6530"
+NAME="AEN6612"
 ></A
 ><P
 ></P
@@ -11996,7 +12306,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -12013,7 +12323,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the value of the attribute</TD
 ></TR
 ><TR
 ><TD
@@ -12028,7 +12338,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the first child</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12039,7 +12349,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6547"
+NAME="AEN6629"
 ></A
 ><H3
 ><A
@@ -12078,7 +12388,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6556"
+NAME="AEN6638"
 ></A
 ><P
 ></P
@@ -12105,7 +12415,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -12122,7 +12432,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the value of the text</TD
 ></TR
 ><TR
 ><TD
@@ -12139,7 +12449,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the length of the string value</TD
 ></TR
 ><TR
 ><TD
@@ -12154,7 +12464,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the first child</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12165,7 +12475,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6577"
+NAME="AEN6659"
 ></A
 ><H3
 ><A
@@ -12204,7 +12514,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6586"
+NAME="AEN6668"
 ></A
 ><P
 ></P
@@ -12231,7 +12541,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -12248,7 +12558,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a Node list</TD
 ></TR
 ><TR
 ><TD
@@ -12265,7 +12575,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  should we replace entity contents or show their external form</TD
 ></TR
 ><TR
 ><TD
@@ -12280,7 +12590,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the string copy, the calller must free it.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12291,7 +12601,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6607"
+NAME="AEN6689"
 ></A
 ><H3
 ><A
@@ -12334,7 +12644,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6617"
+NAME="AEN6699"
 ></A
 ><P
 ></P
@@ -12361,7 +12671,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -12378,7 +12688,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a Node list</TD
 ></TR
 ><TR
 ><TD
@@ -12395,7 +12705,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  should we replace entity contents or show their external form</TD
 ></TR
 ><TR
 ><TD
@@ -12410,7 +12720,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the string copy, the calller must free it.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12421,7 +12731,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6638"
+NAME="AEN6720"
 ></A
 ><H3
 ><A
@@ -12455,7 +12765,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6646"
+NAME="AEN6728"
 ></A
 ><P
 ></P
@@ -12482,7 +12792,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node being modified</TD
 ></TR
 ><TR
 ><TD
@@ -12499,7 +12809,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the new value of the content</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12510,7 +12820,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6659"
+NAME="AEN6741"
 ></A
 ><H3
 ><A
@@ -12545,7 +12855,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6667"
+NAME="AEN6749"
 ></A
 ><P
 ></P
@@ -12572,7 +12882,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node being modified</TD
 ></TR
 ><TR
 ><TD
@@ -12589,7 +12899,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the new value of the content</TD
 ></TR
 ><TR
 ><TD
@@ -12606,7 +12916,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the size of <TT
+CLASS="PARAMETER"
+><I
+>content</I
+></TT
+></TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12617,7 +12932,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6684"
+NAME="AEN6767"
 ></A
 ><H3
 ><A
@@ -12651,7 +12966,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6692"
+NAME="AEN6775"
 ></A
 ><P
 ></P
@@ -12678,7 +12993,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node being modified</TD
 ></TR
 ><TR
 ><TD
@@ -12695,7 +13010,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  extra content</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12706,7 +13021,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6705"
+NAME="AEN6788"
 ></A
 ><H3
 ><A
@@ -12741,7 +13056,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6713"
+NAME="AEN6796"
 ></A
 ><P
 ></P
@@ -12768,7 +13083,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node being modified</TD
 ></TR
 ><TR
 ><TD
@@ -12785,7 +13100,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  extra content</TD
 ></TR
 ><TR
 ><TD
@@ -12802,7 +13117,12 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the size of <TT
+CLASS="PARAMETER"
+><I
+>content</I
+></TT
+></TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12813,7 +13133,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6730"
+NAME="AEN6814"
 ></A
 ><H3
 ><A
@@ -12849,7 +13169,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6738"
+NAME="AEN6822"
 ></A
 ><P
 ></P
@@ -12876,7 +13196,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node being read</TD
 ></TR
 ><TR
 ><TD
@@ -12891,7 +13211,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a new xmlChar * or NULL if no content is available.
+It's up to the caller to free the memory.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12902,7 +13223,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6751"
+NAME="AEN6835"
 ></A
 ><H3
 ><A
@@ -12936,7 +13257,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6759"
+NAME="AEN6843"
 ></A
 ><P
 ></P
@@ -12963,7 +13284,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node being checked</TD
 ></TR
 ><TR
 ><TD
@@ -12978,7 +13299,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the lang value, or NULL if not found
+It's up to the caller to free the memory.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -12989,7 +13311,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6772"
+NAME="AEN6856"
 ></A
 ><H3
 ><A
@@ -13024,7 +13346,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6780"
+NAME="AEN6864"
 ></A
 ><P
 ></P
@@ -13051,7 +13373,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node being changed</TD
 ></TR
 ><TR
 ><TD
@@ -13068,7 +13390,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the langage description</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13079,7 +13401,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6793"
+NAME="AEN6877"
 ></A
 ><H3
 ><A
@@ -13111,7 +13433,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6800"
+NAME="AEN6884"
 ></A
 ><P
 ></P
@@ -13138,7 +13460,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node being checked</TD
 ></TR
 ><TR
 ><TD
@@ -13153,7 +13475,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>-1 if xml:space is not inheried, 0 if "default", 1 if "preserve"</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13164,7 +13486,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6813"
+NAME="AEN6897"
 ></A
 ><H3
 ><A
@@ -13199,7 +13521,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6821"
+NAME="AEN6905"
 ></A
 ><P
 ></P
@@ -13226,7 +13548,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node being changed</TD
 ></TR
 ><TR
 ><TD
@@ -13254,7 +13576,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6834"
+NAME="AEN6918"
 ></A
 ><H3
 ><A
@@ -13301,7 +13623,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6844"
+NAME="AEN6928"
 ></A
 ><P
 ></P
@@ -13328,7 +13650,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document the node pertains to</TD
 ></TR
 ><TR
 ><TD
@@ -13345,7 +13667,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node being checked</TD
 ></TR
 ><TR
 ><TD
@@ -13360,7 +13682,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a pointer to the base URL, or NULL if not found
+It's up to the caller to free the memory.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13371,7 +13694,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6861"
+NAME="AEN6945"
 ></A
 ><H3
 ><A
@@ -13406,7 +13729,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6869"
+NAME="AEN6953"
 ></A
 ><P
 ></P
@@ -13433,7 +13756,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node being changed</TD
 ></TR
 ><TR
 ><TD
@@ -13450,7 +13773,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the new base URI</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13461,7 +13784,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6882"
+NAME="AEN6966"
 ></A
 ><H3
 ><A
@@ -13492,7 +13815,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6889"
+NAME="AEN6973"
 ></A
 ><P
 ></P
@@ -13534,7 +13857,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if success and -1 in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13545,88 +13868,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6902"
-></A
-><H3
-><A
-NAME="XMLREMOVENODE"
-></A
->xmlRemoveNode ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int         xmlRemoveNode                   (<A
-HREF="libxml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> node);</PRE
-></TD
-></TR
-></TABLE
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN6908"
-></A
-><P
-></P
-><TABLE
-BORDER="0"
-WIDTH="100%"
-BGCOLOR="#FFD0D0"
-CELLSPACING="0"
-CELLPADDING="4"
-CLASS="CALSTABLE"
-><TBODY
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
-><I
->node</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->&nbsp;</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN6921"
+NAME="AEN6986"
 ></A
 ><H3
 ><A
@@ -13660,7 +13902,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6929"
+NAME="AEN6994"
 ></A
 ><P
 ></P
@@ -13687,7 +13929,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ><TR
 ><TD
@@ -13704,7 +13946,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute name</TD
 ></TR
 ><TR
 ><TD
@@ -13719,7 +13961,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if successful, -1 if not found</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13730,7 +13972,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6946"
+NAME="AEN7011"
 ></A
 ><H3
 ><A
@@ -13768,7 +14010,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6955"
+NAME="AEN7020"
 ></A
 ><P
 ></P
@@ -13795,7 +14037,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the node</TD
 ></TR
 ><TR
 ><TD
@@ -13812,7 +14054,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the namespace definition</TD
 ></TR
 ><TR
 ><TD
@@ -13829,7 +14071,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the attribute name</TD
 ></TR
 ><TR
 ><TD
@@ -13844,7 +14086,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 if successful, -1 if not found</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13855,7 +14097,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6976"
+NAME="AEN7041"
 ></A
 ><H3
 ><A
@@ -13891,7 +14133,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6984"
+NAME="AEN7049"
 ></A
 ><P
 ></P
@@ -13918,7 +14160,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML buffer</TD
 ></TR
 ><TR
 ><TD
@@ -13935,7 +14177,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the string to add</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -13946,7 +14188,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6997"
+NAME="AEN7062"
 ></A
 ><H3
 ><A
@@ -13981,7 +14223,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7005"
+NAME="AEN7070"
 ></A
 ><P
 ></P
@@ -14008,7 +14250,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML buffer</TD
 ></TR
 ><TR
 ><TD
@@ -14025,7 +14267,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the string to add</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14036,7 +14278,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7018"
+NAME="AEN7083"
 ></A
 ><H3
 ><A
@@ -14068,7 +14310,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7025"
+NAME="AEN7090"
 ></A
 ><P
 ></P
@@ -14095,7 +14337,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML buffer output</TD
 ></TR
 ><TR
 ><TD
@@ -14112,7 +14354,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the string to add</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14123,7 +14365,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7038"
+NAME="AEN7103"
 ></A
 ><H3
 ><A
@@ -14159,7 +14401,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7046"
+NAME="AEN7111"
 ></A
 ><P
 ></P
@@ -14186,7 +14428,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML buffer output</TD
 ></TR
 ><TR
 ><TD
@@ -14203,7 +14445,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the string to add</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14214,7 +14456,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7059"
+NAME="AEN7124"
 ></A
 ><H3
 ><A
@@ -14259,7 +14501,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7068"
+NAME="AEN7133"
 ></A
 ><P
 ></P
@@ -14286,7 +14528,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -14303,7 +14545,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a node defining the subtree to reconciliate</TD
 ></TR
 ><TR
 ><TD
@@ -14318,7 +14560,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of namespace declarations created or -1 in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14329,7 +14571,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7085"
+NAME="AEN7150"
 ></A
 ><H3
 ><A
@@ -14366,7 +14608,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7093"
+NAME="AEN7158"
 ></A
 ><P
 ></P
@@ -14393,7 +14635,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -14410,7 +14652,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  OUT: the memory pointer</TD
 ></TR
 ><TR
 ><TD
@@ -14427,7 +14669,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  OUT: the memory lenght</TD
 ></TR
 ><TR
 ><TD
@@ -14444,7 +14686,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  should formatting spaces been added</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14455,7 +14697,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7114"
+NAME="AEN7179"
 ></A
 ><H3
 ><A
@@ -14491,7 +14733,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7122"
+NAME="AEN7187"
 ></A
 ><P
 ></P
@@ -14518,7 +14760,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -14535,7 +14777,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  OUT: the memory pointer</TD
 ></TR
 ><TR
 ><TD
@@ -14552,7 +14794,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  OUT: the memory lenght</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14563,7 +14805,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7139"
+NAME="AEN7204"
 ></A
 ><H3
 ><A
@@ -14601,7 +14843,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7147"
+NAME="AEN7212"
 ></A
 ><P
 ></P
@@ -14628,7 +14870,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  Document to generate XML text from</TD
 ></TR
 ><TR
 ><TD
@@ -14645,7 +14887,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  Memory pointer for allocated XML text</TD
 ></TR
 ><TR
 ><TD
@@ -14662,7 +14904,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  Length of the generated XML text</TD
 ></TR
 ><TR
 ><TD
@@ -14679,7 +14921,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  Character encoding to use when generating XML text</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14690,7 +14932,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7168"
+NAME="AEN7233"
 ></A
 ><H3
 ><A
@@ -14729,7 +14971,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7176"
+NAME="AEN7241"
 ></A
 ><P
 ></P
@@ -14756,7 +14998,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  Document to generate XML text from</TD
 ></TR
 ><TR
 ><TD
@@ -14773,7 +15015,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  Memory pointer for allocated XML text</TD
 ></TR
 ><TR
 ><TD
@@ -14790,7 +15032,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  Length of the generated XML text</TD
 ></TR
 ><TR
 ><TD
@@ -14807,7 +15049,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  Character encoding to use when generating XML text</TD
 ></TR
 ><TR
 ><TD
@@ -14824,7 +15066,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  should formatting spaces been added</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14835,7 +15077,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7201"
+NAME="AEN7266"
 ></A
 ><H3
 ><A
@@ -14869,7 +15111,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7209"
+NAME="AEN7274"
 ></A
 ><P
 ></P
@@ -14896,7 +15138,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the FILE*</TD
 ></TR
 ><TR
 ><TD
@@ -14913,7 +15155,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -14928,7 +15170,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the number of byte written or -1 in case of failure.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -14939,7 +15181,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7226"
+NAME="AEN7291"
 ></A
 ><H3
 ><A
@@ -14977,7 +15219,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7235"
+NAME="AEN7300"
 ></A
 ><P
 ></P
@@ -15004,7 +15246,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the FILE * for the output</TD
 ></TR
 ><TR
 ><TD
@@ -15021,7 +15263,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -15038,7 +15280,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the current node</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15049,7 +15291,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7252"
+NAME="AEN7317"
 ></A
 ><H3
 ><A
@@ -15087,7 +15329,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7260"
+NAME="AEN7325"
 ></A
 ><P
 ></P
@@ -15114,7 +15356,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename (or URL)</TD
 ></TR
 ><TR
 ><TD
@@ -15131,7 +15373,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -15146,7 +15388,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the number of byte written or -1 in case of failure.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15157,7 +15399,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7277"
+NAME="AEN7342"
 ></A
 ><H3
 ><A
@@ -15196,7 +15438,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7285"
+NAME="AEN7350"
 ></A
 ><P
 ></P
@@ -15223,7 +15465,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename (or URL)</TD
 ></TR
 ><TR
 ><TD
@@ -15240,7 +15482,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -15257,7 +15499,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  should formatting spaces been added</TD
 ></TR
 ><TR
 ><TD
@@ -15272,7 +15514,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the number of byte written or -1 in case of failure.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15283,7 +15525,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7306"
+NAME="AEN7371"
 ></A
 ><H3
 ><A
@@ -15323,7 +15565,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7315"
+NAME="AEN7380"
 ></A
 ><P
 ></P
@@ -15350,7 +15592,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML buffer output</TD
 ></TR
 ><TR
 ><TD
@@ -15367,7 +15609,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -15384,7 +15626,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the current node</TD
 ></TR
 ><TR
 ><TD
@@ -15401,7 +15643,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the imbrication level for indenting</TD
 ></TR
 ><TR
 ><TD
@@ -15418,7 +15660,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> is formatting allowed</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15429,7 +15671,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7340"
+NAME="AEN7405"
 ></A
 ><H3
 ><A
@@ -15462,7 +15704,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7347"
+NAME="AEN7412"
 ></A
 ><P
 ></P
@@ -15489,7 +15731,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename or URL to output</TD
 ></TR
 ><TR
 ><TD
@@ -15506,7 +15748,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document being saved</TD
 ></TR
 ><TR
 ><TD
@@ -15523,7 +15765,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the name of the encoding to use or NULL.</TD
 ></TR
 ><TR
 ><TD
@@ -15540,7 +15782,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  should formatting spaces be added.</TD
 ></TR
 ><TR
 ><TD
@@ -15566,7 +15808,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7372"
+NAME="AEN7437"
 ></A
 ><H3
 ><A
@@ -15598,7 +15840,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7379"
+NAME="AEN7444"
 ></A
 ><P
 ></P
@@ -15625,7 +15867,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the filename (or URL)</TD
 ></TR
 ><TR
 ><TD
@@ -15642,7 +15884,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -15659,7 +15901,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the name of an encoding (or NULL)</TD
 ></TR
 ><TR
 ><TD
@@ -15674,7 +15916,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the number of byte written or -1 in case of failure.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15685,7 +15927,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7400"
+NAME="AEN7465"
 ></A
 ><H3
 ><A
@@ -15715,7 +15957,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7407"
+NAME="AEN7472"
 ></A
 ><P
 ></P
@@ -15742,7 +15984,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -15757,7 +15999,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 (uncompressed) to 9 (max compression)</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15768,7 +16010,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7420"
+NAME="AEN7485"
 ></A
 ><H3
 ><A
@@ -15800,7 +16042,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7427"
+NAME="AEN7492"
 ></A
 ><P
 ></P
@@ -15827,7 +16069,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -15844,7 +16086,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the compression ratio</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15855,7 +16097,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7440"
+NAME="AEN7505"
 ></A
 ><H3
 ><A
@@ -15882,7 +16124,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7446"
+NAME="AEN7511"
 ></A
 ><P
 ></P
@@ -15907,7 +16149,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>0 (uncompressed) to 9 (max compression)</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -15918,7 +16160,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7455"
+NAME="AEN7520"
 ></A
 ><H3
 ><A
@@ -15946,7 +16188,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7461"
+NAME="AEN7526"
 ></A
 ><P
 ></P
@@ -15973,7 +16215,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the compression ratio</TD
 ></TR
 ></TBODY
 ></TABLE

diff --git a/doc/html/libxml-uri.html b/doc/html/libxml-uri.html
index e4adf22..68eb522 100644
--- a/doc/html/libxml-uri.html
+++ b/doc/html/libxml-uri.html

@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN9687"
+NAME="AEN9860"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN9690"
+NAME="AEN9863"
 ></A
 ><H2
 >Synopsis</H2
@@ -180,7 +180,7 @@
 >   <A
 HREF="libxml-uri.html#XMLPARSEURI"
 >xmlParseURI</A
->                     (const char *str);
+>                     (const char *URI);
 int         <A
 HREF="libxml-uri.html#XMLPARSEURIREFERENCE"
 >xmlParseURIReference</A
@@ -258,7 +258,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9722"
+NAME="AEN9895"
 ></A
 ><H2
 >Description</H2
@@ -268,14 +268,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9725"
+NAME="AEN9898"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9727"
+NAME="AEN9900"
 ></A
 ><H3
 ><A
@@ -292,52 +292,52 @@
 ><PRE
 CLASS="PROGRAMLISTING"
 >struct xmlURI {
-    char *scheme;	/* the URI scheme */
-    char *opaque;	/* opaque part */
-    char *authority;	/* the authority part */
-    char *server;	/* the server part */
-    char *user;		/* the user part */
-    int port;		/* the port number */
-    char *path;		/* the path string */
-    char *query;	/* the query string */
-    char *fragment;	/* the fragment identifier */
-};</PRE
+
+    char *scheme;
+
+    char *opaque;
+
+    char *authority;
+
+    char *server;
+
+    char *user;
+
+    int port;
+
+    char *path;
+
+    char *query;
+
+    char *fragment;
+
+};&#13;</PRE
 ></TD
 ></TR
 ></TABLE
 ><P
+>A parsed URI reference. This is a struct containing the various fields
+as described in RFC 2396 but separated for further processing</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9732"
+NAME="AEN9906"
 ></A
 ><H3
 ><A
 NAME="XMLURIPTR"
 ></A
 >xmlURIPtr</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->typedef xmlURI *xmlURIPtr;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9737"
+NAME="AEN9910"
 ></A
 ><H3
 ><A
@@ -367,7 +367,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9744"
+NAME="AEN9917"
 ></A
 ><P
 ></P
@@ -392,7 +392,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->the new structure or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -403,7 +403,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9753"
+NAME="AEN9926"
 ></A
 ><H3
 ><A
@@ -445,7 +445,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9763"
+NAME="AEN9936"
 ></A
 ><P
 ></P
@@ -472,7 +472,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the URI instance found in the document</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -489,7 +489,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the base value</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -504,8 +504,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new URI string (to be freed by the caller) or NULL in case
-of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -516,7 +515,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9780"
+NAME="AEN9953"
 ></A
 ><H3
 ><A
@@ -535,7 +534,7 @@
 ><A
 HREF="libxml-uri.html#XMLURIPTR"
 >xmlURIPtr</A
->   xmlParseURI                     (const char *str);</PRE
+>   xmlParseURI                     (const char *URI);</PRE
 ></TD
 ></TR
 ></TABLE
@@ -548,7 +547,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9788"
+NAME="AEN9961"
 ></A
 ><P
 ></P
@@ -568,14 +567,14 @@
 ><TT
 CLASS="PARAMETER"
 ><I
->str</I
+>URI</I
 ></TT
 >&nbsp;:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the URI string to analyze</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -590,7 +589,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a newly build xmlURIPtr or NULL in case of error</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -601,7 +600,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9801"
+NAME="AEN9974"
 ></A
 ><H3
 ><A
@@ -640,7 +639,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9810"
+NAME="AEN9983"
 ></A
 ><P
 ></P
@@ -667,7 +666,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to an URI structure</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -684,7 +683,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the string to analyze</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -699,7 +698,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 or the error code</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -710,7 +709,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9827"
+NAME="AEN10000"
 ></A
 ><H3
 ><A
@@ -743,7 +742,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9835"
+NAME="AEN10008"
 ></A
 ><P
 ></P
@@ -770,7 +769,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to an xmlURI</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -785,7 +784,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new string (to be deallocated by caller)</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -796,7 +795,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9848"
+NAME="AEN10021"
 ></A
 ><H3
 ><A
@@ -835,7 +834,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9857"
+NAME="AEN10030"
 ></A
 ><P
 ></P
@@ -862,7 +861,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  a FILE* for the output</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -879,7 +878,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to an xmlURI</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -890,7 +889,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9870"
+NAME="AEN10043"
 ></A
 ><H3
 ><A
@@ -928,7 +927,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9879"
+NAME="AEN10052"
 ></A
 ><P
 ></P
@@ -955,7 +954,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  string to escape</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -972,7 +971,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
-> exception list string of chars not to escape</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -987,7 +986,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->a new escaped string or NULL in case of error.</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -998,7 +997,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9896"
+NAME="AEN10069"
 ></A
 ><H3
 ><A
@@ -1031,7 +1030,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9903"
+NAME="AEN10076"
 ></A
 ><P
 ></P
@@ -1058,7 +1057,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the string to unescape</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1075,7 +1074,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->   the lenght in bytes to unescape (or &lt;= 0 to indicate full string)</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1092,7 +1091,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  optionnal destination buffer</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1107,7 +1106,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->an copy of the string, but unescaped</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1118,7 +1117,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9924"
+NAME="AEN10097"
 ></A
 ><H3
 ><A
@@ -1148,7 +1147,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9931"
+NAME="AEN10104"
 ></A
 ><P
 ></P
@@ -1175,7 +1174,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to the path string</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1190,7 +1189,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->0 or an error code</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1201,7 +1200,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9944"
+NAME="AEN10117"
 ></A
 ><H3
 ><A
@@ -1236,7 +1235,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9952"
+NAME="AEN10125"
 ></A
 ><P
 ></P
@@ -1263,7 +1262,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the string of the URI to escape</TD
+>&nbsp;</TD
 ></TR
 ><TR
 ><TD
@@ -1278,12 +1277,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->an copy of the string, but escaped
-
-25 May 2001
-Uses xmlParseURI and xmlURIEscapeStr to try to escape correctly
-according to RFC2396.
-- Carl Douglas</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1294,7 +1288,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9965"
+NAME="AEN10138"
 ></A
 ><H3
 ><A
@@ -1324,7 +1318,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9972"
+NAME="AEN10145"
 ></A
 ><P
 ></P
@@ -1351,7 +1345,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  pointer to an xmlURI</TD
+>&nbsp;</TD
 ></TR
 ></TBODY
 ></TABLE

diff --git a/doc/html/libxml-valid.html b/doc/html/libxml-valid.html
index 521f398..7d57587 100644
--- a/doc/html/libxml-valid.html
+++ b/doc/html/libxml-valid.html

@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN7947"
+NAME="AEN8012"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN7950"
+NAME="AEN8015"
 ></A
 ><H2
 >Synopsis</H2
@@ -304,6 +304,16 @@
 >xmlElementContentPtr</A
 > cur);
 void        <A
+HREF="libxml-valid.html#XMLSNPRINTFELEMENTCONTENT"
+>xmlSnprintfElementContent</A
+>       (char *buf,
+                                             int size,
+                                             <A
+HREF="libxml-tree.html#XMLELEMENTCONTENTPTR"
+>xmlElementContentPtr</A
+> content,
+                                             int glob);
+void        <A
 HREF="libxml-valid.html#XMLSPRINTFELEMENTCONTENT"
 >xmlSprintfElementContent</A
 >        (char *buf,
@@ -858,6 +868,28 @@
 >xmlChar</A
 > *name);
 <A
+HREF="libxml-tree.html#XMLATTRIBUTEPTR"
+>xmlAttributePtr</A
+> <A
+HREF="libxml-valid.html#XMLGETDTDQATTRDESC"
+>xmlGetDtdQAttrDesc</A
+>          (<A
+HREF="libxml-tree.html#XMLDTDPTR"
+>xmlDtdPtr</A
+> dtd,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *elem,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *name,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *prefix);
+<A
 HREF="libxml-tree.html#XMLNOTATIONPTR"
 >xmlNotationPtr</A
 > <A
@@ -875,6 +907,24 @@
 HREF="libxml-tree.html#XMLELEMENTPTR"
 >xmlElementPtr</A
 > <A
+HREF="libxml-valid.html#XMLGETDTDQELEMENTDESC"
+>xmlGetDtdQElementDesc</A
+>         (<A
+HREF="libxml-tree.html#XMLDTDPTR"
+>xmlDtdPtr</A
+> dtd,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *name,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *prefix);
+<A
+HREF="libxml-tree.html#XMLELEMENTPTR"
+>xmlElementPtr</A
+> <A
 HREF="libxml-valid.html#XMLGETDTDELEMENTDESC"
 >xmlGetDtdElementDesc</A
 >          (<A
@@ -921,7 +971,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN8161"
+NAME="AEN8239"
 ></A
 ><H2
 >Description</H2
@@ -931,14 +981,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN8164"
+NAME="AEN8242"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8166"
+NAME="AEN8244"
 ></A
 ><H3
 ><A
@@ -964,7 +1014,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8171"
+NAME="AEN8249"
 ></A
 ><H3
 ><A
@@ -990,7 +1040,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8176"
+NAME="AEN8254"
 ></A
 ><H3
 ><A
@@ -1017,7 +1067,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8181"
+NAME="AEN8259"
 ></A
 ><P
 ></P
@@ -1089,7 +1139,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8198"
+NAME="AEN8276"
 ></A
 ><H3
 ><A
@@ -1116,7 +1166,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8203"
+NAME="AEN8281"
 ></A
 ><P
 ></P
@@ -1188,7 +1238,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8220"
+NAME="AEN8298"
 ></A
 ><H3
 ><A
@@ -1234,7 +1284,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8225"
+NAME="AEN8303"
 ></A
 ><H3
 ><A
@@ -1260,7 +1310,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8230"
+NAME="AEN8308"
 ></A
 ><H3
 ><A
@@ -1286,7 +1336,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8235"
+NAME="AEN8313"
 ></A
 ><H3
 ><A
@@ -1312,7 +1362,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8240"
+NAME="AEN8318"
 ></A
 ><H3
 ><A
@@ -1338,7 +1388,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8245"
+NAME="AEN8323"
 ></A
 ><H3
 ><A
@@ -1364,7 +1414,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8250"
+NAME="AEN8328"
 ></A
 ><H3
 ><A
@@ -1390,7 +1440,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8255"
+NAME="AEN8333"
 ></A
 ><H3
 ><A
@@ -1433,7 +1483,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8267"
+NAME="AEN8345"
 ></A
 ><P
 ></P
@@ -1504,7 +1554,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8284"
+NAME="AEN8362"
 ></A
 ><H3
 ><A
@@ -1553,7 +1603,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8296"
+NAME="AEN8374"
 ></A
 ><P
 ></P
@@ -1674,7 +1724,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8325"
+NAME="AEN8403"
 ></A
 ><H3
 ><A
@@ -1707,7 +1757,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8333"
+NAME="AEN8411"
 ></A
 ><P
 ></P
@@ -1760,7 +1810,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8346"
+NAME="AEN8424"
 ></A
 ><H3
 ><A
@@ -1790,7 +1840,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8353"
+NAME="AEN8431"
 ></A
 ><P
 ></P
@@ -1828,7 +1878,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8362"
+NAME="AEN8440"
 ></A
 ><H3
 ><A
@@ -1862,7 +1912,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8370"
+NAME="AEN8448"
 ></A
 ><P
 ></P
@@ -1917,7 +1967,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8383"
+NAME="AEN8461"
 ></A
 ><H3
 ><A
@@ -1951,7 +2001,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8391"
+NAME="AEN8469"
 ></A
 ><P
 ></P
@@ -2006,7 +2056,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8404"
+NAME="AEN8482"
 ></A
 ><H3
 ><A
@@ -2043,7 +2093,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8413"
+NAME="AEN8491"
 ></A
 ><P
 ></P
@@ -2113,7 +2163,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8430"
+NAME="AEN8508"
 ></A
 ><H3
 ><A
@@ -2146,7 +2196,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8438"
+NAME="AEN8516"
 ></A
 ><P
 ></P
@@ -2199,7 +2249,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8451"
+NAME="AEN8529"
 ></A
 ><H3
 ><A
@@ -2229,7 +2279,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8458"
+NAME="AEN8536"
 ></A
 ><P
 ></P
@@ -2267,7 +2317,130 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8467"
+NAME="AEN8545"
+></A
+><H3
+><A
+NAME="XMLSNPRINTFELEMENTCONTENT"
+></A
+>xmlSnprintfElementContent ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlSnprintfElementContent       (char *buf,
+                                             int size,
+                                             <A
+HREF="libxml-tree.html#XMLELEMENTCONTENTPTR"
+>xmlElementContentPtr</A
+> content,
+                                             int glob);</PRE
+></TD
+></TR
+></TABLE
+><P
+>This will dump the content of the element content definition
+Intended just for the debug routine</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN8552"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>buf</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  an output buffer</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>size</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the buffer size</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>content</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  An element table</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>glob</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+> 1 if one must print the englobing parenthesis, 0 otherwise</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN8573"
 ></A
 ><H3
 ><A
@@ -2293,14 +2466,13 @@
 ></TR
 ></TABLE
 ><P
->This will dump the content of the element content definition
-Intended just for the debug routine</P
+>Deprecated, unsafe, use xmlSnprintfElementContent</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8474"
+NAME="AEN8580"
 ></A
 ><P
 ></P
@@ -2372,7 +2544,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8491"
+NAME="AEN8597"
 ></A
 ><H3
 ><A
@@ -2421,7 +2593,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8503"
+NAME="AEN8609"
 ></A
 ><P
 ></P
@@ -2542,7 +2714,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8532"
+NAME="AEN8638"
 ></A
 ><H3
 ><A
@@ -2575,7 +2747,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8540"
+NAME="AEN8646"
 ></A
 ><P
 ></P
@@ -2628,7 +2800,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8553"
+NAME="AEN8659"
 ></A
 ><H3
 ><A
@@ -2658,7 +2830,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8560"
+NAME="AEN8666"
 ></A
 ><P
 ></P
@@ -2696,7 +2868,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8569"
+NAME="AEN8675"
 ></A
 ><H3
 ><A
@@ -2730,7 +2902,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8577"
+NAME="AEN8683"
 ></A
 ><P
 ></P
@@ -2785,7 +2957,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8590"
+NAME="AEN8696"
 ></A
 ><H3
 ><A
@@ -2820,7 +2992,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8598"
+NAME="AEN8704"
 ></A
 ><P
 ></P
@@ -2875,7 +3047,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8611"
+NAME="AEN8717"
 ></A
 ><H3
 ><A
@@ -2908,7 +3080,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8619"
+NAME="AEN8725"
 ></A
 ><P
 ></P
@@ -2962,7 +3134,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8632"
+NAME="AEN8738"
 ></A
 ><H3
 ><A
@@ -2992,7 +3164,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8639"
+NAME="AEN8745"
 ></A
 ><P
 ></P
@@ -3030,7 +3202,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8648"
+NAME="AEN8754"
 ></A
 ><H3
 ><A
@@ -3063,7 +3235,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8656"
+NAME="AEN8762"
 ></A
 ><P
 ></P
@@ -3117,7 +3289,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8669"
+NAME="AEN8775"
 ></A
 ><H3
 ><A
@@ -3188,7 +3360,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8686"
+NAME="AEN8792"
 ></A
 ><P
 ></P
@@ -3377,7 +3549,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8731"
+NAME="AEN8837"
 ></A
 ><H3
 ><A
@@ -3410,7 +3582,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8739"
+NAME="AEN8845"
 ></A
 ><P
 ></P
@@ -3463,7 +3635,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8752"
+NAME="AEN8858"
 ></A
 ><H3
 ><A
@@ -3493,7 +3665,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8759"
+NAME="AEN8865"
 ></A
 ><P
 ></P
@@ -3531,7 +3703,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8768"
+NAME="AEN8874"
 ></A
 ><H3
 ><A
@@ -3565,7 +3737,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8776"
+NAME="AEN8882"
 ></A
 ><P
 ></P
@@ -3620,7 +3792,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8789"
+NAME="AEN8895"
 ></A
 ><H3
 ><A
@@ -3655,7 +3827,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8797"
+NAME="AEN8903"
 ></A
 ><P
 ></P
@@ -3710,7 +3882,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8810"
+NAME="AEN8916"
 ></A
 ><H3
 ><A
@@ -3755,7 +3927,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8821"
+NAME="AEN8927"
 ></A
 ><P
 ></P
@@ -3859,7 +4031,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8846"
+NAME="AEN8952"
 ></A
 ><H3
 ><A
@@ -3889,7 +4061,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8853"
+NAME="AEN8959"
 ></A
 ><P
 ></P
@@ -3927,7 +4099,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8862"
+NAME="AEN8968"
 ></A
 ><H3
 ><A
@@ -3964,7 +4136,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8871"
+NAME="AEN8977"
 ></A
 ><P
 ></P
@@ -4034,7 +4206,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8888"
+NAME="AEN8994"
 ></A
 ><H3
 ><A
@@ -4074,7 +4246,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8897"
+NAME="AEN9003"
 ></A
 ><P
 ></P
@@ -4161,7 +4333,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8918"
+NAME="AEN9024"
 ></A
 ><H3
 ><A
@@ -4195,7 +4367,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8926"
+NAME="AEN9032"
 ></A
 ><P
 ></P
@@ -4265,7 +4437,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8943"
+NAME="AEN9049"
 ></A
 ><H3
 ><A
@@ -4310,7 +4482,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8954"
+NAME="AEN9060"
 ></A
 ><P
 ></P
@@ -4414,7 +4586,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8979"
+NAME="AEN9085"
 ></A
 ><H3
 ><A
@@ -4444,7 +4616,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8986"
+NAME="AEN9092"
 ></A
 ><P
 ></P
@@ -4482,7 +4654,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8995"
+NAME="AEN9101"
 ></A
 ><H3
 ><A
@@ -4522,7 +4694,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9004"
+NAME="AEN9110"
 ></A
 ><P
 ></P
@@ -4609,7 +4781,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9025"
+NAME="AEN9131"
 ></A
 ><H3
 ><A
@@ -4643,7 +4815,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9033"
+NAME="AEN9139"
 ></A
 ><P
 ></P
@@ -4713,7 +4885,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9050"
+NAME="AEN9156"
 ></A
 ><H3
 ><A
@@ -4750,7 +4922,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9059"
+NAME="AEN9165"
 ></A
 ><P
 ></P
@@ -4820,7 +4992,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9076"
+NAME="AEN9182"
 ></A
 ><H3
 ><A
@@ -4858,7 +5030,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9084"
+NAME="AEN9190"
 ></A
 ><P
 ></P
@@ -4928,7 +5100,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9101"
+NAME="AEN9207"
 ></A
 ><H3
 ><A
@@ -4971,7 +5143,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9110"
+NAME="AEN9216"
 ></A
 ><P
 ></P
@@ -5058,7 +5230,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9131"
+NAME="AEN9237"
 ></A
 ><H3
 ><A
@@ -5118,7 +5290,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9146"
+NAME="AEN9252"
 ></A
 ><P
 ></P
@@ -5223,7 +5395,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9171"
+NAME="AEN9277"
 ></A
 ><H3
 ><A
@@ -5268,7 +5440,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9181"
+NAME="AEN9287"
 ></A
 ><P
 ></P
@@ -5355,7 +5527,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9202"
+NAME="AEN9308"
 ></A
 ><H3
 ><A
@@ -5404,7 +5576,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9214"
+NAME="AEN9320"
 ></A
 ><P
 ></P
@@ -5474,7 +5646,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9231"
+NAME="AEN9337"
 ></A
 ><H3
 ><A
@@ -5516,7 +5688,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9240"
+NAME="AEN9346"
 ></A
 ><P
 ></P
@@ -5603,7 +5775,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9261"
+NAME="AEN9367"
 ></A
 ><H3
 ><A
@@ -5643,7 +5815,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9271"
+NAME="AEN9377"
 ></A
 ><P
 ></P
@@ -5730,7 +5902,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9292"
+NAME="AEN9398"
 ></A
 ><H3
 ><A
@@ -5771,7 +5943,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9301"
+NAME="AEN9407"
 ></A
 ><P
 ></P
@@ -5841,7 +6013,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9318"
+NAME="AEN9424"
 ></A
 ><H3
 ><A
@@ -5879,7 +6051,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9327"
+NAME="AEN9433"
 ></A
 ><P
 ></P
@@ -5949,7 +6121,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9344"
+NAME="AEN9450"
 ></A
 ><H3
 ><A
@@ -5987,7 +6159,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9353"
+NAME="AEN9459"
 ></A
 ><P
 ></P
@@ -6074,7 +6246,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9374"
+NAME="AEN9480"
 ></A
 ><H3
 ><A
@@ -6122,7 +6294,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9385"
+NAME="AEN9491"
 ></A
 ><P
 ></P
@@ -6209,7 +6381,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9406"
+NAME="AEN9512"
 ></A
 ><H3
 ><A
@@ -6267,7 +6439,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9418"
+NAME="AEN9524"
 ></A
 ><P
 ></P
@@ -6388,7 +6560,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9447"
+NAME="AEN9553"
 ></A
 ><H3
 ><A
@@ -6425,7 +6597,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9456"
+NAME="AEN9562"
 ></A
 ><P
 ></P
@@ -6495,7 +6667,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9473"
+NAME="AEN9579"
 ></A
 ><H3
 ><A
@@ -6534,7 +6706,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9482"
+NAME="AEN9588"
 ></A
 ><P
 ></P
@@ -6621,7 +6793,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9503"
+NAME="AEN9609"
 ></A
 ><H3
 ><A
@@ -6656,7 +6828,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9511"
+NAME="AEN9617"
 ></A
 ><P
 ></P
@@ -6726,7 +6898,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9528"
+NAME="AEN9634"
 ></A
 ><H3
 ><A
@@ -6768,7 +6940,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9538"
+NAME="AEN9644"
 ></A
 ><P
 ></P
@@ -6855,7 +7027,157 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9559"
+NAME="AEN9665"
+></A
+><H3
+><A
+NAME="XMLGETDTDQATTRDESC"
+></A
+>xmlGetDtdQAttrDesc ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-tree.html#XMLATTRIBUTEPTR"
+>xmlAttributePtr</A
+> xmlGetDtdQAttrDesc          (<A
+HREF="libxml-tree.html#XMLDTDPTR"
+>xmlDtdPtr</A
+> dtd,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *elem,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *name,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *prefix);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Search the Dtd for the description of this qualified attribute on
+this element.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN9676"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>dtd</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  a pointer to the DtD to search</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>elem</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the element name</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>name</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the attribute name</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>prefix</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the attribute namespace prefix</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the xmlAttributePtr if found or NULL</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN9701"
 ></A
 ><H3
 ><A
@@ -6892,7 +7214,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9568"
+NAME="AEN9710"
 ></A
 ><P
 ></P
@@ -6962,7 +7284,135 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9585"
+NAME="AEN9727"
+></A
+><H3
+><A
+NAME="XMLGETDTDQELEMENTDESC"
+></A
+>xmlGetDtdQElementDesc ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-tree.html#XMLELEMENTPTR"
+>xmlElementPtr</A
+> xmlGetDtdQElementDesc         (<A
+HREF="libxml-tree.html#XMLDTDPTR"
+>xmlDtdPtr</A
+> dtd,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *name,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *prefix);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Search the Dtd for the description of this element</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN9737"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>dtd</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  a pointer to the DtD to search</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>name</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the element name</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>prefix</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the element namespace prefix</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the xmlElementPtr if found or NULL</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN9758"
 ></A
 ><H3
 ><A
@@ -6999,7 +7449,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9594"
+NAME="AEN9767"
 ></A
 ><P
 ></P
@@ -7069,7 +7519,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9611"
+NAME="AEN9784"
 ></A
 ><H3
 ><A
@@ -7129,7 +7579,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9623"
+NAME="AEN9796"
 ></A
 ><P
 ></P
@@ -7240,7 +7690,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9649"
+NAME="AEN9822"
 ></A
 ><H3
 ><A
@@ -7276,7 +7726,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9657"
+NAME="AEN9830"
 ></A
 ><P
 ></P

diff --git a/doc/html/libxml-xinclude.html b/doc/html/libxml-xinclude.html
index 3afa78b..14bd216 100644
--- a/doc/html/libxml-xinclude.html
+++ b/doc/html/libxml-xinclude.html

@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN16415"
+NAME="AEN16754"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN16418"
+NAME="AEN16757"
 ></A
 ><H2
 >Synopsis</H2
@@ -159,7 +159,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN16423"
+NAME="AEN16762"
 ></A
 ><H2
 >Description</H2
@@ -169,14 +169,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN16426"
+NAME="AEN16765"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16428"
+NAME="AEN16767"
 ></A
 ><H3
 ><A
@@ -211,7 +211,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16436"
+NAME="AEN16775"
 ></A
 ><P
 ></P

diff --git a/doc/html/libxml-xmlerror.html b/doc/html/libxml-xmlerror.html
index f11811c..d7d2ee3 100644
--- a/doc/html/libxml-xmlerror.html
+++ b/doc/html/libxml-xmlerror.html

@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN9986"
+NAME="AEN10159"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN9989"
+NAME="AEN10162"
 ></A
 ><H2
 >Synopsis</H2
@@ -208,7 +208,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10004"
+NAME="AEN10177"
 ></A
 ><H2
 >Description</H2
@@ -218,14 +218,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10007"
+NAME="AEN10180"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10009"
+NAME="AEN10182"
 ></A
 ><H3
 ><A
@@ -367,7 +367,8 @@
     XML_ERR_ENTITY_LOOP, /* 89 */
     XML_ERR_ENTITY_BOUNDARY, /* 90 */
     XML_ERR_INVALID_URI, /* 91 */
-    XML_ERR_URI_FRAGMENT /* 92 */
+    XML_ERR_URI_FRAGMENT, /* 92 */
+    XML_WAR_CATALOG_PI  /* 93 */
 }xmlParserErrors;</PRE
 ></TD
 ></TR
@@ -378,7 +379,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10014"
+NAME="AEN10187"
 ></A
 ><H3
 ><A
@@ -405,7 +406,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10019"
+NAME="AEN10192"
 ></A
 ><P
 ></P
@@ -477,7 +478,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10036"
+NAME="AEN10209"
 ></A
 ><H3
 ><A
@@ -539,7 +540,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10048"
+NAME="AEN10221"
 ></A
 ><P
 ></P
@@ -594,7 +595,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10061"
+NAME="AEN10234"
 ></A
 ><H3
 ><A
@@ -624,7 +625,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10067"
+NAME="AEN10240"
 ></A
 ><P
 ></P
@@ -696,7 +697,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10084"
+NAME="AEN10257"
 ></A
 ><H3
 ><A
@@ -726,7 +727,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10090"
+NAME="AEN10263"
 ></A
 ><P
 ></P
@@ -798,7 +799,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10107"
+NAME="AEN10280"
 ></A
 ><H3
 ><A
@@ -828,7 +829,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10113"
+NAME="AEN10286"
 ></A
 ><P
 ></P
@@ -900,7 +901,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10130"
+NAME="AEN10303"
 ></A
 ><H3
 ><A
@@ -930,7 +931,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10136"
+NAME="AEN10309"
 ></A
 ><P
 ></P
@@ -1002,7 +1003,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10153"
+NAME="AEN10326"
 ></A
 ><H3
 ><A
@@ -1032,7 +1033,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10160"
+NAME="AEN10333"
 ></A
 ><P
 ></P
@@ -1070,7 +1071,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10169"
+NAME="AEN10342"
 ></A
 ><H3
 ><A
@@ -1100,7 +1101,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10176"
+NAME="AEN10349"
 ></A
 ><P
 ></P

diff --git a/doc/html/libxml-xmlio.html b/doc/html/libxml-xmlio.html
index e2e77b3..6f53076 100644
--- a/doc/html/libxml-xmlio.html
+++ b/doc/html/libxml-xmlio.html

@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN17301"
+NAME="AEN17642"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN17304"
+NAME="AEN17645"
 ></A
 ><H2
 >Synopsis</H2
@@ -480,6 +480,10 @@
 >xmlIOHTTPOpenW</A
 >                  (const char *post_uri,
                                              int compression);
+void        <A
+HREF="libxml-xmlio.html#XMLREGISTERHTTPPOSTCALLBACKS"
+>xmlRegisterHTTPPostCallbacks</A
+>    (void);
 int         <A
 HREF="libxml-xmlio.html#XMLSAVEFILETO"
 >xmlSaveFileTo</A
@@ -542,7 +546,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN17404"
+NAME="AEN17746"
 ></A
 ><H2
 >Description</H2
@@ -552,14 +556,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN17407"
+NAME="AEN17749"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17409"
+NAME="AEN17751"
 ></A
 ><H3
 ><A
@@ -584,7 +588,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17414"
+NAME="AEN17756"
 ></A
 ><P
 ></P
@@ -637,7 +641,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17427"
+NAME="AEN17769"
 ></A
 ><H3
 ><A
@@ -662,7 +666,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17432"
+NAME="AEN17774"
 ></A
 ><P
 ></P
@@ -700,7 +704,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17441"
+NAME="AEN17783"
 ></A
 ><H3
 ><A
@@ -727,7 +731,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17446"
+NAME="AEN17788"
 ></A
 ><P
 ></P
@@ -814,7 +818,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17467"
+NAME="AEN17809"
 ></A
 ><H3
 ><A
@@ -839,7 +843,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17472"
+NAME="AEN17814"
 ></A
 ><P
 ></P
@@ -892,7 +896,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17485"
+NAME="AEN17827"
 ></A
 ><H3
 ><A
@@ -927,20 +931,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17490"
+NAME="AEN17832"
 ></A
 ><H3
 ><A
 NAME="XMLPARSERINPUTBUFFERPTR"
 ></A
 >xmlParserInputBufferPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlParserInputBuffer *xmlParserInputBufferPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17494"
+NAME="AEN17837"
 ></A
 ><H3
 ><A
@@ -965,7 +982,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17499"
+NAME="AEN17842"
 ></A
 ><P
 ></P
@@ -1018,7 +1035,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17512"
+NAME="AEN17855"
 ></A
 ><H3
 ><A
@@ -1043,7 +1060,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17517"
+NAME="AEN17860"
 ></A
 ><P
 ></P
@@ -1081,7 +1098,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17526"
+NAME="AEN17869"
 ></A
 ><H3
 ><A
@@ -1108,7 +1125,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17531"
+NAME="AEN17874"
 ></A
 ><P
 ></P
@@ -1195,7 +1212,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17552"
+NAME="AEN17895"
 ></A
 ><H3
 ><A
@@ -1220,7 +1237,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17557"
+NAME="AEN17900"
 ></A
 ><P
 ></P
@@ -1273,7 +1290,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17570"
+NAME="AEN17913"
 ></A
 ><H3
 ><A
@@ -1309,20 +1326,33 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17575"
+NAME="AEN17918"
 ></A
 ><H3
 ><A
 NAME="XMLOUTPUTBUFFERPTR"
 ></A
 >xmlOutputBufferPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlOutputBuffer *xmlOutputBufferPtr;</PRE
+></TD
+></TR
+></TABLE
 ><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17579"
+NAME="AEN17923"
 ></A
 ><H3
 ><A
@@ -1351,7 +1381,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17585"
+NAME="AEN17929"
 ></A
 ><H3
 ><A
@@ -1385,7 +1415,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17593"
+NAME="AEN17937"
 ></A
 ><P
 ></P
@@ -1412,7 +1442,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the charset encoding if known</TD
 ></TR
 ><TR
 ><TD
@@ -1427,7 +1457,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser input or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1438,7 +1468,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17606"
+NAME="AEN17950"
 ></A
 ><H3
 ><A
@@ -1476,7 +1506,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17615"
+NAME="AEN17959"
 ></A
 ><P
 ></P
@@ -1503,7 +1533,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a C string containing the URI or filename</TD
 ></TR
 ><TR
 ><TD
@@ -1520,7 +1550,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the charset encoding if known</TD
 ></TR
 ><TR
 ><TD
@@ -1535,7 +1565,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser input or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1546,7 +1576,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17632"
+NAME="AEN17976"
 ></A
 ><H3
 ><A
@@ -1585,7 +1615,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17640"
+NAME="AEN17984"
 ></A
 ><P
 ></P
@@ -1612,7 +1642,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a C string containing the URI or filename</TD
 ></TR
 ><TR
 ><TD
@@ -1629,7 +1659,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the charset encoding if known</TD
 ></TR
 ><TR
 ><TD
@@ -1644,7 +1674,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser input or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1655,7 +1685,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17657"
+NAME="AEN18001"
 ></A
 ><H3
 ><A
@@ -1694,7 +1724,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17666"
+NAME="AEN18010"
 ></A
 ><P
 ></P
@@ -1721,7 +1751,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a FILE* </TD
 ></TR
 ><TR
 ><TD
@@ -1738,7 +1768,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the charset encoding if known</TD
 ></TR
 ><TR
 ><TD
@@ -1753,7 +1783,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser input or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1764,7 +1794,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17683"
+NAME="AEN18027"
 ></A
 ><H3
 ><A
@@ -1800,7 +1830,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17691"
+NAME="AEN18035"
 ></A
 ><P
 ></P
@@ -1827,7 +1857,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a file descriptor number</TD
 ></TR
 ><TR
 ><TD
@@ -1844,7 +1874,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the charset encoding if known</TD
 ></TR
 ><TR
 ><TD
@@ -1859,7 +1889,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser input or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1870,7 +1900,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17708"
+NAME="AEN18052"
 ></A
 ><H3
 ><A
@@ -1907,7 +1937,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17716"
+NAME="AEN18060"
 ></A
 ><P
 ></P
@@ -1934,7 +1964,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the memory input</TD
 ></TR
 ><TR
 ><TD
@@ -1951,7 +1981,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the length of the memory block</TD
 ></TR
 ><TR
 ><TD
@@ -1968,7 +1998,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the charset encoding if known</TD
 ></TR
 ><TR
 ><TD
@@ -1983,7 +2013,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser input or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1994,7 +2024,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17737"
+NAME="AEN18081"
 ></A
 ><H3
 ><A
@@ -2038,7 +2068,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17747"
+NAME="AEN18091"
 ></A
 ><P
 ></P
@@ -2065,7 +2095,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an I/O read function</TD
 ></TR
 ><TR
 ><TD
@@ -2082,7 +2112,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an I/O close function</TD
 ></TR
 ><TR
 ><TD
@@ -2099,7 +2129,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an I/O handler</TD
 ></TR
 ><TR
 ><TD
@@ -2116,7 +2146,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the charset encoding if known</TD
 ></TR
 ><TR
 ><TD
@@ -2131,7 +2161,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser input or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2142,7 +2172,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17772"
+NAME="AEN18116"
 ></A
 ><H3
 ><A
@@ -2175,7 +2205,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17779"
+NAME="AEN18123"
 ></A
 ><P
 ></P
@@ -2202,7 +2232,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a buffered parser input</TD
 ></TR
 ><TR
 ><TD
@@ -2219,7 +2249,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  indicative value of the amount of chars to read</TD
 ></TR
 ><TR
 ><TD
@@ -2234,7 +2264,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of chars read and stored in the buffer, or -1
+in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2245,7 +2276,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17796"
+NAME="AEN18140"
 ></A
 ><H3
 ><A
@@ -2281,7 +2312,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17804"
+NAME="AEN18148"
 ></A
 ><P
 ></P
@@ -2308,7 +2339,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a buffered parser input</TD
 ></TR
 ><TR
 ><TD
@@ -2325,7 +2356,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  indicative value of the amount of chars to read</TD
 ></TR
 ><TR
 ><TD
@@ -2340,7 +2371,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of chars read and stored in the buffer, or -1
+in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2351,7 +2383,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17821"
+NAME="AEN18165"
 ></A
 ><H3
 ><A
@@ -2385,7 +2417,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17828"
+NAME="AEN18172"
 ></A
 ><P
 ></P
@@ -2412,7 +2444,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a buffered parser input</TD
 ></TR
 ><TR
 ><TD
@@ -2429,7 +2461,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the size in bytes of the array.</TD
 ></TR
 ><TR
 ><TD
@@ -2446,7 +2478,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an char array</TD
 ></TR
 ><TR
 ><TD
@@ -2461,7 +2493,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of chars read and stored in the buffer, or -1
+in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2472,7 +2505,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17849"
+NAME="AEN18193"
 ></A
 ><H3
 ><A
@@ -2502,7 +2535,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17856"
+NAME="AEN18200"
 ></A
 ><P
 ></P
@@ -2529,7 +2562,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a buffered parser input</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2540,7 +2573,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17865"
+NAME="AEN18209"
 ></A
 ><H3
 ><A
@@ -2567,7 +2600,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17871"
+NAME="AEN18215"
 ></A
 ><P
 ></P
@@ -2594,7 +2627,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the path to a file</TD
 ></TR
 ><TR
 ><TD
@@ -2609,7 +2642,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>a new allocated string containing the directory, or NULL.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2620,7 +2653,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17884"
+NAME="AEN18228"
 ></A
 ><H3
 ><A
@@ -2662,7 +2695,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17894"
+NAME="AEN18238"
 ></A
 ><P
 ></P
@@ -2689,7 +2722,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlInputMatchCallback</TD
 ></TR
 ><TR
 ><TD
@@ -2706,7 +2739,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlInputOpenCallback</TD
 ></TR
 ><TR
 ><TD
@@ -2723,7 +2756,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlInputReadCallback</TD
 ></TR
 ><TR
 ><TD
@@ -2740,7 +2773,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlInputCloseCallback</TD
 ></TR
 ><TR
 ><TD
@@ -2755,7 +2788,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the registered handler number or -1 in case of error</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2766,7 +2799,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17919"
+NAME="AEN18263"
 ></A
 ><H3
 ><A
@@ -2795,7 +2828,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17925"
+NAME="AEN18269"
 ></A
 ><H3
 ><A
@@ -2828,7 +2861,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17933"
+NAME="AEN18277"
 ></A
 ><P
 ></P
@@ -2855,7 +2888,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the encoding converter or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -2870,7 +2903,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser output or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2881,7 +2914,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17946"
+NAME="AEN18290"
 ></A
 ><H3
 ><A
@@ -2922,7 +2955,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17954"
+NAME="AEN18298"
 ></A
 ><P
 ></P
@@ -2949,7 +2982,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a C string containing the URI or filename</TD
 ></TR
 ><TR
 ><TD
@@ -2966,7 +2999,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the encoding converter or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -2983,7 +3016,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the compression ration (0 none, 9 max).</TD
 ></TR
 ><TR
 ><TD
@@ -2998,7 +3031,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new output or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3009,7 +3042,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17975"
+NAME="AEN18319"
 ></A
 ><H3
 ><A
@@ -3048,7 +3081,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17984"
+NAME="AEN18328"
 ></A
 ><P
 ></P
@@ -3075,7 +3108,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a FILE* </TD
 ></TR
 ><TR
 ><TD
@@ -3092,7 +3125,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the encoding converter or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -3107,7 +3140,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser output or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3118,7 +3151,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18001"
+NAME="AEN18345"
 ></A
 ><H3
 ><A
@@ -3153,7 +3186,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18009"
+NAME="AEN18353"
 ></A
 ><P
 ></P
@@ -3180,7 +3213,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a file descriptor number</TD
 ></TR
 ><TR
 ><TD
@@ -3197,7 +3230,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the encoding converter or NULL</TD
 ></TR
 ><TR
 ><TD
@@ -3212,7 +3245,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser output or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3223,7 +3256,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18026"
+NAME="AEN18370"
 ></A
 ><H3
 ><A
@@ -3266,7 +3299,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18036"
+NAME="AEN18380"
 ></A
 ><P
 ></P
@@ -3293,7 +3326,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an I/O write function</TD
 ></TR
 ><TR
 ><TD
@@ -3310,7 +3343,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an I/O close function</TD
 ></TR
 ><TR
 ><TD
@@ -3327,7 +3360,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an I/O handler</TD
 ></TR
 ><TR
 ><TD
@@ -3359,7 +3392,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the new parser output or NULL</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3370,7 +3403,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18061"
+NAME="AEN18405"
 ></A
 ><H3
 ><A
@@ -3405,7 +3438,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18068"
+NAME="AEN18412"
 ></A
 ><P
 ></P
@@ -3432,7 +3465,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a buffered parser output</TD
 ></TR
 ><TR
 ><TD
@@ -3449,7 +3482,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the size in bytes of the array.</TD
 ></TR
 ><TR
 ><TD
@@ -3466,7 +3499,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an char array</TD
 ></TR
 ><TR
 ><TD
@@ -3481,7 +3514,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of chars immediately written, or -1
+in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3492,7 +3526,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18089"
+NAME="AEN18433"
 ></A
 ><H3
 ><A
@@ -3526,7 +3560,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18096"
+NAME="AEN18440"
 ></A
 ><P
 ></P
@@ -3553,7 +3587,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a buffered parser output</TD
 ></TR
 ><TR
 ><TD
@@ -3570,7 +3604,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a zero terminated C string</TD
 ></TR
 ><TR
 ><TD
@@ -3585,7 +3619,8 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of chars immediately written, or -1
+in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3596,7 +3631,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18113"
+NAME="AEN18457"
 ></A
 ><H3
 ><A
@@ -3626,7 +3661,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18120"
+NAME="AEN18464"
 ></A
 ><P
 ></P
@@ -3653,7 +3688,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a buffered output</TD
 ></TR
 ><TR
 ><TD
@@ -3668,7 +3703,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of byte written or -1 in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3679,7 +3714,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18133"
+NAME="AEN18477"
 ></A
 ><H3
 ><A
@@ -3710,7 +3745,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18140"
+NAME="AEN18484"
 ></A
 ><P
 ></P
@@ -3737,7 +3772,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a buffered output</TD
 ></TR
 ><TR
 ><TD
@@ -3752,7 +3787,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the number of byte written or -1 in case of error.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3763,7 +3798,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18153"
+NAME="AEN18497"
 ></A
 ><H3
 ><A
@@ -3805,7 +3840,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18163"
+NAME="AEN18507"
 ></A
 ><P
 ></P
@@ -3832,7 +3867,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlOutputMatchCallback</TD
 ></TR
 ><TR
 ><TD
@@ -3849,7 +3884,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlOutputOpenCallback</TD
 ></TR
 ><TR
 ><TD
@@ -3866,7 +3901,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlOutputWriteCallback</TD
 ></TR
 ><TR
 ><TD
@@ -3883,7 +3918,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the xmlOutputCloseCallback</TD
 ></TR
 ><TR
 ><TD
@@ -3898,7 +3933,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>the registered handler number or -1 in case of error</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3909,7 +3944,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18188"
+NAME="AEN18532"
 ></A
 ><H3
 ><A
@@ -3938,7 +3973,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18194"
+NAME="AEN18538"
 ></A
 ><P
 ></P
@@ -3965,7 +4000,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The destination URI for the document</TD
 ></TR
 ><TR
 ><TD
@@ -3982,7 +4017,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  The compression desired for the document.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3993,7 +4028,37 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18207"
+NAME="AEN18551"
+></A
+><H3
+><A
+NAME="XMLREGISTERHTTPPOSTCALLBACKS"
+></A
+>xmlRegisterHTTPPostCallbacks ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlRegisterHTTPPostCallbacks    (void);</PRE
+></TD
+></TR
+></TABLE
+><P
+>By default, libxml submits HTTP output requests using the "PUT" method.
+Calling this method changes the HTTP output method to use the "POST"
+method instead.</P
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN18557"
 ></A
 ><H3
 ><A
@@ -4028,7 +4093,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18215"
+NAME="AEN18565"
 ></A
 ><P
 ></P
@@ -4055,7 +4120,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an output I/O buffer</TD
 ></TR
 ><TR
 ><TD
@@ -4072,7 +4137,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -4089,7 +4154,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the encoding if any assuming the i/O layer handles the trancoding</TD
 ></TR
 ><TR
 ><TD
@@ -4104,7 +4169,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the number of byte written or -1 in case of failure.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4115,7 +4180,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18236"
+NAME="AEN18586"
 ></A
 ><H3
 ><A
@@ -4151,7 +4216,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18244"
+NAME="AEN18594"
 ></A
 ><P
 ></P
@@ -4178,7 +4243,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an output I/O buffer</TD
 ></TR
 ><TR
 ><TD
@@ -4195,7 +4260,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -4212,7 +4277,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the encoding if any assuming the i/O layer handles the trancoding</TD
 ></TR
 ><TR
 ><TD
@@ -4229,7 +4294,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> should formatting spaces been added</TD
 ></TR
 ><TR
 ><TD
@@ -4244,7 +4309,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the number of byte written or -1 in case of failure.</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4255,7 +4320,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18269"
+NAME="AEN18619"
 ></A
 ><H3
 ><A
@@ -4296,7 +4361,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18278"
+NAME="AEN18628"
 ></A
 ><P
 ></P
@@ -4323,7 +4388,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XML buffer output</TD
 ></TR
 ><TR
 ><TD
@@ -4340,7 +4405,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -4357,7 +4422,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the current node</TD
 ></TR
 ><TR
 ><TD
@@ -4374,7 +4439,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the imbrication level for indenting</TD
 ></TR
 ><TR
 ><TD
@@ -4391,7 +4456,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> is formatting allowed</TD
 ></TR
 ><TR
 ><TD
@@ -4408,7 +4473,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an optional encoding string</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -4419,7 +4484,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18307"
+NAME="AEN18657"
 ></A
 ><H3
 ><A
@@ -4454,7 +4519,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18315"
+NAME="AEN18665"
 ></A
 ><P
 ></P
@@ -4481,7 +4546,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the HTML buffer output</TD
 ></TR
 ><TR
 ><TD
@@ -4498,7 +4563,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the document</TD
 ></TR
 ><TR
 ><TD
@@ -4515,7 +4580,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the encoding string</TD
 ></TR
 ></TBODY
 ></TABLE

diff --git a/doc/html/libxml-xmlmemory.html b/doc/html/libxml-xmlmemory.html
index 494c1b8..05f5179 100644
--- a/doc/html/libxml-xmlmemory.html
+++ b/doc/html/libxml-xmlmemory.html

@@ -110,7 +110,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN22715"
+NAME="AEN23508"
 ></A
 ><H2
 >Name</H2
@@ -118,7 +118,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN22718"
+NAME="AEN23511"
 ></A
 ><H2
 >Synopsis</H2
@@ -273,7 +273,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN22754"
+NAME="AEN23547"
 ></A
 ><H2
 >Description</H2
@@ -283,14 +283,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN22757"
+NAME="AEN23550"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22759"
+NAME="AEN23552"
 ></A
 ><H3
 ><A
@@ -311,12 +311,17 @@
 ></TR
 ></TABLE
 ><P
+>should be activated only done when debugging libxml. It replaces the
+allocator with a collect and debug shell to the libc allocator.
+DEBUG_MEMORY should be activated only when debugging 
+libxml i.e. if libxml has been configured with --with-debug-mem too</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22764"
+NAME="AEN23558"
 ></A
 ><H3
 ><A
@@ -337,12 +342,14 @@
 ></TR
 ></TABLE
 ><P
+>keep track of all allocated blocks for error reporting</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22769"
+NAME="AEN23564"
 ></A
 ><H3
 ><A
@@ -367,7 +374,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22774"
+NAME="AEN23569"
 ></A
 ><P
 ></P
@@ -405,7 +412,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22783"
+NAME="AEN23578"
 ></A
 ><H3
 ><A
@@ -433,7 +440,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22789"
+NAME="AEN23584"
 ></A
 ><P
 ></P
@@ -471,7 +478,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22798"
+NAME="AEN23593"
 ></A
 ><H3
 ><A
@@ -500,7 +507,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22804"
+NAME="AEN23599"
 ></A
 ><P
 ></P
@@ -555,7 +562,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22817"
+NAME="AEN23612"
 ></A
 ><H3
 ><A
@@ -580,7 +587,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22822"
+NAME="AEN23617"
 ></A
 ><P
 ></P
@@ -633,7 +640,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22835"
+NAME="AEN23630"
 ></A
 ><H3
 ><A
@@ -679,7 +686,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22846"
+NAME="AEN23641"
 ></A
 ><P
 ></P
@@ -795,7 +802,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22875"
+NAME="AEN23670"
 ></A
 ><H3
 ><A
@@ -837,7 +844,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22885"
+NAME="AEN23680"
 ></A
 ><P
 ></P
@@ -953,7 +960,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22914"
+NAME="AEN23709"
 ></A
 ><H3
 ><A
@@ -980,7 +987,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22920"
+NAME="AEN23715"
 ></A
 ><P
 ></P
@@ -1016,7 +1023,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22929"
+NAME="AEN23724"
 ></A
 ><H3
 ><A
@@ -1043,7 +1050,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22935"
+NAME="AEN23730"
 ></A
 ><P
 ></P
@@ -1079,7 +1086,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22944"
+NAME="AEN23739"
 ></A
 ><H3
 ><A
@@ -1109,7 +1116,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22951"
+NAME="AEN23746"
 ></A
 ><P
 ></P
@@ -1148,7 +1155,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22960"
+NAME="AEN23755"
 ></A
 ><H3
 ><A
@@ -1185,7 +1192,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22968"
+NAME="AEN23763"
 ></A
 ><P
 ></P
@@ -1240,7 +1247,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22981"
+NAME="AEN23776"
 ></A
 ><H3
 ><A
@@ -1268,7 +1275,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22987"
+NAME="AEN23782"
 ></A
 ><H3
 ><A
@@ -1289,11 +1296,16 @@
 ></TR
 ></TABLE
 ><P
+>Wrapper for the <GTKDOCLINK
+HREF="MALLOC"
+>malloc</GTKDOCLINK
+>() function used in the XML library</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22992"
+NAME="AEN23789"
 ></A
 ><P
 ></P
@@ -1320,7 +1332,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  number of bytes to allocate</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1331,7 +1343,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23001"
+NAME="AEN23798"
 ></A
 ><H3
 ><A
@@ -1352,11 +1364,16 @@
 ></TR
 ></TABLE
 ><P
+>Wrapper for the <GTKDOCLINK
+HREF="REALLOC"
+>realloc</GTKDOCLINK
+>() function used in the XML library</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23006"
+NAME="AEN23805"
 ></A
 ><P
 ></P
@@ -1383,7 +1400,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  pointer to the existing allocated area</TD
 ></TR
 ><TR
 ><TD
@@ -1400,7 +1417,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  number of bytes to allocate</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1411,7 +1428,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23019"
+NAME="AEN23818"
 ></A
 ><H3
 ><A
@@ -1432,11 +1449,19 @@
 ></TR
 ></TABLE
 ><P
+>Wrapper for the <GTKDOCLINK
+HREF="STRDUP"
+>strdup</GTKDOCLINK
+>() function, <A
+HREF="libxml-parser.html#XMLSTRDUP"
+>xmlStrdup</A
+>() is usually preferred</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23024"
+NAME="AEN23826"
 ></A
 ><P
 ></P
@@ -1463,7 +1488,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  pointer to the existing string</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1474,7 +1499,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23033"
+NAME="AEN23835"
 ></A
 ><H3
 ><A
@@ -1509,7 +1534,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23041"
+NAME="AEN23843"
 ></A
 ><P
 ></P
@@ -1581,7 +1606,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23058"
+NAME="AEN23860"
 ></A
 ><H3
 ><A
@@ -1617,7 +1642,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23066"
+NAME="AEN23868"
 ></A
 ><P
 ></P
@@ -1706,7 +1731,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23087"
+NAME="AEN23889"
 ></A
 ><H3
 ><A
@@ -1738,7 +1763,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23094"
+NAME="AEN23896"
 ></A
 ><P
 ></P

diff --git a/doc/html/libxml-xpath.html b/doc/html/libxml-xpath.html
index a397787..dddb21e 100644
--- a/doc/html/libxml-xpath.html
+++ b/doc/html/libxml-xpath.html

@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN11249"
+NAME="AEN11427"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN11252"
+NAME="AEN11430"
 ></A
 ><H2
 >Synopsis</H2
@@ -255,14 +255,27 @@
 HREF="libxml-xpath.html#XMLXPATHCOMPEXPRPTR"
 >xmlXPathCompExprPtr</A
 >;
-void        (<A
+<GTKDOCLINK
+HREF="TYPEDEF"
+>typedef</GTKDOCLINK
+>     <A
 HREF="libxml-xpath.html#XMLXPATHFUNCTION"
->*xmlXPathFunction</A
->)             (<A
-HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
->xmlXPathParserContextPtr</A
-> ctxt,
-                                             int nargs);
+>xmlXPathFunction</A
+>                ();
+int         <A
+HREF="libxml-xpath.html#XMLXPATHISNAN"
+>xmlXPathIsNaN</A
+>                   (<GTKDOCLINK
+HREF="DOUBLE"
+>double</GTKDOCLINK
+> val);
+int         <A
+HREF="libxml-xpath.html#XMLXPATHISINF"
+>xmlXPathIsInf</A
+>                   (<GTKDOCLINK
+HREF="DOUBLE"
+>double</GTKDOCLINK
+> val);
 #define     <A
 HREF="libxml-xpath.html#XMLXPATHNODESETGETLENGTH"
 >xmlXPathNodeSetGetLength</A
@@ -577,7 +590,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN11374"
+NAME="AEN11556"
 ></A
 ><H2
 >Description</H2
@@ -587,14 +600,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN11377"
+NAME="AEN11559"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11379"
+NAME="AEN11561"
 ></A
 ><H3
 ><A
@@ -655,17 +668,35 @@
     /* The function name and URI when calling a function */
     const xmlChar *function;
     const xmlChar *functionURI;
+
+    /* function lookup function and data */
+    void *funcLookupFunc;		/* function lookup func */
+    void *funcLookupData;		/* function lookup data */
+
+    /* temporary namespace lists kept for walking the namespace axis */
+    xmlNsPtr *tmpNsList;		/* Array of namespaces */
+    int tmpNsNr;			/* number of namespace in scope */
 };</PRE
 ></TD
 ></TR
 ></TABLE
 ><P
+>Expression evaluation occurs with respect to a context.
+he context consists of:
+- a node (the context node) 
+- a node list (the context node list) 
+- a set of variable bindings 
+- a function library 
+- the set of namespace declarations in scope for the expression 
+Following the switch to hash tables, this need to be trimmed up at
+the next binary incompatible release.</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11384"
+NAME="AEN11567"
 ></A
 ><H3
 ><A
@@ -691,7 +722,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11389"
+NAME="AEN11572"
 ></A
 ><H3
 ><A
@@ -727,12 +758,15 @@
 ></TR
 ></TABLE
 ><P
+>An XPath parser context, it contains pure parsing informations,
+an xmlXPathContext, and the stack of objects.</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11394"
+NAME="AEN11578"
 ></A
 ><H3
 ><A
@@ -758,7 +792,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11399"
+NAME="AEN11583"
 ></A
 ><H3
 ><A
@@ -807,7 +841,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11404"
+NAME="AEN11588"
 ></A
 ><H3
 ><A
@@ -837,7 +871,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11409"
+NAME="AEN11593"
 ></A
 ><H3
 ><A
@@ -863,7 +897,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11414"
+NAME="AEN11598"
 ></A
 ><H3
 ><A
@@ -900,7 +934,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11419"
+NAME="AEN11603"
 ></A
 ><H3
 ><A
@@ -936,7 +970,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11424"
+NAME="AEN11608"
 ></A
 ><H3
 ><A
@@ -962,7 +996,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11429"
+NAME="AEN11613"
 ></A
 ><H3
 ><A
@@ -991,7 +1025,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11435"
+NAME="AEN11619"
 ></A
 ><P
 ></P
@@ -1061,7 +1095,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11452"
+NAME="AEN11636"
 ></A
 ><H3
 ><A
@@ -1090,7 +1124,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11457"
+NAME="AEN11641"
 ></A
 ><H3
 ><A
@@ -1116,7 +1150,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11462"
+NAME="AEN11646"
 ></A
 ><H3
 ><A
@@ -1145,7 +1179,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11467"
+NAME="AEN11651"
 ></A
 ><H3
 ><A
@@ -1171,7 +1205,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11472"
+NAME="AEN11656"
 ></A
 ><H3
 ><A
@@ -1196,11 +1230,13 @@
 ></TR
 ></TABLE
 ><P
+>an XPath evaluation function, the parameters are on thei XPath context stack</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11478"
+NAME="AEN11663"
 ></A
 ><P
 ></P
@@ -1227,7 +1263,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> an XPath parser context</TD
 ></TR
 ><TR
 ><TD
@@ -1244,7 +1280,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> the number of arguments passed to the function</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1255,7 +1291,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11491"
+NAME="AEN11676"
 ></A
 ><H3
 ><A
@@ -1284,7 +1320,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11496"
+NAME="AEN11681"
 ></A
 ><H3
 ><A
@@ -1310,7 +1346,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11501"
+NAME="AEN11686"
 ></A
 ><H3
 ><A
@@ -1345,7 +1381,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11509"
+NAME="AEN11694"
 ></A
 ><P
 ></P
@@ -1415,7 +1451,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11526"
+NAME="AEN11711"
 ></A
 ><H3
 ><A
@@ -1444,7 +1480,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11531"
+NAME="AEN11716"
 ></A
 ><H3
 ><A
@@ -1470,7 +1506,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11536"
+NAME="AEN11721"
 ></A
 ><H3
 ><A
@@ -1502,7 +1538,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11543"
+NAME="AEN11728"
 ></A
 ><H3
 ><A
@@ -1528,7 +1564,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11548"
+NAME="AEN11733"
 ></A
 ><H3
 ><A
@@ -1544,20 +1580,94 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->void        (*xmlXPathFunction)             (<A
-HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
->xmlXPathParserContextPtr</A
-> ctxt,
-                                             int nargs);</PRE
+><GTKDOCLINK
+HREF="TYPEDEF"
+>typedef</GTKDOCLINK
+>     xmlXPathFunction                ();</PRE
 ></TD
 ></TR
 ></TABLE
 ><P
+>An XPath function
+The arguments (if any) are popped out of the context stack
+and the result is pushed on the stack.</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11554"
+NAME="AEN11740"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN11749"
+></A
+><H3
+><A
+NAME="XMLXPATHISNAN"
+></A
+>xmlXPathIsNaN ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlXPathIsNaN                   (<GTKDOCLINK
+HREF="DOUBLE"
+>double</GTKDOCLINK
+> val);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Provides a portable <GTKDOCLINK
+HREF="ISNAN"
+>isnan</GTKDOCLINK
+>() function to detect whether a double
+is a NotaNumber. Based on trio code
+http://sourceforge.net/projects/ctrio/</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN11757"
 ></A
 ><P
 ></P
@@ -1577,31 +1687,29 @@
 ><TT
 CLASS="PARAMETER"
 ><I
->ctxt</I
+>val</I
 ></TT
 >&nbsp;:</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a double value</TD
 ></TR
 ><TR
 ><TD
 WIDTH="20%"
 ALIGN="RIGHT"
 VALIGN="TOP"
-><TT
-CLASS="PARAMETER"
 ><I
->nargs</I
-></TT
->&nbsp;:</TD
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
 ><TD
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>1 if the value is a NaN, 0 otherwise</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1612,7 +1720,95 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11567"
+NAME="AEN11770"
+></A
+><H3
+><A
+NAME="XMLXPATHISINF"
+></A
+>xmlXPathIsInf ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlXPathIsInf                   (<GTKDOCLINK
+HREF="DOUBLE"
+>double</GTKDOCLINK
+> val);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Provides a portable <GTKDOCLINK
+HREF="ISINF"
+>isinf</GTKDOCLINK
+>() function to detect whether a double
+is a +Infinite or -Infinite. Based on trio code
+http://sourceforge.net/projects/ctrio/</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN11778"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>val</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  a double value</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>1 vi the value is +Infinite, -1 if -Infinite, 0 otherwise</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN11791"
 ></A
 ><H3
 ><A
@@ -1633,11 +1829,13 @@
 ></TR
 ></TABLE
 ><P
+>Implement a functionnality similar to the DOM NodeList.length</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11572"
+NAME="AEN11797"
 ></A
 ><P
 ></P
@@ -1664,7 +1862,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a node-set</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1675,7 +1873,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11581"
+NAME="AEN11806"
 ></A
 ><H3
 ><A
@@ -1696,11 +1894,16 @@
 ></TR
 ></TABLE
 ><P
+>Implements a functionnality similar to the DOM NodeList.<GTKDOCLINK
+HREF="ITEM"
+>item</GTKDOCLINK
+>()</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11586"
+NAME="AEN11813"
 ></A
 ><P
 ></P
@@ -1727,7 +1930,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a node-set</TD
 ></TR
 ><TR
 ><TD
@@ -1744,7 +1947,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  index of a node in the set</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1755,7 +1958,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11599"
+NAME="AEN11826"
 ></A
 ><H3
 ><A
@@ -1776,11 +1979,18 @@
 ></TR
 ></TABLE
 ><P
+>Checks whether <TT
+CLASS="PARAMETER"
+><I
+>ns</I
+></TT
+> is empty or not</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11604"
+NAME="AEN11833"
 ></A
 ><P
 ></P
@@ -1807,7 +2017,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> a node-set</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1818,7 +2028,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11613"
+NAME="AEN11842"
 ></A
 ><H3
 ><A
@@ -1848,7 +2058,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11620"
+NAME="AEN11849"
 ></A
 ><P
 ></P
@@ -1886,7 +2096,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11629"
+NAME="AEN11858"
 ></A
 ><H3
 ><A
@@ -1924,7 +2134,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11638"
+NAME="AEN11867"
 ></A
 ><P
 ></P
@@ -1977,7 +2187,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11651"
+NAME="AEN11880"
 ></A
 ><H3
 ><A
@@ -2016,7 +2226,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11660"
+NAME="AEN11889"
 ></A
 ><P
 ></P
@@ -2054,7 +2264,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11669"
+NAME="AEN11898"
 ></A
 ><H3
 ><A
@@ -2084,7 +2294,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11676"
+NAME="AEN11905"
 ></A
 ><P
 ></P
@@ -2122,7 +2332,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11685"
+NAME="AEN11914"
 ></A
 ><H3
 ><A
@@ -2155,7 +2365,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11693"
+NAME="AEN11922"
 ></A
 ><P
 ></P
@@ -2208,7 +2418,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11706"
+NAME="AEN11935"
 ></A
 ><H3
 ><A
@@ -2242,7 +2452,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11714"
+NAME="AEN11943"
 ></A
 ><P
 ></P
@@ -2313,7 +2523,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11731"
+NAME="AEN11960"
 ></A
 ><H3
 ><A
@@ -2343,7 +2553,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11738"
+NAME="AEN11967"
 ></A
 ><P
 ></P
@@ -2396,7 +2606,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11751"
+NAME="AEN11980"
 ></A
 ><H3
 ><A
@@ -2426,7 +2636,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11758"
+NAME="AEN11987"
 ></A
 ><P
 ></P
@@ -2479,7 +2689,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11771"
+NAME="AEN12000"
 ></A
 ><H3
 ><A
@@ -2509,7 +2719,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11778"
+NAME="AEN12007"
 ></A
 ><P
 ></P
@@ -2562,7 +2772,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11791"
+NAME="AEN12020"
 ></A
 ><H3
 ><A
@@ -2592,7 +2802,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11798"
+NAME="AEN12027"
 ></A
 ><P
 ></P
@@ -2645,7 +2855,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11811"
+NAME="AEN12040"
 ></A
 ><H3
 ><A
@@ -2675,7 +2885,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11818"
+NAME="AEN12047"
 ></A
 ><P
 ></P
@@ -2728,7 +2938,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11831"
+NAME="AEN12060"
 ></A
 ><H3
 ><A
@@ -2761,7 +2971,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11839"
+NAME="AEN12068"
 ></A
 ><P
 ></P
@@ -2814,7 +3024,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11852"
+NAME="AEN12081"
 ></A
 ><H3
 ><A
@@ -2847,7 +3057,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11860"
+NAME="AEN12089"
 ></A
 ><P
 ></P
@@ -2900,7 +3110,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11873"
+NAME="AEN12102"
 ></A
 ><H3
 ><A
@@ -2933,7 +3143,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11881"
+NAME="AEN12110"
 ></A
 ><P
 ></P
@@ -2986,7 +3196,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11894"
+NAME="AEN12123"
 ></A
 ><H3
 ><A
@@ -3019,7 +3229,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11902"
+NAME="AEN12131"
 ></A
 ><P
 ></P
@@ -3072,7 +3282,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11915"
+NAME="AEN12144"
 ></A
 ><H3
 ><A
@@ -3102,7 +3312,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11922"
+NAME="AEN12151"
 ></A
 ><P
 ></P
@@ -3155,7 +3365,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11935"
+NAME="AEN12164"
 ></A
 ><H3
 ><A
@@ -3188,7 +3398,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11943"
+NAME="AEN12172"
 ></A
 ><P
 ></P
@@ -3241,7 +3451,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11956"
+NAME="AEN12185"
 ></A
 ><H3
 ><A
@@ -3274,7 +3484,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11964"
+NAME="AEN12193"
 ></A
 ><P
 ></P
@@ -3327,7 +3537,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11977"
+NAME="AEN12206"
 ></A
 ><H3
 ><A
@@ -3360,7 +3570,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11985"
+NAME="AEN12214"
 ></A
 ><P
 ></P
@@ -3413,7 +3623,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11998"
+NAME="AEN12227"
 ></A
 ><H3
 ><A
@@ -3449,7 +3659,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12007"
+NAME="AEN12236"
 ></A
 ><P
 ></P
@@ -3504,7 +3714,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12020"
+NAME="AEN12249"
 ></A
 ><H3
 ><A
@@ -3540,7 +3750,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12029"
+NAME="AEN12258"
 ></A
 ><P
 ></P
@@ -3599,7 +3809,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12043"
+NAME="AEN12272"
 ></A
 ><H3
 ><A
@@ -3635,7 +3845,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12052"
+NAME="AEN12281"
 ></A
 ><P
 ></P
@@ -3694,7 +3904,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12066"
+NAME="AEN12295"
 ></A
 ><H3
 ><A
@@ -3730,7 +3940,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12075"
+NAME="AEN12304"
 ></A
 ><P
 ></P
@@ -3789,7 +3999,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12089"
+NAME="AEN12318"
 ></A
 ><H3
 ><A
@@ -3817,7 +4027,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12095"
+NAME="AEN12324"
 ></A
 ><H3
 ><A
@@ -3850,7 +4060,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12103"
+NAME="AEN12332"
 ></A
 ><P
 ></P
@@ -3903,7 +4113,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12116"
+NAME="AEN12345"
 ></A
 ><H3
 ><A
@@ -3933,7 +4143,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12123"
+NAME="AEN12352"
 ></A
 ><P
 ></P
@@ -3971,7 +4181,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12132"
+NAME="AEN12361"
 ></A
 ><H3
 ><A
@@ -4008,7 +4218,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12141"
+NAME="AEN12370"
 ></A
 ><P
 ></P
@@ -4079,7 +4289,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12158"
+NAME="AEN12387"
 ></A
 ><H3
 ><A
@@ -4116,7 +4326,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12167"
+NAME="AEN12396"
 ></A
 ><P
 ></P
@@ -4187,7 +4397,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12184"
+NAME="AEN12413"
 ></A
 ><H3
 ><A
@@ -4230,7 +4440,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12193"
+NAME="AEN12422"
 ></A
 ><P
 ></P
@@ -4300,7 +4510,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12210"
+NAME="AEN12439"
 ></A
 ><H3
 ><A
@@ -4333,7 +4543,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12218"
+NAME="AEN12447"
 ></A
 ><P
 ></P
@@ -4387,7 +4597,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12231"
+NAME="AEN12460"
 ></A
 ><H3
 ><A
@@ -4424,7 +4634,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12240"
+NAME="AEN12469"
 ></A
 ><P
 ></P
@@ -4495,7 +4705,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12257"
+NAME="AEN12486"
 ></A
 ><H3
 ><A
@@ -4530,7 +4740,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12265"
+NAME="AEN12494"
 ></A
 ><P
 ></P

diff --git a/doc/html/libxml-xpathinternals.html b/doc/html/libxml-xpathinternals.html
index 544b54c..588c301 100644
--- a/doc/html/libxml-xpathinternals.html
+++ b/doc/html/libxml-xpathinternals.html

@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN12279"
+NAME="AEN12508"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN12282"
+NAME="AEN12511"
 ></A
 ><H2
 >Synopsis</H2
@@ -329,6 +329,25 @@
 >xmlXPathVariableLookupFunc</A
 > f,
                                              void *varCtxt);
+<GTKDOCLINK
+HREF="TYPEDEF"
+>typedef</GTKDOCLINK
+>     <A
+HREF="libxml-xpath.html#XMLXPATHFUNCTION"
+>xmlXPathFunction</A
+>                ();
+void        <A
+HREF="libxml-xpathinternals.html#XMLXPATHREGISTERFUNCLOOKUP"
+>xmlXPathRegisterFuncLookup</A
+>      (<A
+HREF="libxml-xpath.html#XMLXPATHCONTEXTPTR"
+>xmlXPathContextPtr</A
+> ctxt,
+                                             <GTKDOCLINK
+HREF="XMLXPATHFUNCLOOKUPFUNC"
+>xmlXPathFuncLookupFunc</GTKDOCLINK
+> f,
+                                             void *funcCtxt);
 void        <A
 HREF="libxml-xpath.html#XMLXPATHERROR"
 >xmlXPatherror</A
@@ -363,6 +382,17 @@
 >xmlXPathCompExprPtr</A
 > comp,
                                              int depth);
+int         <A
+HREF="libxml-xpathinternals.html#XMLXPATHNODESETCONTAINS"
+>xmlXPathNodeSetContains</A
+>         (<A
+HREF="libxml-xpath.html#XMLNODESETPTR"
+>xmlNodeSetPtr</A
+> cur,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> val);
 <A
 HREF="libxml-xpath.html#XMLNODESETPTR"
 >xmlNodeSetPtr</A
@@ -1496,7 +1526,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN12653"
+NAME="AEN12890"
 ></A
 ><H2
 >Description</H2
@@ -1506,14 +1536,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN12656"
+NAME="AEN12893"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12658"
+NAME="AEN12895"
 ></A
 ><H3
 ><A
@@ -1534,11 +1564,13 @@
 ></TR
 ></TABLE
 ><P
+>Raises an error.</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12663"
+NAME="AEN12901"
 ></A
 ><P
 ></P
@@ -1565,7 +1597,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XPath parser context</TD
 ></TR
 ><TR
 ><TD
@@ -1582,7 +1614,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an xmlXPathError code</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1593,7 +1625,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12676"
+NAME="AEN12914"
 ></A
 ><H3
 ><A
@@ -1614,11 +1646,13 @@
 ></TR
 ></TABLE
 ><P
+>Raises an XPATH_INVALID_ARITY error</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12681"
+NAME="AEN12920"
 ></A
 ><P
 ></P
@@ -1645,7 +1679,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XPath parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1656,7 +1690,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12690"
+NAME="AEN12929"
 ></A
 ><H3
 ><A
@@ -1677,11 +1711,13 @@
 ></TR
 ></TABLE
 ><P
+>Raises an XPATH_INVALID_TYPE error</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12695"
+NAME="AEN12935"
 ></A
 ><P
 ></P
@@ -1708,7 +1744,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XPath parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1719,7 +1755,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12704"
+NAME="AEN12944"
 ></A
 ><H3
 ><A
@@ -1740,11 +1776,13 @@
 ></TR
 ></TABLE
 ><P
+>Get the error code of an XPath context</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12709"
+NAME="AEN12950"
 ></A
 ><P
 ></P
@@ -1771,7 +1809,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XPath parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1782,7 +1820,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12718"
+NAME="AEN12959"
 ></A
 ><H3
 ><A
@@ -1803,11 +1841,13 @@
 ></TR
 ></TABLE
 ><P
+>Check if an XPath error was raised</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12723"
+NAME="AEN12965"
 ></A
 ><P
 ></P
@@ -1834,7 +1874,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XPath parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1845,7 +1885,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12732"
+NAME="AEN12974"
 ></A
 ><H3
 ><A
@@ -1866,11 +1906,13 @@
 ></TR
 ></TABLE
 ><P
+>Get the document of an XPath context</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12737"
+NAME="AEN12980"
 ></A
 ><P
 ></P
@@ -1897,7 +1939,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XPath parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1908,7 +1950,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12746"
+NAME="AEN12989"
 ></A
 ><H3
 ><A
@@ -1929,11 +1971,13 @@
 ></TR
 ></TABLE
 ><P
+>Get the context node of an XPath context</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12751"
+NAME="AEN12995"
 ></A
 ><P
 ></P
@@ -1960,7 +2004,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> an XPath parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -1971,7 +2015,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12760"
+NAME="AEN13004"
 ></A
 ><H3
 ><A
@@ -2005,7 +2049,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12768"
+NAME="AEN13012"
 ></A
 ><P
 ></P
@@ -2058,7 +2102,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12781"
+NAME="AEN13025"
 ></A
 ><H3
 ><A
@@ -2095,7 +2139,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12790"
+NAME="AEN13034"
 ></A
 ><P
 ></P
@@ -2148,7 +2192,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12803"
+NAME="AEN13047"
 ></A
 ><H3
 ><A
@@ -2185,7 +2229,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12812"
+NAME="AEN13056"
 ></A
 ><P
 ></P
@@ -2238,7 +2282,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12825"
+NAME="AEN13069"
 ></A
 ><H3
 ><A
@@ -2275,7 +2319,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12834"
+NAME="AEN13078"
 ></A
 ><P
 ></P
@@ -2328,7 +2372,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12847"
+NAME="AEN13091"
 ></A
 ><H3
 ><A
@@ -2362,7 +2406,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12855"
+NAME="AEN13099"
 ></A
 ><P
 ></P
@@ -2400,7 +2444,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12864"
+NAME="AEN13108"
 ></A
 ><H3
 ><A
@@ -2421,11 +2465,18 @@
 ></TR
 ></TABLE
 ><P
+>Pushes the boolean <TT
+CLASS="PARAMETER"
+><I
+>val</I
+></TT
+> on the context stack</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12869"
+NAME="AEN13115"
 ></A
 ><P
 ></P
@@ -2452,7 +2503,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XPath parser context</TD
 ></TR
 ><TR
 ><TD
@@ -2469,7 +2520,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a boolean</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2480,7 +2531,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12882"
+NAME="AEN13128"
 ></A
 ><H3
 ><A
@@ -2501,11 +2552,13 @@
 ></TR
 ></TABLE
 ><P
+>Pushes true on the context stack</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12887"
+NAME="AEN13134"
 ></A
 ><P
 ></P
@@ -2532,7 +2585,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XPath parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2543,7 +2596,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12896"
+NAME="AEN13143"
 ></A
 ><H3
 ><A
@@ -2564,11 +2617,13 @@
 ></TR
 ></TABLE
 ><P
+>Pushes false on the context stack</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12901"
+NAME="AEN13149"
 ></A
 ><P
 ></P
@@ -2595,7 +2650,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XPath parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2606,7 +2661,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12910"
+NAME="AEN13158"
 ></A
 ><H3
 ><A
@@ -2627,11 +2682,18 @@
 ></TR
 ></TABLE
 ><P
+>Pushes the double <TT
+CLASS="PARAMETER"
+><I
+>val</I
+></TT
+> on the context stack</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12915"
+NAME="AEN13165"
 ></A
 ><P
 ></P
@@ -2658,7 +2720,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XPath parser context</TD
 ></TR
 ><TR
 ><TD
@@ -2675,7 +2737,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a double</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2686,7 +2748,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12928"
+NAME="AEN13178"
 ></A
 ><H3
 ><A
@@ -2707,11 +2769,18 @@
 ></TR
 ></TABLE
 ><P
+>Pushes the string <TT
+CLASS="PARAMETER"
+><I
+>str</I
+></TT
+> on the context stack</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12933"
+NAME="AEN13185"
 ></A
 ><P
 ></P
@@ -2738,7 +2807,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XPath parser context</TD
 ></TR
 ><TR
 ><TD
@@ -2755,7 +2824,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a string</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2766,7 +2835,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12946"
+NAME="AEN13198"
 ></A
 ><H3
 ><A
@@ -2787,11 +2856,13 @@
 ></TR
 ></TABLE
 ><P
+>Pushes an empty string on the stack</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12951"
+NAME="AEN13204"
 ></A
 ><P
 ></P
@@ -2818,7 +2889,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XPath parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2829,7 +2900,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12960"
+NAME="AEN13213"
 ></A
 ><H3
 ><A
@@ -2850,11 +2921,18 @@
 ></TR
 ></TABLE
 ><P
+>Pushes the node-set <TT
+CLASS="PARAMETER"
+><I
+>ns</I
+></TT
+> on the context stack</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12965"
+NAME="AEN13220"
 ></A
 ><P
 ></P
@@ -2881,7 +2959,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XPath parser context</TD
 ></TR
 ><TR
 ><TD
@@ -2898,7 +2976,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a node-set</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -2909,7 +2987,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12978"
+NAME="AEN13233"
 ></A
 ><H3
 ><A
@@ -2930,11 +3008,13 @@
 ></TR
 ></TABLE
 ><P
+>Pushes an empty node-set on the context stack</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12983"
+NAME="AEN13239"
 ></A
 ><P
 ></P
@@ -2961,7 +3041,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XPath parser context</TD
 ></TR
 ><TR
 ><TD
@@ -2989,7 +3069,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12996"
+NAME="AEN13252"
 ></A
 ><H3
 ><A
@@ -3010,11 +3090,13 @@
 ></TR
 ></TABLE
 ><P
+>Pushes user data on the context stack</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13001"
+NAME="AEN13258"
 ></A
 ><P
 ></P
@@ -3041,7 +3123,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  an XPath parser context</TD
 ></TR
 ><TR
 ><TD
@@ -3058,7 +3140,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  user data</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3069,7 +3151,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13014"
+NAME="AEN13271"
 ></A
 ><H3
 ><A
@@ -3090,11 +3172,14 @@
 ></TR
 ></TABLE
 ><P
+>Check if the current value on the XPath stack is a node set or
+an XSLT value tree</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13019"
+NAME="AEN13277"
 ></A
 ><P
 ></P
@@ -3121,7 +3206,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+> an XPath parser context</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3132,7 +3217,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13028"
+NAME="AEN13286"
 ></A
 ><H3
 ><A
@@ -3153,11 +3238,13 @@
 ></TR
 ></TABLE
 ><P
+>Empties a node-set</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13033"
+NAME="AEN13292"
 ></A
 ><P
 ></P
@@ -3184,7 +3271,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  a node-set</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3195,7 +3282,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13042"
+NAME="AEN13301"
 ></A
 ><H3
 ><A
@@ -3216,12 +3303,14 @@
 ></TR
 ></TABLE
 ><P
+>macro to return from the function if an XPath error was detected</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13047"
+NAME="AEN13307"
 ></A
 ><H3
 ><A
@@ -3242,12 +3331,14 @@
 ></TR
 ></TABLE
 ><P
+>macro to return 0 from the function if an XPath error was detected</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13052"
+NAME="AEN13313"
 ></A
 ><H3
 ><A
@@ -3268,11 +3359,13 @@
 ></TR
 ></TABLE
 ><P
+>Macro to raise an XPath error and return</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13057"
+NAME="AEN13319"
 ></A
 ><P
 ></P
@@ -3299,7 +3392,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the error code</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3310,7 +3403,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13066"
+NAME="AEN13328"
 ></A
 ><H3
 ><A
@@ -3331,11 +3424,13 @@
 ></TR
 ></TABLE
 ><P
+>Macro to raise an XPath error and return 0</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13071"
+NAME="AEN13334"
 ></A
 ><P
 ></P
@@ -3362,7 +3457,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the error code</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3373,7 +3468,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13080"
+NAME="AEN13343"
 ></A
 ><H3
 ><A
@@ -3394,11 +3489,14 @@
 ></TR
 ></TABLE
 ><P
+>Macro to check that the value on top of the XPath stack is of a given
+type.</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13085"
+NAME="AEN13349"
 ></A
 ><P
 ></P
@@ -3425,7 +3523,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath type</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3436,7 +3534,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13094"
+NAME="AEN13358"
 ></A
 ><H3
 ><A
@@ -3457,11 +3555,14 @@
 ></TR
 ></TABLE
 ><P
+>Macro to check that the value on top of the XPath stack is of a given
+type. return(0) in case of failure</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13099"
+NAME="AEN13364"
 ></A
 ><P
 ></P
@@ -3488,7 +3589,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the XPath type</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3499,7 +3600,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13108"
+NAME="AEN13373"
 ></A
 ><H3
 ><A
@@ -3520,11 +3621,13 @@
 ></TR
 ></TABLE
 ><P
+>Macro to check that the number of args passed to an XPath function matches</P
+><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13113"
+NAME="AEN13379"
 ></A
 ><P
 ></P
@@ -3551,7 +3654,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->&nbsp;</TD
+>  the number of expected args</TD
 ></TR
 ></TBODY
 ></TABLE
@@ -3562,7 +3665,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13122"
+NAME="AEN13388"
 ></A
 ><H3
 ><A
@@ -3583,12 +3686,14 @@
 ></TR
 ></TABLE
 ><P
+>Macro to try to cast the value on the top of the XPath stack to a string</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13127"
+NAME="AEN13394"
 ></A
 ><H3
 ><A
@@ -3609,12 +3714,14 @@
 ></TR
 ></TABLE
 ><P
+>Macro to try to cast the value on the top of the XPath stack to a number</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13132"
+NAME="AEN13400"
 ></A
 ><H3
 ><A
@@ -3635,12 +3742,14 @@
 ></TR
 ></TABLE
 ><P
+>Macro to try to cast the value on the top of the XPath stack to a boolean</P
+><P
 ></P
 ></DIV
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13137"
+NAME="AEN13406"
 ></A
 ><H3
 ><A
@@ -3677,7 +3786,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13145"
+NAME="AEN13414"
 ></A
 ><P
 ></P
@@ -3764,7 +3873,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13166"
+NAME="AEN13435"
 ></A
 ><H3
 ><A
@@ -3799,7 +3908,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13174"
+NAME="AEN13443"
 ></A
 ><P
 ></P
@@ -3871,7 +3980,182 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13191"
+NAME="AEN13460"
+></A
+><H3
+><A
+NAME="XMLXPATHFUNCTION"
+></A
+>xmlXPathFunction ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><GTKDOCLINK
+HREF="TYPEDEF"
+>typedef</GTKDOCLINK
+>     xmlXPathFunction                ();</PRE
+></TD
+></TR
+></TABLE
+><P
+>An XPath function
+The arguments (if any) are popped out of the context stack
+and the result is pushed on the stack.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN13467"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN13476"
+></A
+><H3
+><A
+NAME="XMLXPATHREGISTERFUNCLOOKUP"
+></A
+>xmlXPathRegisterFuncLookup ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlXPathRegisterFuncLookup      (<A
+HREF="libxml-xpath.html#XMLXPATHCONTEXTPTR"
+>xmlXPathContextPtr</A
+> ctxt,
+                                             <GTKDOCLINK
+HREF="XMLXPATHFUNCLOOKUPFUNC"
+>xmlXPathFuncLookupFunc</GTKDOCLINK
+> f,
+                                             void *funcCtxt);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Registers an external mecanism to do function lookup.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN13484"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>ctxt</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the XPath context</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>f</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the lookup function</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>funcCtxt</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN13501"
 ></A
 ><H3
 ><A
@@ -3904,7 +4188,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13198"
+NAME="AEN13508"
 ></A
 ><P
 ></P
@@ -3993,7 +4277,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13219"
+NAME="AEN13529"
 ></A
 ><H3
 ><A
@@ -4028,7 +4312,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13227"
+NAME="AEN13537"
 ></A
 ><P
 ></P
@@ -4100,7 +4384,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13244"
+NAME="AEN13554"
 ></A
 ><H3
 ><A
@@ -4135,7 +4419,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13252"
+NAME="AEN13562"
 ></A
 ><P
 ></P
@@ -4207,7 +4491,131 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13269"
+NAME="AEN13579"
+></A
+><H3
+><A
+NAME="XMLXPATHNODESETCONTAINS"
+></A
+>xmlXPathNodeSetContains ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlXPathNodeSetContains         (<A
+HREF="libxml-xpath.html#XMLNODESETPTR"
+>xmlNodeSetPtr</A
+> cur,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> val);</PRE
+></TD
+></TR
+></TABLE
+><P
+>checks whether <TT
+CLASS="PARAMETER"
+><I
+>cur</I
+></TT
+> contains <TT
+CLASS="PARAMETER"
+><I
+>val</I
+></TT
+></P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN13589"
+></A
+><P
+></P
+><TABLE
+BORDER="0"
+WIDTH="100%"
+BGCOLOR="#FFD0D0"
+CELLSPACING="0"
+CELLPADDING="4"
+CLASS="CALSTABLE"
+><TBODY
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>cur</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the node-set</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>val</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the node</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>true (1) if <TT
+CLASS="PARAMETER"
+><I
+>cur</I
+></TT
+> contains <TT
+CLASS="PARAMETER"
+><I
+>val</I
+></TT
+>, false (0) otherwise</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN13608"
 ></A
 ><H3
 ><A
@@ -4248,7 +4656,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13279"
+NAME="AEN13618"
 ></A
 ><P
 ></P
@@ -4319,7 +4727,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13296"
+NAME="AEN13635"
 ></A
 ><H3
 ><A
@@ -4360,7 +4768,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13306"
+NAME="AEN13645"
 ></A
 ><P
 ></P
@@ -4431,7 +4839,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13323"
+NAME="AEN13662"
 ></A
 ><H3
 ><A
@@ -4468,7 +4876,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13332"
+NAME="AEN13671"
 ></A
 ><P
 ></P
@@ -4532,7 +4940,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13347"
+NAME="AEN13686"
 ></A
 ><H3
 ><A
@@ -4579,7 +4987,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13358"
+NAME="AEN13697"
 ></A
 ><P
 ></P
@@ -4643,7 +5051,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13373"
+NAME="AEN13712"
 ></A
 ><H3
 ><A
@@ -4678,7 +5086,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13381"
+NAME="AEN13720"
 ></A
 ><P
 ></P
@@ -4759,7 +5167,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13400"
+NAME="AEN13739"
 ></A
 ><H3
 ><A
@@ -4800,7 +5208,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13410"
+NAME="AEN13749"
 ></A
 ><P
 ></P
@@ -4902,7 +5310,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13433"
+NAME="AEN13772"
 ></A
 ><H3
 ><A
@@ -4943,7 +5351,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13443"
+NAME="AEN13782"
 ></A
 ><P
 ></P
@@ -5045,7 +5453,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13466"
+NAME="AEN13805"
 ></A
 ><H3
 ><A
@@ -5096,7 +5504,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13478"
+NAME="AEN13817"
 ></A
 ><P
 ></P
@@ -5198,7 +5606,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13501"
+NAME="AEN13840"
 ></A
 ><H3
 ><A
@@ -5254,7 +5662,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13514"
+NAME="AEN13853"
 ></A
 ><P
 ></P
@@ -5356,7 +5764,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13537"
+NAME="AEN13876"
 ></A
 ><H3
 ><A
@@ -5397,7 +5805,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13547"
+NAME="AEN13886"
 ></A
 ><P
 ></P
@@ -5499,7 +5907,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13570"
+NAME="AEN13909"
 ></A
 ><H3
 ><A
@@ -5540,7 +5948,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13580"
+NAME="AEN13919"
 ></A
 ><P
 ></P
@@ -5642,7 +6050,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13603"
+NAME="AEN13942"
 ></A
 ><H3
 ><A
@@ -5693,7 +6101,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13615"
+NAME="AEN13954"
 ></A
 ><P
 ></P
@@ -5795,7 +6203,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13638"
+NAME="AEN13977"
 ></A
 ><H3
 ><A
@@ -5851,7 +6259,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13651"
+NAME="AEN13990"
 ></A
 ><P
 ></P
@@ -5953,7 +6361,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13674"
+NAME="AEN14013"
 ></A
 ><H3
 ><A
@@ -5997,7 +6405,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13684"
+NAME="AEN14023"
 ></A
 ><P
 ></P
@@ -6084,7 +6492,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13705"
+NAME="AEN14044"
 ></A
 ><H3
 ><A
@@ -6122,7 +6530,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13714"
+NAME="AEN14053"
 ></A
 ><P
 ></P
@@ -6192,7 +6600,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13731"
+NAME="AEN14070"
 ></A
 ><H3
 ><A
@@ -6222,7 +6630,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13738"
+NAME="AEN14077"
 ></A
 ><P
 ></P
@@ -6260,7 +6668,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13747"
+NAME="AEN14086"
 ></A
 ><H3
 ><A
@@ -6303,7 +6711,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13757"
+NAME="AEN14096"
 ></A
 ><P
 ></P
@@ -6390,7 +6798,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13778"
+NAME="AEN14117"
 ></A
 ><H3
 ><A
@@ -6437,7 +6845,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13789"
+NAME="AEN14128"
 ></A
 ><P
 ></P
@@ -6541,7 +6949,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13814"
+NAME="AEN14153"
 ></A
 ><H3
 ><A
@@ -6585,7 +6993,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13824"
+NAME="AEN14163"
 ></A
 ><P
 ></P
@@ -6672,7 +7080,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13845"
+NAME="AEN14184"
 ></A
 ><H3
 ><A
@@ -6720,7 +7128,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13856"
+NAME="AEN14195"
 ></A
 ><P
 ></P
@@ -6824,7 +7232,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13881"
+NAME="AEN14220"
 ></A
 ><H3
 ><A
@@ -6862,7 +7270,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13890"
+NAME="AEN14229"
 ></A
 ><P
 ></P
@@ -6932,7 +7340,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13907"
+NAME="AEN14246"
 ></A
 ><H3
 ><A
@@ -6974,7 +7382,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13917"
+NAME="AEN14256"
 ></A
 ><P
 ></P
@@ -7061,7 +7469,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13938"
+NAME="AEN14277"
 ></A
 ><H3
 ><A
@@ -7091,7 +7499,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13945"
+NAME="AEN14284"
 ></A
 ><P
 ></P
@@ -7129,7 +7537,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13954"
+NAME="AEN14293"
 ></A
 ><H3
 ><A
@@ -7167,7 +7575,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13963"
+NAME="AEN14302"
 ></A
 ><P
 ></P
@@ -7237,7 +7645,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13980"
+NAME="AEN14319"
 ></A
 ><H3
 ><A
@@ -7279,7 +7687,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13990"
+NAME="AEN14329"
 ></A
 ><P
 ></P
@@ -7366,7 +7774,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14011"
+NAME="AEN14350"
 ></A
 ><H3
 ><A
@@ -7397,7 +7805,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14018"
+NAME="AEN14357"
 ></A
 ><P
 ></P
@@ -7435,7 +7843,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14027"
+NAME="AEN14366"
 ></A
 ><H3
 ><A
@@ -7473,7 +7881,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14036"
+NAME="AEN14375"
 ></A
 ><P
 ></P
@@ -7543,7 +7951,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14053"
+NAME="AEN14392"
 ></A
 ><H3
 ><A
@@ -7573,7 +7981,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14060"
+NAME="AEN14399"
 ></A
 ><P
 ></P
@@ -7611,7 +8019,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14069"
+NAME="AEN14408"
 ></A
 ><H3
 ><A
@@ -7644,7 +8052,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14077"
+NAME="AEN14416"
 ></A
 ><P
 ></P
@@ -7697,7 +8105,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14090"
+NAME="AEN14429"
 ></A
 ><H3
 ><A
@@ -7731,7 +8139,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14098"
+NAME="AEN14437"
 ></A
 ><P
 ></P
@@ -7801,7 +8209,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14115"
+NAME="AEN14454"
 ></A
 ><H3
 ><A
@@ -7839,7 +8247,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14124"
+NAME="AEN14463"
 ></A
 ><P
 ></P
@@ -7892,7 +8300,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14137"
+NAME="AEN14476"
 ></A
 ><H3
 ><A
@@ -7927,7 +8335,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14145"
+NAME="AEN14484"
 ></A
 ><P
 ></P
@@ -7980,7 +8388,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14158"
+NAME="AEN14497"
 ></A
 ><H3
 ><A
@@ -8018,7 +8426,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14167"
+NAME="AEN14506"
 ></A
 ><P
 ></P
@@ -8071,7 +8479,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14180"
+NAME="AEN14519"
 ></A
 ><H3
 ><A
@@ -8101,7 +8509,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14187"
+NAME="AEN14526"
 ></A
 ><P
 ></P
@@ -8154,7 +8562,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14200"
+NAME="AEN14539"
 ></A
 ><H3
 ><A
@@ -8192,7 +8600,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14209"
+NAME="AEN14548"
 ></A
 ><P
 ></P
@@ -8245,7 +8653,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14222"
+NAME="AEN14561"
 ></A
 ><H3
 ><A
@@ -8280,7 +8688,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14230"
+NAME="AEN14569"
 ></A
 ><P
 ></P
@@ -8333,7 +8741,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14243"
+NAME="AEN14582"
 ></A
 ><H3
 ><A
@@ -8372,7 +8780,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14252"
+NAME="AEN14591"
 ></A
 ><P
 ></P
@@ -8425,7 +8833,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14265"
+NAME="AEN14604"
 ></A
 ><H3
 ><A
@@ -8464,7 +8872,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14274"
+NAME="AEN14613"
 ></A
 ><P
 ></P
@@ -8517,7 +8925,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14287"
+NAME="AEN14626"
 ></A
 ><H3
 ><A
@@ -8551,7 +8959,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14295"
+NAME="AEN14634"
 ></A
 ><P
 ></P
@@ -8606,7 +9014,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14308"
+NAME="AEN14647"
 ></A
 ><H3
 ><A
@@ -8641,7 +9049,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14316"
+NAME="AEN14655"
 ></A
 ><P
 ></P
@@ -8696,7 +9104,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14329"
+NAME="AEN14668"
 ></A
 ><H3
 ><A
@@ -8726,7 +9134,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14336"
+NAME="AEN14675"
 ></A
 ><P
 ></P
@@ -8764,7 +9172,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14345"
+NAME="AEN14684"
 ></A
 ><H3
 ><A
@@ -8809,7 +9217,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14353"
+NAME="AEN14692"
 ></A
 ><P
 ></P
@@ -8864,7 +9272,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14366"
+NAME="AEN14705"
 ></A
 ><H3
 ><A
@@ -8894,7 +9302,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14373"
+NAME="AEN14712"
 ></A
 ><P
 ></P
@@ -8932,7 +9340,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14382"
+NAME="AEN14721"
 ></A
 ><H3
 ><A
@@ -8963,7 +9371,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14389"
+NAME="AEN14728"
 ></A
 ><P
 ></P
@@ -9001,7 +9409,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14398"
+NAME="AEN14737"
 ></A
 ><H3
 ><A
@@ -9039,7 +9447,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14408"
+NAME="AEN14747"
 ></A
 ><P
 ></P
@@ -9092,7 +9500,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14421"
+NAME="AEN14760"
 ></A
 ><H3
 ><A
@@ -9130,7 +9538,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14431"
+NAME="AEN14770"
 ></A
 ><P
 ></P
@@ -9183,7 +9591,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14444"
+NAME="AEN14783"
 ></A
 ><H3
 ><A
@@ -9224,7 +9632,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14454"
+NAME="AEN14793"
 ></A
 ><P
 ></P
@@ -9277,7 +9685,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14467"
+NAME="AEN14806"
 ></A
 ><H3
 ><A
@@ -9320,7 +9728,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14476"
+NAME="AEN14815"
 ></A
 ><P
 ></P
@@ -9390,7 +9798,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14493"
+NAME="AEN14832"
 ></A
 ><H3
 ><A
@@ -9418,7 +9826,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14499"
+NAME="AEN14838"
 ></A
 ><H3
 ><A
@@ -9481,7 +9889,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14508"
+NAME="AEN14847"
 ></A
 ><P
 ></P
@@ -9536,7 +9944,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14521"
+NAME="AEN14860"
 ></A
 ><H3
 ><A
@@ -9566,7 +9974,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14528"
+NAME="AEN14867"
 ></A
 ><P
 ></P
@@ -9604,7 +10012,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14537"
+NAME="AEN14876"
 ></A
 ><H3
 ><A
@@ -9642,7 +10050,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14546"
+NAME="AEN14885"
 ></A
 ><P
 ></P
@@ -9695,7 +10103,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14559"
+NAME="AEN14898"
 ></A
 ><H3
 ><A
@@ -9753,7 +10161,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14572"
+NAME="AEN14911"
 ></A
 ><P
 ></P
@@ -9823,7 +10231,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14589"
+NAME="AEN14928"
 ></A
 ><H3
 ><A
@@ -9857,7 +10265,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14597"
+NAME="AEN14936"
 ></A
 ><P
 ></P
@@ -9912,7 +10320,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14610"
+NAME="AEN14949"
 ></A
 ><H3
 ><A
@@ -9943,7 +10351,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14617"
+NAME="AEN14956"
 ></A
 ><P
 ></P
@@ -9998,7 +10406,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14630"
+NAME="AEN14969"
 ></A
 ><H3
 ><A
@@ -10028,7 +10436,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14637"
+NAME="AEN14976"
 ></A
 ><P
 ></P
@@ -10066,7 +10474,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14646"
+NAME="AEN14985"
 ></A
 ><H3
 ><A
@@ -10105,7 +10513,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14655"
+NAME="AEN14994"
 ></A
 ><P
 ></P
@@ -10158,7 +10566,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14668"
+NAME="AEN15007"
 ></A
 ><H3
 ><A
@@ -10196,7 +10604,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14677"
+NAME="AEN15016"
 ></A
 ><P
 ></P
@@ -10249,7 +10657,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14690"
+NAME="AEN15029"
 ></A
 ><H3
 ><A
@@ -10284,7 +10692,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14698"
+NAME="AEN15037"
 ></A
 ><P
 ></P
@@ -10337,7 +10745,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14711"
+NAME="AEN15050"
 ></A
 ><H3
 ><A
@@ -10376,7 +10784,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14720"
+NAME="AEN15059"
 ></A
 ><P
 ></P
@@ -10414,7 +10822,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14729"
+NAME="AEN15068"
 ></A
 ><H3
 ><A
@@ -10444,7 +10852,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14736"
+NAME="AEN15075"
 ></A
 ><P
 ></P
@@ -10482,7 +10890,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14745"
+NAME="AEN15084"
 ></A
 ><H3
 ><A
@@ -10515,7 +10923,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14753"
+NAME="AEN15092"
 ></A
 ><P
 ></P
@@ -10568,7 +10976,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14766"
+NAME="AEN15105"
 ></A
 ><H3
 ><A
@@ -10598,7 +11006,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14773"
+NAME="AEN15112"
 ></A
 ><P
 ></P
@@ -10636,7 +11044,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14782"
+NAME="AEN15121"
 ></A
 ><H3
 ><A
@@ -10676,7 +11084,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14791"
+NAME="AEN15130"
 ></A
 ><P
 ></P
@@ -10729,7 +11137,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14804"
+NAME="AEN15143"
 ></A
 ><H3
 ><A
@@ -10815,7 +11223,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14820"
+NAME="AEN15159"
 ></A
 ><P
 ></P
@@ -10902,7 +11310,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14841"
+NAME="AEN15180"
 ></A
 ><H3
 ><A
@@ -10934,7 +11342,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14848"
+NAME="AEN15187"
 ></A
 ><P
 ></P
@@ -10972,7 +11380,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14857"
+NAME="AEN15196"
 ></A
 ><H3
 ><A
@@ -11004,7 +11412,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14864"
+NAME="AEN15203"
 ></A
 ><P
 ></P
@@ -11042,7 +11450,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14873"
+NAME="AEN15212"
 ></A
 ><H3
 ><A
@@ -11074,7 +11482,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14880"
+NAME="AEN15219"
 ></A
 ><P
 ></P
@@ -11112,7 +11520,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14889"
+NAME="AEN15228"
 ></A
 ><H3
 ><A
@@ -11144,7 +11552,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14896"
+NAME="AEN15235"
 ></A
 ><P
 ></P
@@ -11182,7 +11590,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14905"
+NAME="AEN15244"
 ></A
 ><H3
 ><A
@@ -11224,7 +11632,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14914"
+NAME="AEN15253"
 ></A
 ><P
 ></P
@@ -11262,7 +11670,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14923"
+NAME="AEN15262"
 ></A
 ><H3
 ><A
@@ -11304,7 +11712,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14932"
+NAME="AEN15271"
 ></A
 ><P
 ></P
@@ -11342,7 +11750,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14941"
+NAME="AEN15280"
 ></A
 ><H3
 ><A
@@ -11377,7 +11785,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14949"
+NAME="AEN15288"
 ></A
 ><P
 ></P
@@ -11430,7 +11838,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14962"
+NAME="AEN15301"
 ></A
 ><H3
 ><A
@@ -11468,7 +11876,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14971"
+NAME="AEN15310"
 ></A
 ><P
 ></P
@@ -11538,7 +11946,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14988"
+NAME="AEN15327"
 ></A
 ><H3
 ><A
@@ -11576,7 +11984,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14997"
+NAME="AEN15336"
 ></A
 ><P
 ></P
@@ -11646,7 +12054,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15014"
+NAME="AEN15353"
 ></A
 ><H3
 ><A
@@ -11685,7 +12093,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15023"
+NAME="AEN15362"
 ></A
 ><P
 ></P
@@ -11755,7 +12163,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15040"
+NAME="AEN15379"
 ></A
 ><H3
 ><A
@@ -11796,7 +12204,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15049"
+NAME="AEN15388"
 ></A
 ><P
 ></P
@@ -11866,7 +12274,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15066"
+NAME="AEN15405"
 ></A
 ><H3
 ><A
@@ -11904,7 +12312,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15075"
+NAME="AEN15414"
 ></A
 ><P
 ></P
@@ -11974,7 +12382,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15092"
+NAME="AEN15431"
 ></A
 ><H3
 ><A
@@ -12015,7 +12423,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15101"
+NAME="AEN15440"
 ></A
 ><P
 ></P
@@ -12085,7 +12493,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15118"
+NAME="AEN15457"
 ></A
 ><H3
 ><A
@@ -12124,7 +12532,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15127"
+NAME="AEN15466"
 ></A
 ><P
 ></P
@@ -12194,7 +12602,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15144"
+NAME="AEN15483"
 ></A
 ><H3
 ><A
@@ -12235,7 +12643,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15153"
+NAME="AEN15492"
 ></A
 ><P
 ></P
@@ -12305,7 +12713,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15170"
+NAME="AEN15509"
 ></A
 ><H3
 ><A
@@ -12345,7 +12753,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15179"
+NAME="AEN15518"
 ></A
 ><P
 ></P
@@ -12415,7 +12823,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15196"
+NAME="AEN15535"
 ></A
 ><H3
 ><A
@@ -12453,7 +12861,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15205"
+NAME="AEN15544"
 ></A
 ><P
 ></P
@@ -12523,7 +12931,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15222"
+NAME="AEN15561"
 ></A
 ><H3
 ><A
@@ -12564,7 +12972,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15231"
+NAME="AEN15570"
 ></A
 ><P
 ></P
@@ -12634,7 +13042,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15248"
+NAME="AEN15587"
 ></A
 ><H3
 ><A
@@ -12676,7 +13084,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15257"
+NAME="AEN15596"
 ></A
 ><P
 ></P
@@ -12746,7 +13154,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15274"
+NAME="AEN15613"
 ></A
 ><H3
 ><A
@@ -12786,7 +13194,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15283"
+NAME="AEN15622"
 ></A
 ><P
 ></P
@@ -12856,7 +13264,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15300"
+NAME="AEN15639"
 ></A
 ><H3
 ><A
@@ -12895,7 +13303,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15309"
+NAME="AEN15648"
 ></A
 ><P
 ></P
@@ -12950,7 +13358,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15322"
+NAME="AEN15661"
 ></A
 ><H3
 ><A
@@ -12994,7 +13402,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15332"
+NAME="AEN15671"
 ></A
 ><P
 ></P
@@ -13049,7 +13457,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15345"
+NAME="AEN15684"
 ></A
 ><H3
 ><A
@@ -13084,7 +13492,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15353"
+NAME="AEN15692"
 ></A
 ><P
 ></P
@@ -13139,7 +13547,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15366"
+NAME="AEN15705"
 ></A
 ><H3
 ><A
@@ -13179,7 +13587,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15374"
+NAME="AEN15713"
 ></A
 ><P
 ></P
@@ -13234,7 +13642,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15387"
+NAME="AEN15726"
 ></A
 ><H3
 ><A
@@ -13275,7 +13683,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15395"
+NAME="AEN15734"
 ></A
 ><P
 ></P
@@ -13330,7 +13738,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15408"
+NAME="AEN15747"
 ></A
 ><H3
 ><A
@@ -13369,7 +13777,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15416"
+NAME="AEN15755"
 ></A
 ><P
 ></P
@@ -13424,7 +13832,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15429"
+NAME="AEN15768"
 ></A
 ><H3
 ><A
@@ -13460,7 +13868,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15437"
+NAME="AEN15776"
 ></A
 ><P
 ></P
@@ -13515,7 +13923,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15450"
+NAME="AEN15789"
 ></A
 ><H3
 ><A
@@ -13552,7 +13960,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15458"
+NAME="AEN15797"
 ></A
 ><P
 ></P
@@ -13607,7 +14015,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15471"
+NAME="AEN15810"
 ></A
 ><H3
 ><A
@@ -13644,7 +14052,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15479"
+NAME="AEN15818"
 ></A
 ><P
 ></P
@@ -13699,7 +14107,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15492"
+NAME="AEN15831"
 ></A
 ><H3
 ><A
@@ -13754,7 +14162,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15500"
+NAME="AEN15839"
 ></A
 ><P
 ></P
@@ -13809,7 +14217,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15513"
+NAME="AEN15852"
 ></A
 ><H3
 ><A
@@ -13849,7 +14257,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15521"
+NAME="AEN15860"
 ></A
 ><P
 ></P
@@ -13904,7 +14312,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15534"
+NAME="AEN15873"
 ></A
 ><H3
 ><A
@@ -13945,7 +14353,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15542"
+NAME="AEN15881"
 ></A
 ><P
 ></P
@@ -14000,7 +14408,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15555"
+NAME="AEN15894"
 ></A
 ><H3
 ><A
@@ -14041,7 +14449,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15563"
+NAME="AEN15902"
 ></A
 ><P
 ></P
@@ -14096,7 +14504,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15576"
+NAME="AEN15915"
 ></A
 ><H3
 ><A
@@ -14140,7 +14548,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15584"
+NAME="AEN15923"
 ></A
 ><P
 ></P
@@ -14195,7 +14603,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15597"
+NAME="AEN15936"
 ></A
 ><H3
 ><A
@@ -14232,7 +14640,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15605"
+NAME="AEN15944"
 ></A
 ><P
 ></P
@@ -14287,7 +14695,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15618"
+NAME="AEN15957"
 ></A
 ><H3
 ><A
@@ -14325,7 +14733,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15627"
+NAME="AEN15966"
 ></A
 ><P
 ></P
@@ -14380,7 +14788,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15640"
+NAME="AEN15979"
 ></A
 ><H3
 ><A
@@ -14418,7 +14826,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15649"
+NAME="AEN15988"
 ></A
 ><P
 ></P
@@ -14473,7 +14881,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15662"
+NAME="AEN16001"
 ></A
 ><H3
 ><A
@@ -14516,7 +14924,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15670"
+NAME="AEN16009"
 ></A
 ><P
 ></P
@@ -14571,7 +14979,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15683"
+NAME="AEN16022"
 ></A
 ><H3
 ><A
@@ -14606,7 +15014,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15691"
+NAME="AEN16030"
 ></A
 ><P
 ></P
@@ -14661,7 +15069,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15704"
+NAME="AEN16043"
 ></A
 ><H3
 ><A
@@ -14698,7 +15106,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15712"
+NAME="AEN16051"
 ></A
 ><P
 ></P
@@ -14753,7 +15161,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15725"
+NAME="AEN16064"
 ></A
 ><H3
 ><A
@@ -14790,7 +15198,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15733"
+NAME="AEN16072"
 ></A
 ><P
 ></P
@@ -14845,7 +15253,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15746"
+NAME="AEN16085"
 ></A
 ><H3
 ><A
@@ -14882,7 +15290,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15754"
+NAME="AEN16093"
 ></A
 ><P
 ></P
@@ -14937,7 +15345,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15767"
+NAME="AEN16106"
 ></A
 ><H3
 ><A
@@ -14975,7 +15383,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15775"
+NAME="AEN16114"
 ></A
 ><P
 ></P
@@ -15030,7 +15438,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15788"
+NAME="AEN16127"
 ></A
 ><H3
 ><A
@@ -15070,7 +15478,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15796"
+NAME="AEN16135"
 ></A
 ><P
 ></P

diff --git a/doc/html/libxml-xpointer.html b/doc/html/libxml-xpointer.html
index 493df9d..15b2bea 100644
--- a/doc/html/libxml-xpointer.html
+++ b/doc/html/libxml-xpointer.html

@@ -122,7 +122,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN15814"
+NAME="AEN16153"
 ></A
 ><H2
 >Name</H2
@@ -130,7 +130,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN15817"
+NAME="AEN16156"
 ></A
 ><H2
 >Synopsis</H2
@@ -410,7 +410,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN15892"
+NAME="AEN16231"
 ></A
 ><H2
 >Description</H2
@@ -420,14 +420,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN15895"
+NAME="AEN16234"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15897"
+NAME="AEN16236"
 ></A
 ><H3
 ><A
@@ -457,7 +457,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15902"
+NAME="AEN16241"
 ></A
 ><H3
 ><A
@@ -483,7 +483,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15907"
+NAME="AEN16246"
 ></A
 ><H3
 ><A
@@ -521,7 +521,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15916"
+NAME="AEN16255"
 ></A
 ><P
 ></P
@@ -574,7 +574,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15929"
+NAME="AEN16268"
 ></A
 ><H3
 ><A
@@ -604,7 +604,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15936"
+NAME="AEN16275"
 ></A
 ><P
 ></P
@@ -642,7 +642,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15945"
+NAME="AEN16284"
 ></A
 ><H3
 ><A
@@ -689,7 +689,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15956"
+NAME="AEN16295"
 ></A
 ><P
 ></P
@@ -759,7 +759,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15973"
+NAME="AEN16312"
 ></A
 ><H3
 ><A
@@ -798,7 +798,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15982"
+NAME="AEN16321"
 ></A
 ><P
 ></P
@@ -902,7 +902,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16007"
+NAME="AEN16346"
 ></A
 ><H3
 ><A
@@ -939,7 +939,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16016"
+NAME="AEN16355"
 ></A
 ><P
 ></P
@@ -1009,7 +1009,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16033"
+NAME="AEN16372"
 ></A
 ><H3
 ><A
@@ -1046,7 +1046,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16042"
+NAME="AEN16381"
 ></A
 ><P
 ></P
@@ -1116,7 +1116,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16059"
+NAME="AEN16398"
 ></A
 ><H3
 ><A
@@ -1153,7 +1153,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16068"
+NAME="AEN16407"
 ></A
 ><P
 ></P
@@ -1223,7 +1223,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16085"
+NAME="AEN16424"
 ></A
 ><H3
 ><A
@@ -1260,7 +1260,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16094"
+NAME="AEN16433"
 ></A
 ><P
 ></P
@@ -1330,7 +1330,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16111"
+NAME="AEN16450"
 ></A
 ><H3
 ><A
@@ -1379,7 +1379,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16122"
+NAME="AEN16461"
 ></A
 ><P
 ></P
@@ -1449,7 +1449,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16139"
+NAME="AEN16478"
 ></A
 ><H3
 ><A
@@ -1489,7 +1489,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16148"
+NAME="AEN16487"
 ></A
 ><P
 ></P
@@ -1542,7 +1542,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16161"
+NAME="AEN16500"
 ></A
 ><H3
 ><A
@@ -1579,7 +1579,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16170"
+NAME="AEN16509"
 ></A
 ><P
 ></P
@@ -1649,7 +1649,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16187"
+NAME="AEN16526"
 ></A
 ><H3
 ><A
@@ -1682,7 +1682,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16195"
+NAME="AEN16534"
 ></A
 ><P
 ></P
@@ -1735,7 +1735,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16208"
+NAME="AEN16547"
 ></A
 ><H3
 ><A
@@ -1775,7 +1775,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16217"
+NAME="AEN16556"
 ></A
 ><P
 ></P
@@ -1830,7 +1830,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16230"
+NAME="AEN16569"
 ></A
 ><H3
 ><A
@@ -1868,7 +1868,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16239"
+NAME="AEN16578"
 ></A
 ><P
 ></P
@@ -1921,7 +1921,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16252"
+NAME="AEN16591"
 ></A
 ><H3
 ><A
@@ -1955,7 +1955,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16260"
+NAME="AEN16599"
 ></A
 ><P
 ></P
@@ -2010,7 +2010,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16273"
+NAME="AEN16612"
 ></A
 ><H3
 ><A
@@ -2041,7 +2041,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16280"
+NAME="AEN16619"
 ></A
 ><P
 ></P
@@ -2096,7 +2096,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16293"
+NAME="AEN16632"
 ></A
 ><H3
 ><A
@@ -2137,7 +2137,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16303"
+NAME="AEN16642"
 ></A
 ><P
 ></P
@@ -2225,7 +2225,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16324"
+NAME="AEN16663"
 ></A
 ><H3
 ><A
@@ -2262,7 +2262,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16333"
+NAME="AEN16672"
 ></A
 ><P
 ></P
@@ -2333,7 +2333,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16350"
+NAME="AEN16689"
 ></A
 ><H3
 ><A
@@ -2367,7 +2367,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16358"
+NAME="AEN16697"
 ></A
 ><P
 ></P
@@ -2422,7 +2422,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16371"
+NAME="AEN16710"
 ></A
 ><H3
 ><A
@@ -2456,7 +2456,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16379"
+NAME="AEN16718"
 ></A
 ><P
 ></P
@@ -2510,7 +2510,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16392"
+NAME="AEN16731"
 ></A
 ><H3
 ><A
@@ -2547,7 +2547,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16401"
+NAME="AEN16740"
 ></A
 ><P
 ></P

diff --git a/doc/xml.html b/doc/xml.html
index f0049e3..4990b14 100644
--- a/doc/xml.html
+++ b/doc/xml.html

@@ -56,6 +56,7 @@
   <li><a href="encoding.html">libxml Internationalization support</a></li>
   <li><a href="xmlio.html">libxml Input/Output interfaces</a></li>
   <li><a href="xmlmem.html">libxml Memory interfaces</a></li>
+  <li><a href="catalog.html">libxml Catalog support</a></li>
   <li><a href="xmldtd.html">a short introduction about DTDs and
   libxml</a></li>
   <li><a href="http://xmlsoft.org/XSLT/">the libxslt page</a></li>
@@ -160,7 +161,8 @@
     version</a>, and that the problem still shows up in those</li>
   <li>check the <a href="http://mail.gnome.org/archives/xml/">list
     archives</a> to see if the problem was reported already, in this case
-    there is probably a fix available, similary check the <a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml">registered
+    there is probably a fix available, similary check the <a
+    href="http://bugzilla.gnome.org/buglist.cgi?product=libxml">registered
     open bugs</a></li>
   <li>make sure you can reproduce the bug with xmllint or one of the test
     programs found in source in the distribution</li>
@@ -202,9 +204,9 @@
   <li>provide new documentations pieces (translations, examples, etc ...)</li>
   <li>Check the TODO file and try to close one of the items</li>
   <li>take one of the points raised in the archive or the bug database and
-    provide a fix. <a href="mailto:daniel@veillard.com">Get in touch with
-    me </a>before to avoid synchronization problems and check that the
-    suggested fix will fit in nicely :-)</li>
+    provide a fix. <a href="mailto:daniel@veillard.com">Get in touch with me
+    </a>before to avoid synchronization problems and check that the suggested
+    fix will fit in nicely :-)</li>
 </ol>
 
 <h2><a name="Downloads">Downloads</a></h2>
@@ -1670,6 +1672,6 @@
 
 <p><a href="mailto:daniel@veillard.com">Daniel Veillard</a></p>
 
-<p>$Id: xml.html,v 1.105 2001/08/15 13:12:39 veillard Exp $</p>
+<p>$Id: xml.html,v 1.106 2001/08/17 12:01:21 veillard Exp $</p>
 </body>
 </html>
commit	e7ead2d2379fa933b064e4a138a267313d40988e	[log] [tgz]
author	Daniel Veillard <veillard@src.gnome.org>	Wed Aug 22 23:44:09 2001 +0000
committer	Daniel Veillard <veillard@src.gnome.org>	Wed Aug 22 23:44:09 2001 +0000
tree	269c2c833822b2acbf2307bbc2a810b0f6ca0d27
parent	dc2cee29d094958139f409e30209f68953c9cb67 [diff]