diff --git a/ChangeLog b/ChangeLog
index c84fd18..a3bc6c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Oct 30 13:33:13 CET 2001 Daniel Veillard <daniel@veillard.com>
+
+	* configure.in: preparing 2.4.7
+	* Makefile.am doc/Makefile.am: switched to the latest xmllint
+	  manual page from John
+	* doc/*: updated the doc and rebuilt the generated pages
+
 Tue Oct 30 11:31:19 CET 2001 Daniel Veillard <daniel@veillard.com>
 
 	* xmlIO.c: closing bug #62711, the library should never
diff --git a/Makefile.am b/Makefile.am
index 36dcce5..98aea6e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,7 +34,7 @@
 DEPS = $(top_builddir)/libxml2.la
 LDADDS = $(top_builddir)/libxml2.la @THREAD_LIBS@ @Z_LIBS@ $(ICONV_LIBS) -lm
 
-man_MANS = xmllint.1 xml2-config.1 libxml.4
+man_MANS = xml2-config.1 libxml.4
 
 m4datadir = $(datadir)/aclocal
 m4data_DATA = libxml.m4
diff --git a/configure.in b/configure.in
index 39d36ce..34b8014 100644
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@
 
 LIBXML_MAJOR_VERSION=2
 LIBXML_MINOR_VERSION=4
-LIBXML_MICRO_VERSION=6
+LIBXML_MICRO_VERSION=7
 LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION
 LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION
 
diff --git a/doc/DOM.html b/doc/DOM.html
index 2189d07..46e4b6d 100644
--- a/doc/DOM.html
+++ b/doc/DOM.html
@@ -49,6 +49,7 @@
 <li><a href="entities.html">Entities or no entities</a></li>
 <li><a href="namespaces.html">Namespaces</a></li>
 <li><a href="upgrade.html">Upgrading 1.x code</a></li>
+<li><a href="threads.html">Thread safety</a></li>
 <li><a href="DOM.html">DOM Principles</a></li>
 <li><a href="example.html">A real example</a></li>
 <li><a href="contribs.html">Contributions</a></li>
diff --git a/doc/FAQ.html b/doc/FAQ.html
index c14c3d7..b3022bf 100644
--- a/doc/FAQ.html
+++ b/doc/FAQ.html
@@ -49,6 +49,7 @@
 <li><a href="entities.html">Entities or no entities</a></li>
 <li><a href="namespaces.html">Namespaces</a></li>
 <li><a href="upgrade.html">Upgrading 1.x code</a></li>
+<li><a href="threads.html">Thread safety</a></li>
 <li><a href="DOM.html">DOM Principles</a></li>
 <li><a href="example.html">A real example</a></li>
 <li><a href="contribs.html">Contributions</a></li>
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 650d0e0..fb3809e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -17,7 +17,7 @@
     interface.html intro.html library.html namespaces.html news.html \
     tree.html xmldtd.html XML.html XSLT.html
 
-man_MANS = xmlcatalog.1
+man_MANS = xmllint.1 xmlcatalog.1
 
 all: $(PAGES)
 
diff --git a/doc/XML.html b/doc/XML.html
index 5079d97..e2a7d3a 100644
--- a/doc/XML.html
+++ b/doc/XML.html
@@ -49,6 +49,7 @@
 <li><a href="entities.html">Entities or no entities</a></li>
 <li><a href="namespaces.html">Namespaces</a></li>
 <li><a href="upgrade.html">Upgrading 1.x code</a></li>
+<li><a href="threads.html">Thread safety</a></li>
 <li><a href="DOM.html">DOM Principles</a></li>
 <li><a href="example.html">A real example</a></li>
 <li><a href="contribs.html">Contributions</a></li>
diff --git a/doc/XSLT.html b/doc/XSLT.html
index ecbb023..4190280 100644
--- a/doc/XSLT.html
+++ b/doc/XSLT.html
@@ -49,6 +49,7 @@
 <li><a href="entities.html">Entities or no entities</a></li>
 <li><a href="namespaces.html">Namespaces</a></li>
 <li><a href="upgrade.html">Upgrading 1.x code</a></li>
+<li><a href="threads.html">Thread safety</a></li>
 <li><a href="DOM.html">DOM Principles</a></li>
 <li><a href="example.html">A real example</a></li>
 <li><a href="contribs.html">Contributions</a></li>
diff --git a/doc/architecture.html b/doc/architecture.html
index 2ebb033..ed9315a 100644
--- a/doc/architecture.html
+++ b/doc/architecture.html
@@ -49,6 +49,7 @@
 <li><a href="entities.html">Entities or no entities</a></li>
 <li><a href="namespaces.html">Namespaces</a></li>
 <li><a href="upgrade.html">Upgrading 1.x code</a></li>
+<li><a href="threads.html">Thread safety</a></li>
 <li><a href="DOM.html">DOM Principles</a></li>
 <li><a href="example.html">A real example</a></li>
 <li><a href="contribs.html">Contributions</a></li>
diff --git a/doc/bugs.html b/doc/bugs.html
index 447e318..f4c9268 100644
--- a/doc/bugs.html
+++ b/doc/bugs.html
@@ -49,6 +49,7 @@
 <li><a href="entities.html">Entities or no entities</a></li>
 <li><a href="namespaces.html">Namespaces</a></li>
 <li><a href="upgrade.html">Upgrading 1.x code</a></li>
+<li><a href="threads.html">Thread safety</a></li>
 <li><a href="DOM.html">DOM Principles</a></li>
 <li><a href="example.html">A real example</a></li>
 <li><a href="contribs.html">Contributions</a></li>
diff --git a/doc/catalog.html b/doc/catalog.html
index 6e98be1..e539bb1 100644
--- a/doc/catalog.html
+++ b/doc/catalog.html
@@ -49,6 +49,7 @@
 <li><a href="entities.html">Entities or no entities</a></li>
 <li><a href="namespaces.html">Namespaces</a></li>
 <li><a href="upgrade.html">Upgrading 1.x code</a></li>
+<li><a href="threads.html">Thread safety</a></li>
 <li><a href="DOM.html">DOM Principles</a></li>
 <li><a href="example.html">A real example</a></li>
 <li><a href="contribs.html">Contributions</a></li>
diff --git a/doc/contribs.html b/doc/contribs.html
index 174d836..20d1707 100644
--- a/doc/contribs.html
+++ b/doc/contribs.html
@@ -49,6 +49,7 @@
 <li><a href="entities.html">Entities or no entities</a></li>
 <li><a href="namespaces.html">Namespaces</a></li>
 <li><a href="upgrade.html">Upgrading 1.x code</a></li>
+<li><a href="threads.html">Thread safety</a></li>
 <li><a href="DOM.html">DOM Principles</a></li>
 <li><a href="example.html">A real example</a></li>
 <li><a href="contribs.html">Contributions</a></li>
diff --git a/doc/docs.html b/doc/docs.html
index a736ab6..998b6f4 100644
--- a/doc/docs.html
+++ b/doc/docs.html
@@ -49,6 +49,7 @@
 <li><a href="entities.html">Entities or no entities</a></li>
 <li><a href="namespaces.html">Namespaces</a></li>
 <li><a href="upgrade.html">Upgrading 1.x code</a></li>
+<li><a href="threads.html">Thread safety</a></li>
 <li><a href="DOM.html">DOM Principles</a></li>
 <li><a href="example.html">A real example</a></li>
 <li><a href="contribs.html">Contributions</a></li>
diff --git a/doc/downloads.html b/doc/downloads.html
index b5bf285..d1e5eeb 100644
--- a/doc/downloads.html
+++ b/doc/downloads.html
@@ -49,6 +49,7 @@
 <li><a href="entities.html">Entities or no entities</a></li>
 <li><a href="namespaces.html">Namespaces</a></li>
 <li><a href="upgrade.html">Upgrading 1.x code</a></li>
+<li><a href="threads.html">Thread safety</a></li>
 <li><a href="DOM.html">DOM Principles</a></li>
 <li><a href="example.html">A real example</a></li>
 <li><a href="contribs.html">Contributions</a></li>
diff --git a/doc/encoding.html b/doc/encoding.html
index fcc05a2..b51261f 100644
--- a/doc/encoding.html
+++ b/doc/encoding.html
@@ -49,6 +49,7 @@
 <li><a href="entities.html">Entities or no entities</a></li>
 <li><a href="namespaces.html">Namespaces</a></li>
 <li><a href="upgrade.html">Upgrading 1.x code</a></li>
+<li><a href="threads.html">Thread safety</a></li>
 <li><a href="DOM.html">DOM Principles</a></li>
 <li><a href="example.html">A real example</a></li>
 <li><a href="contribs.html">Contributions</a></li>
diff --git a/doc/entities.html b/doc/entities.html
index 7bc72ee..986857f 100644
--- a/doc/entities.html
+++ b/doc/entities.html
@@ -49,6 +49,7 @@
 <li><a href="entities.html">Entities or no entities</a></li>
 <li><a href="namespaces.html">Namespaces</a></li>
 <li><a href="upgrade.html">Upgrading 1.x code</a></li>
+<li><a href="threads.html">Thread safety</a></li>
 <li><a href="DOM.html">DOM Principles</a></li>
 <li><a href="example.html">A real example</a></li>
 <li><a href="contribs.html">Contributions</a></li>
diff --git a/doc/example.html b/doc/example.html
index ff49607..59e6f70 100644
--- a/doc/example.html
+++ b/doc/example.html
@@ -49,6 +49,7 @@
 <li><a href="entities.html">Entities or no entities</a></li>
 <li><a href="namespaces.html">Namespaces</a></li>
 <li><a href="upgrade.html">Upgrading 1.x code</a></li>
+<li><a href="threads.html">Thread safety</a></li>
 <li><a href="DOM.html">DOM Principles</a></li>
 <li><a href="example.html">A real example</a></li>
 <li><a href="contribs.html">Contributions</a></li>
diff --git a/doc/gnome-xml.sgml b/doc/gnome-xml.sgml
index a89de42..4eb0464 100644
--- a/doc/gnome-xml.sgml
+++ b/doc/gnome-xml.sgml
@@ -21,6 +21,10 @@
 <!entity nanohttp SYSTEM "sgml/nanohttp.sgml">
 <!entity nanoftp SYSTEM "sgml/nanoftp.sgml">
 <!entity valid SYSTEM "sgml/valid.sgml">
+<!entity hash SYSTEM "sgml/hash.sgml">
+<!entity threads SYSTEM "sgml/threads.sgml">
+<!entity globals SYSTEM "sgml/globals.sgml">
+<!entity global_functions SYSTEM "sgml/global_functions.sgml">
 ]>
 
 <book>
@@ -96,9 +100,13 @@
     &nanoftp;
     &xmlIO;
     &catalog;
+    &threads;
+    &globals;
+    &global_functions;
     &DOCBparser;
     &parserInternals;
     &encoding;
+    &hash;
     &debugXML;
     &xmlmemory;
   </chapter>
diff --git a/doc/help.html b/doc/help.html
index 191b2c1..4537502 100644
--- a/doc/help.html
+++ b/doc/help.html
@@ -49,6 +49,7 @@
 <li><a href="entities.html">Entities or no entities</a></li>
 <li><a href="namespaces.html">Namespaces</a></li>
 <li><a href="upgrade.html">Upgrading 1.x code</a></li>
+<li><a href="threads.html">Thread safety</a></li>
 <li><a href="DOM.html">DOM Principles</a></li>
 <li><a href="example.html">A real example</a></li>
 <li><a href="contribs.html">Contributions</a></li>
diff --git a/doc/html/book1.html b/doc/html/book1.html
index f0f78ef..7fbbcbc 100644
--- a/doc/html/book1.html
+++ b/doc/html/book1.html
@@ -209,6 +209,16 @@
 > &#8212; </DT
 ><DT
 ><A
+HREF="libxml-threads.html"
+>threads</A
+> &#8212; </DT
+><DT
+><A
+HREF="libxml-globals.html"
+>globals</A
+> &#8212; </DT
+><DT
+><A
 HREF="libxml-docbparser.html"
 >DOCBparser</A
 > &#8212; </DT
@@ -224,6 +234,11 @@
 > &#8212; </DT
 ><DT
 ><A
+HREF="libxml-hash.html"
+>hash</A
+> &#8212; </DT
+><DT
+><A
 HREF="libxml-debugxml.html"
 >debugXML</A
 > &#8212; </DT
diff --git a/doc/html/index.sgml b/doc/html/index.sgml
index 42c0a14..aff063b 100644
--- a/doc/html/index.sgml
+++ b/doc/html/index.sgml
@@ -150,10 +150,14 @@
 <ANCHOR id ="NAMESPACEDECL" href="libxml/libxml-sax.html#NAMESPACEDECL">
 <ANCHOR id ="COMMENT" href="libxml/libxml-sax.html#COMMENT">
 <ANCHOR id ="CDATABLOCK" href="libxml/libxml-sax.html#CDATABLOCK">
+<ANCHOR id ="INITXMLDEFAULTSAXHANDLER" href="libxml/libxml-sax.html#INITXMLDEFAULTSAXHANDLER">
+<ANCHOR id ="INITHTMLDEFAULTSAXHANDLER" href="libxml/libxml-sax.html#INITHTMLDEFAULTSAXHANDLER">
+<ANCHOR id ="INITDOCBDEFAULTSAXHANDLER" href="libxml/libxml-sax.html#INITDOCBDEFAULTSAXHANDLER">
 <ANCHOR id ="XMLDEFAULTSAXHANDLERINIT" href="libxml/libxml-sax.html#XMLDEFAULTSAXHANDLERINIT">
 <ANCHOR id ="HTMLDEFAULTSAXHANDLERINIT" href="libxml/libxml-sax.html#HTMLDEFAULTSAXHANDLERINIT">
 <ANCHOR id ="DOCBDEFAULTSAXHANDLERINIT" href="libxml/libxml-sax.html#DOCBDEFAULTSAXHANDLERINIT">
 <ANCHOR id ="LIBXML-TREE" href="libxml/libxml-tree.html">
+<ANCHOR id ="BASE-BUFFER-SIZE-CAPS" href="libxml/libxml-tree.html#BASE-BUFFER-SIZE-CAPS">
 <ANCHOR id ="XML-XML-NAMESPACE-CAPS" href="libxml/libxml-tree.html#XML-XML-NAMESPACE-CAPS">
 <ANCHOR id ="XMLELEMENTTYPE" href="libxml/libxml-tree.html#XMLELEMENTTYPE">
 <ANCHOR id ="XMLCHAR" href="libxml/libxml-tree.html#XMLCHAR">
@@ -427,6 +431,7 @@
 <ANCHOR id ="XMLPARSERERRORS" href="libxml/libxml-xmlerror.html#XMLPARSERERRORS">
 <ANCHOR id ="XMLGENERICERRORFUNC" href="libxml/libxml-xmlerror.html#XMLGENERICERRORFUNC">
 <ANCHOR id ="XMLSETGENERICERRORFUNC" href="libxml/libxml-xmlerror.html#XMLSETGENERICERRORFUNC">
+<ANCHOR id ="INITGENERICERRORDEFAULTFUNC" href="libxml/libxml-xmlerror.html#INITGENERICERRORDEFAULTFUNC">
 <ANCHOR id ="XMLPARSERERROR" href="libxml/libxml-xmlerror.html#XMLPARSERERROR">
 <ANCHOR id ="XMLPARSERWARNING" href="libxml/libxml-xmlerror.html#XMLPARSERWARNING">
 <ANCHOR id ="XMLPARSERVALIDITYERROR" href="libxml/libxml-xmlerror.html#XMLPARSERVALIDITYERROR">
@@ -775,6 +780,8 @@
 <ANCHOR id ="XMLOUTPUTCLOSECALLBACK" href="libxml/libxml-xmlio.html#XMLOUTPUTCLOSECALLBACK">
 <ANCHOR id ="XMLOUTPUTBUFFER" href="libxml/libxml-xmlio.html#XMLOUTPUTBUFFER">
 <ANCHOR id ="XMLOUTPUTBUFFERPTR" href="libxml/libxml-xmlio.html#XMLOUTPUTBUFFERPTR">
+<ANCHOR id ="XMLCLEANUPINPUTCALLBACKS" href="libxml/libxml-xmlio.html#XMLCLEANUPINPUTCALLBACKS">
+<ANCHOR id ="XMLCLEANUPOUTPUTCALLBACKS" href="libxml/libxml-xmlio.html#XMLCLEANUPOUTPUTCALLBACKS">
 <ANCHOR id ="XMLREGISTERDEFAULTINPUTCALLBACKS" href="libxml/libxml-xmlio.html#XMLREGISTERDEFAULTINPUTCALLBACKS">
 <ANCHOR id ="XMLALLOCPARSERINPUTBUFFER" href="libxml/libxml-xmlio.html#XMLALLOCPARSERINPUTBUFFER">
 <ANCHOR id ="XMLPARSERINPUTBUFFERCREATEFNAME" href="libxml/libxml-xmlio.html#XMLPARSERINPUTBUFFERCREATEFNAME">
@@ -811,9 +818,21 @@
 <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 ="XMLCATALOG" href="libxml/libxml-catalog.html#XMLCATALOG">
+<ANCHOR id ="XMLCATALOGPTR" href="libxml/libxml-catalog.html#XMLCATALOGPTR">
+<ANCHOR id ="XMLLOADACATALOG" href="libxml/libxml-catalog.html#XMLLOADACATALOG">
+<ANCHOR id ="XMLLOADSGMLSUPERCATALOG" href="libxml/libxml-catalog.html#XMLLOADSGMLSUPERCATALOG">
+<ANCHOR id ="XMLCONVERTSGMLCATALOG" href="libxml/libxml-catalog.html#XMLCONVERTSGMLCATALOG">
+<ANCHOR id ="XMLACATALOGADD" href="libxml/libxml-catalog.html#XMLACATALOGADD">
+<ANCHOR id ="XMLACATALOGREMOVE" href="libxml/libxml-catalog.html#XMLACATALOGREMOVE">
+<ANCHOR id ="XMLACATALOGRESOLVE" href="libxml/libxml-catalog.html#XMLACATALOGRESOLVE">
+<ANCHOR id ="XMLACATALOGRESOLVESYSTEM" href="libxml/libxml-catalog.html#XMLACATALOGRESOLVESYSTEM">
+<ANCHOR id ="XMLACATALOGRESOLVEPUBLIC" href="libxml/libxml-catalog.html#XMLACATALOGRESOLVEPUBLIC">
+<ANCHOR id ="XMLACATALOGRESOLVEURI" href="libxml/libxml-catalog.html#XMLACATALOGRESOLVEURI">
+<ANCHOR id ="XMLACATALOGDUMP" href="libxml/libxml-catalog.html#XMLACATALOGDUMP">
+<ANCHOR id ="XMLFREECATALOG" href="libxml/libxml-catalog.html#XMLFREECATALOG">
 <ANCHOR id ="XMLINITIALIZECATALOG" href="libxml/libxml-catalog.html#XMLINITIALIZECATALOG">
 <ANCHOR id ="XMLLOADCATALOG" href="libxml/libxml-catalog.html#XMLLOADCATALOG">
-<ANCHOR id ="XMLLOADSGMLSUPERCATALOG" href="libxml/libxml-catalog.html#XMLLOADSGMLSUPERCATALOG">
 <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">
@@ -835,6 +854,54 @@
 <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-THREADS" href="libxml/libxml-threads.html">
+<ANCHOR id ="XMLMUTEX" href="libxml/libxml-threads.html#XMLMUTEX">
+<ANCHOR id ="XMLMUTEXPTR" href="libxml/libxml-threads.html#XMLMUTEXPTR">
+<ANCHOR id ="XMLNEWMUTEX" href="libxml/libxml-threads.html#XMLNEWMUTEX">
+<ANCHOR id ="XMLMUTEXLOCK" href="libxml/libxml-threads.html#XMLMUTEXLOCK">
+<ANCHOR id ="XMLMUTEXUNLOCK" href="libxml/libxml-threads.html#XMLMUTEXUNLOCK">
+<ANCHOR id ="XMLFREEMUTEX" href="libxml/libxml-threads.html#XMLFREEMUTEX">
+<ANCHOR id ="XMLRMUTEX" href="libxml/libxml-threads.html#XMLRMUTEX">
+<ANCHOR id ="XMLRMUTEXPTR" href="libxml/libxml-threads.html#XMLRMUTEXPTR">
+<ANCHOR id ="XMLNEWRMUTEX" href="libxml/libxml-threads.html#XMLNEWRMUTEX">
+<ANCHOR id ="XMLRMUTEXLOCK" href="libxml/libxml-threads.html#XMLRMUTEXLOCK">
+<ANCHOR id ="XMLRMUTEXUNLOCK" href="libxml/libxml-threads.html#XMLRMUTEXUNLOCK">
+<ANCHOR id ="XMLFREERMUTEX" href="libxml/libxml-threads.html#XMLFREERMUTEX">
+<ANCHOR id ="XMLINITTHREADS" href="libxml/libxml-threads.html#XMLINITTHREADS">
+<ANCHOR id ="XMLLOCKLIBRARY" href="libxml/libxml-threads.html#XMLLOCKLIBRARY">
+<ANCHOR id ="XMLUNLOCKLIBRARY" href="libxml/libxml-threads.html#XMLUNLOCKLIBRARY">
+<ANCHOR id ="XMLGETTHREADID" href="libxml/libxml-threads.html#XMLGETTHREADID">
+<ANCHOR id ="XMLISMAINTHREAD" href="libxml/libxml-threads.html#XMLISMAINTHREAD">
+<ANCHOR id ="XMLCLEANUPTHREADS" href="libxml/libxml-threads.html#XMLCLEANUPTHREADS">
+<ANCHOR id ="XMLGETGLOBALSTATE" href="libxml/libxml-threads.html#XMLGETGLOBALSTATE">
+<ANCHOR id ="LIBXML-GLOBALS" href="libxml/libxml-globals.html">
+<ANCHOR id ="XMLGLOBALSTATE" href="libxml/libxml-globals.html#XMLGLOBALSTATE">
+<ANCHOR id ="XMLGLOBALSTATEPTR" href="libxml/libxml-globals.html#XMLGLOBALSTATEPTR">
+<ANCHOR id ="XMLINITIALIZEGLOBALSTATE" href="libxml/libxml-globals.html#XMLINITIALIZEGLOBALSTATE">
+<ANCHOR id ="XMLMALLOC" href="libxml/libxml-globals.html#XMLMALLOC">
+<ANCHOR id ="XMLREALLOC" href="libxml/libxml-globals.html#XMLREALLOC">
+<ANCHOR id ="XMLFREE" href="libxml/libxml-globals.html#XMLFREE">
+<ANCHOR id ="XMLMEMSTRDUP" href="libxml/libxml-globals.html#XMLMEMSTRDUP">
+<ANCHOR id ="DOCBDEFAULTSAXHANDLER" href="libxml/libxml-globals.html#DOCBDEFAULTSAXHANDLER">
+<ANCHOR id ="HTMLDEFAULTSAXHANDLER" href="libxml/libxml-globals.html#HTMLDEFAULTSAXHANDLER">
+<ANCHOR id ="OLDXMLWDCOMPATIBILITY" href="libxml/libxml-globals.html#OLDXMLWDCOMPATIBILITY">
+<ANCHOR id ="XMLBUFFERALLOCSCHEME" href="libxml/libxml-globals.html#XMLBUFFERALLOCSCHEME">
+<ANCHOR id ="XMLDEFAULTBUFFERSIZE" href="libxml/libxml-globals.html#XMLDEFAULTBUFFERSIZE">
+<ANCHOR id ="XMLDEFAULTSAXHANDLER" href="libxml/libxml-globals.html#XMLDEFAULTSAXHANDLER">
+<ANCHOR id ="XMLDEFAULTSAXLOCATOR" href="libxml/libxml-globals.html#XMLDEFAULTSAXLOCATOR">
+<ANCHOR id ="XMLDOVALIDITYCHECKINGDEFAULTVALUE" href="libxml/libxml-globals.html#XMLDOVALIDITYCHECKINGDEFAULTVALUE">
+<ANCHOR id ="XMLGENERICERROR" href="libxml/libxml-globals.html#XMLGENERICERROR">
+<ANCHOR id ="XMLGENERICERRORCONTEXT" href="libxml/libxml-globals.html#XMLGENERICERRORCONTEXT">
+<ANCHOR id ="XMLGETWARNINGSDEFAULTVALUE" href="libxml/libxml-globals.html#XMLGETWARNINGSDEFAULTVALUE">
+<ANCHOR id ="XMLINDENTTREEOUTPUT" href="libxml/libxml-globals.html#XMLINDENTTREEOUTPUT">
+<ANCHOR id ="XMLKEEPBLANKSDEFAULTVALUE" href="libxml/libxml-globals.html#XMLKEEPBLANKSDEFAULTVALUE">
+<ANCHOR id ="XMLLINENUMBERSDEFAULTVALUE" href="libxml/libxml-globals.html#XMLLINENUMBERSDEFAULTVALUE">
+<ANCHOR id ="XMLLOADEXTDTDDEFAULTVALUE" href="libxml/libxml-globals.html#XMLLOADEXTDTDDEFAULTVALUE">
+<ANCHOR id ="XMLPARSERDEBUGENTITIES" href="libxml/libxml-globals.html#XMLPARSERDEBUGENTITIES">
+<ANCHOR id ="XMLPARSERVERSION" href="libxml/libxml-globals.html#XMLPARSERVERSION">
+<ANCHOR id ="XMLPEDANTICPARSERDEFAULTVALUE" href="libxml/libxml-globals.html#XMLPEDANTICPARSERDEFAULTVALUE">
+<ANCHOR id ="XMLSAVENOEMPTYTAGS" href="libxml/libxml-globals.html#XMLSAVENOEMPTYTAGS">
+<ANCHOR id ="XMLSUBSTITUTEENTITIESDEFAULTVALUE" href="libxml/libxml-globals.html#XMLSUBSTITUTEENTITIESDEFAULTVALUE">
 <ANCHOR id ="LIBXML-DOCBPARSER" href="libxml/libxml-docbparser.html">
 <ANCHOR id ="DOCBPARSERCTXT" href="libxml/libxml-docbparser.html#DOCBPARSERCTXT">
 <ANCHOR id ="DOCBPARSERCTXTPTR" href="libxml/libxml-docbparser.html#DOCBPARSERCTXTPTR">
@@ -1002,6 +1069,33 @@
 <ANCHOR id ="XMLUTF8STRLOC" href="libxml/libxml-encoding.html#XMLUTF8STRLOC">
 <ANCHOR id ="XMLUTF8STRSUB" href="libxml/libxml-encoding.html#XMLUTF8STRSUB">
 <ANCHOR id ="XMLUTF8STRLEN" href="libxml/libxml-encoding.html#XMLUTF8STRLEN">
+<ANCHOR id ="LIBXML-HASH" href="libxml/libxml-hash.html">
+<ANCHOR id ="XMLHASHTABLE" href="libxml/libxml-hash.html#XMLHASHTABLE">
+<ANCHOR id ="XMLHASHTABLEPTR" href="libxml/libxml-hash.html#XMLHASHTABLEPTR">
+<ANCHOR id ="XMLHASHDEALLOCATOR" href="libxml/libxml-hash.html#XMLHASHDEALLOCATOR">
+<ANCHOR id ="XMLHASHCOPIER" href="libxml/libxml-hash.html#XMLHASHCOPIER">
+<ANCHOR id ="XMLHASHSCANNER" href="libxml/libxml-hash.html#XMLHASHSCANNER">
+<ANCHOR id ="XMLHASHSCANNERFULL" href="libxml/libxml-hash.html#XMLHASHSCANNERFULL">
+<ANCHOR id ="XMLHASHCREATE" href="libxml/libxml-hash.html#XMLHASHCREATE">
+<ANCHOR id ="XMLHASHFREE" href="libxml/libxml-hash.html#XMLHASHFREE">
+<ANCHOR id ="XMLHASHADDENTRY" href="libxml/libxml-hash.html#XMLHASHADDENTRY">
+<ANCHOR id ="XMLHASHUPDATEENTRY" href="libxml/libxml-hash.html#XMLHASHUPDATEENTRY">
+<ANCHOR id ="XMLHASHADDENTRY2" href="libxml/libxml-hash.html#XMLHASHADDENTRY2">
+<ANCHOR id ="XMLHASHUPDATEENTRY2" href="libxml/libxml-hash.html#XMLHASHUPDATEENTRY2">
+<ANCHOR id ="XMLHASHADDENTRY3" href="libxml/libxml-hash.html#XMLHASHADDENTRY3">
+<ANCHOR id ="XMLHASHUPDATEENTRY3" href="libxml/libxml-hash.html#XMLHASHUPDATEENTRY3">
+<ANCHOR id ="XMLHASHREMOVEENTRY" href="libxml/libxml-hash.html#XMLHASHREMOVEENTRY">
+<ANCHOR id ="XMLHASHREMOVEENTRY2" href="libxml/libxml-hash.html#XMLHASHREMOVEENTRY2">
+<ANCHOR id ="XMLHASHREMOVEENTRY3" href="libxml/libxml-hash.html#XMLHASHREMOVEENTRY3">
+<ANCHOR id ="XMLHASHLOOKUP" href="libxml/libxml-hash.html#XMLHASHLOOKUP">
+<ANCHOR id ="XMLHASHLOOKUP2" href="libxml/libxml-hash.html#XMLHASHLOOKUP2">
+<ANCHOR id ="XMLHASHLOOKUP3" href="libxml/libxml-hash.html#XMLHASHLOOKUP3">
+<ANCHOR id ="XMLHASHCOPY" href="libxml/libxml-hash.html#XMLHASHCOPY">
+<ANCHOR id ="XMLHASHSIZE" href="libxml/libxml-hash.html#XMLHASHSIZE">
+<ANCHOR id ="XMLHASHSCAN" href="libxml/libxml-hash.html#XMLHASHSCAN">
+<ANCHOR id ="XMLHASHSCAN3" href="libxml/libxml-hash.html#XMLHASHSCAN3">
+<ANCHOR id ="XMLHASHSCANFULL" href="libxml/libxml-hash.html#XMLHASHSCANFULL">
+<ANCHOR id ="XMLHASHSCANFULL3" href="libxml/libxml-hash.html#XMLHASHSCANFULL3">
 <ANCHOR id ="LIBXML-DEBUGXML" href="libxml/libxml-debugxml.html">
 <ANCHOR id ="XMLDEBUGDUMPSTRING" href="libxml/libxml-debugxml.html#XMLDEBUGDUMPSTRING">
 <ANCHOR id ="XMLDEBUGDUMPATTR" href="libxml/libxml-debugxml.html#XMLDEBUGDUMPATTR">
@@ -1013,10 +1107,27 @@
 <ANCHOR id ="XMLDEBUGDUMPDOCUMENT" href="libxml/libxml-debugxml.html#XMLDEBUGDUMPDOCUMENT">
 <ANCHOR id ="XMLDEBUGDUMPDTD" href="libxml/libxml-debugxml.html#XMLDEBUGDUMPDTD">
 <ANCHOR id ="XMLDEBUGDUMPENTITIES" href="libxml/libxml-debugxml.html#XMLDEBUGDUMPENTITIES">
+<ANCHOR id ="XMLLSONENODE" href="libxml/libxml-debugxml.html#XMLLSONENODE">
+<ANCHOR id ="XMLLSCOUNTNODE" href="libxml/libxml-debugxml.html#XMLLSCOUNTNODE">
+<ANCHOR id ="XMLBOOLTOTEXT" href="libxml/libxml-debugxml.html#XMLBOOLTOTEXT">
+<ANCHOR id ="XMLGETLINENO" href="libxml/libxml-debugxml.html#XMLGETLINENO">
 <ANCHOR id ="XMLSHELLREADLINEFUNC" href="libxml/libxml-debugxml.html#XMLSHELLREADLINEFUNC">
 <ANCHOR id ="XMLSHELLCTXT" href="libxml/libxml-debugxml.html#XMLSHELLCTXT">
 <ANCHOR id ="XMLSHELLCTXTPTR" href="libxml/libxml-debugxml.html#XMLSHELLCTXTPTR">
 <ANCHOR id ="XMLSHELLCMD" href="libxml/libxml-debugxml.html#XMLSHELLCMD">
+<ANCHOR id ="XMLSHELLPRINTXPATHERROR" href="libxml/libxml-debugxml.html#XMLSHELLPRINTXPATHERROR">
+<ANCHOR id ="XMLSHELLPRINTNODE" href="libxml/libxml-debugxml.html#XMLSHELLPRINTNODE">
+<ANCHOR id ="XMLSHELLPRINTXPATHRESULT" href="libxml/libxml-debugxml.html#XMLSHELLPRINTXPATHRESULT">
+<ANCHOR id ="XMLSHELLLIST" href="libxml/libxml-debugxml.html#XMLSHELLLIST">
+<ANCHOR id ="XMLSHELLBASE" href="libxml/libxml-debugxml.html#XMLSHELLBASE">
+<ANCHOR id ="XMLSHELLDIR" href="libxml/libxml-debugxml.html#XMLSHELLDIR">
+<ANCHOR id ="XMLSHELLCAT" href="libxml/libxml-debugxml.html#XMLSHELLCAT">
+<ANCHOR id ="XMLSHELLLOAD" href="libxml/libxml-debugxml.html#XMLSHELLLOAD">
+<ANCHOR id ="XMLSHELLWRITE" href="libxml/libxml-debugxml.html#XMLSHELLWRITE">
+<ANCHOR id ="XMLSHELLSAVE" href="libxml/libxml-debugxml.html#XMLSHELLSAVE">
+<ANCHOR id ="XMLSHELLVALIDATE" href="libxml/libxml-debugxml.html#XMLSHELLVALIDATE">
+<ANCHOR id ="XMLSHELLDU" href="libxml/libxml-debugxml.html#XMLSHELLDU">
+<ANCHOR id ="XMLSHELLPWD" href="libxml/libxml-debugxml.html#XMLSHELLPWD">
 <ANCHOR id ="XMLSHELL" href="libxml/libxml-debugxml.html#XMLSHELL">
 <ANCHOR id ="LIBXML-XMLMEMORY" href="libxml/libxml-xmlmemory.html">
 <ANCHOR id ="DEBUG-MEMORY-CAPS" href="libxml/libxml-xmlmemory.html#DEBUG-MEMORY-CAPS">
diff --git a/doc/html/libxml-catalog.html b/doc/html/libxml-catalog.html
index 787702b..3c14142 100644
--- a/doc/html/libxml-catalog.html
+++ b/doc/html/libxml-catalog.html
@@ -16,8 +16,8 @@
 TITLE="xmlIO"
 HREF="libxml-xmlio.html"><LINK
 REL="NEXT"
-TITLE="DOCBparser"
-HREF="libxml-docbparser.html"></HEAD
+TITLE="threads"
+HREF="libxml-threads.html"></HEAD
 ><BODY
 CLASS="REFENTRY"
 BGCOLOR="#FFFFFF"
@@ -103,7 +103,7 @@
 BGCOLOR="#C00000"
 ALIGN="right"
 ><A
-HREF="libxml-docbparser.html"
+HREF="libxml-threads.html"
 ><FONT
 COLOR="#FFFFFF"
 SIZE="3"
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN18741"
+NAME="AEN18833"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN18744"
+NAME="AEN18836"
 ></A
 ><H2
 >Synopsis</H2
@@ -162,6 +162,143 @@
 HREF="libxml-catalog.html#XMLCATALOGALLOW"
 >xmlCatalogAllow</A
 >;
+struct      <A
+HREF="libxml-catalog.html#XMLCATALOG"
+>xmlCatalog</A
+>;
+typedef     <A
+HREF="libxml-catalog.html#XMLCATALOGPTR"
+>xmlCatalogPtr</A
+>;
+<A
+HREF="libxml-catalog.html#XMLCATALOGPTR"
+>xmlCatalogPtr</A
+> <A
+HREF="libxml-catalog.html#XMLLOADACATALOG"
+>xmlLoadACatalog</A
+>               (const char *filename);
+<A
+HREF="libxml-catalog.html#XMLCATALOGPTR"
+>xmlCatalogPtr</A
+> <A
+HREF="libxml-catalog.html#XMLLOADSGMLSUPERCATALOG"
+>xmlLoadSGMLSuperCatalog</A
+>       (const char *filename);
+int         <A
+HREF="libxml-catalog.html#XMLCONVERTSGMLCATALOG"
+>xmlConvertSGMLCatalog</A
+>           (<A
+HREF="libxml-catalog.html#XMLCATALOGPTR"
+>xmlCatalogPtr</A
+> catal);
+int         <A
+HREF="libxml-catalog.html#XMLACATALOGADD"
+>xmlACatalogAdd</A
+>                  (<A
+HREF="libxml-catalog.html#XMLCATALOGPTR"
+>xmlCatalogPtr</A
+> catal,
+                                             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#XMLACATALOGREMOVE"
+>xmlACatalogRemove</A
+>               (<A
+HREF="libxml-catalog.html#XMLCATALOGPTR"
+>xmlCatalogPtr</A
+> catal,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *value);
+<A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+>*    <A
+HREF="libxml-catalog.html#XMLACATALOGRESOLVE"
+>xmlACatalogResolve</A
+>              (<A
+HREF="libxml-catalog.html#XMLCATALOGPTR"
+>xmlCatalogPtr</A
+> catal,
+                                             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#XMLACATALOGRESOLVESYSTEM"
+>xmlACatalogResolveSystem</A
+>        (<A
+HREF="libxml-catalog.html#XMLCATALOGPTR"
+>xmlCatalogPtr</A
+> catal,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *sysID);
+<A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+>*    <A
+HREF="libxml-catalog.html#XMLACATALOGRESOLVEPUBLIC"
+>xmlACatalogResolvePublic</A
+>        (<A
+HREF="libxml-catalog.html#XMLCATALOGPTR"
+>xmlCatalogPtr</A
+> catal,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *pubID);
+<A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+>*    <A
+HREF="libxml-catalog.html#XMLACATALOGRESOLVEURI"
+>xmlACatalogResolveURI</A
+>           (<A
+HREF="libxml-catalog.html#XMLCATALOGPTR"
+>xmlCatalogPtr</A
+> catal,
+                                             const <A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+> *URI);
+void        <A
+HREF="libxml-catalog.html#XMLACATALOGDUMP"
+>xmlACatalogDump</A
+>                 (<A
+HREF="libxml-catalog.html#XMLCATALOGPTR"
+>xmlCatalogPtr</A
+> catal,
+                                             <GTKDOCLINK
+HREF="FILE-CAPS"
+>FILE</GTKDOCLINK
+> *out);
+void        <A
+HREF="libxml-catalog.html#XMLFREECATALOG"
+>xmlFreeCatalog</A
+>                  (<A
+HREF="libxml-catalog.html#XMLCATALOGPTR"
+>xmlCatalogPtr</A
+> catal);
 void        <A
 HREF="libxml-catalog.html#XMLINITIALIZECATALOG"
 >xmlInitializeCatalog</A
@@ -170,10 +307,6 @@
 HREF="libxml-catalog.html#XMLLOADCATALOG"
 >xmlLoadCatalog</A
 >                  (const char *filename);
-int         <A
-HREF="libxml-catalog.html#XMLLOADSGMLSUPERCATALOG"
->xmlLoadSGMLSuperCatalog</A
->         (const char *filename);
 void        <A
 HREF="libxml-catalog.html#XMLLOADCATALOGS"
 >xmlLoadCatalogs</A
@@ -359,7 +492,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN18804"
+NAME="AEN18933"
 ></A
 ><H2
 >Description</H2
@@ -369,14 +502,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN18807"
+NAME="AEN18936"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18809"
+NAME="AEN18938"
 ></A
 ><H3
 ><A
@@ -404,7 +537,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18815"
+NAME="AEN18944"
 ></A
 ><H3
 ><A
@@ -430,7 +563,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18820"
+NAME="AEN18949"
 ></A
 ><H3
 ><A
@@ -460,7 +593,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18825"
+NAME="AEN18954"
 ></A
 ><H3
 ><A
@@ -491,7 +624,1174 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18830"
+NAME="AEN18959"
+></A
+><H3
+><A
+NAME="XMLCATALOG"
+></A
+>struct xmlCatalog</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>struct xmlCatalog;</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN18964"
+></A
+><H3
+><A
+NAME="XMLCATALOGPTR"
+></A
+>xmlCatalogPtr</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>typedef xmlCatalog *xmlCatalogPtr;</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN18969"
+></A
+><H3
+><A
+NAME="XMLLOADACATALOG"
+></A
+>xmlLoadACatalog ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-catalog.html#XMLCATALOGPTR"
+>xmlCatalogPtr</A
+> xmlLoadACatalog               (const char *filename);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Load the catalog and build the associated data structures.
+This can be either an XML Catalog or an SGML Catalog
+It will recurse in SGML CATALOG entries. On the other hand XML
+Catalogs are not handled recursively.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN18976"
+></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
+>filename</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  a file path</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the catalog parsed or NULL in case of error</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN18989"
+></A
+><H3
+><A
+NAME="XMLLOADSGMLSUPERCATALOG"
+></A
+>xmlLoadSGMLSuperCatalog ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-catalog.html#XMLCATALOGPTR"
+>xmlCatalogPtr</A
+> xmlLoadSGMLSuperCatalog       (const char *filename);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Load an SGML super catalog. It won't expand CATALOG or DELEGATE
+references. This is only needed for manipulating SGML Super Catalogs
+like adding and removing CATALOG or DELEGATE entries.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN18996"
+></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
+>filename</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  a file path</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the catalog parsed or NULL in case of error</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN19009"
+></A
+><H3
+><A
+NAME="XMLCONVERTSGMLCATALOG"
+></A
+>xmlConvertSGMLCatalog ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlConvertSGMLCatalog           (<A
+HREF="libxml-catalog.html#XMLCATALOGPTR"
+>xmlCatalogPtr</A
+> catal);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Convert all the SGML catalog entries as XML ones</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN19016"
+></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
+>catal</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+> the catalog</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the number of entries converted if successful, -1 otherwise</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN19029"
+></A
+><H3
+><A
+NAME="XMLACATALOGADD"
+></A
+>xmlACatalogAdd ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlACatalogAdd                  (<A
+HREF="libxml-catalog.html#XMLCATALOGPTR"
+>xmlCatalogPtr</A
+> catal,
+                                             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="AEN19039"
+></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
+>catal</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  a Catalog</TD
+></TR
+><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="AEN19064"
+></A
+><H3
+><A
+NAME="XMLACATALOGREMOVE"
+></A
+>xmlACatalogRemove ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlACatalogRemove               (<A
+HREF="libxml-catalog.html#XMLCATALOGPTR"
+>xmlCatalogPtr</A
+> catal,
+                                             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="AEN19072"
+></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
+>catal</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  a Catalog</TD
+></TR
+><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"
+>the number of entries removed if successful, -1 otherwise</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN19089"
+></A
+><H3
+><A
+NAME="XMLACATALOGRESOLVE"
+></A
+>xmlACatalogResolve ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+>*    xmlACatalogResolve              (<A
+HREF="libxml-catalog.html#XMLCATALOGPTR"
+>xmlCatalogPtr</A
+> catal,
+                                             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</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN19099"
+></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
+>catal</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  a Catalog</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="AEN19120"
+></A
+><H3
+><A
+NAME="XMLACATALOGRESOLVESYSTEM"
+></A
+>xmlACatalogResolveSystem ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+>*    xmlACatalogResolveSystem        (<A
+HREF="libxml-catalog.html#XMLCATALOGPTR"
+>xmlCatalogPtr</A
+> catal,
+                                             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="AEN19129"
+></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
+>catal</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  a Catalog</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 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="AEN19146"
+></A
+><H3
+><A
+NAME="XMLACATALOGRESOLVEPUBLIC"
+></A
+>xmlACatalogResolvePublic ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+>*    xmlACatalogResolvePublic        (<A
+HREF="libxml-catalog.html#XMLCATALOGPTR"
+>xmlCatalogPtr</A
+> catal,
+                                             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 in that catalog</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN19155"
+></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
+>catal</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  a Catalog</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"
+><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="AEN19172"
+></A
+><H3
+><A
+NAME="XMLACATALOGRESOLVEURI"
+></A
+>xmlACatalogResolveURI ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-tree.html#XMLCHAR"
+>xmlChar</A
+>*    xmlACatalogResolveURI           (<A
+HREF="libxml-catalog.html#XMLCATALOGPTR"
+>xmlCatalogPtr</A
+> catal,
+                                             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="AEN19181"
+></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
+>catal</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  a Catalog</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="AEN19198"
+></A
+><H3
+><A
+NAME="XMLACATALOGDUMP"
+></A
+>xmlACatalogDump ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlACatalogDump                 (<A
+HREF="libxml-catalog.html#XMLCATALOGPTR"
+>xmlCatalogPtr</A
+> catal,
+                                             <GTKDOCLINK
+HREF="FILE-CAPS"
+>FILE</GTKDOCLINK
+> *out);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Free up all the memory associated with catalogs</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN19206"
+></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
+>catal</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  a Catalog</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>out</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the file.</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN19219"
+></A
+><H3
+><A
+NAME="XMLFREECATALOG"
+></A
+>xmlFreeCatalog ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlFreeCatalog                  (<A
+HREF="libxml-catalog.html#XMLCATALOGPTR"
+>xmlCatalogPtr</A
+> catal);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Free the memory allocated to a Catalog</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN19226"
+></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
+>catal</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  a Catalog entry</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN19235"
 ></A
 ><H3
 ><A
@@ -513,7 +1813,7 @@
 ></TABLE
 ><P
 >Do the catalog initialization.
-TODO: this function is not thread safe, catalog initialization should
+this function is not thread safe, catalog initialization should
 preferably be done once at startup</P
 ><P
 ></P
@@ -521,7 +1821,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18836"
+NAME="AEN19241"
 ></A
 ><H3
 ><A
@@ -544,14 +1844,14 @@
 ><P
 >Load the catalog and makes its definitions effective for the default
 external entity loader. It will recurse in SGML CATALOG entries.
-TODO: this function is not thread safe, catalog initialization should
+this function is not thread safe, catalog initialization should
 preferably be done once at startup</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18842"
+NAME="AEN19247"
 ></A
 ><P
 ></P
@@ -604,89 +1904,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18855"
-></A
-><H3
-><A
-NAME="XMLLOADSGMLSUPERCATALOG"
-></A
->xmlLoadSGMLSuperCatalog ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->int         xmlLoadSGMLSuperCatalog         (const char *filename);</PRE
-></TD
-></TR
-></TABLE
-><P
->Load an SGML super catalog. It won't expand CATALOG or DELEGATE
-references. This is only needed for manipulating SGML Super Catalogs
-like adding and removing CATALOG or DELEGATE entries.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN18861"
-></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
->filename</I
-></TT
->&nbsp;:</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->  a file path</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->0 in case of success -1 in case of error</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN18874"
+NAME="AEN19260"
 ></A
 ><H3
 ><A
@@ -709,14 +1927,14 @@
 ><P
 >Load the catalogs and makes their definitions effective for the default
 external entity loader.
-TODO: this function is not thread safe, catalog initialization should
+this function is not thread safe, catalog initialization should
 preferably be done once at startup</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18880"
+NAME="AEN19266"
 ></A
 ><P
 ></P
@@ -754,7 +1972,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18889"
+NAME="AEN19275"
 ></A
 ><H3
 ><A
@@ -782,7 +2000,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18895"
+NAME="AEN19281"
 ></A
 ><H3
 ><A
@@ -812,7 +2030,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18902"
+NAME="AEN19288"
 ></A
 ><P
 ></P
@@ -850,7 +2068,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18911"
+NAME="AEN19297"
 ></A
 ><H3
 ><A
@@ -887,7 +2105,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18920"
+NAME="AEN19306"
 ></A
 ><P
 ></P
@@ -958,7 +2176,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18937"
+NAME="AEN19323"
 ></A
 ><H3
 ><A
@@ -991,7 +2209,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18945"
+NAME="AEN19331"
 ></A
 ><P
 ></P
@@ -1045,7 +2263,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18958"
+NAME="AEN19344"
 ></A
 ><H3
 ><A
@@ -1078,7 +2296,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18966"
+NAME="AEN19352"
 ></A
 ><P
 ></P
@@ -1132,7 +2350,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18979"
+NAME="AEN19365"
 ></A
 ><H3
 ><A
@@ -1165,7 +2383,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18987"
+NAME="AEN19373"
 ></A
 ><P
 ></P
@@ -1219,7 +2437,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19000"
+NAME="AEN19386"
 ></A
 ><H3
 ><A
@@ -1252,13 +2470,18 @@
 ></TABLE
 ><P
 >Add an entry in the catalog, it may overwrite existing but
-different entries.</P
+different entries.
+If called before any other catalo routine, allows to override the
+default shared catalog put in place by <A
+HREF="libxml-catalog.html#XMLINITIALIZECATALOG"
+>xmlInitializeCatalog</A
+>();</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19009"
+NAME="AEN19396"
 ></A
 ><P
 ></P
@@ -1345,7 +2568,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19030"
+NAME="AEN19417"
 ></A
 ><H3
 ><A
@@ -1375,7 +2598,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19037"
+NAME="AEN19424"
 ></A
 ><P
 ></P
@@ -1428,7 +2651,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19050"
+NAME="AEN19437"
 ></A
 ><H3
 ><A
@@ -1462,7 +2685,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19058"
+NAME="AEN19445"
 ></A
 ><P
 ></P
@@ -1515,7 +2738,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19071"
+NAME="AEN19458"
 ></A
 ><H3
 ><A
@@ -1542,7 +2765,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19077"
+NAME="AEN19464"
 ></A
 ><P
 ></P
@@ -1578,7 +2801,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19086"
+NAME="AEN19473"
 ></A
 ><H3
 ><A
@@ -1605,7 +2828,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19092"
+NAME="AEN19479"
 ></A
 ><P
 ></P
@@ -1643,7 +2866,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19101"
+NAME="AEN19488"
 ></A
 ><H3
 ><A
@@ -1674,7 +2897,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19108"
+NAME="AEN19495"
 ></A
 ><P
 ></P
@@ -1729,7 +2952,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19121"
+NAME="AEN19508"
 ></A
 ><H3
 ><A
@@ -1768,7 +2991,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19130"
+NAME="AEN19517"
 ></A
 ><P
 ></P
@@ -1856,7 +3079,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19151"
+NAME="AEN19538"
 ></A
 ><H3
 ><A
@@ -1891,7 +3114,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19159"
+NAME="AEN19546"
 ></A
 ><P
 ></P
@@ -1962,7 +3185,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19176"
+NAME="AEN19563"
 ></A
 ><H3
 ><A
@@ -1990,7 +3213,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19182"
+NAME="AEN19569"
 ></A
 ><P
 ></P
@@ -2043,7 +3266,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19195"
+NAME="AEN19582"
 ></A
 ><H3
 ><A
@@ -2078,7 +3301,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19203"
+NAME="AEN19590"
 ></A
 ><P
 ></P
@@ -2131,7 +3354,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19216"
+NAME="AEN19603"
 ></A
 ><H3
 ><A
@@ -2162,7 +3385,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19223"
+NAME="AEN19610"
 ></A
 ><P
 ></P
@@ -2200,7 +3423,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19232"
+NAME="AEN19619"
 ></A
 ><H3
 ><A
@@ -2231,7 +3454,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19239"
+NAME="AEN19626"
 ></A
 ><P
 ></P
@@ -2267,7 +3490,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19248"
+NAME="AEN19635"
 ></A
 ><H3
 ><A
@@ -2304,7 +3527,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19257"
+NAME="AEN19644"
 ></A
 ><P
 ></P
@@ -2357,7 +3580,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19270"
+NAME="AEN19657"
 ></A
 ><H3
 ><A
@@ -2394,7 +3617,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19279"
+NAME="AEN19666"
 ></A
 ><P
 ></P
@@ -2514,7 +3737,7 @@
 BGCOLOR="#C00000"
 ALIGN="right"
 ><A
-HREF="libxml-docbparser.html"
+HREF="libxml-threads.html"
 ><FONT
 COLOR="#FFFFFF"
 SIZE="3"
@@ -2542,7 +3765,7 @@
 COLOR="#FFFFFF"
 SIZE="3"
 ><B
->DOCBparser</B
+>threads</B
 ></FONT
 ></TD
 ></TR
diff --git a/doc/html/libxml-debugxml.html b/doc/html/libxml-debugxml.html
index dd4ba1c..65693aa 100644
--- a/doc/html/libxml-debugxml.html
+++ b/doc/html/libxml-debugxml.html
@@ -13,8 +13,8 @@
 TITLE="Libxml Library Reference"
 HREF="libxml-lib.html"><LINK
 REL="PREVIOUS"
-TITLE="encoding"
-HREF="libxml-encoding.html"><LINK
+TITLE="hash"
+HREF="libxml-hash.html"><LINK
 REL="NEXT"
 TITLE="xmlmemory"
 HREF="libxml-xmlmemory.html"></HEAD
@@ -49,7 +49,7 @@
 BGCOLOR="#C00000"
 ALIGN="left"
 ><A
-HREF="libxml-encoding.html"
+HREF="libxml-hash.html"
 ><FONT
 COLOR="#FFFFFF"
 SIZE="3"
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN23240"
+NAME="AEN24971"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN23243"
+NAME="AEN24974"
 ></A
 ><H2
 >Synopsis</H2
@@ -261,6 +261,38 @@
 HREF="libxml-tree.html#XMLDOCPTR"
 >xmlDocPtr</A
 > doc);
+void        <A
+HREF="libxml-debugxml.html#XMLLSONENODE"
+>xmlLsOneNode</A
+>                    (<GTKDOCLINK
+HREF="FILE-CAPS"
+>FILE</GTKDOCLINK
+> *output,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node);
+int         <A
+HREF="libxml-debugxml.html#XMLLSCOUNTNODE"
+>xmlLsCountNode</A
+>                  (<A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node);
+const char* <A
+HREF="libxml-debugxml.html#XMLBOOLTOTEXT"
+>xmlBoolToText</A
+>                   (int bool);
+<GTKDOCLINK
+HREF="LONG"
+>long</GTKDOCLINK
+>        <A
+HREF="libxml-debugxml.html#XMLGETLINENO"
+>xmlGetLineNo</A
+>                    (<A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node);
 char*       (<A
 HREF="libxml-debugxml.html#XMLSHELLREADLINEFUNC"
 >*xmlShellReadlineFunc</A
@@ -290,6 +322,185 @@
 >xmlNodePtr</A
 > node2);
 void        <A
+HREF="libxml-debugxml.html#XMLSHELLPRINTXPATHERROR"
+>xmlShellPrintXPathError</A
+>         (int errorType,
+                                             const char *arg);
+void        <A
+HREF="libxml-debugxml.html#XMLSHELLPRINTNODE"
+>xmlShellPrintNode</A
+>               (<A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node);
+void        <A
+HREF="libxml-debugxml.html#XMLSHELLPRINTXPATHRESULT"
+>xmlShellPrintXPathResult</A
+>        (<A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> list);
+int         <A
+HREF="libxml-debugxml.html#XMLSHELLLIST"
+>xmlShellList</A
+>                    (<A
+HREF="libxml-debugxml.html#XMLSHELLCTXTPTR"
+>xmlShellCtxtPtr</A
+> ctxt,
+                                             char *arg,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node2);
+int         <A
+HREF="libxml-debugxml.html#XMLSHELLBASE"
+>xmlShellBase</A
+>                    (<A
+HREF="libxml-debugxml.html#XMLSHELLCTXTPTR"
+>xmlShellCtxtPtr</A
+> ctxt,
+                                             char *arg,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node2);
+int         <A
+HREF="libxml-debugxml.html#XMLSHELLDIR"
+>xmlShellDir</A
+>                     (<A
+HREF="libxml-debugxml.html#XMLSHELLCTXTPTR"
+>xmlShellCtxtPtr</A
+> ctxt,
+                                             char *arg,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node2);
+int         <A
+HREF="libxml-debugxml.html#XMLSHELLCAT"
+>xmlShellCat</A
+>                     (<A
+HREF="libxml-debugxml.html#XMLSHELLCTXTPTR"
+>xmlShellCtxtPtr</A
+> ctxt,
+                                             char *arg,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node2);
+int         <A
+HREF="libxml-debugxml.html#XMLSHELLLOAD"
+>xmlShellLoad</A
+>                    (<A
+HREF="libxml-debugxml.html#XMLSHELLCTXTPTR"
+>xmlShellCtxtPtr</A
+> ctxt,
+                                             char *filename,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node2);
+int         <A
+HREF="libxml-debugxml.html#XMLSHELLWRITE"
+>xmlShellWrite</A
+>                   (<A
+HREF="libxml-debugxml.html#XMLSHELLCTXTPTR"
+>xmlShellCtxtPtr</A
+> ctxt,
+                                             char *filename,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node2);
+int         <A
+HREF="libxml-debugxml.html#XMLSHELLSAVE"
+>xmlShellSave</A
+>                    (<A
+HREF="libxml-debugxml.html#XMLSHELLCTXTPTR"
+>xmlShellCtxtPtr</A
+> ctxt,
+                                             char *filename,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node2);
+int         <A
+HREF="libxml-debugxml.html#XMLSHELLVALIDATE"
+>xmlShellValidate</A
+>                (<A
+HREF="libxml-debugxml.html#XMLSHELLCTXTPTR"
+>xmlShellCtxtPtr</A
+> ctxt,
+                                             char *dtd,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node2);
+int         <A
+HREF="libxml-debugxml.html#XMLSHELLDU"
+>xmlShellDu</A
+>                      (<A
+HREF="libxml-debugxml.html#XMLSHELLCTXTPTR"
+>xmlShellCtxtPtr</A
+> ctxt,
+                                             char *arg,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> tree,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node2);
+int         <A
+HREF="libxml-debugxml.html#XMLSHELLPWD"
+>xmlShellPwd</A
+>                     (<A
+HREF="libxml-debugxml.html#XMLSHELLCTXTPTR"
+>xmlShellCtxtPtr</A
+> ctxt,
+                                             char *buffer,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node2);
+void        <A
 HREF="libxml-debugxml.html#XMLSHELL"
 >xmlShell</A
 >                        (<A
@@ -312,7 +523,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN23287"
+NAME="AEN25072"
 ></A
 ><H2
 >Description</H2
@@ -322,14 +533,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN23290"
+NAME="AEN25075"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23292"
+NAME="AEN25077"
 ></A
 ><H3
 ><A
@@ -363,7 +574,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23300"
+NAME="AEN25085"
 ></A
 ><P
 ></P
@@ -418,7 +629,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23313"
+NAME="AEN25098"
 ></A
 ><H3
 ><A
@@ -453,7 +664,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23321"
+NAME="AEN25106"
 ></A
 ><P
 ></P
@@ -525,7 +736,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23338"
+NAME="AEN25123"
 ></A
 ><H3
 ><A
@@ -560,7 +771,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23346"
+NAME="AEN25131"
 ></A
 ><P
 ></P
@@ -632,7 +843,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23363"
+NAME="AEN25148"
 ></A
 ><H3
 ><A
@@ -667,7 +878,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23371"
+NAME="AEN25156"
 ></A
 ><P
 ></P
@@ -739,7 +950,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23388"
+NAME="AEN25173"
 ></A
 ><H3
 ><A
@@ -774,7 +985,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23396"
+NAME="AEN25181"
 ></A
 ><P
 ></P
@@ -846,7 +1057,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23413"
+NAME="AEN25198"
 ></A
 ><H3
 ><A
@@ -881,7 +1092,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23421"
+NAME="AEN25206"
 ></A
 ><P
 ></P
@@ -953,7 +1164,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23438"
+NAME="AEN25223"
 ></A
 ><H3
 ><A
@@ -987,7 +1198,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23446"
+NAME="AEN25231"
 ></A
 ><P
 ></P
@@ -1042,7 +1253,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23459"
+NAME="AEN25244"
 ></A
 ><H3
 ><A
@@ -1076,7 +1287,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23467"
+NAME="AEN25252"
 ></A
 ><P
 ></P
@@ -1131,7 +1342,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23480"
+NAME="AEN25265"
 ></A
 ><H3
 ><A
@@ -1165,7 +1376,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23488"
+NAME="AEN25273"
 ></A
 ><P
 ></P
@@ -1220,7 +1431,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23501"
+NAME="AEN25286"
 ></A
 ><H3
 ><A
@@ -1254,7 +1465,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23509"
+NAME="AEN25294"
 ></A
 ><P
 ></P
@@ -1309,7 +1520,341 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23522"
+NAME="AEN25307"
+></A
+><H3
+><A
+NAME="XMLLSONENODE"
+></A
+>xmlLsOneNode ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlLsOneNode                    (<GTKDOCLINK
+HREF="FILE-CAPS"
+>FILE</GTKDOCLINK
+> *output,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node);</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN25314"
+></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
+>output</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+><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
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN25327"
+></A
+><H3
+><A
+NAME="XMLLSCOUNTNODE"
+></A
+>xmlLsCountNode ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlLsCountNode                  (<A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node);</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN25333"
+></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="AEN25346"
+></A
+><H3
+><A
+NAME="XMLBOOLTOTEXT"
+></A
+>xmlBoolToText ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>const char* xmlBoolToText                   (int bool);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Convenient way to turn bool into text</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN25352"
+></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
+>bool</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+> a bool to turn into text</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="AEN25365"
+></A
+><H3
+><A
+NAME="XMLGETLINENO"
+></A
+>xmlGetLineNo ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><GTKDOCLINK
+HREF="LONG"
+>long</GTKDOCLINK
+>        xmlGetLineNo                    (<A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Get line number of node</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN25373"
+></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"
+> valid node</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the line number if sucessfull, -1 otherwise</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN25386"
 ></A
 ><H3
 ><A
@@ -1336,7 +1881,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23528"
+NAME="AEN25392"
 ></A
 ><P
 ></P
@@ -1389,7 +1934,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23541"
+NAME="AEN25405"
 ></A
 ><H3
 ><A
@@ -1426,7 +1971,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23547"
+NAME="AEN25411"
 ></A
 ><H3
 ><A
@@ -1452,7 +1997,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23552"
+NAME="AEN25416"
 ></A
 ><H3
 ><A
@@ -1491,7 +2036,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23561"
+NAME="AEN25425"
 ></A
 ><P
 ></P
@@ -1595,7 +2140,1684 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23586"
+NAME="AEN25450"
+></A
+><H3
+><A
+NAME="XMLSHELLPRINTXPATHERROR"
+></A
+>xmlShellPrintXPathError ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlShellPrintXPathError         (int errorType,
+                                             const char *arg);</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN25455"
+></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
+>errorType</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>arg</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="AEN25468"
+></A
+><H3
+><A
+NAME="XMLSHELLPRINTNODE"
+></A
+>xmlShellPrintNode ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlShellPrintNode               (<A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Print node to stdout</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN25475"
+></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"
+> a non-null node to print to stdout</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN25484"
+></A
+><H3
+><A
+NAME="XMLSHELLPRINTXPATHRESULT"
+></A
+>xmlShellPrintXPathResult ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlShellPrintXPathResult        (<A
+HREF="libxml-xpath.html#XMLXPATHOBJECTPTR"
+>xmlXPathObjectPtr</A
+> list);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Prints result to stdout</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN25491"
+></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
+>list</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="AEN25500"
+></A
+><H3
+><A
+NAME="XMLSHELLLIST"
+></A
+>xmlShellList ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlShellList                    (<A
+HREF="libxml-debugxml.html#XMLSHELLCTXTPTR"
+>xmlShellCtxtPtr</A
+> ctxt,
+                                             char *arg,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node2);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Implements the XML shell function "ls"
+Does an Unix like listing of the given node (like a directory)</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN25509"
+></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 shell context</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>arg</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  unused</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>node</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  a node</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>node2</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  unused</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>0</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN25534"
+></A
+><H3
+><A
+NAME="XMLSHELLBASE"
+></A
+>xmlShellBase ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlShellBase                    (<A
+HREF="libxml-debugxml.html#XMLSHELLCTXTPTR"
+>xmlShellCtxtPtr</A
+> ctxt,
+                                             char *arg,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node2);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Implements the XML shell function "base"
+dumps the current XML base of the node</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN25543"
+></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 shell context</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>arg</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  unused</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>node</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  a node</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>node2</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  unused</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>0</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN25568"
+></A
+><H3
+><A
+NAME="XMLSHELLDIR"
+></A
+>xmlShellDir ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlShellDir                     (<A
+HREF="libxml-debugxml.html#XMLSHELLCTXTPTR"
+>xmlShellCtxtPtr</A
+> ctxt,
+                                             char *arg,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node2);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Implements the XML shell function "dir"
+dumps informations about the node (namespace, attributes, content).</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN25577"
+></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 shell context</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>arg</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  unused</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>node</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  a node</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>node2</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  unused</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>0</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN25602"
+></A
+><H3
+><A
+NAME="XMLSHELLCAT"
+></A
+>xmlShellCat ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlShellCat                     (<A
+HREF="libxml-debugxml.html#XMLSHELLCTXTPTR"
+>xmlShellCtxtPtr</A
+> ctxt,
+                                             char *arg,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node2);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Implements the XML shell function "cat"
+dumps the serialization node content (XML or HTML).</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN25611"
+></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 shell context</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>arg</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  unused</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>node</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  a node</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>node2</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  unused</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>0</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN25636"
+></A
+><H3
+><A
+NAME="XMLSHELLLOAD"
+></A
+>xmlShellLoad ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlShellLoad                    (<A
+HREF="libxml-debugxml.html#XMLSHELLCTXTPTR"
+>xmlShellCtxtPtr</A
+> ctxt,
+                                             char *filename,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node2);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Implements the XML shell function "load"
+loads a new document specified by the filename</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN25645"
+></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 shell context</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>filename</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the file name</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>node</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  unused</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>node2</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  unused</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>0 or -1 if loading failed</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN25670"
+></A
+><H3
+><A
+NAME="XMLSHELLWRITE"
+></A
+>xmlShellWrite ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlShellWrite                   (<A
+HREF="libxml-debugxml.html#XMLSHELLCTXTPTR"
+>xmlShellCtxtPtr</A
+> ctxt,
+                                             char *filename,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node2);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Implements the XML shell function "write"
+Write the current node to the filename, it saves the serailization
+of the subtree under the <TT
+CLASS="PARAMETER"
+><I
+>node</I
+></TT
+> specified</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN25680"
+></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 shell context</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>filename</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the file name</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>node</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  a node in the tree</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>node2</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  unused</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>0 or -1 in case of error</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN25705"
+></A
+><H3
+><A
+NAME="XMLSHELLSAVE"
+></A
+>xmlShellSave ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlShellSave                    (<A
+HREF="libxml-debugxml.html#XMLSHELLCTXTPTR"
+>xmlShellCtxtPtr</A
+> ctxt,
+                                             char *filename,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node2);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Implements the XML shell function "save"
+Write the current document to the filename, or it's original name</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN25714"
+></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 shell context</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>filename</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the file name (optionnal)</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>node</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  unused</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>node2</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  unused</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>0 or -1 in case of error</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN25739"
+></A
+><H3
+><A
+NAME="XMLSHELLVALIDATE"
+></A
+>xmlShellValidate ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlShellValidate                (<A
+HREF="libxml-debugxml.html#XMLSHELLCTXTPTR"
+>xmlShellCtxtPtr</A
+> ctxt,
+                                             char *dtd,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node2);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Implements the XML shell function "validate"
+Validate the document, if a DTD path is provided, then the validation
+is done against the given DTD.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN25748"
+></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 shell context</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>dtd</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the DTD URI (optionnal)</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>node</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  unused</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>node2</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  unused</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>0 or -1 in case of error</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN25773"
+></A
+><H3
+><A
+NAME="XMLSHELLDU"
+></A
+>xmlShellDu ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlShellDu                      (<A
+HREF="libxml-debugxml.html#XMLSHELLCTXTPTR"
+>xmlShellCtxtPtr</A
+> ctxt,
+                                             char *arg,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> tree,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node2);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Implements the XML shell function "du"
+show the structure of the subtree under node <TT
+CLASS="PARAMETER"
+><I
+>tree</I
+></TT
+>
+If <TT
+CLASS="PARAMETER"
+><I
+>tree</I
+></TT
+> is null, the command works on the current node.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN25784"
+></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 shell context</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>arg</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  unused</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>tree</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  a node defining a subtree</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>node2</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  unused</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>0 or -1 in case of error</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN25809"
+></A
+><H3
+><A
+NAME="XMLSHELLPWD"
+></A
+>xmlShellPwd ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>int         xmlShellPwd                     (<A
+HREF="libxml-debugxml.html#XMLSHELLCTXTPTR"
+>xmlShellCtxtPtr</A
+> ctxt,
+                                             char *buffer,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> node2);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Implements the XML shell function "pwd"
+Show the full path from the root to the node, if needed building
+thumblers when similar elements exists at a given ancestor level.
+The output is compatible with XPath commands.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN25818"
+></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 shell context</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>buffer</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  the output buffer</TD
+></TR
+><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"
+><TT
+CLASS="PARAMETER"
+><I
+>node2</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>  unused</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>0 or -1 in case of error</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN25843"
 ></A
 ><H3
 ><A
@@ -1636,7 +3858,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23595"
+NAME="AEN25852"
 ></A
 ><P
 ></P
@@ -1738,7 +3960,7 @@
 BGCOLOR="#C00000"
 ALIGN="left"
 ><A
-HREF="libxml-encoding.html"
+HREF="libxml-hash.html"
 ><FONT
 COLOR="#FFFFFF"
 SIZE="3"
@@ -1810,7 +4032,7 @@
 COLOR="#FFFFFF"
 SIZE="3"
 ><B
->encoding</B
+>hash</B
 ></FONT
 ></TD
 ><TD
diff --git a/doc/html/libxml-docbparser.html b/doc/html/libxml-docbparser.html
index a1c3704..ac8855a 100644
--- a/doc/html/libxml-docbparser.html
+++ b/doc/html/libxml-docbparser.html
@@ -13,8 +13,8 @@
 TITLE="Libxml Library Reference"
 HREF="libxml-lib.html"><LINK
 REL="PREVIOUS"
-TITLE="catalog"
-HREF="libxml-catalog.html"><LINK
+TITLE="globals"
+HREF="libxml-globals.html"><LINK
 REL="NEXT"
 TITLE="parserInternals"
 HREF="libxml-parserinternals.html"></HEAD
@@ -49,7 +49,7 @@
 BGCOLOR="#C00000"
 ALIGN="left"
 ><A
-HREF="libxml-catalog.html"
+HREF="libxml-globals.html"
 ><FONT
 COLOR="#FFFFFF"
 SIZE="3"
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN19297"
+NAME="AEN20188"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN19300"
+NAME="AEN20191"
 ></A
 ><H2
 >Synopsis</H2
@@ -295,7 +295,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN19337"
+NAME="AEN20228"
 ></A
 ><H2
 >Description</H2
@@ -305,14 +305,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN19340"
+NAME="AEN20231"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19342"
+NAME="AEN20233"
 ></A
 ><H3
 ><A
@@ -338,7 +338,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19347"
+NAME="AEN20238"
 ></A
 ><H3
 ><A
@@ -364,7 +364,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19352"
+NAME="AEN20243"
 ></A
 ><H3
 ><A
@@ -390,7 +390,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19357"
+NAME="AEN20248"
 ></A
 ><H3
 ><A
@@ -416,7 +416,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19362"
+NAME="AEN20253"
 ></A
 ><H3
 ><A
@@ -442,7 +442,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19367"
+NAME="AEN20258"
 ></A
 ><H3
 ><A
@@ -468,7 +468,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19372"
+NAME="AEN20263"
 ></A
 ><H3
 ><A
@@ -494,7 +494,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19377"
+NAME="AEN20268"
 ></A
 ><H3
 ><A
@@ -520,7 +520,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19382"
+NAME="AEN20273"
 ></A
 ><H3
 ><A
@@ -546,7 +546,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19387"
+NAME="AEN20278"
 ></A
 ><H3
 ><A
@@ -578,7 +578,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19393"
+NAME="AEN20284"
 ></A
 ><P
 ></P
@@ -722,7 +722,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19426"
+NAME="AEN20317"
 ></A
 ><H3
 ><A
@@ -763,7 +763,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19435"
+NAME="AEN20326"
 ></A
 ><P
 ></P
@@ -867,7 +867,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19460"
+NAME="AEN20351"
 ></A
 ><H3
 ><A
@@ -901,7 +901,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19468"
+NAME="AEN20359"
 ></A
 ><P
 ></P
@@ -971,7 +971,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19485"
+NAME="AEN20376"
 ></A
 ><H3
 ><A
@@ -1010,7 +1010,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19493"
+NAME="AEN20384"
 ></A
 ><P
 ></P
@@ -1114,7 +1114,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19518"
+NAME="AEN20409"
 ></A
 ><H3
 ><A
@@ -1147,7 +1147,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19525"
+NAME="AEN20416"
 ></A
 ><P
 ></P
@@ -1217,7 +1217,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19542"
+NAME="AEN20433"
 ></A
 ><H3
 ><A
@@ -1248,7 +1248,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19549"
+NAME="AEN20440"
 ></A
 ><P
 ></P
@@ -1286,7 +1286,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19558"
+NAME="AEN20449"
 ></A
 ><H3
 ><A
@@ -1340,7 +1340,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19569"
+NAME="AEN20460"
 ></A
 ><P
 ></P
@@ -1478,7 +1478,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19602"
+NAME="AEN20493"
 ></A
 ><H3
 ><A
@@ -1511,7 +1511,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19609"
+NAME="AEN20500"
 ></A
 ><P
 ></P
@@ -1615,7 +1615,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19634"
+NAME="AEN20525"
 ></A
 ><H3
 ><A
@@ -1648,7 +1648,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19641"
+NAME="AEN20532"
 ></A
 ><P
 ></P
@@ -1718,7 +1718,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19658"
+NAME="AEN20549"
 ></A
 ><H3
 ><A
@@ -1749,7 +1749,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19665"
+NAME="AEN20556"
 ></A
 ><P
 ></P
@@ -1816,7 +1816,7 @@
 BGCOLOR="#C00000"
 ALIGN="left"
 ><A
-HREF="libxml-catalog.html"
+HREF="libxml-globals.html"
 ><FONT
 COLOR="#FFFFFF"
 SIZE="3"
@@ -1888,7 +1888,7 @@
 COLOR="#FFFFFF"
 SIZE="3"
 ><B
->catalog</B
+>globals</B
 ></FONT
 ></TD
 ><TD
diff --git a/doc/html/libxml-encoding.html b/doc/html/libxml-encoding.html
index c646e04..319b517 100644
--- a/doc/html/libxml-encoding.html
+++ b/doc/html/libxml-encoding.html
@@ -16,8 +16,8 @@
 TITLE="parserInternals"
 HREF="libxml-parserinternals.html"><LINK
 REL="NEXT"
-TITLE="debugXML"
-HREF="libxml-debugxml.html"></HEAD
+TITLE="hash"
+HREF="libxml-hash.html"></HEAD
 ><BODY
 CLASS="REFENTRY"
 BGCOLOR="#FFFFFF"
@@ -103,7 +103,7 @@
 BGCOLOR="#C00000"
 ALIGN="right"
 ><A
-HREF="libxml-debugxml.html"
+HREF="libxml-hash.html"
 ><FONT
 COLOR="#FFFFFF"
 SIZE="3"
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN22524"
+NAME="AEN23415"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN22527"
+NAME="AEN23418"
 ></A
 ><H2
 >Synopsis</H2
@@ -382,7 +382,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN22587"
+NAME="AEN23478"
 ></A
 ><H2
 >Description</H2
@@ -392,14 +392,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN22590"
+NAME="AEN23481"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22592"
+NAME="AEN23483"
 ></A
 ><H3
 ><A
@@ -465,7 +465,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22599"
+NAME="AEN23490"
 ></A
 ><H3
 ><A
@@ -496,7 +496,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22605"
+NAME="AEN23496"
 ></A
 ><P
 ></P
@@ -624,7 +624,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22634"
+NAME="AEN23525"
 ></A
 ><H3
 ><A
@@ -657,7 +657,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22640"
+NAME="AEN23531"
 ></A
 ><P
 ></P
@@ -785,7 +785,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22669"
+NAME="AEN23560"
 ></A
 ><H3
 ><A
@@ -819,7 +819,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22674"
+NAME="AEN23565"
 ></A
 ><H3
 ><A
@@ -845,7 +845,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22679"
+NAME="AEN23570"
 ></A
 ><H3
 ><A
@@ -876,7 +876,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22685"
+NAME="AEN23576"
 ></A
 ><H3
 ><A
@@ -905,7 +905,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22691"
+NAME="AEN23582"
 ></A
 ><H3
 ><A
@@ -935,7 +935,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22698"
+NAME="AEN23589"
 ></A
 ><P
 ></P
@@ -973,7 +973,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22707"
+NAME="AEN23598"
 ></A
 ><H3
 ><A
@@ -1007,7 +1007,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22715"
+NAME="AEN23606"
 ></A
 ><P
 ></P
@@ -1060,7 +1060,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22728"
+NAME="AEN23619"
 ></A
 ><H3
 ><A
@@ -1091,7 +1091,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22735"
+NAME="AEN23626"
 ></A
 ><P
 ></P
@@ -1144,7 +1144,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22748"
+NAME="AEN23639"
 ></A
 ><H3
 ><A
@@ -1183,7 +1183,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22756"
+NAME="AEN23647"
 ></A
 ><P
 ></P
@@ -1253,7 +1253,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22773"
+NAME="AEN23664"
 ></A
 ><H3
 ><A
@@ -1285,7 +1285,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22780"
+NAME="AEN23671"
 ></A
 ><P
 ></P
@@ -1338,7 +1338,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22793"
+NAME="AEN23684"
 ></A
 ><H3
 ><A
@@ -1365,7 +1365,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22799"
+NAME="AEN23690"
 ></A
 ><P
 ></P
@@ -1418,7 +1418,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22812"
+NAME="AEN23703"
 ></A
 ><H3
 ><A
@@ -1446,7 +1446,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22818"
+NAME="AEN23709"
 ></A
 ><H3
 ><A
@@ -1478,7 +1478,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22825"
+NAME="AEN23716"
 ></A
 ><P
 ></P
@@ -1532,7 +1532,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22838"
+NAME="AEN23729"
 ></A
 ><H3
 ><A
@@ -1567,7 +1567,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22846"
+NAME="AEN23737"
 ></A
 ><P
 ></P
@@ -1620,7 +1620,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22859"
+NAME="AEN23750"
 ></A
 ><H3
 ><A
@@ -1652,7 +1652,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22866"
+NAME="AEN23757"
 ></A
 ><P
 ></P
@@ -1723,7 +1723,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22883"
+NAME="AEN23774"
 ></A
 ><H3
 ><A
@@ -1771,7 +1771,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22893"
+NAME="AEN23784"
 ></A
 ><P
 ></P
@@ -1861,7 +1861,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22914"
+NAME="AEN23805"
 ></A
 ><H3
 ><A
@@ -1899,7 +1899,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22923"
+NAME="AEN23814"
 ></A
 ><P
 ></P
@@ -1989,7 +1989,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22944"
+NAME="AEN23835"
 ></A
 ><H3
 ><A
@@ -2028,7 +2028,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22953"
+NAME="AEN23844"
 ></A
 ><P
 ></P
@@ -2118,7 +2118,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22974"
+NAME="AEN23865"
 ></A
 ><H3
 ><A
@@ -2148,7 +2148,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22981"
+NAME="AEN23872"
 ></A
 ><P
 ></P
@@ -2201,7 +2201,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22994"
+NAME="AEN23885"
 ></A
 ><H3
 ><A
@@ -2232,7 +2232,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23000"
+NAME="AEN23891"
 ></A
 ><P
 ></P
@@ -2359,7 +2359,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23029"
+NAME="AEN23920"
 ></A
 ><H3
 ><A
@@ -2390,7 +2390,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23035"
+NAME="AEN23926"
 ></A
 ><P
 ></P
@@ -2517,7 +2517,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23064"
+NAME="AEN23955"
 ></A
 ><H3
 ><A
@@ -2559,7 +2559,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23072"
+NAME="AEN23963"
 ></A
 ><P
 ></P
@@ -2617,7 +2617,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23086"
+NAME="AEN23977"
 ></A
 ><H3
 ><A
@@ -2648,7 +2648,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23093"
+NAME="AEN23984"
 ></A
 ><P
 ></P
@@ -2719,7 +2719,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23110"
+NAME="AEN24001"
 ></A
 ><H3
 ><A
@@ -2753,7 +2753,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23118"
+NAME="AEN24009"
 ></A
 ><P
 ></P
@@ -2828,7 +2828,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23136"
+NAME="AEN24027"
 ></A
 ><H3
 ><A
@@ -2863,7 +2863,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23144"
+NAME="AEN24035"
 ></A
 ><P
 ></P
@@ -2933,7 +2933,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23161"
+NAME="AEN24052"
 ></A
 ><H3
 ><A
@@ -2967,7 +2967,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23169"
+NAME="AEN24060"
 ></A
 ><P
 ></P
@@ -3038,7 +3038,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23186"
+NAME="AEN24077"
 ></A
 ><H3
 ><A
@@ -3073,7 +3073,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23194"
+NAME="AEN24085"
 ></A
 ><P
 ></P
@@ -3161,7 +3161,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23215"
+NAME="AEN24106"
 ></A
 ><H3
 ><A
@@ -3192,7 +3192,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23222"
+NAME="AEN24113"
 ></A
 ><P
 ></P
@@ -3312,7 +3312,7 @@
 BGCOLOR="#C00000"
 ALIGN="right"
 ><A
-HREF="libxml-debugxml.html"
+HREF="libxml-hash.html"
 ><FONT
 COLOR="#FFFFFF"
 SIZE="3"
@@ -3340,7 +3340,7 @@
 COLOR="#FFFFFF"
 SIZE="3"
 ><B
->debugXML</B
+>hash</B
 ></FONT
 ></TD
 ></TR
diff --git a/doc/html/libxml-entities.html b/doc/html/libxml-entities.html
index 8abeb63..d327894 100644
--- a/doc/html/libxml-entities.html
+++ b/doc/html/libxml-entities.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN7577"
+NAME="AEN7638"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN7580"
+NAME="AEN7641"
 ></A
 ><H2
 >Synopsis</H2
@@ -371,7 +371,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN7643"
+NAME="AEN7704"
 ></A
 ><H2
 >Description</H2
@@ -381,14 +381,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN7646"
+NAME="AEN7707"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7648"
+NAME="AEN7709"
 ></A
 ><H3
 ><A
@@ -421,7 +421,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7653"
+NAME="AEN7714"
 ></A
 ><H3
 ><A
@@ -467,7 +467,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7658"
+NAME="AEN7719"
 ></A
 ><H3
 ><A
@@ -493,7 +493,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7663"
+NAME="AEN7724"
 ></A
 ><H3
 ><A
@@ -519,7 +519,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7668"
+NAME="AEN7729"
 ></A
 ><H3
 ><A
@@ -547,7 +547,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7674"
+NAME="AEN7735"
 ></A
 ><H3
 ><A
@@ -597,7 +597,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7686"
+NAME="AEN7747"
 ></A
 ><P
 ></P
@@ -735,7 +735,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7719"
+NAME="AEN7780"
 ></A
 ><H3
 ><A
@@ -785,7 +785,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7731"
+NAME="AEN7792"
 ></A
 ><P
 ></P
@@ -923,7 +923,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7764"
+NAME="AEN7825"
 ></A
 ><H3
 ><A
@@ -956,7 +956,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7772"
+NAME="AEN7833"
 ></A
 ><P
 ></P
@@ -1009,7 +1009,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7785"
+NAME="AEN7846"
 ></A
 ><H3
 ><A
@@ -1048,7 +1048,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7794"
+NAME="AEN7855"
 ></A
 ><P
 ></P
@@ -1118,7 +1118,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7811"
+NAME="AEN7872"
 ></A
 ><H3
 ><A
@@ -1156,7 +1156,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7820"
+NAME="AEN7881"
 ></A
 ><P
 ></P
@@ -1226,7 +1226,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7837"
+NAME="AEN7898"
 ></A
 ><H3
 ><A
@@ -1264,7 +1264,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7846"
+NAME="AEN7907"
 ></A
 ><P
 ></P
@@ -1334,7 +1334,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7863"
+NAME="AEN7924"
 ></A
 ><H3
 ><A
@@ -1378,7 +1378,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7874"
+NAME="AEN7935"
 ></A
 ><P
 ></P
@@ -1448,7 +1448,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7891"
+NAME="AEN7952"
 ></A
 ><H3
 ><A
@@ -1488,7 +1488,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7900"
+NAME="AEN7961"
 ></A
 ><P
 ></P
@@ -1558,7 +1558,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7917"
+NAME="AEN7978"
 ></A
 ><H3
 ><A
@@ -1596,7 +1596,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7926"
+NAME="AEN7987"
 ></A
 ><P
 ></P
@@ -1666,7 +1666,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7943"
+NAME="AEN8004"
 ></A
 ><H3
 ><A
@@ -1696,7 +1696,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7950"
+NAME="AEN8011"
 ></A
 ><P
 ></P
@@ -1732,7 +1732,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7959"
+NAME="AEN8020"
 ></A
 ><H3
 ><A
@@ -1765,7 +1765,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7967"
+NAME="AEN8028"
 ></A
 ><P
 ></P
@@ -1818,7 +1818,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7980"
+NAME="AEN8041"
 ></A
 ><H3
 ><A
@@ -1848,7 +1848,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7987"
+NAME="AEN8048"
 ></A
 ><P
 ></P
@@ -1886,7 +1886,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7996"
+NAME="AEN8057"
 ></A
 ><H3
 ><A
@@ -1920,7 +1920,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8004"
+NAME="AEN8065"
 ></A
 ><P
 ></P
@@ -1975,7 +1975,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8017"
+NAME="AEN8078"
 ></A
 ><H3
 ><A
@@ -2009,7 +2009,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8025"
+NAME="AEN8086"
 ></A
 ><P
 ></P
@@ -2064,7 +2064,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8038"
+NAME="AEN8099"
 ></A
 ><H3
 ><A
diff --git a/doc/html/libxml-htmlparser.html b/doc/html/libxml-htmlparser.html
index 8c79f8c..b165b9f 100644
--- a/doc/html/libxml-htmlparser.html
+++ b/doc/html/libxml-htmlparser.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN10400"
+NAME="AEN10478"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN10403"
+NAME="AEN10481"
 ></A
 ><H2
 >Synopsis</H2
@@ -395,7 +395,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10467"
+NAME="AEN10545"
 ></A
 ><H2
 >Description</H2
@@ -405,14 +405,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10470"
+NAME="AEN10548"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10472"
+NAME="AEN10550"
 ></A
 ><H3
 ><A
@@ -438,7 +438,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10477"
+NAME="AEN10555"
 ></A
 ><H3
 ><A
@@ -464,7 +464,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10482"
+NAME="AEN10560"
 ></A
 ><H3
 ><A
@@ -490,7 +490,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10487"
+NAME="AEN10565"
 ></A
 ><H3
 ><A
@@ -516,7 +516,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10492"
+NAME="AEN10570"
 ></A
 ><H3
 ><A
@@ -542,7 +542,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10497"
+NAME="AEN10575"
 ></A
 ><H3
 ><A
@@ -568,7 +568,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10502"
+NAME="AEN10580"
 ></A
 ><H3
 ><A
@@ -594,7 +594,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10507"
+NAME="AEN10585"
 ></A
 ><H3
 ><A
@@ -620,7 +620,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10512"
+NAME="AEN10590"
 ></A
 ><H3
 ><A
@@ -646,7 +646,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10517"
+NAME="AEN10595"
 ></A
 ><H3
 ><A
@@ -682,7 +682,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10522"
+NAME="AEN10600"
 ></A
 ><H3
 ><A
@@ -708,7 +708,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10527"
+NAME="AEN10605"
 ></A
 ><H3
 ><A
@@ -738,7 +738,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10532"
+NAME="AEN10610"
 ></A
 ><H3
 ><A
@@ -764,7 +764,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10537"
+NAME="AEN10615"
 ></A
 ><H3
 ><A
@@ -797,7 +797,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10545"
+NAME="AEN10623"
 ></A
 ><P
 ></P
@@ -850,7 +850,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10558"
+NAME="AEN10636"
 ></A
 ><H3
 ><A
@@ -885,7 +885,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10567"
+NAME="AEN10645"
 ></A
 ><P
 ></P
@@ -938,7 +938,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10580"
+NAME="AEN10658"
 ></A
 ><H3
 ><A
@@ -970,7 +970,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10588"
+NAME="AEN10666"
 ></A
 ><P
 ></P
@@ -1023,7 +1023,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10601"
+NAME="AEN10679"
 ></A
 ><H3
 ><A
@@ -1059,7 +1059,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10609"
+NAME="AEN10687"
 ></A
 ><P
 ></P
@@ -1129,7 +1129,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10626"
+NAME="AEN10704"
 ></A
 ><H3
 ><A
@@ -1170,7 +1170,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10635"
+NAME="AEN10713"
 ></A
 ><P
 ></P
@@ -1257,7 +1257,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10656"
+NAME="AEN10734"
 ></A
 ><H3
 ><A
@@ -1296,7 +1296,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10666"
+NAME="AEN10744"
 ></A
 ><P
 ></P
@@ -1367,7 +1367,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10683"
+NAME="AEN10761"
 ></A
 ><H3
 ><A
@@ -1403,7 +1403,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10692"
+NAME="AEN10770"
 ></A
 ><P
 ></P
@@ -1456,7 +1456,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10705"
+NAME="AEN10783"
 ></A
 ><H3
 ><A
@@ -1490,7 +1490,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10714"
+NAME="AEN10792"
 ></A
 ><P
 ></P
@@ -1528,7 +1528,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10723"
+NAME="AEN10801"
 ></A
 ><H3
 ><A
@@ -1569,7 +1569,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10732"
+NAME="AEN10810"
 ></A
 ><P
 ></P
@@ -1674,7 +1674,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10757"
+NAME="AEN10835"
 ></A
 ><H3
 ><A
@@ -1708,7 +1708,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10765"
+NAME="AEN10843"
 ></A
 ><P
 ></P
@@ -1778,7 +1778,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10782"
+NAME="AEN10860"
 ></A
 ><H3
 ><A
@@ -1817,7 +1817,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10790"
+NAME="AEN10868"
 ></A
 ><P
 ></P
@@ -1922,7 +1922,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10815"
+NAME="AEN10893"
 ></A
 ><H3
 ><A
@@ -1954,7 +1954,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10822"
+NAME="AEN10900"
 ></A
 ><P
 ></P
@@ -2024,7 +2024,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10839"
+NAME="AEN10917"
 ></A
 ><H3
 ><A
@@ -2055,7 +2055,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10845"
+NAME="AEN10923"
 ></A
 ><P
 ></P
@@ -2182,7 +2182,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10874"
+NAME="AEN10952"
 ></A
 ><H3
 ><A
@@ -2214,7 +2214,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10880"
+NAME="AEN10958"
 ></A
 ><P
 ></P
@@ -2358,7 +2358,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10913"
+NAME="AEN10991"
 ></A
 ><H3
 ><A
@@ -2388,7 +2388,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10920"
+NAME="AEN10998"
 ></A
 ><P
 ></P
@@ -2441,7 +2441,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10933"
+NAME="AEN11011"
 ></A
 ><H3
 ><A
@@ -2468,7 +2468,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10939"
+NAME="AEN11017"
 ></A
 ><P
 ></P
@@ -2521,7 +2521,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10952"
+NAME="AEN11030"
 ></A
 ><H3
 ><A
@@ -2552,7 +2552,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10959"
+NAME="AEN11037"
 ></A
 ><P
 ></P
@@ -2590,7 +2590,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10968"
+NAME="AEN11046"
 ></A
 ><H3
 ><A
@@ -2644,7 +2644,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10979"
+NAME="AEN11057"
 ></A
 ><P
 ></P
@@ -2782,7 +2782,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11012"
+NAME="AEN11090"
 ></A
 ><H3
 ><A
@@ -2815,7 +2815,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11019"
+NAME="AEN11097"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-htmltree.html b/doc/html/libxml-htmltree.html
index b7ccc10..d932e97 100644
--- a/doc/html/libxml-htmltree.html
+++ b/doc/html/libxml-htmltree.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN11049"
+NAME="AEN11127"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN11052"
+NAME="AEN11130"
 ></A
 ><H2
 >Synopsis</H2
@@ -319,7 +319,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN11098"
+NAME="AEN11176"
 ></A
 ><H2
 >Description</H2
@@ -329,14 +329,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN11101"
+NAME="AEN11179"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11103"
+NAME="AEN11181"
 ></A
 ><H3
 ><A
@@ -365,7 +365,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11109"
+NAME="AEN11187"
 ></A
 ><H3
 ><A
@@ -394,7 +394,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11115"
+NAME="AEN11193"
 ></A
 ><H3
 ><A
@@ -423,7 +423,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11121"
+NAME="AEN11199"
 ></A
 ><H3
 ><A
@@ -452,7 +452,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11127"
+NAME="AEN11205"
 ></A
 ><H3
 ><A
@@ -481,7 +481,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11133"
+NAME="AEN11211"
 ></A
 ><H3
 ><A
@@ -518,7 +518,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11142"
+NAME="AEN11220"
 ></A
 ><P
 ></P
@@ -588,7 +588,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11159"
+NAME="AEN11237"
 ></A
 ><H3
 ><A
@@ -636,7 +636,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11170"
+NAME="AEN11248"
 ></A
 ><P
 ></P
@@ -706,7 +706,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11187"
+NAME="AEN11265"
 ></A
 ><H3
 ><A
@@ -739,7 +739,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11195"
+NAME="AEN11273"
 ></A
 ><P
 ></P
@@ -792,7 +792,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11208"
+NAME="AEN11286"
 ></A
 ><H3
 ><A
@@ -828,7 +828,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11216"
+NAME="AEN11294"
 ></A
 ><P
 ></P
@@ -898,7 +898,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11233"
+NAME="AEN11311"
 ></A
 ><H3
 ><A
@@ -934,7 +934,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11241"
+NAME="AEN11319"
 ></A
 ><P
 ></P
@@ -1006,7 +1006,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11258"
+NAME="AEN11336"
 ></A
 ><H3
 ><A
@@ -1040,7 +1040,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11266"
+NAME="AEN11344"
 ></A
 ><P
 ></P
@@ -1110,7 +1110,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11283"
+NAME="AEN11361"
 ></A
 ><H3
 ><A
@@ -1147,7 +1147,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11291"
+NAME="AEN11369"
 ></A
 ><P
 ></P
@@ -1217,7 +1217,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11308"
+NAME="AEN11386"
 ></A
 ><H3
 ><A
@@ -1256,7 +1256,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11317"
+NAME="AEN11395"
 ></A
 ><P
 ></P
@@ -1328,7 +1328,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11334"
+NAME="AEN11412"
 ></A
 ><H3
 ><A
@@ -1367,7 +1367,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11343"
+NAME="AEN11421"
 ></A
 ><P
 ></P
@@ -1439,7 +1439,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11360"
+NAME="AEN11438"
 ></A
 ><H3
 ><A
@@ -1481,7 +1481,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11370"
+NAME="AEN11448"
 ></A
 ><P
 ></P
@@ -1602,7 +1602,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11399"
+NAME="AEN11477"
 ></A
 ><H3
 ><A
@@ -1635,7 +1635,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11406"
+NAME="AEN11484"
 ></A
 ><P
 ></P
@@ -1722,7 +1722,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11427"
+NAME="AEN11505"
 ></A
 ><H3
 ><A
@@ -1755,7 +1755,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11434"
+NAME="AEN11512"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-lib.html b/doc/html/libxml-lib.html
index 2cedd4d..14a87fc 100644
--- a/doc/html/libxml-lib.html
+++ b/doc/html/libxml-lib.html
@@ -204,6 +204,16 @@
 > &#8212; </DT
 ><DT
 ><A
+HREF="libxml-threads.html"
+>threads</A
+> &#8212; </DT
+><DT
+><A
+HREF="libxml-globals.html"
+>globals</A
+> &#8212; </DT
+><DT
+><A
 HREF="libxml-docbparser.html"
 >DOCBparser</A
 > &#8212; </DT
@@ -219,6 +229,11 @@
 > &#8212; </DT
 ><DT
 ><A
+HREF="libxml-hash.html"
+>hash</A
+> &#8212; </DT
+><DT
+><A
 HREF="libxml-debugxml.html"
 >debugXML</A
 > &#8212; </DT
@@ -233,7 +248,8 @@
 >This section contains the API reference for libxml. All
     the public interfaces are documented here. This reference guide is
     build by extracting comments from the code sources. </P
-></DIV
+>_functions;
+    </DIV
 ><DIV
 CLASS="NAVFOOTER"
 ><BR
diff --git a/doc/html/libxml-nanoftp.html b/doc/html/libxml-nanoftp.html
index 8c78446..2b2b211 100644
--- a/doc/html/libxml-nanoftp.html
+++ b/doc/html/libxml-nanoftp.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN17153"
+NAME="AEN17231"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN17156"
+NAME="AEN17234"
 ></A
 ><H2
 >Synopsis</H2
@@ -283,7 +283,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN17185"
+NAME="AEN17263"
 ></A
 ><H2
 >Description</H2
@@ -293,14 +293,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN17188"
+NAME="AEN17266"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17190"
+NAME="AEN17268"
 ></A
 ><H3
 ><A
@@ -342,7 +342,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17197"
+NAME="AEN17275"
 ></A
 ><P
 ></P
@@ -567,7 +567,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17250"
+NAME="AEN17328"
 ></A
 ><H3
 ><A
@@ -596,7 +596,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17256"
+NAME="AEN17334"
 ></A
 ><P
 ></P
@@ -668,7 +668,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17273"
+NAME="AEN17351"
 ></A
 ><H3
 ><A
@@ -698,7 +698,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17279"
+NAME="AEN17357"
 ></A
 ><H3
 ><A
@@ -726,7 +726,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17285"
+NAME="AEN17363"
 ></A
 ><H3
 ><A
@@ -753,7 +753,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17291"
+NAME="AEN17369"
 ></A
 ><P
 ></P
@@ -791,7 +791,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17300"
+NAME="AEN17378"
 ></A
 ><H3
 ><A
@@ -818,7 +818,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17306"
+NAME="AEN17384"
 ></A
 ><P
 ></P
@@ -856,7 +856,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17315"
+NAME="AEN17393"
 ></A
 ><H3
 ><A
@@ -884,7 +884,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17321"
+NAME="AEN17399"
 ></A
 ><P
 ></P
@@ -939,7 +939,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17334"
+NAME="AEN17412"
 ></A
 ><H3
 ><A
@@ -966,7 +966,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17340"
+NAME="AEN17418"
 ></A
 ><P
 ></P
@@ -1004,7 +1004,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17349"
+NAME="AEN17427"
 ></A
 ><H3
 ><A
@@ -1031,7 +1031,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17355"
+NAME="AEN17433"
 ></A
 ><P
 ></P
@@ -1084,7 +1084,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17368"
+NAME="AEN17446"
 ></A
 ><H3
 ><A
@@ -1111,7 +1111,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17374"
+NAME="AEN17452"
 ></A
 ><P
 ></P
@@ -1164,7 +1164,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17387"
+NAME="AEN17465"
 ></A
 ><H3
 ><A
@@ -1191,7 +1191,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17393"
+NAME="AEN17471"
 ></A
 ><P
 ></P
@@ -1244,7 +1244,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17406"
+NAME="AEN17484"
 ></A
 ><H3
 ><A
@@ -1274,7 +1274,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17412"
+NAME="AEN17490"
 ></A
 ><P
 ></P
@@ -1312,7 +1312,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17421"
+NAME="AEN17499"
 ></A
 ><H3
 ><A
@@ -1345,7 +1345,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17427"
+NAME="AEN17505"
 ></A
 ><P
 ></P
@@ -1456,7 +1456,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17453"
+NAME="AEN17531"
 ></A
 ><H3
 ><A
@@ -1488,7 +1488,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17459"
+NAME="AEN17537"
 ></A
 ><P
 ></P
@@ -1558,7 +1558,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17476"
+NAME="AEN17554"
 ></A
 ><H3
 ><A
@@ -1585,7 +1585,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17482"
+NAME="AEN17560"
 ></A
 ><P
 ></P
@@ -1638,7 +1638,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17495"
+NAME="AEN17573"
 ></A
 ><H3
 ><A
@@ -1665,7 +1665,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17501"
+NAME="AEN17579"
 ></A
 ><P
 ></P
@@ -1718,7 +1718,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17514"
+NAME="AEN17592"
 ></A
 ><H3
 ><A
@@ -1746,7 +1746,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17520"
+NAME="AEN17598"
 ></A
 ><P
 ></P
@@ -1816,7 +1816,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17537"
+NAME="AEN17615"
 ></A
 ><H3
 ><A
@@ -1844,7 +1844,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17543"
+NAME="AEN17621"
 ></A
 ><P
 ></P
@@ -1897,7 +1897,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17556"
+NAME="AEN17634"
 ></A
 ><H3
 ><A
@@ -1924,7 +1924,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17562"
+NAME="AEN17640"
 ></A
 ><P
 ></P
@@ -1977,7 +1977,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17575"
+NAME="AEN17653"
 ></A
 ><H3
 ><A
@@ -2011,7 +2011,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17582"
+NAME="AEN17660"
 ></A
 ><P
 ></P
@@ -2115,7 +2115,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17607"
+NAME="AEN17685"
 ></A
 ><H3
 ><A
@@ -2143,7 +2143,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17613"
+NAME="AEN17691"
 ></A
 ><P
 ></P
@@ -2213,7 +2213,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17630"
+NAME="AEN17708"
 ></A
 ><H3
 ><A
@@ -2247,7 +2247,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17637"
+NAME="AEN17715"
 ></A
 ><P
 ></P
@@ -2351,7 +2351,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17662"
+NAME="AEN17740"
 ></A
 ><H3
 ><A
@@ -2391,7 +2391,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17670"
+NAME="AEN17748"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-nanohttp.html b/doc/html/libxml-nanohttp.html
index c3a422c..9d0ea3f 100644
--- a/doc/html/libxml-nanohttp.html
+++ b/doc/html/libxml-nanohttp.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN16847"
+NAME="AEN16925"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN16850"
+NAME="AEN16928"
 ></A
 ><H2
 >Synopsis</H2
@@ -224,7 +224,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN16866"
+NAME="AEN16944"
 ></A
 ><H2
 >Description</H2
@@ -234,14 +234,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN16869"
+NAME="AEN16947"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16871"
+NAME="AEN16949"
 ></A
 ><H3
 ><A
@@ -270,7 +270,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16877"
+NAME="AEN16955"
 ></A
 ><H3
 ><A
@@ -298,7 +298,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16883"
+NAME="AEN16961"
 ></A
 ><H3
 ><A
@@ -328,7 +328,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16889"
+NAME="AEN16967"
 ></A
 ><P
 ></P
@@ -366,7 +366,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16898"
+NAME="AEN16976"
 ></A
 ><H3
 ><A
@@ -396,7 +396,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16904"
+NAME="AEN16982"
 ></A
 ><P
 ></P
@@ -485,7 +485,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16925"
+NAME="AEN17003"
 ></A
 ><H3
 ><A
@@ -524,7 +524,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16932"
+NAME="AEN17010"
 ></A
 ><P
 ></P
@@ -647,7 +647,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16961"
+NAME="AEN17039"
 ></A
 ><H3
 ><A
@@ -687,7 +687,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16968"
+NAME="AEN17046"
 ></A
 ><P
 ></P
@@ -827,7 +827,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17001"
+NAME="AEN17079"
 ></A
 ><H3
 ><A
@@ -856,7 +856,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17007"
+NAME="AEN17085"
 ></A
 ><P
 ></P
@@ -912,7 +912,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17020"
+NAME="AEN17098"
 ></A
 ><H3
 ><A
@@ -942,7 +942,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17026"
+NAME="AEN17104"
 ></A
 ><P
 ></P
@@ -1015,7 +1015,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17043"
+NAME="AEN17121"
 ></A
 ><H3
 ><A
@@ -1042,7 +1042,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17049"
+NAME="AEN17127"
 ></A
 ><P
 ></P
@@ -1095,7 +1095,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17062"
+NAME="AEN17140"
 ></A
 ><H3
 ><A
@@ -1122,7 +1122,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17068"
+NAME="AEN17146"
 ></A
 ><P
 ></P
@@ -1176,7 +1176,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17081"
+NAME="AEN17159"
 ></A
 ><H3
 ><A
@@ -1216,7 +1216,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17089"
+NAME="AEN17167"
 ></A
 ><P
 ></P
@@ -1304,7 +1304,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17110"
+NAME="AEN17188"
 ></A
 ><H3
 ><A
@@ -1333,7 +1333,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17116"
+NAME="AEN17194"
 ></A
 ><P
 ></P
@@ -1403,7 +1403,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17133"
+NAME="AEN17211"
 ></A
 ><H3
 ><A
@@ -1431,7 +1431,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17139"
+NAME="AEN17217"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-parser.html b/doc/html/libxml-parser.html
index 10c6419..7f02628 100644
--- a/doc/html/libxml-parser.html
+++ b/doc/html/libxml-parser.html
@@ -4842,6 +4842,7 @@
     getParameterEntitySAXFunc getParameterEntity;
     cdataBlockSAXFunc cdataBlock;
     externalSubsetSAXFunc externalSubset;
+    int initialized;
 };</PRE
 ></TD
 ></TR
@@ -5020,7 +5021,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define xmlSubstituteEntitiesDefaultValue xmlSubstituteEntitiesDefaultVal</PRE
+>#define     xmlSubstituteEntitiesDefaultValue</PRE
 ></TD
 ></TR
 ></TABLE
diff --git a/doc/html/libxml-parserinternals.html b/doc/html/libxml-parserinternals.html
index 3726746..0207074 100644
--- a/doc/html/libxml-parserinternals.html
+++ b/doc/html/libxml-parserinternals.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN19683"
+NAME="AEN20574"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN19686"
+NAME="AEN20577"
 ></A
 ><H2
 >Synopsis</H2
@@ -1132,7 +1132,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN19961"
+NAME="AEN20852"
 ></A
 ><H2
 >Description</H2
@@ -1142,14 +1142,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN19964"
+NAME="AEN20855"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19966"
+NAME="AEN20857"
 ></A
 ><H3
 ><A
@@ -1178,7 +1178,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19972"
+NAME="AEN20863"
 ></A
 ><H3
 ><A
@@ -1207,7 +1207,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN19978"
+NAME="AEN20869"
 ></A
 ><H3
 ><A
@@ -1265,7 +1265,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN19994"
+NAME="AEN20885"
 ></A
 ><P
 ></P
@@ -1303,7 +1303,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20003"
+NAME="AEN20894"
 ></A
 ><H3
 ><A
@@ -1344,7 +1344,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20014"
+NAME="AEN20905"
 ></A
 ><P
 ></P
@@ -1382,7 +1382,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20023"
+NAME="AEN20914"
 ></A
 ><H3
 ><A
@@ -1411,7 +1411,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20030"
+NAME="AEN20921"
 ></A
 ><P
 ></P
@@ -1449,7 +1449,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20039"
+NAME="AEN20930"
 ></A
 ><H3
 ><A
@@ -1478,7 +1478,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20046"
+NAME="AEN20937"
 ></A
 ><P
 ></P
@@ -1516,7 +1516,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20055"
+NAME="AEN20946"
 ></A
 ><H3
 ><A
@@ -1545,7 +1545,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20062"
+NAME="AEN20953"
 ></A
 ><P
 ></P
@@ -1583,7 +1583,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20071"
+NAME="AEN20962"
 ></A
 ><H3
 ><A
@@ -1656,7 +1656,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20092"
+NAME="AEN20983"
 ></A
 ><P
 ></P
@@ -1694,7 +1694,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20101"
+NAME="AEN20992"
 ></A
 ><H3
 ><A
@@ -1738,7 +1738,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20113"
+NAME="AEN21004"
 ></A
 ><P
 ></P
@@ -1776,7 +1776,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20122"
+NAME="AEN21013"
 ></A
 ><H3
 ><A
@@ -1805,7 +1805,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20129"
+NAME="AEN21020"
 ></A
 ><P
 ></P
@@ -1843,7 +1843,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20138"
+NAME="AEN21029"
 ></A
 ><H3
 ><A
@@ -1881,7 +1881,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20148"
+NAME="AEN21039"
 ></A
 ><P
 ></P
@@ -1919,7 +1919,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20157"
+NAME="AEN21048"
 ></A
 ><H3
 ><A
@@ -1946,7 +1946,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20163"
+NAME="AEN21054"
 ></A
 ><P
 ></P
@@ -1984,7 +1984,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20172"
+NAME="AEN21063"
 ></A
 ><H3
 ><A
@@ -2011,7 +2011,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20178"
+NAME="AEN21069"
 ></A
 ><P
 ></P
@@ -2049,7 +2049,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20187"
+NAME="AEN21078"
 ></A
 ><H3
 ><A
@@ -2076,7 +2076,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20193"
+NAME="AEN21084"
 ></A
 ><P
 ></P
@@ -2114,7 +2114,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20202"
+NAME="AEN21093"
 ></A
 ><H3
 ><A
@@ -2156,7 +2156,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20212"
+NAME="AEN21103"
 ></A
 ><P
 ></P
@@ -2209,7 +2209,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20225"
+NAME="AEN21116"
 ></A
 ><H3
 ><A
@@ -2253,7 +2253,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20236"
+NAME="AEN21127"
 ></A
 ><P
 ></P
@@ -2306,7 +2306,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20249"
+NAME="AEN21140"
 ></A
 ><H3
 ><A
@@ -2343,7 +2343,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20258"
+NAME="AEN21149"
 ></A
 ><P
 ></P
@@ -2396,7 +2396,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20271"
+NAME="AEN21162"
 ></A
 ><H3
 ><A
@@ -2424,7 +2424,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20277"
+NAME="AEN21168"
 ></A
 ><P
 ></P
@@ -2477,7 +2477,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20290"
+NAME="AEN21181"
 ></A
 ><H3
 ><A
@@ -2505,7 +2505,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20296"
+NAME="AEN21187"
 ></A
 ><P
 ></P
@@ -2558,7 +2558,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20309"
+NAME="AEN21200"
 ></A
 ><H3
 ><A
@@ -2601,7 +2601,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20320"
+NAME="AEN21211"
 ></A
 ><P
 ></P
@@ -2654,7 +2654,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20333"
+NAME="AEN21224"
 ></A
 ><H3
 ><A
@@ -2682,7 +2682,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20339"
+NAME="AEN21230"
 ></A
 ><P
 ></P
@@ -2735,7 +2735,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20352"
+NAME="AEN21243"
 ></A
 ><H3
 ><A
@@ -2807,7 +2807,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20372"
+NAME="AEN21263"
 ></A
 ><P
 ></P
@@ -2860,7 +2860,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20385"
+NAME="AEN21276"
 ></A
 ><H3
 ><A
@@ -2921,7 +2921,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20401"
+NAME="AEN21292"
 ></A
 ><P
 ></P
@@ -2974,7 +2974,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20414"
+NAME="AEN21305"
 ></A
 ><H3
 ><A
@@ -3007,7 +3007,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20422"
+NAME="AEN21313"
 ></A
 ><P
 ></P
@@ -3060,7 +3060,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20435"
+NAME="AEN21326"
 ></A
 ><H3
 ><A
@@ -3092,7 +3092,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20442"
+NAME="AEN21333"
 ></A
 ><P
 ></P
@@ -3145,7 +3145,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20455"
+NAME="AEN21346"
 ></A
 ><H3
 ><A
@@ -3176,7 +3176,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20462"
+NAME="AEN21353"
 ></A
 ><P
 ></P
@@ -3246,7 +3246,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20479"
+NAME="AEN21370"
 ></A
 ><H3
 ><A
@@ -3276,7 +3276,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20486"
+NAME="AEN21377"
 ></A
 ><P
 ></P
@@ -3312,7 +3312,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20495"
+NAME="AEN21386"
 ></A
 ><H3
 ><A
@@ -3355,7 +3355,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20505"
+NAME="AEN21396"
 ></A
 ><P
 ></P
@@ -3442,7 +3442,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20526"
+NAME="AEN21417"
 ></A
 ><H3
 ><A
@@ -3477,7 +3477,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20534"
+NAME="AEN21425"
 ></A
 ><P
 ></P
@@ -3547,7 +3547,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20551"
+NAME="AEN21442"
 ></A
 ><H3
 ><A
@@ -3582,7 +3582,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20559"
+NAME="AEN21450"
 ></A
 ><P
 ></P
@@ -3652,7 +3652,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20576"
+NAME="AEN21467"
 ></A
 ><H3
 ><A
@@ -3683,7 +3683,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20583"
+NAME="AEN21474"
 ></A
 ><P
 ></P
@@ -3721,7 +3721,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20592"
+NAME="AEN21483"
 ></A
 ><H3
 ><A
@@ -3758,7 +3758,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20601"
+NAME="AEN21492"
 ></A
 ><P
 ></P
@@ -3813,7 +3813,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20614"
+NAME="AEN21505"
 ></A
 ><H3
 ><A
@@ -3850,7 +3850,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20623"
+NAME="AEN21514"
 ></A
 ><P
 ></P
@@ -3920,7 +3920,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20640"
+NAME="AEN21531"
 ></A
 ><H3
 ><A
@@ -3957,7 +3957,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20649"
+NAME="AEN21540"
 ></A
 ><P
 ></P
@@ -4027,7 +4027,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20666"
+NAME="AEN21557"
 ></A
 ><H3
 ><A
@@ -4062,7 +4062,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20674"
+NAME="AEN21565"
 ></A
 ><P
 ></P
@@ -4117,7 +4117,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20687"
+NAME="AEN21578"
 ></A
 ><H3
 ><A
@@ -4151,7 +4151,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20695"
+NAME="AEN21586"
 ></A
 ><P
 ></P
@@ -4204,7 +4204,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20708"
+NAME="AEN21599"
 ></A
 ><H3
 ><A
@@ -4234,7 +4234,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20715"
+NAME="AEN21606"
 ></A
 ><P
 ></P
@@ -4272,7 +4272,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20724"
+NAME="AEN21615"
 ></A
 ><H3
 ><A
@@ -4306,7 +4306,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20732"
+NAME="AEN21623"
 ></A
 ><P
 ></P
@@ -4376,7 +4376,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20749"
+NAME="AEN21640"
 ></A
 ><H3
 ><A
@@ -4409,7 +4409,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20757"
+NAME="AEN21648"
 ></A
 ><P
 ></P
@@ -4462,7 +4462,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20770"
+NAME="AEN21661"
 ></A
 ><H3
 ><A
@@ -4509,7 +4509,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20783"
+NAME="AEN21674"
 ></A
 ><P
 ></P
@@ -4597,7 +4597,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20804"
+NAME="AEN21695"
 ></A
 ><H3
 ><A
@@ -4638,7 +4638,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20815"
+NAME="AEN21706"
 ></A
 ><P
 ></P
@@ -4691,7 +4691,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20828"
+NAME="AEN21719"
 ></A
 ><H3
 ><A
@@ -4737,7 +4737,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20841"
+NAME="AEN21732"
 ></A
 ><P
 ></P
@@ -4808,7 +4808,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20858"
+NAME="AEN21749"
 ></A
 ><H3
 ><A
@@ -4848,7 +4848,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20869"
+NAME="AEN21760"
 ></A
 ><P
 ></P
@@ -4901,7 +4901,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20882"
+NAME="AEN21773"
 ></A
 ><H3
 ><A
@@ -4936,7 +4936,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20891"
+NAME="AEN21782"
 ></A
 ><P
 ></P
@@ -4989,7 +4989,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20904"
+NAME="AEN21795"
 ></A
 ><H3
 ><A
@@ -5027,7 +5027,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20914"
+NAME="AEN21805"
 ></A
 ><P
 ></P
@@ -5065,7 +5065,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20923"
+NAME="AEN21814"
 ></A
 ><H3
 ><A
@@ -5109,7 +5109,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20935"
+NAME="AEN21826"
 ></A
 ><P
 ></P
@@ -5162,7 +5162,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20948"
+NAME="AEN21839"
 ></A
 ><H3
 ><A
@@ -5202,7 +5202,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20959"
+NAME="AEN21850"
 ></A
 ><P
 ></P
@@ -5255,7 +5255,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20972"
+NAME="AEN21863"
 ></A
 ><H3
 ><A
@@ -5292,7 +5292,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN20982"
+NAME="AEN21873"
 ></A
 ><P
 ></P
@@ -5345,7 +5345,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN20995"
+NAME="AEN21886"
 ></A
 ><H3
 ><A
@@ -5385,7 +5385,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21005"
+NAME="AEN21896"
 ></A
 ><P
 ></P
@@ -5455,7 +5455,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21022"
+NAME="AEN21913"
 ></A
 ><H3
 ><A
@@ -5545,7 +5545,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21043"
+NAME="AEN21934"
 ></A
 ><P
 ></P
@@ -5598,7 +5598,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21056"
+NAME="AEN21947"
 ></A
 ><H3
 ><A
@@ -5633,7 +5633,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21065"
+NAME="AEN21956"
 ></A
 ><P
 ></P
@@ -5686,7 +5686,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21078"
+NAME="AEN21969"
 ></A
 ><H3
 ><A
@@ -5721,7 +5721,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21087"
+NAME="AEN21978"
 ></A
 ><P
 ></P
@@ -5774,7 +5774,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21100"
+NAME="AEN21991"
 ></A
 ><H3
 ><A
@@ -5813,7 +5813,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21109"
+NAME="AEN22000"
 ></A
 ><P
 ></P
@@ -5868,7 +5868,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21122"
+NAME="AEN22013"
 ></A
 ><H3
 ><A
@@ -5914,7 +5914,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21134"
+NAME="AEN22025"
 ></A
 ><P
 ></P
@@ -6004,7 +6004,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21155"
+NAME="AEN22046"
 ></A
 ><H3
 ><A
@@ -6038,7 +6038,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21163"
+NAME="AEN22054"
 ></A
 ><P
 ></P
@@ -6076,7 +6076,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21172"
+NAME="AEN22063"
 ></A
 ><H3
 ><A
@@ -6111,7 +6111,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21181"
+NAME="AEN22072"
 ></A
 ><P
 ></P
@@ -6164,7 +6164,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21194"
+NAME="AEN22085"
 ></A
 ><H3
 ><A
@@ -6198,7 +6198,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21203"
+NAME="AEN22094"
 ></A
 ><P
 ></P
@@ -6236,7 +6236,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21212"
+NAME="AEN22103"
 ></A
 ><H3
 ><A
@@ -6278,7 +6278,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21223"
+NAME="AEN22114"
 ></A
 ><P
 ></P
@@ -6316,7 +6316,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21232"
+NAME="AEN22123"
 ></A
 ><H3
 ><A
@@ -6361,7 +6361,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21246"
+NAME="AEN22137"
 ></A
 ><P
 ></P
@@ -6399,7 +6399,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21255"
+NAME="AEN22146"
 ></A
 ><H3
 ><A
@@ -6472,7 +6472,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21275"
+NAME="AEN22166"
 ></A
 ><P
 ></P
@@ -6543,7 +6543,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21292"
+NAME="AEN22183"
 ></A
 ><H3
 ><A
@@ -6584,7 +6584,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21303"
+NAME="AEN22194"
 ></A
 ><P
 ></P
@@ -6637,7 +6637,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21316"
+NAME="AEN22207"
 ></A
 ><H3
 ><A
@@ -6676,7 +6676,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21326"
+NAME="AEN22217"
 ></A
 ><P
 ></P
@@ -6729,7 +6729,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21339"
+NAME="AEN22230"
 ></A
 ><H3
 ><A
@@ -6767,7 +6767,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21349"
+NAME="AEN22240"
 ></A
 ><P
 ></P
@@ -6837,7 +6837,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21366"
+NAME="AEN22257"
 ></A
 ><H3
 ><A
@@ -6916,7 +6916,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21387"
+NAME="AEN22278"
 ></A
 ><P
 ></P
@@ -6986,7 +6986,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21404"
+NAME="AEN22295"
 ></A
 ><H3
 ><A
@@ -7020,7 +7020,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21413"
+NAME="AEN22304"
 ></A
 ><P
 ></P
@@ -7058,7 +7058,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21422"
+NAME="AEN22313"
 ></A
 ><H3
 ><A
@@ -7108,7 +7108,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21435"
+NAME="AEN22326"
 ></A
 ><P
 ></P
@@ -7161,7 +7161,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21448"
+NAME="AEN22339"
 ></A
 ><H3
 ><A
@@ -7198,7 +7198,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21457"
+NAME="AEN22348"
 ></A
 ><P
 ></P
@@ -7252,7 +7252,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21470"
+NAME="AEN22361"
 ></A
 ><H3
 ><A
@@ -7306,7 +7306,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21483"
+NAME="AEN22374"
 ></A
 ><P
 ></P
@@ -7360,7 +7360,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21496"
+NAME="AEN22387"
 ></A
 ><H3
 ><A
@@ -7401,7 +7401,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21506"
+NAME="AEN22397"
 ></A
 ><P
 ></P
@@ -7488,7 +7488,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21527"
+NAME="AEN22418"
 ></A
 ><H3
 ><A
@@ -7523,7 +7523,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21536"
+NAME="AEN22427"
 ></A
 ><P
 ></P
@@ -7576,7 +7576,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21549"
+NAME="AEN22440"
 ></A
 ><H3
 ><A
@@ -7622,7 +7622,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21559"
+NAME="AEN22450"
 ></A
 ><P
 ></P
@@ -7660,7 +7660,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21568"
+NAME="AEN22459"
 ></A
 ><H3
 ><A
@@ -7700,7 +7700,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21578"
+NAME="AEN22469"
 ></A
 ><P
 ></P
@@ -7753,7 +7753,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21591"
+NAME="AEN22482"
 ></A
 ><H3
 ><A
@@ -7806,7 +7806,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21602"
+NAME="AEN22493"
 ></A
 ><P
 ></P
@@ -7859,7 +7859,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21615"
+NAME="AEN22506"
 ></A
 ><H3
 ><A
@@ -7900,7 +7900,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21625"
+NAME="AEN22516"
 ></A
 ><P
 ></P
@@ -7938,7 +7938,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21634"
+NAME="AEN22525"
 ></A
 ><H3
 ><A
@@ -7991,7 +7991,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21646"
+NAME="AEN22537"
 ></A
 ><P
 ></P
@@ -8029,7 +8029,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21655"
+NAME="AEN22546"
 ></A
 ><H3
 ><A
@@ -8066,7 +8066,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21664"
+NAME="AEN22555"
 ></A
 ><P
 ></P
@@ -8104,7 +8104,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21673"
+NAME="AEN22564"
 ></A
 ><H3
 ><A
@@ -8164,7 +8164,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21690"
+NAME="AEN22581"
 ></A
 ><P
 ></P
@@ -8234,7 +8234,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21707"
+NAME="AEN22598"
 ></A
 ><H3
 ><A
@@ -8286,7 +8286,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21722"
+NAME="AEN22613"
 ></A
 ><P
 ></P
@@ -8339,7 +8339,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21735"
+NAME="AEN22626"
 ></A
 ><H3
 ><A
@@ -8375,7 +8375,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21745"
+NAME="AEN22636"
 ></A
 ><P
 ></P
@@ -8413,7 +8413,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21754"
+NAME="AEN22645"
 ></A
 ><H3
 ><A
@@ -8451,7 +8451,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21765"
+NAME="AEN22656"
 ></A
 ><P
 ></P
@@ -8489,7 +8489,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21774"
+NAME="AEN22665"
 ></A
 ><H3
 ><A
@@ -8521,7 +8521,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21782"
+NAME="AEN22673"
 ></A
 ><P
 ></P
@@ -8559,7 +8559,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21791"
+NAME="AEN22682"
 ></A
 ><H3
 ><A
@@ -8608,7 +8608,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21801"
+NAME="AEN22692"
 ></A
 ><P
 ></P
@@ -8646,7 +8646,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21810"
+NAME="AEN22701"
 ></A
 ><H3
 ><A
@@ -8681,7 +8681,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21819"
+NAME="AEN22710"
 ></A
 ><P
 ></P
@@ -8734,7 +8734,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21832"
+NAME="AEN22723"
 ></A
 ><H3
 ><A
@@ -8771,7 +8771,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21842"
+NAME="AEN22733"
 ></A
 ><P
 ></P
@@ -8824,7 +8824,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21855"
+NAME="AEN22746"
 ></A
 ><H3
 ><A
@@ -8859,7 +8859,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21864"
+NAME="AEN22755"
 ></A
 ><P
 ></P
@@ -8912,7 +8912,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21877"
+NAME="AEN22768"
 ></A
 ><H3
 ><A
@@ -8949,7 +8949,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21887"
+NAME="AEN22778"
 ></A
 ><P
 ></P
@@ -9002,7 +9002,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21900"
+NAME="AEN22791"
 ></A
 ><H3
 ><A
@@ -9049,7 +9049,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21909"
+NAME="AEN22800"
 ></A
 ><P
 ></P
@@ -9102,7 +9102,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21922"
+NAME="AEN22813"
 ></A
 ><H3
 ><A
@@ -9134,7 +9134,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21930"
+NAME="AEN22821"
 ></A
 ><P
 ></P
@@ -9172,7 +9172,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21939"
+NAME="AEN22830"
 ></A
 ><H3
 ><A
@@ -9206,7 +9206,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21948"
+NAME="AEN22839"
 ></A
 ><P
 ></P
@@ -9244,7 +9244,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21957"
+NAME="AEN22848"
 ></A
 ><H3
 ><A
@@ -9276,7 +9276,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21965"
+NAME="AEN22856"
 ></A
 ><P
 ></P
@@ -9314,7 +9314,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN21974"
+NAME="AEN22865"
 ></A
 ><H3
 ><A
@@ -9356,7 +9356,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN21985"
+NAME="AEN22876"
 ></A
 ><P
 ></P
@@ -9428,7 +9428,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22002"
+NAME="AEN22893"
 ></A
 ><H3
 ><A
@@ -9456,7 +9456,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22008"
+NAME="AEN22899"
 ></A
 ><H3
 ><A
@@ -9484,7 +9484,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22014"
+NAME="AEN22905"
 ></A
 ><H3
 ><A
@@ -9512,7 +9512,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22020"
+NAME="AEN22911"
 ></A
 ><H3
 ><A
@@ -9540,7 +9540,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22026"
+NAME="AEN22917"
 ></A
 ><H3
 ><A
@@ -9594,7 +9594,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22040"
+NAME="AEN22931"
 ></A
 ><P
 ></P
@@ -9733,7 +9733,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22073"
+NAME="AEN22964"
 ></A
 ><H3
 ><A
@@ -9787,7 +9787,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22087"
+NAME="AEN22978"
 ></A
 ><P
 ></P
@@ -9926,7 +9926,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22120"
+NAME="AEN23011"
 ></A
 ><H3
 ><A
@@ -9960,7 +9960,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22128"
+NAME="AEN23019"
 ></A
 ><P
 ></P
@@ -10030,7 +10030,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22145"
+NAME="AEN23036"
 ></A
 ><H3
 ><A
@@ -10063,7 +10063,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22153"
+NAME="AEN23044"
 ></A
 ><P
 ></P
@@ -10116,7 +10116,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22166"
+NAME="AEN23057"
 ></A
 ><H3
 ><A
@@ -10150,7 +10150,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22174"
+NAME="AEN23065"
 ></A
 ><P
 ></P
@@ -10220,7 +10220,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22191"
+NAME="AEN23082"
 ></A
 ><H3
 ><A
@@ -10253,7 +10253,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22199"
+NAME="AEN23090"
 ></A
 ><P
 ></P
@@ -10306,7 +10306,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22212"
+NAME="AEN23103"
 ></A
 ><H3
 ><A
@@ -10339,7 +10339,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22220"
+NAME="AEN23111"
 ></A
 ><P
 ></P
@@ -10392,7 +10392,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22233"
+NAME="AEN23124"
 ></A
 ><H3
 ><A
@@ -10426,7 +10426,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22241"
+NAME="AEN23132"
 ></A
 ><P
 ></P
@@ -10496,7 +10496,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22258"
+NAME="AEN23149"
 ></A
 ><H3
 ><A
@@ -10527,7 +10527,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22265"
+NAME="AEN23156"
 ></A
 ><P
 ></P
@@ -10580,7 +10580,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22278"
+NAME="AEN23169"
 ></A
 ><H3
 ><A
@@ -10616,7 +10616,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22286"
+NAME="AEN23177"
 ></A
 ><P
 ></P
@@ -10703,7 +10703,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22307"
+NAME="AEN23198"
 ></A
 ><H3
 ><A
@@ -10762,7 +10762,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22320"
+NAME="AEN23211"
 ></A
 ><P
 ></P
@@ -10800,7 +10800,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22329"
+NAME="AEN23220"
 ></A
 ><H3
 ><A
@@ -10857,7 +10857,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22344"
+NAME="AEN23235"
 ></A
 ><P
 ></P
@@ -10895,7 +10895,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22353"
+NAME="AEN23244"
 ></A
 ><H3
 ><A
@@ -10935,7 +10935,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22362"
+NAME="AEN23253"
 ></A
 ><P
 ></P
@@ -10988,7 +10988,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22375"
+NAME="AEN23266"
 ></A
 ><H3
 ><A
@@ -11042,7 +11042,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22387"
+NAME="AEN23278"
 ></A
 ><P
 ></P
@@ -11112,7 +11112,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22404"
+NAME="AEN23295"
 ></A
 ><H3
 ><A
@@ -11143,7 +11143,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22411"
+NAME="AEN23302"
 ></A
 ><P
 ></P
@@ -11213,7 +11213,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22428"
+NAME="AEN23319"
 ></A
 ><H3
 ><A
@@ -11245,7 +11245,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22435"
+NAME="AEN23326"
 ></A
 ><P
 ></P
@@ -11332,7 +11332,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22456"
+NAME="AEN23347"
 ></A
 ><H3
 ><A
@@ -11362,7 +11362,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22463"
+NAME="AEN23354"
 ></A
 ><P
 ></P
@@ -11400,7 +11400,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22472"
+NAME="AEN23363"
 ></A
 ><H3
 ><A
@@ -11430,7 +11430,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22479"
+NAME="AEN23370"
 ></A
 ><P
 ></P
@@ -11468,7 +11468,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22488"
+NAME="AEN23379"
 ></A
 ><H3
 ><A
@@ -11501,7 +11501,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN22495"
+NAME="AEN23386"
 ></A
 ><H3
 ><A
@@ -11534,7 +11534,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN22502"
+NAME="AEN23393"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-sax.html b/doc/html/libxml-sax.html
index c0ac69c..ce71b75 100644
--- a/doc/html/libxml-sax.html
+++ b/doc/html/libxml-sax.html
@@ -492,6 +492,28 @@
 > *value,
                                              int len);
 void        <A
+HREF="libxml-sax.html#INITXMLDEFAULTSAXHANDLER"
+>initxmlDefaultSAXHandler</A
+>        (<A
+HREF="libxml-parser.html#XMLSAXHANDLER"
+>xmlSAXHandler</A
+> *hdlr,
+                                             int warning);
+void        <A
+HREF="libxml-sax.html#INITHTMLDEFAULTSAXHANDLER"
+>inithtmlDefaultSAXHandler</A
+>       (<A
+HREF="libxml-parser.html#XMLSAXHANDLER"
+>xmlSAXHandler</A
+> *hdlr);
+void        <A
+HREF="libxml-sax.html#INITDOCBDEFAULTSAXHANDLER"
+>initdocbDefaultSAXHandler</A
+>       (<A
+HREF="libxml-parser.html#XMLSAXHANDLER"
+>xmlSAXHandler</A
+> *hdlr);
+void        <A
 HREF="libxml-parser.html#XMLDEFAULTSAXHANDLERINIT"
 >xmlDefaultSAXHandlerInit</A
 >        (void);
@@ -510,7 +532,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN2929"
+NAME="AEN2935"
 ></A
 ><H2
 >Description</H2
@@ -520,14 +542,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN2932"
+NAME="AEN2938"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2934"
+NAME="AEN2940"
 ></A
 ><H3
 ><A
@@ -557,7 +579,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2941"
+NAME="AEN2947"
 ></A
 ><P
 ></P
@@ -610,7 +632,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2954"
+NAME="AEN2960"
 ></A
 ><H3
 ><A
@@ -641,7 +663,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2961"
+NAME="AEN2967"
 ></A
 ><P
 ></P
@@ -694,7 +716,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2974"
+NAME="AEN2980"
 ></A
 ><H3
 ><A
@@ -726,7 +748,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN2981"
+NAME="AEN2987"
 ></A
 ><P
 ></P
@@ -781,7 +803,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN2994"
+NAME="AEN3000"
 ></A
 ><H3
 ><A
@@ -808,7 +830,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3000"
+NAME="AEN3006"
 ></A
 ><P
 ></P
@@ -861,7 +883,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3013"
+NAME="AEN3019"
 ></A
 ><H3
 ><A
@@ -888,7 +910,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3019"
+NAME="AEN3025"
 ></A
 ><P
 ></P
@@ -941,7 +963,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3032"
+NAME="AEN3038"
 ></A
 ><H3
 ><A
@@ -968,7 +990,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3038"
+NAME="AEN3044"
 ></A
 ><P
 ></P
@@ -1021,7 +1043,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3051"
+NAME="AEN3057"
 ></A
 ><H3
 ><A
@@ -1048,7 +1070,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3057"
+NAME="AEN3063"
 ></A
 ><P
 ></P
@@ -1101,7 +1123,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3070"
+NAME="AEN3076"
 ></A
 ><H3
 ><A
@@ -1128,7 +1150,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3076"
+NAME="AEN3082"
 ></A
 ><P
 ></P
@@ -1181,7 +1203,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3089"
+NAME="AEN3095"
 ></A
 ><H3
 ><A
@@ -1220,7 +1242,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3098"
+NAME="AEN3104"
 ></A
 ><P
 ></P
@@ -1309,7 +1331,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3119"
+NAME="AEN3125"
 ></A
 ><H3
 ><A
@@ -1348,7 +1370,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3128"
+NAME="AEN3134"
 ></A
 ><P
 ></P
@@ -1437,7 +1459,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3149"
+NAME="AEN3155"
 ></A
 ><H3
 ><A
@@ -1471,7 +1493,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3157"
+NAME="AEN3163"
 ></A
 ><P
 ></P
@@ -1541,7 +1563,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3174"
+NAME="AEN3180"
 ></A
 ><H3
 ><A
@@ -1575,7 +1597,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3182"
+NAME="AEN3188"
 ></A
 ><P
 ></P
@@ -1645,7 +1667,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3199"
+NAME="AEN3205"
 ></A
 ><H3
 ><A
@@ -1693,7 +1715,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3210"
+NAME="AEN3216"
 ></A
 ><P
 ></P
@@ -1780,7 +1802,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3231"
+NAME="AEN3237"
 ></A
 ><H3
 ><A
@@ -1824,7 +1846,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3241"
+NAME="AEN3247"
 ></A
 ><P
 ></P
@@ -1947,7 +1969,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3270"
+NAME="AEN3276"
 ></A
 ><H3
 ><A
@@ -1992,7 +2014,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3280"
+NAME="AEN3286"
 ></A
 ><P
 ></P
@@ -2132,7 +2154,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3313"
+NAME="AEN3319"
 ></A
 ><H3
 ><A
@@ -2168,7 +2190,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3321"
+NAME="AEN3327"
 ></A
 ><P
 ></P
@@ -2257,7 +2279,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3342"
+NAME="AEN3348"
 ></A
 ><H3
 ><A
@@ -2296,7 +2318,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3351"
+NAME="AEN3357"
 ></A
 ><P
 ></P
@@ -2385,7 +2407,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3372"
+NAME="AEN3378"
 ></A
 ><H3
 ><A
@@ -2428,7 +2450,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3382"
+NAME="AEN3388"
 ></A
 ><P
 ></P
@@ -2534,7 +2556,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3407"
+NAME="AEN3413"
 ></A
 ><H3
 ><A
@@ -2561,7 +2583,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3413"
+NAME="AEN3419"
 ></A
 ><P
 ></P
@@ -2599,7 +2621,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3422"
+NAME="AEN3428"
 ></A
 ><H3
 ><A
@@ -2626,7 +2648,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3428"
+NAME="AEN3434"
 ></A
 ><P
 ></P
@@ -2664,7 +2686,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3437"
+NAME="AEN3443"
 ></A
 ><H3
 ><A
@@ -2702,7 +2724,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3445"
+NAME="AEN3451"
 ></A
 ><P
 ></P
@@ -2774,7 +2796,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3462"
+NAME="AEN3468"
 ></A
 ><H3
 ><A
@@ -2809,7 +2831,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3470"
+NAME="AEN3476"
 ></A
 ><P
 ></P
@@ -2881,7 +2903,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3487"
+NAME="AEN3493"
 ></A
 ><H3
 ><A
@@ -2912,7 +2934,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3494"
+NAME="AEN3500"
 ></A
 ><P
 ></P
@@ -2967,7 +2989,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3507"
+NAME="AEN3513"
 ></A
 ><H3
 ><A
@@ -2998,7 +3020,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3514"
+NAME="AEN3520"
 ></A
 ><P
 ></P
@@ -3053,7 +3075,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3527"
+NAME="AEN3533"
 ></A
 ><H3
 ><A
@@ -3085,7 +3107,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3534"
+NAME="AEN3540"
 ></A
 ><P
 ></P
@@ -3157,7 +3179,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3551"
+NAME="AEN3557"
 ></A
 ><H3
 ><A
@@ -3190,7 +3212,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3558"
+NAME="AEN3564"
 ></A
 ><P
 ></P
@@ -3262,7 +3284,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3575"
+NAME="AEN3581"
 ></A
 ><H3
 ><A
@@ -3297,7 +3319,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3583"
+NAME="AEN3589"
 ></A
 ><P
 ></P
@@ -3369,7 +3391,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3600"
+NAME="AEN3606"
 ></A
 ><H3
 ><A
@@ -3404,7 +3426,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3608"
+NAME="AEN3614"
 ></A
 ><P
 ></P
@@ -3476,7 +3498,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3625"
+NAME="AEN3631"
 ></A
 ><H3
 ><A
@@ -3507,7 +3529,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3632"
+NAME="AEN3638"
 ></A
 ><P
 ></P
@@ -3562,7 +3584,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3645"
+NAME="AEN3651"
 ></A
 ><H3
 ><A
@@ -3592,7 +3614,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3652"
+NAME="AEN3658"
 ></A
 ><P
 ></P
@@ -3645,7 +3667,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3665"
+NAME="AEN3671"
 ></A
 ><H3
 ><A
@@ -3677,7 +3699,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3672"
+NAME="AEN3678"
 ></A
 ><P
 ></P
@@ -3747,7 +3769,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3689"
+NAME="AEN3695"
 ></A
 ><H3
 ><A
@@ -3782,7 +3804,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3697"
+NAME="AEN3703"
 ></A
 ><P
 ></P
@@ -3854,7 +3876,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3714"
+NAME="AEN3720"
 ></A
 ><H3
 ><A
@@ -3885,7 +3907,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3721"
+NAME="AEN3727"
 ></A
 ><P
 ></P
@@ -3940,7 +3962,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3734"
+NAME="AEN3740"
 ></A
 ><H3
 ><A
@@ -3972,7 +3994,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN3741"
+NAME="AEN3747"
 ></A
 ><P
 ></P
@@ -4044,7 +4066,223 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3758"
+NAME="AEN3764"
+></A
+><H3
+><A
+NAME="INITXMLDEFAULTSAXHANDLER"
+></A
+>initxmlDefaultSAXHandler ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        initxmlDefaultSAXHandler        (<A
+HREF="libxml-parser.html#XMLSAXHANDLER"
+>xmlSAXHandler</A
+> *hdlr,
+                                             int warning);</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN3770"
+></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
+>hdlr</I
+></TT
+>&nbsp;:</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>&nbsp;</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><TT
+CLASS="PARAMETER"
+><I
+>warning</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="AEN3783"
+></A
+><H3
+><A
+NAME="INITHTMLDEFAULTSAXHANDLER"
+></A
+>inithtmlDefaultSAXHandler ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        inithtmlDefaultSAXHandler       (<A
+HREF="libxml-parser.html#XMLSAXHANDLER"
+>xmlSAXHandler</A
+> *hdlr);</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN3789"
+></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
+>hdlr</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="AEN3798"
+></A
+><H3
+><A
+NAME="INITDOCBDEFAULTSAXHANDLER"
+></A
+>initdocbDefaultSAXHandler ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        initdocbDefaultSAXHandler       (<A
+HREF="libxml-parser.html#XMLSAXHANDLER"
+>xmlSAXHandler</A
+> *hdlr);</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN3804"
+></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
+>hdlr</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="AEN3813"
 ></A
 ><H3
 ><A
@@ -4072,7 +4310,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3764"
+NAME="AEN3819"
 ></A
 ><H3
 ><A
@@ -4100,7 +4338,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN3770"
+NAME="AEN3825"
 ></A
 ><H3
 ><A
diff --git a/doc/html/libxml-tree.html b/doc/html/libxml-tree.html
index 2152157..3fdf5cb 100644
--- a/doc/html/libxml-tree.html
+++ b/doc/html/libxml-tree.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN3781"
+NAME="AEN3836"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN3784"
+NAME="AEN3839"
 ></A
 ><H2
 >Synopsis</H2
@@ -147,6 +147,10 @@
 >&#13;
 
 #define     <A
+HREF="libxml-tree.html#BASE-BUFFER-SIZE-CAPS"
+>BASE_BUFFER_SIZE</A
+>
+#define     <A
 HREF="libxml-tree.html#XML-XML-NAMESPACE-CAPS"
 >XML_XML_NAMESPACE</A
 >
@@ -1816,7 +1820,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN4239"
+NAME="AEN4295"
 ></A
 ><H2
 >Description</H2
@@ -1826,14 +1830,40 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN4242"
+NAME="AEN4298"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4244"
+NAME="AEN4300"
+></A
+><H3
+><A
+NAME="BASE-BUFFER-SIZE-CAPS"
+></A
+>BASE_BUFFER_SIZE</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>#define BASE_BUFFER_SIZE 4000</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN4305"
 ></A
 ><H3
 ><A
@@ -1862,7 +1892,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4250"
+NAME="AEN4311"
 ></A
 ><H3
 ><A
@@ -1912,7 +1942,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4255"
+NAME="AEN4316"
 ></A
 ><H3
 ><A
@@ -1942,7 +1972,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4261"
+NAME="AEN4322"
 ></A
 ><H3
 ><A
@@ -1970,7 +2000,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4267"
+NAME="AEN4328"
 ></A
 ><H3
 ><A
@@ -2002,7 +2032,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4273"
+NAME="AEN4334"
 ></A
 ><H3
 ><A
@@ -2028,7 +2058,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4278"
+NAME="AEN4339"
 ></A
 ><H3
 ><A
@@ -2067,7 +2097,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4284"
+NAME="AEN4345"
 ></A
 ><H3
 ><A
@@ -2100,7 +2130,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4290"
+NAME="AEN4351"
 ></A
 ><H3
 ><A
@@ -2131,7 +2161,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4296"
+NAME="AEN4357"
 ></A
 ><H3
 ><A
@@ -2157,7 +2187,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4301"
+NAME="AEN4362"
 ></A
 ><H3
 ><A
@@ -2203,7 +2233,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4307"
+NAME="AEN4368"
 ></A
 ><H3
 ><A
@@ -2229,7 +2259,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4312"
+NAME="AEN4373"
 ></A
 ><H3
 ><A
@@ -2262,7 +2292,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4318"
+NAME="AEN4379"
 ></A
 ><H3
 ><A
@@ -2295,7 +2325,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4324"
+NAME="AEN4385"
 ></A
 ><H3
 ><A
@@ -2331,7 +2361,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4330"
+NAME="AEN4391"
 ></A
 ><H3
 ><A
@@ -2357,7 +2387,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4335"
+NAME="AEN4396"
 ></A
 ><H3
 ><A
@@ -2391,7 +2421,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4341"
+NAME="AEN4402"
 ></A
 ><H3
 ><A
@@ -2434,7 +2464,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4347"
+NAME="AEN4408"
 ></A
 ><H3
 ><A
@@ -2460,7 +2490,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4352"
+NAME="AEN4413"
 ></A
 ><H3
 ><A
@@ -2488,7 +2518,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4358"
+NAME="AEN4419"
 ></A
 ><H3
 ><A
@@ -2514,7 +2544,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4363"
+NAME="AEN4424"
 ></A
 ><H3
 ><A
@@ -2551,7 +2581,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4370"
+NAME="AEN4431"
 ></A
 ><H3
 ><A
@@ -2577,7 +2607,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4375"
+NAME="AEN4436"
 ></A
 ><H3
 ><A
@@ -2625,7 +2655,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4381"
+NAME="AEN4442"
 ></A
 ><H3
 ><A
@@ -2651,7 +2681,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4386"
+NAME="AEN4447"
 ></A
 ><H3
 ><A
@@ -2691,7 +2721,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4392"
+NAME="AEN4453"
 ></A
 ><H3
 ><A
@@ -2717,7 +2747,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4397"
+NAME="AEN4458"
 ></A
 ><H3
 ><A
@@ -2749,7 +2779,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4403"
+NAME="AEN4464"
 ></A
 ><H3
 ><A
@@ -2775,7 +2805,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4408"
+NAME="AEN4469"
 ></A
 ><H3
 ><A
@@ -2807,7 +2837,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4414"
+NAME="AEN4475"
 ></A
 ><H3
 ><A
@@ -2833,7 +2863,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4419"
+NAME="AEN4480"
 ></A
 ><H3
 ><A
@@ -2865,7 +2895,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4425"
+NAME="AEN4486"
 ></A
 ><H3
 ><A
@@ -2898,7 +2928,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4431"
+NAME="AEN4492"
 ></A
 ><H3
 ><A
@@ -2924,7 +2954,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4436"
+NAME="AEN4497"
 ></A
 ><H3
 ><A
@@ -2972,7 +3002,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4442"
+NAME="AEN4503"
 ></A
 ><H3
 ><A
@@ -2998,7 +3028,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4447"
+NAME="AEN4508"
 ></A
 ><H3
 ><A
@@ -3025,7 +3055,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4453"
+NAME="AEN4514"
 ></A
 ><P
 ></P
@@ -3063,7 +3093,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4462"
+NAME="AEN4523"
 ></A
 ><H3
 ><A
@@ -3090,7 +3120,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4468"
+NAME="AEN4529"
 ></A
 ><P
 ></P
@@ -3128,7 +3158,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4477"
+NAME="AEN4538"
 ></A
 ><H3
 ><A
@@ -3180,7 +3210,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4483"
+NAME="AEN4544"
 ></A
 ><H3
 ><A
@@ -3206,7 +3236,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4488"
+NAME="AEN4549"
 ></A
 ><H3
 ><A
@@ -3234,7 +3264,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4494"
+NAME="AEN4555"
 ></A
 ><H3
 ><A
@@ -3262,7 +3292,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4500"
+NAME="AEN4561"
 ></A
 ><H3
 ><A
@@ -3295,7 +3325,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4507"
+NAME="AEN4568"
 ></A
 ><P
 ></P
@@ -3333,7 +3363,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4516"
+NAME="AEN4577"
 ></A
 ><H3
 ><A
@@ -3367,7 +3397,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4523"
+NAME="AEN4584"
 ></A
 ><P
 ></P
@@ -3403,7 +3433,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4532"
+NAME="AEN4593"
 ></A
 ><H3
 ><A
@@ -3433,7 +3463,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4539"
+NAME="AEN4600"
 ></A
 ><P
 ></P
@@ -3469,7 +3499,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4548"
+NAME="AEN4609"
 ></A
 ><H3
 ><A
@@ -3502,7 +3532,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4556"
+NAME="AEN4617"
 ></A
 ><P
 ></P
@@ -3555,7 +3585,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4569"
+NAME="AEN4630"
 ></A
 ><H3
 ><A
@@ -3591,7 +3621,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4577"
+NAME="AEN4638"
 ></A
 ><P
 ></P
@@ -3661,7 +3691,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4594"
+NAME="AEN4655"
 ></A
 ><H3
 ><A
@@ -3691,7 +3721,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4601"
+NAME="AEN4662"
 ></A
 ><P
 ></P
@@ -3729,7 +3759,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4610"
+NAME="AEN4671"
 ></A
 ><H3
 ><A
@@ -3763,7 +3793,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4618"
+NAME="AEN4679"
 ></A
 ><P
 ></P
@@ -3833,7 +3863,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4635"
+NAME="AEN4696"
 ></A
 ><H3
 ><A
@@ -3869,7 +3899,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4643"
+NAME="AEN4704"
 ></A
 ><P
 ></P
@@ -3941,7 +3971,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4660"
+NAME="AEN4721"
 ></A
 ><H3
 ><A
@@ -3982,7 +4012,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4669"
+NAME="AEN4730"
 ></A
 ><P
 ></P
@@ -4054,7 +4084,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4686"
+NAME="AEN4747"
 ></A
 ><H3
 ><A
@@ -4088,7 +4118,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4694"
+NAME="AEN4755"
 ></A
 ><P
 ></P
@@ -4143,7 +4173,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4707"
+NAME="AEN4768"
 ></A
 ><H3
 ><A
@@ -4174,7 +4204,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4714"
+NAME="AEN4775"
 ></A
 ><P
 ></P
@@ -4229,7 +4259,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4727"
+NAME="AEN4788"
 ></A
 ><H3
 ><A
@@ -4260,7 +4290,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4734"
+NAME="AEN4795"
 ></A
 ><P
 ></P
@@ -4330,7 +4360,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4751"
+NAME="AEN4812"
 ></A
 ><H3
 ><A
@@ -4361,7 +4391,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4758"
+NAME="AEN4819"
 ></A
 ><P
 ></P
@@ -4431,7 +4461,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4775"
+NAME="AEN4836"
 ></A
 ><H3
 ><A
@@ -4461,7 +4491,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4782"
+NAME="AEN4843"
 ></A
 ><P
 ></P
@@ -4499,7 +4529,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4791"
+NAME="AEN4852"
 ></A
 ><H3
 ><A
@@ -4532,7 +4562,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4799"
+NAME="AEN4860"
 ></A
 ><P
 ></P
@@ -4585,7 +4615,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4812"
+NAME="AEN4873"
 ></A
 ><H3
 ><A
@@ -4619,7 +4649,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4820"
+NAME="AEN4881"
 ></A
 ><P
 ></P
@@ -4674,7 +4704,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4833"
+NAME="AEN4894"
 ></A
 ><H3
 ><A
@@ -4704,7 +4734,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4840"
+NAME="AEN4901"
 ></A
 ><P
 ></P
@@ -4757,7 +4787,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4853"
+NAME="AEN4914"
 ></A
 ><H3
 ><A
@@ -4802,7 +4832,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4864"
+NAME="AEN4925"
 ></A
 ><P
 ></P
@@ -4906,7 +4936,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4889"
+NAME="AEN4950"
 ></A
 ><H3
 ><A
@@ -4955,7 +4985,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4901"
+NAME="AEN4962"
 ></A
 ><P
 ></P
@@ -5059,7 +5089,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4926"
+NAME="AEN4987"
 ></A
 ><H3
 ><A
@@ -5092,7 +5122,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4934"
+NAME="AEN4995"
 ></A
 ><P
 ></P
@@ -5145,7 +5175,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4947"
+NAME="AEN5008"
 ></A
 ><H3
 ><A
@@ -5175,7 +5205,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4954"
+NAME="AEN5015"
 ></A
 ><P
 ></P
@@ -5213,7 +5243,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4963"
+NAME="AEN5024"
 ></A
 ><H3
 ><A
@@ -5256,7 +5286,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN4973"
+NAME="AEN5034"
 ></A
 ><P
 ></P
@@ -5343,7 +5373,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN4994"
+NAME="AEN5055"
 ></A
 ><H3
 ><A
@@ -5388,7 +5418,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5004"
+NAME="AEN5065"
 ></A
 ><P
 ></P
@@ -5475,7 +5505,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5025"
+NAME="AEN5086"
 ></A
 ><H3
 ><A
@@ -5505,7 +5535,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5032"
+NAME="AEN5093"
 ></A
 ><P
 ></P
@@ -5543,7 +5573,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5041"
+NAME="AEN5102"
 ></A
 ><H3
 ><A
@@ -5573,7 +5603,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5048"
+NAME="AEN5109"
 ></A
 ><P
 ></P
@@ -5611,7 +5641,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5057"
+NAME="AEN5118"
 ></A
 ><H3
 ><A
@@ -5644,7 +5674,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5065"
+NAME="AEN5126"
 ></A
 ><P
 ></P
@@ -5697,7 +5727,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5078"
+NAME="AEN5139"
 ></A
 ><H3
 ><A
@@ -5727,7 +5757,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5085"
+NAME="AEN5146"
 ></A
 ><P
 ></P
@@ -5766,7 +5796,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5094"
+NAME="AEN5155"
 ></A
 ><H3
 ><A
@@ -5807,7 +5837,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5104"
+NAME="AEN5165"
 ></A
 ><P
 ></P
@@ -5894,7 +5924,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5125"
+NAME="AEN5186"
 ></A
 ><H3
 ><A
@@ -5935,7 +5965,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5135"
+NAME="AEN5196"
 ></A
 ><P
 ></P
@@ -6022,7 +6052,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5156"
+NAME="AEN5217"
 ></A
 ><H3
 ><A
@@ -6067,7 +6097,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5167"
+NAME="AEN5228"
 ></A
 ><P
 ></P
@@ -6171,7 +6201,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5192"
+NAME="AEN5253"
 ></A
 ><H3
 ><A
@@ -6201,7 +6231,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5199"
+NAME="AEN5260"
 ></A
 ><P
 ></P
@@ -6239,7 +6269,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5208"
+NAME="AEN5269"
 ></A
 ><H3
 ><A
@@ -6269,7 +6299,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5215"
+NAME="AEN5276"
 ></A
 ><P
 ></P
@@ -6307,7 +6337,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5224"
+NAME="AEN5285"
 ></A
 ><H3
 ><A
@@ -6344,7 +6374,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5233"
+NAME="AEN5294"
 ></A
 ><P
 ></P
@@ -6414,7 +6444,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5250"
+NAME="AEN5311"
 ></A
 ><H3
 ><A
@@ -6451,7 +6481,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5259"
+NAME="AEN5320"
 ></A
 ><P
 ></P
@@ -6521,7 +6551,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5276"
+NAME="AEN5337"
 ></A
 ><H3
 ><A
@@ -6554,7 +6584,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5284"
+NAME="AEN5345"
 ></A
 ><P
 ></P
@@ -6607,7 +6637,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5297"
+NAME="AEN5358"
 ></A
 ><H3
 ><A
@@ -6642,7 +6672,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5305"
+NAME="AEN5366"
 ></A
 ><P
 ></P
@@ -6712,7 +6742,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5322"
+NAME="AEN5383"
 ></A
 ><H3
 ><A
@@ -6783,7 +6813,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5338"
+NAME="AEN5399"
 ></A
 ><P
 ></P
@@ -6887,7 +6917,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5363"
+NAME="AEN5424"
 ></A
 ><H3
 ><A
@@ -6943,7 +6973,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5376"
+NAME="AEN5437"
 ></A
 ><P
 ></P
@@ -7047,7 +7077,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5401"
+NAME="AEN5462"
 ></A
 ><H3
 ><A
@@ -7089,7 +7119,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5411"
+NAME="AEN5472"
 ></A
 ><P
 ></P
@@ -7159,7 +7189,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5428"
+NAME="AEN5489"
 ></A
 ><H3
 ><A
@@ -7236,7 +7266,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5445"
+NAME="AEN5506"
 ></A
 ><P
 ></P
@@ -7340,7 +7370,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5470"
+NAME="AEN5531"
 ></A
 ><H3
 ><A
@@ -7402,7 +7432,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5484"
+NAME="AEN5545"
 ></A
 ><P
 ></P
@@ -7506,7 +7536,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5509"
+NAME="AEN5570"
 ></A
 ><H3
 ><A
@@ -7543,7 +7573,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5518"
+NAME="AEN5579"
 ></A
 ><P
 ></P
@@ -7613,7 +7643,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5535"
+NAME="AEN5596"
 ></A
 ><H3
 ><A
@@ -7646,7 +7676,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5543"
+NAME="AEN5604"
 ></A
 ><P
 ></P
@@ -7699,7 +7729,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5556"
+NAME="AEN5617"
 ></A
 ><H3
 ><A
@@ -7736,7 +7766,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5565"
+NAME="AEN5626"
 ></A
 ><P
 ></P
@@ -7806,7 +7836,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5582"
+NAME="AEN5643"
 ></A
 ><H3
 ><A
@@ -7845,7 +7875,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5591"
+NAME="AEN5652"
 ></A
 ><P
 ></P
@@ -7932,7 +7962,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5612"
+NAME="AEN5673"
 ></A
 ><H3
 ><A
@@ -7966,7 +7996,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5620"
+NAME="AEN5681"
 ></A
 ><P
 ></P
@@ -8036,7 +8066,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5637"
+NAME="AEN5698"
 ></A
 ><H3
 ><A
@@ -8073,7 +8103,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5646"
+NAME="AEN5707"
 ></A
 ><P
 ></P
@@ -8143,7 +8173,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5663"
+NAME="AEN5724"
 ></A
 ><H3
 ><A
@@ -8176,7 +8206,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5671"
+NAME="AEN5732"
 ></A
 ><P
 ></P
@@ -8229,7 +8259,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5684"
+NAME="AEN5745"
 ></A
 ><H3
 ><A
@@ -8267,7 +8297,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5693"
+NAME="AEN5754"
 ></A
 ><P
 ></P
@@ -8354,7 +8384,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5714"
+NAME="AEN5775"
 ></A
 ><H3
 ><A
@@ -8391,7 +8421,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5723"
+NAME="AEN5784"
 ></A
 ><P
 ></P
@@ -8461,7 +8491,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5740"
+NAME="AEN5801"
 ></A
 ><H3
 ><A
@@ -8498,7 +8528,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5749"
+NAME="AEN5810"
 ></A
 ><P
 ></P
@@ -8568,7 +8598,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5766"
+NAME="AEN5827"
 ></A
 ><H3
 ><A
@@ -8602,7 +8632,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5774"
+NAME="AEN5835"
 ></A
 ><P
 ></P
@@ -8672,7 +8702,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5791"
+NAME="AEN5852"
 ></A
 ><H3
 ><A
@@ -8710,7 +8740,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5800"
+NAME="AEN5861"
 ></A
 ><P
 ></P
@@ -8797,7 +8827,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5821"
+NAME="AEN5882"
 ></A
 ><H3
 ><A
@@ -8830,7 +8860,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5829"
+NAME="AEN5890"
 ></A
 ><P
 ></P
@@ -8883,7 +8913,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5842"
+NAME="AEN5903"
 ></A
 ><H3
 ><A
@@ -8916,7 +8946,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5850"
+NAME="AEN5911"
 ></A
 ><P
 ></P
@@ -8969,7 +8999,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5863"
+NAME="AEN5924"
 ></A
 ><H3
 ><A
@@ -9003,7 +9033,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5871"
+NAME="AEN5932"
 ></A
 ><P
 ></P
@@ -9056,7 +9086,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5884"
+NAME="AEN5945"
 ></A
 ><H3
 ><A
@@ -9089,7 +9119,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5892"
+NAME="AEN5953"
 ></A
 ><P
 ></P
@@ -9142,7 +9172,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5905"
+NAME="AEN5966"
 ></A
 ><H3
 ><A
@@ -9172,7 +9202,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5912"
+NAME="AEN5973"
 ></A
 ><P
 ></P
@@ -9225,7 +9255,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5925"
+NAME="AEN5986"
 ></A
 ><H3
 ><A
@@ -9256,7 +9286,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5932"
+NAME="AEN5993"
 ></A
 ><P
 ></P
@@ -9309,7 +9339,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5945"
+NAME="AEN6006"
 ></A
 ><H3
 ><A
@@ -9347,7 +9377,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5954"
+NAME="AEN6015"
 ></A
 ><P
 ></P
@@ -9417,7 +9447,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5971"
+NAME="AEN6032"
 ></A
 ><H3
 ><A
@@ -9451,7 +9481,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN5979"
+NAME="AEN6040"
 ></A
 ><P
 ></P
@@ -9506,7 +9536,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN5992"
+NAME="AEN6053"
 ></A
 ><H3
 ><A
@@ -9554,7 +9584,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6003"
+NAME="AEN6064"
 ></A
 ><P
 ></P
@@ -9624,7 +9654,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6020"
+NAME="AEN6081"
 ></A
 ><H3
 ><A
@@ -9667,7 +9697,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6030"
+NAME="AEN6091"
 ></A
 ><P
 ></P
@@ -9737,7 +9767,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6047"
+NAME="AEN6108"
 ></A
 ><H3
 ><A
@@ -9776,7 +9806,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6056"
+NAME="AEN6117"
 ></A
 ><P
 ></P
@@ -9846,7 +9876,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6073"
+NAME="AEN6134"
 ></A
 ><H3
 ><A
@@ -9901,7 +9931,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6085"
+NAME="AEN6146"
 ></A
 ><P
 ></P
@@ -9971,7 +10001,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6102"
+NAME="AEN6163"
 ></A
 ><H3
 ><A
@@ -10026,7 +10056,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6114"
+NAME="AEN6175"
 ></A
 ><P
 ></P
@@ -10096,7 +10126,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6131"
+NAME="AEN6192"
 ></A
 ><H3
 ><A
@@ -10151,7 +10181,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6143"
+NAME="AEN6204"
 ></A
 ><P
 ></P
@@ -10221,7 +10251,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6160"
+NAME="AEN6221"
 ></A
 ><H3
 ><A
@@ -10251,7 +10281,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6167"
+NAME="AEN6228"
 ></A
 ><P
 ></P
@@ -10289,7 +10319,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6176"
+NAME="AEN6237"
 ></A
 ><H3
 ><A
@@ -10326,7 +10356,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6185"
+NAME="AEN6246"
 ></A
 ><P
 ></P
@@ -10396,7 +10426,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6202"
+NAME="AEN6263"
 ></A
 ><H3
 ><A
@@ -10431,7 +10461,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6210"
+NAME="AEN6271"
 ></A
 ><P
 ></P
@@ -10508,7 +10538,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6228"
+NAME="AEN6289"
 ></A
 ><H3
 ><A
@@ -10539,7 +10569,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6235"
+NAME="AEN6296"
 ></A
 ><P
 ></P
@@ -10577,7 +10607,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6244"
+NAME="AEN6305"
 ></A
 ><H3
 ><A
@@ -10611,7 +10641,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6252"
+NAME="AEN6313"
 ></A
 ><P
 ></P
@@ -10649,7 +10679,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6261"
+NAME="AEN6322"
 ></A
 ><H3
 ><A
@@ -10683,7 +10713,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6269"
+NAME="AEN6330"
 ></A
 ><P
 ></P
@@ -10738,7 +10768,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6282"
+NAME="AEN6343"
 ></A
 ><H3
 ><A
@@ -10772,7 +10802,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6290"
+NAME="AEN6351"
 ></A
 ><P
 ></P
@@ -10827,7 +10857,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6303"
+NAME="AEN6364"
 ></A
 ><H3
 ><A
@@ -10879,7 +10909,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6314"
+NAME="AEN6375"
 ></A
 ><P
 ></P
@@ -10966,7 +10996,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6335"
+NAME="AEN6396"
 ></A
 ><H3
 ><A
@@ -11008,7 +11038,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6345"
+NAME="AEN6406"
 ></A
 ><P
 ></P
@@ -11095,7 +11125,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6366"
+NAME="AEN6427"
 ></A
 ><H3
 ><A
@@ -11132,7 +11162,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6375"
+NAME="AEN6436"
 ></A
 ><P
 ></P
@@ -11204,7 +11234,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6392"
+NAME="AEN6453"
 ></A
 ><H3
 ><A
@@ -11238,7 +11268,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6400"
+NAME="AEN6461"
 ></A
 ><P
 ></P
@@ -11293,7 +11323,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6413"
+NAME="AEN6474"
 ></A
 ><H3
 ><A
@@ -11326,7 +11356,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6421"
+NAME="AEN6482"
 ></A
 ><P
 ></P
@@ -11379,7 +11409,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6434"
+NAME="AEN6495"
 ></A
 ><H3
 ><A
@@ -11412,7 +11442,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6442"
+NAME="AEN6503"
 ></A
 ><P
 ></P
@@ -11465,7 +11495,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6455"
+NAME="AEN6516"
 ></A
 ><H3
 ><A
@@ -11506,7 +11536,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6465"
+NAME="AEN6526"
 ></A
 ><P
 ></P
@@ -11593,7 +11623,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6486"
+NAME="AEN6547"
 ></A
 ><H3
 ><A
@@ -11636,7 +11666,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6496"
+NAME="AEN6557"
 ></A
 ><P
 ></P
@@ -11707,7 +11737,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6513"
+NAME="AEN6574"
 ></A
 ><H3
 ><A
@@ -11749,7 +11779,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6523"
+NAME="AEN6584"
 ></A
 ><P
 ></P
@@ -11820,7 +11850,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6540"
+NAME="AEN6601"
 ></A
 ><H3
 ><A
@@ -11868,7 +11898,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6551"
+NAME="AEN6612"
 ></A
 ><P
 ></P
@@ -11956,7 +11986,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6572"
+NAME="AEN6633"
 ></A
 ><H3
 ><A
@@ -12002,7 +12032,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6583"
+NAME="AEN6644"
 ></A
 ><P
 ></P
@@ -12106,7 +12136,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6608"
+NAME="AEN6669"
 ></A
 ><H3
 ><A
@@ -12154,7 +12184,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6619"
+NAME="AEN6680"
 ></A
 ><P
 ></P
@@ -12242,7 +12272,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6640"
+NAME="AEN6701"
 ></A
 ><H3
 ><A
@@ -12280,7 +12310,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6649"
+NAME="AEN6710"
 ></A
 ><P
 ></P
@@ -12350,7 +12380,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6666"
+NAME="AEN6727"
 ></A
 ><H3
 ><A
@@ -12389,7 +12419,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6675"
+NAME="AEN6736"
 ></A
 ><P
 ></P
@@ -12476,7 +12506,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6696"
+NAME="AEN6757"
 ></A
 ><H3
 ><A
@@ -12515,7 +12545,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6705"
+NAME="AEN6766"
 ></A
 ><P
 ></P
@@ -12602,7 +12632,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6726"
+NAME="AEN6787"
 ></A
 ><H3
 ><A
@@ -12645,7 +12675,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6736"
+NAME="AEN6797"
 ></A
 ><P
 ></P
@@ -12732,7 +12762,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6757"
+NAME="AEN6818"
 ></A
 ><H3
 ><A
@@ -12766,7 +12796,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6765"
+NAME="AEN6826"
 ></A
 ><P
 ></P
@@ -12821,7 +12851,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6778"
+NAME="AEN6839"
 ></A
 ><H3
 ><A
@@ -12856,7 +12886,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6786"
+NAME="AEN6847"
 ></A
 ><P
 ></P
@@ -12933,7 +12963,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6804"
+NAME="AEN6865"
 ></A
 ><H3
 ><A
@@ -12967,7 +12997,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6812"
+NAME="AEN6873"
 ></A
 ><P
 ></P
@@ -13022,7 +13052,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6825"
+NAME="AEN6886"
 ></A
 ><H3
 ><A
@@ -13057,7 +13087,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6833"
+NAME="AEN6894"
 ></A
 ><P
 ></P
@@ -13134,7 +13164,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6851"
+NAME="AEN6912"
 ></A
 ><H3
 ><A
@@ -13170,7 +13200,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6859"
+NAME="AEN6920"
 ></A
 ><P
 ></P
@@ -13224,7 +13254,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6872"
+NAME="AEN6933"
 ></A
 ><H3
 ><A
@@ -13258,7 +13288,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6880"
+NAME="AEN6941"
 ></A
 ><P
 ></P
@@ -13312,7 +13342,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6893"
+NAME="AEN6954"
 ></A
 ><H3
 ><A
@@ -13347,7 +13377,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6901"
+NAME="AEN6962"
 ></A
 ><P
 ></P
@@ -13402,7 +13432,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6914"
+NAME="AEN6975"
 ></A
 ><H3
 ><A
@@ -13434,7 +13464,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6921"
+NAME="AEN6982"
 ></A
 ><P
 ></P
@@ -13487,7 +13517,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6934"
+NAME="AEN6995"
 ></A
 ><H3
 ><A
@@ -13522,7 +13552,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6942"
+NAME="AEN7003"
 ></A
 ><P
 ></P
@@ -13577,7 +13607,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6955"
+NAME="AEN7016"
 ></A
 ><H3
 ><A
@@ -13624,7 +13654,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6965"
+NAME="AEN7026"
 ></A
 ><P
 ></P
@@ -13695,7 +13725,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN6982"
+NAME="AEN7043"
 ></A
 ><H3
 ><A
@@ -13730,7 +13760,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN6990"
+NAME="AEN7051"
 ></A
 ><P
 ></P
@@ -13785,7 +13815,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7003"
+NAME="AEN7064"
 ></A
 ><H3
 ><A
@@ -13816,7 +13846,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7010"
+NAME="AEN7071"
 ></A
 ><P
 ></P
@@ -13869,7 +13899,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7023"
+NAME="AEN7084"
 ></A
 ><H3
 ><A
@@ -13903,7 +13933,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7031"
+NAME="AEN7092"
 ></A
 ><P
 ></P
@@ -13973,7 +14003,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7048"
+NAME="AEN7109"
 ></A
 ><H3
 ><A
@@ -14011,7 +14041,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7057"
+NAME="AEN7118"
 ></A
 ><P
 ></P
@@ -14098,7 +14128,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7078"
+NAME="AEN7139"
 ></A
 ><H3
 ><A
@@ -14134,7 +14164,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7086"
+NAME="AEN7147"
 ></A
 ><P
 ></P
@@ -14189,7 +14219,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7099"
+NAME="AEN7160"
 ></A
 ><H3
 ><A
@@ -14224,7 +14254,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7107"
+NAME="AEN7168"
 ></A
 ><P
 ></P
@@ -14279,7 +14309,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7120"
+NAME="AEN7181"
 ></A
 ><H3
 ><A
@@ -14311,7 +14341,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7127"
+NAME="AEN7188"
 ></A
 ><P
 ></P
@@ -14366,7 +14396,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7140"
+NAME="AEN7201"
 ></A
 ><H3
 ><A
@@ -14402,7 +14432,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7148"
+NAME="AEN7209"
 ></A
 ><P
 ></P
@@ -14457,7 +14487,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7161"
+NAME="AEN7222"
 ></A
 ><H3
 ><A
@@ -14502,7 +14532,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7170"
+NAME="AEN7231"
 ></A
 ><P
 ></P
@@ -14572,7 +14602,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7187"
+NAME="AEN7248"
 ></A
 ><H3
 ><A
@@ -14609,7 +14639,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7195"
+NAME="AEN7256"
 ></A
 ><P
 ></P
@@ -14698,7 +14728,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7216"
+NAME="AEN7277"
 ></A
 ><H3
 ><A
@@ -14734,7 +14764,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7224"
+NAME="AEN7285"
 ></A
 ><P
 ></P
@@ -14806,7 +14836,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7241"
+NAME="AEN7302"
 ></A
 ><H3
 ><A
@@ -14844,7 +14874,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7249"
+NAME="AEN7310"
 ></A
 ><P
 ></P
@@ -14933,7 +14963,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7270"
+NAME="AEN7331"
 ></A
 ><H3
 ><A
@@ -14972,7 +15002,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7278"
+NAME="AEN7339"
 ></A
 ><P
 ></P
@@ -15078,7 +15108,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7303"
+NAME="AEN7364"
 ></A
 ><H3
 ><A
@@ -15112,7 +15142,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7311"
+NAME="AEN7372"
 ></A
 ><P
 ></P
@@ -15182,7 +15212,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7328"
+NAME="AEN7389"
 ></A
 ><H3
 ><A
@@ -15220,7 +15250,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7337"
+NAME="AEN7398"
 ></A
 ><P
 ></P
@@ -15292,7 +15322,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7354"
+NAME="AEN7415"
 ></A
 ><H3
 ><A
@@ -15330,7 +15360,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7362"
+NAME="AEN7423"
 ></A
 ><P
 ></P
@@ -15400,7 +15430,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7379"
+NAME="AEN7440"
 ></A
 ><H3
 ><A
@@ -15439,7 +15469,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7387"
+NAME="AEN7448"
 ></A
 ><P
 ></P
@@ -15526,7 +15556,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7408"
+NAME="AEN7469"
 ></A
 ><H3
 ><A
@@ -15566,7 +15596,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7417"
+NAME="AEN7478"
 ></A
 ><P
 ></P
@@ -15672,7 +15702,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7442"
+NAME="AEN7503"
 ></A
 ><H3
 ><A
@@ -15705,7 +15735,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7449"
+NAME="AEN7510"
 ></A
 ><P
 ></P
@@ -15809,7 +15839,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7474"
+NAME="AEN7535"
 ></A
 ><H3
 ><A
@@ -15841,7 +15871,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7481"
+NAME="AEN7542"
 ></A
 ><P
 ></P
@@ -15928,7 +15958,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7502"
+NAME="AEN7563"
 ></A
 ><H3
 ><A
@@ -15958,7 +15988,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7509"
+NAME="AEN7570"
 ></A
 ><P
 ></P
@@ -16011,7 +16041,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7522"
+NAME="AEN7583"
 ></A
 ><H3
 ><A
@@ -16043,7 +16073,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7529"
+NAME="AEN7590"
 ></A
 ><P
 ></P
@@ -16098,7 +16128,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7542"
+NAME="AEN7603"
 ></A
 ><H3
 ><A
@@ -16125,7 +16155,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7548"
+NAME="AEN7609"
 ></A
 ><P
 ></P
@@ -16161,7 +16191,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN7557"
+NAME="AEN7618"
 ></A
 ><H3
 ><A
@@ -16189,7 +16219,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN7563"
+NAME="AEN7624"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-uri.html b/doc/html/libxml-uri.html
index 9339ec5..919ae0d 100644
--- a/doc/html/libxml-uri.html
+++ b/doc/html/libxml-uri.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN9897"
+NAME="AEN9958"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN9900"
+NAME="AEN9961"
 ></A
 ><H2
 >Synopsis</H2
@@ -259,7 +259,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9932"
+NAME="AEN9993"
 ></A
 ><H2
 >Description</H2
@@ -269,14 +269,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN9935"
+NAME="AEN9996"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9937"
+NAME="AEN9998"
 ></A
 ><H3
 ><A
@@ -325,7 +325,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9943"
+NAME="AEN10004"
 ></A
 ><H3
 ><A
@@ -338,7 +338,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9947"
+NAME="AEN10008"
 ></A
 ><H3
 ><A
@@ -368,7 +368,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9954"
+NAME="AEN10015"
 ></A
 ><P
 ></P
@@ -404,7 +404,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9963"
+NAME="AEN10024"
 ></A
 ><H3
 ><A
@@ -446,7 +446,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9973"
+NAME="AEN10034"
 ></A
 ><P
 ></P
@@ -516,7 +516,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9990"
+NAME="AEN10051"
 ></A
 ><H3
 ><A
@@ -548,7 +548,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9998"
+NAME="AEN10059"
 ></A
 ><P
 ></P
@@ -601,7 +601,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10011"
+NAME="AEN10072"
 ></A
 ><H3
 ><A
@@ -640,7 +640,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10020"
+NAME="AEN10081"
 ></A
 ><P
 ></P
@@ -710,7 +710,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10037"
+NAME="AEN10098"
 ></A
 ><H3
 ><A
@@ -743,7 +743,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10045"
+NAME="AEN10106"
 ></A
 ><P
 ></P
@@ -796,7 +796,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10058"
+NAME="AEN10119"
 ></A
 ><H3
 ><A
@@ -835,7 +835,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10067"
+NAME="AEN10128"
 ></A
 ><P
 ></P
@@ -890,7 +890,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10080"
+NAME="AEN10141"
 ></A
 ><H3
 ><A
@@ -928,7 +928,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10089"
+NAME="AEN10150"
 ></A
 ><P
 ></P
@@ -998,7 +998,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10106"
+NAME="AEN10167"
 ></A
 ><H3
 ><A
@@ -1031,7 +1031,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10113"
+NAME="AEN10174"
 ></A
 ><P
 ></P
@@ -1118,7 +1118,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10134"
+NAME="AEN10195"
 ></A
 ><H3
 ><A
@@ -1148,7 +1148,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10141"
+NAME="AEN10202"
 ></A
 ><P
 ></P
@@ -1201,7 +1201,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10154"
+NAME="AEN10215"
 ></A
 ><H3
 ><A
@@ -1236,7 +1236,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10162"
+NAME="AEN10223"
 ></A
 ><P
 ></P
@@ -1289,7 +1289,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10175"
+NAME="AEN10236"
 ></A
 ><H3
 ><A
@@ -1319,7 +1319,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10182"
+NAME="AEN10243"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-valid.html b/doc/html/libxml-valid.html
index 9d2a303..13e8f82 100644
--- a/doc/html/libxml-valid.html
+++ b/doc/html/libxml-valid.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN8049"
+NAME="AEN8110"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN8052"
+NAME="AEN8113"
 ></A
 ><H2
 >Synopsis</H2
@@ -972,7 +972,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN8276"
+NAME="AEN8337"
 ></A
 ><H2
 >Description</H2
@@ -982,14 +982,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN8279"
+NAME="AEN8340"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8281"
+NAME="AEN8342"
 ></A
 ><H3
 ><A
@@ -1015,7 +1015,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8286"
+NAME="AEN8347"
 ></A
 ><H3
 ><A
@@ -1041,7 +1041,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8291"
+NAME="AEN8352"
 ></A
 ><H3
 ><A
@@ -1068,7 +1068,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8296"
+NAME="AEN8357"
 ></A
 ><P
 ></P
@@ -1140,7 +1140,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8313"
+NAME="AEN8374"
 ></A
 ><H3
 ><A
@@ -1167,7 +1167,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8318"
+NAME="AEN8379"
 ></A
 ><P
 ></P
@@ -1239,7 +1239,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8335"
+NAME="AEN8396"
 ></A
 ><H3
 ><A
@@ -1285,7 +1285,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8340"
+NAME="AEN8401"
 ></A
 ><H3
 ><A
@@ -1311,7 +1311,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8345"
+NAME="AEN8406"
 ></A
 ><H3
 ><A
@@ -1337,7 +1337,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8350"
+NAME="AEN8411"
 ></A
 ><H3
 ><A
@@ -1363,7 +1363,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8355"
+NAME="AEN8416"
 ></A
 ><H3
 ><A
@@ -1389,7 +1389,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8360"
+NAME="AEN8421"
 ></A
 ><H3
 ><A
@@ -1415,7 +1415,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8365"
+NAME="AEN8426"
 ></A
 ><H3
 ><A
@@ -1441,7 +1441,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8370"
+NAME="AEN8431"
 ></A
 ><H3
 ><A
@@ -1484,7 +1484,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8382"
+NAME="AEN8443"
 ></A
 ><P
 ></P
@@ -1555,7 +1555,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8399"
+NAME="AEN8460"
 ></A
 ><H3
 ><A
@@ -1604,7 +1604,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8411"
+NAME="AEN8472"
 ></A
 ><P
 ></P
@@ -1725,7 +1725,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8440"
+NAME="AEN8501"
 ></A
 ><H3
 ><A
@@ -1758,7 +1758,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8448"
+NAME="AEN8509"
 ></A
 ><P
 ></P
@@ -1811,7 +1811,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8461"
+NAME="AEN8522"
 ></A
 ><H3
 ><A
@@ -1841,7 +1841,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8468"
+NAME="AEN8529"
 ></A
 ><P
 ></P
@@ -1879,7 +1879,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8477"
+NAME="AEN8538"
 ></A
 ><H3
 ><A
@@ -1913,7 +1913,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8485"
+NAME="AEN8546"
 ></A
 ><P
 ></P
@@ -1968,7 +1968,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8498"
+NAME="AEN8559"
 ></A
 ><H3
 ><A
@@ -2002,7 +2002,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8506"
+NAME="AEN8567"
 ></A
 ><P
 ></P
@@ -2057,7 +2057,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8519"
+NAME="AEN8580"
 ></A
 ><H3
 ><A
@@ -2094,7 +2094,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8528"
+NAME="AEN8589"
 ></A
 ><P
 ></P
@@ -2164,7 +2164,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8545"
+NAME="AEN8606"
 ></A
 ><H3
 ><A
@@ -2197,7 +2197,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8553"
+NAME="AEN8614"
 ></A
 ><P
 ></P
@@ -2250,7 +2250,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8566"
+NAME="AEN8627"
 ></A
 ><H3
 ><A
@@ -2280,7 +2280,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8573"
+NAME="AEN8634"
 ></A
 ><P
 ></P
@@ -2318,7 +2318,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8582"
+NAME="AEN8643"
 ></A
 ><H3
 ><A
@@ -2352,7 +2352,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8589"
+NAME="AEN8650"
 ></A
 ><P
 ></P
@@ -2441,7 +2441,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8610"
+NAME="AEN8671"
 ></A
 ><H3
 ><A
@@ -2473,7 +2473,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8617"
+NAME="AEN8678"
 ></A
 ><P
 ></P
@@ -2545,7 +2545,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8634"
+NAME="AEN8695"
 ></A
 ><H3
 ><A
@@ -2594,7 +2594,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8646"
+NAME="AEN8707"
 ></A
 ><P
 ></P
@@ -2715,7 +2715,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8675"
+NAME="AEN8736"
 ></A
 ><H3
 ><A
@@ -2748,7 +2748,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8683"
+NAME="AEN8744"
 ></A
 ><P
 ></P
@@ -2801,7 +2801,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8696"
+NAME="AEN8757"
 ></A
 ><H3
 ><A
@@ -2831,7 +2831,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8703"
+NAME="AEN8764"
 ></A
 ><P
 ></P
@@ -2869,7 +2869,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8712"
+NAME="AEN8773"
 ></A
 ><H3
 ><A
@@ -2903,7 +2903,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8720"
+NAME="AEN8781"
 ></A
 ><P
 ></P
@@ -2958,7 +2958,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8733"
+NAME="AEN8794"
 ></A
 ><H3
 ><A
@@ -2993,7 +2993,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8741"
+NAME="AEN8802"
 ></A
 ><P
 ></P
@@ -3048,7 +3048,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8754"
+NAME="AEN8815"
 ></A
 ><H3
 ><A
@@ -3081,7 +3081,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8762"
+NAME="AEN8823"
 ></A
 ><P
 ></P
@@ -3135,7 +3135,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8775"
+NAME="AEN8836"
 ></A
 ><H3
 ><A
@@ -3165,7 +3165,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8782"
+NAME="AEN8843"
 ></A
 ><P
 ></P
@@ -3203,7 +3203,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8791"
+NAME="AEN8852"
 ></A
 ><H3
 ><A
@@ -3236,7 +3236,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8799"
+NAME="AEN8860"
 ></A
 ><P
 ></P
@@ -3290,7 +3290,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8812"
+NAME="AEN8873"
 ></A
 ><H3
 ><A
@@ -3361,7 +3361,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8829"
+NAME="AEN8890"
 ></A
 ><P
 ></P
@@ -3550,7 +3550,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8874"
+NAME="AEN8935"
 ></A
 ><H3
 ><A
@@ -3583,7 +3583,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8882"
+NAME="AEN8943"
 ></A
 ><P
 ></P
@@ -3636,7 +3636,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8895"
+NAME="AEN8956"
 ></A
 ><H3
 ><A
@@ -3666,7 +3666,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8902"
+NAME="AEN8963"
 ></A
 ><P
 ></P
@@ -3704,7 +3704,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8911"
+NAME="AEN8972"
 ></A
 ><H3
 ><A
@@ -3738,7 +3738,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8919"
+NAME="AEN8980"
 ></A
 ><P
 ></P
@@ -3793,7 +3793,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8932"
+NAME="AEN8993"
 ></A
 ><H3
 ><A
@@ -3828,7 +3828,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8940"
+NAME="AEN9001"
 ></A
 ><P
 ></P
@@ -3883,7 +3883,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8953"
+NAME="AEN9014"
 ></A
 ><H3
 ><A
@@ -3928,7 +3928,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8964"
+NAME="AEN9025"
 ></A
 ><P
 ></P
@@ -4032,7 +4032,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN8989"
+NAME="AEN9050"
 ></A
 ><H3
 ><A
@@ -4062,7 +4062,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN8996"
+NAME="AEN9057"
 ></A
 ><P
 ></P
@@ -4100,7 +4100,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9005"
+NAME="AEN9066"
 ></A
 ><H3
 ><A
@@ -4137,7 +4137,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9014"
+NAME="AEN9075"
 ></A
 ><P
 ></P
@@ -4207,7 +4207,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9031"
+NAME="AEN9092"
 ></A
 ><H3
 ><A
@@ -4247,7 +4247,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9040"
+NAME="AEN9101"
 ></A
 ><P
 ></P
@@ -4334,7 +4334,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9061"
+NAME="AEN9122"
 ></A
 ><H3
 ><A
@@ -4368,7 +4368,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9069"
+NAME="AEN9130"
 ></A
 ><P
 ></P
@@ -4438,7 +4438,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9086"
+NAME="AEN9147"
 ></A
 ><H3
 ><A
@@ -4483,7 +4483,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9097"
+NAME="AEN9158"
 ></A
 ><P
 ></P
@@ -4587,7 +4587,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9122"
+NAME="AEN9183"
 ></A
 ><H3
 ><A
@@ -4617,7 +4617,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9129"
+NAME="AEN9190"
 ></A
 ><P
 ></P
@@ -4655,7 +4655,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9138"
+NAME="AEN9199"
 ></A
 ><H3
 ><A
@@ -4695,7 +4695,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9147"
+NAME="AEN9208"
 ></A
 ><P
 ></P
@@ -4782,7 +4782,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9168"
+NAME="AEN9229"
 ></A
 ><H3
 ><A
@@ -4816,7 +4816,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9176"
+NAME="AEN9237"
 ></A
 ><P
 ></P
@@ -4886,7 +4886,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9193"
+NAME="AEN9254"
 ></A
 ><H3
 ><A
@@ -4923,7 +4923,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9202"
+NAME="AEN9263"
 ></A
 ><P
 ></P
@@ -4993,7 +4993,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9219"
+NAME="AEN9280"
 ></A
 ><H3
 ><A
@@ -5031,7 +5031,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9227"
+NAME="AEN9288"
 ></A
 ><P
 ></P
@@ -5101,7 +5101,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9244"
+NAME="AEN9305"
 ></A
 ><H3
 ><A
@@ -5144,7 +5144,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9253"
+NAME="AEN9314"
 ></A
 ><P
 ></P
@@ -5231,7 +5231,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9274"
+NAME="AEN9335"
 ></A
 ><H3
 ><A
@@ -5291,7 +5291,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9289"
+NAME="AEN9350"
 ></A
 ><P
 ></P
@@ -5396,7 +5396,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9314"
+NAME="AEN9375"
 ></A
 ><H3
 ><A
@@ -5441,7 +5441,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9324"
+NAME="AEN9385"
 ></A
 ><P
 ></P
@@ -5528,7 +5528,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9345"
+NAME="AEN9406"
 ></A
 ><H3
 ><A
@@ -5577,7 +5577,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9357"
+NAME="AEN9418"
 ></A
 ><P
 ></P
@@ -5647,7 +5647,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9374"
+NAME="AEN9435"
 ></A
 ><H3
 ><A
@@ -5689,7 +5689,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9383"
+NAME="AEN9444"
 ></A
 ><P
 ></P
@@ -5776,7 +5776,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9404"
+NAME="AEN9465"
 ></A
 ><H3
 ><A
@@ -5816,7 +5816,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9414"
+NAME="AEN9475"
 ></A
 ><P
 ></P
@@ -5903,7 +5903,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9435"
+NAME="AEN9496"
 ></A
 ><H3
 ><A
@@ -5944,7 +5944,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9444"
+NAME="AEN9505"
 ></A
 ><P
 ></P
@@ -6014,7 +6014,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9461"
+NAME="AEN9522"
 ></A
 ><H3
 ><A
@@ -6052,7 +6052,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9470"
+NAME="AEN9531"
 ></A
 ><P
 ></P
@@ -6122,7 +6122,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9487"
+NAME="AEN9548"
 ></A
 ><H3
 ><A
@@ -6160,7 +6160,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9496"
+NAME="AEN9557"
 ></A
 ><P
 ></P
@@ -6247,7 +6247,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9517"
+NAME="AEN9578"
 ></A
 ><H3
 ><A
@@ -6295,7 +6295,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9528"
+NAME="AEN9589"
 ></A
 ><P
 ></P
@@ -6382,7 +6382,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9549"
+NAME="AEN9610"
 ></A
 ><H3
 ><A
@@ -6440,7 +6440,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9561"
+NAME="AEN9622"
 ></A
 ><P
 ></P
@@ -6561,7 +6561,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9590"
+NAME="AEN9651"
 ></A
 ><H3
 ><A
@@ -6598,7 +6598,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9599"
+NAME="AEN9660"
 ></A
 ><P
 ></P
@@ -6668,7 +6668,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9616"
+NAME="AEN9677"
 ></A
 ><H3
 ><A
@@ -6707,7 +6707,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9625"
+NAME="AEN9686"
 ></A
 ><P
 ></P
@@ -6794,7 +6794,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9646"
+NAME="AEN9707"
 ></A
 ><H3
 ><A
@@ -6829,7 +6829,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9654"
+NAME="AEN9715"
 ></A
 ><P
 ></P
@@ -6899,7 +6899,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9671"
+NAME="AEN9732"
 ></A
 ><H3
 ><A
@@ -6941,7 +6941,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9681"
+NAME="AEN9742"
 ></A
 ><P
 ></P
@@ -7028,7 +7028,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9702"
+NAME="AEN9763"
 ></A
 ><H3
 ><A
@@ -7074,7 +7074,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9713"
+NAME="AEN9774"
 ></A
 ><P
 ></P
@@ -7178,7 +7178,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9738"
+NAME="AEN9799"
 ></A
 ><H3
 ><A
@@ -7215,7 +7215,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9747"
+NAME="AEN9808"
 ></A
 ><P
 ></P
@@ -7285,7 +7285,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9764"
+NAME="AEN9825"
 ></A
 ><H3
 ><A
@@ -7326,7 +7326,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9774"
+NAME="AEN9835"
 ></A
 ><P
 ></P
@@ -7413,7 +7413,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9795"
+NAME="AEN9856"
 ></A
 ><H3
 ><A
@@ -7450,7 +7450,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9804"
+NAME="AEN9865"
 ></A
 ><P
 ></P
@@ -7520,7 +7520,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9821"
+NAME="AEN9882"
 ></A
 ><H3
 ><A
@@ -7580,7 +7580,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9833"
+NAME="AEN9894"
 ></A
 ><P
 ></P
@@ -7691,7 +7691,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN9859"
+NAME="AEN9920"
 ></A
 ><H3
 ><A
@@ -7727,7 +7727,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN9867"
+NAME="AEN9928"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-xinclude.html b/doc/html/libxml-xinclude.html
index 9d497ad..9123432 100644
--- a/doc/html/libxml-xinclude.html
+++ b/doc/html/libxml-xinclude.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN16808"
+NAME="AEN16886"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN16811"
+NAME="AEN16889"
 ></A
 ><H2
 >Synopsis</H2
@@ -160,7 +160,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN16816"
+NAME="AEN16894"
 ></A
 ><H2
 >Description</H2
@@ -170,14 +170,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN16819"
+NAME="AEN16897"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16821"
+NAME="AEN16899"
 ></A
 ><H3
 ><A
@@ -212,7 +212,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16829"
+NAME="AEN16907"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-xmlerror.html b/doc/html/libxml-xmlerror.html
index 15e0819..1189479 100644
--- a/doc/html/libxml-xmlerror.html
+++ b/doc/html/libxml-xmlerror.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN10196"
+NAME="AEN10257"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN10199"
+NAME="AEN10260"
 ></A
 ><H2
 >Synopsis</H2
@@ -165,6 +165,13 @@
 >xmlGenericErrorFunc</A
 > handler);
 void        <A
+HREF="libxml-xmlerror.html#INITGENERICERRORDEFAULTFUNC"
+>initGenericErrorDefaultFunc</A
+>     (<A
+HREF="libxml-xmlerror.html#XMLGENERICERRORFUNC"
+>xmlGenericErrorFunc</A
+> *handler);
+void        <A
 HREF="libxml-xmlerror.html#XMLPARSERERROR"
 >xmlParserError</A
 >                  (void *ctx,
@@ -209,7 +216,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10214"
+NAME="AEN10277"
 ></A
 ><H2
 >Description</H2
@@ -219,14 +226,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN10217"
+NAME="AEN10280"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10219"
+NAME="AEN10282"
 ></A
 ><H3
 ><A
@@ -381,7 +388,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10224"
+NAME="AEN10287"
 ></A
 ><H3
 ><A
@@ -408,7 +415,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10229"
+NAME="AEN10292"
 ></A
 ><P
 ></P
@@ -480,7 +487,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10246"
+NAME="AEN10309"
 ></A
 ><H3
 ><A
@@ -542,7 +549,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10258"
+NAME="AEN10321"
 ></A
 ><P
 ></P
@@ -597,7 +604,73 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10271"
+NAME="AEN10334"
+></A
+><H3
+><A
+NAME="INITGENERICERRORDEFAULTFUNC"
+></A
+>initGenericErrorDefaultFunc ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        initGenericErrorDefaultFunc     (<A
+HREF="libxml-xmlerror.html#XMLGENERICERRORFUNC"
+>xmlGenericErrorFunc</A
+> *handler);</PRE
+></TD
+></TR
+></TABLE
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN10340"
+></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
+>handler</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="AEN10349"
 ></A
 ><H3
 ><A
@@ -627,7 +700,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10277"
+NAME="AEN10355"
 ></A
 ><P
 ></P
@@ -699,7 +772,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10294"
+NAME="AEN10372"
 ></A
 ><H3
 ><A
@@ -729,7 +802,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10300"
+NAME="AEN10378"
 ></A
 ><P
 ></P
@@ -801,7 +874,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10317"
+NAME="AEN10395"
 ></A
 ><H3
 ><A
@@ -831,7 +904,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10323"
+NAME="AEN10401"
 ></A
 ><P
 ></P
@@ -903,7 +976,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10340"
+NAME="AEN10418"
 ></A
 ><H3
 ><A
@@ -933,7 +1006,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10346"
+NAME="AEN10424"
 ></A
 ><P
 ></P
@@ -1005,7 +1078,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10363"
+NAME="AEN10441"
 ></A
 ><H3
 ><A
@@ -1035,7 +1108,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10370"
+NAME="AEN10448"
 ></A
 ><P
 ></P
@@ -1073,7 +1146,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN10379"
+NAME="AEN10457"
 ></A
 ><H3
 ><A
@@ -1103,7 +1176,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN10386"
+NAME="AEN10464"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-xmlio.html b/doc/html/libxml-xmlio.html
index 26f42c2..692f794 100644
--- a/doc/html/libxml-xmlio.html
+++ b/doc/html/libxml-xmlio.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN17696"
+NAME="AEN17774"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN17699"
+NAME="AEN17777"
 ></A
 ><H2
 >Synopsis</H2
@@ -199,6 +199,14 @@
 >xmlOutputBufferPtr</A
 >;
 void        <A
+HREF="libxml-xmlio.html#XMLCLEANUPINPUTCALLBACKS"
+>xmlCleanupInputCallbacks</A
+>        (void);
+void        <A
+HREF="libxml-xmlio.html#XMLCLEANUPOUTPUTCALLBACKS"
+>xmlCleanupOutputCallbacks</A
+>       (void);
+void        <A
 HREF="libxml-xmlio.html#XMLREGISTERDEFAULTINPUTCALLBACKS"
 >xmlRegisterDefaultInputCallbacks</A
 >
@@ -547,7 +555,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN17800"
+NAME="AEN17880"
 ></A
 ><H2
 >Description</H2
@@ -557,14 +565,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN17803"
+NAME="AEN17883"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17805"
+NAME="AEN17885"
 ></A
 ><H3
 ><A
@@ -589,7 +597,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17810"
+NAME="AEN17890"
 ></A
 ><P
 ></P
@@ -642,7 +650,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17823"
+NAME="AEN17903"
 ></A
 ><H3
 ><A
@@ -667,7 +675,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17828"
+NAME="AEN17908"
 ></A
 ><P
 ></P
@@ -705,7 +713,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17837"
+NAME="AEN17917"
 ></A
 ><H3
 ><A
@@ -732,7 +740,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17842"
+NAME="AEN17922"
 ></A
 ><P
 ></P
@@ -819,7 +827,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17863"
+NAME="AEN17943"
 ></A
 ><H3
 ><A
@@ -844,7 +852,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17868"
+NAME="AEN17948"
 ></A
 ><P
 ></P
@@ -897,7 +905,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17881"
+NAME="AEN17961"
 ></A
 ><H3
 ><A
@@ -932,7 +940,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17886"
+NAME="AEN17966"
 ></A
 ><H3
 ><A
@@ -958,7 +966,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17891"
+NAME="AEN17971"
 ></A
 ><H3
 ><A
@@ -983,7 +991,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17896"
+NAME="AEN17976"
 ></A
 ><P
 ></P
@@ -1036,7 +1044,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17909"
+NAME="AEN17989"
 ></A
 ><H3
 ><A
@@ -1061,7 +1069,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17914"
+NAME="AEN17994"
 ></A
 ><P
 ></P
@@ -1099,7 +1107,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17923"
+NAME="AEN18003"
 ></A
 ><H3
 ><A
@@ -1126,7 +1134,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17928"
+NAME="AEN18008"
 ></A
 ><P
 ></P
@@ -1213,7 +1221,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17949"
+NAME="AEN18029"
 ></A
 ><H3
 ><A
@@ -1238,7 +1246,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17954"
+NAME="AEN18034"
 ></A
 ><P
 ></P
@@ -1291,7 +1299,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17967"
+NAME="AEN18047"
 ></A
 ><H3
 ><A
@@ -1327,7 +1335,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17972"
+NAME="AEN18052"
 ></A
 ><H3
 ><A
@@ -1353,7 +1361,65 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17977"
+NAME="AEN18057"
+></A
+><H3
+><A
+NAME="XMLCLEANUPINPUTCALLBACKS"
+></A
+>xmlCleanupInputCallbacks ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlCleanupInputCallbacks        (void);</PRE
+></TD
+></TR
+></TABLE
+><P
+>clears the entire input callback table. this includes the
+compiled-in I/O.</P
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN18063"
+></A
+><H3
+><A
+NAME="XMLCLEANUPOUTPUTCALLBACKS"
+></A
+>xmlCleanupOutputCallbacks ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+>void        xmlCleanupOutputCallbacks       (void);</PRE
+></TD
+></TR
+></TABLE
+><P
+>clears the entire output callback table. this includes the
+compiled-in I/O callbacks.</P
+><P
+></P
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN18069"
 ></A
 ><H3
 ><A
@@ -1382,7 +1448,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN17983"
+NAME="AEN18075"
 ></A
 ><H3
 ><A
@@ -1416,7 +1482,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN17991"
+NAME="AEN18083"
 ></A
 ><P
 ></P
@@ -1469,7 +1535,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18004"
+NAME="AEN18096"
 ></A
 ><H3
 ><A
@@ -1507,7 +1573,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18013"
+NAME="AEN18105"
 ></A
 ><P
 ></P
@@ -1577,7 +1643,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18030"
+NAME="AEN18122"
 ></A
 ><H3
 ><A
@@ -1616,7 +1682,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18038"
+NAME="AEN18130"
 ></A
 ><P
 ></P
@@ -1686,7 +1752,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18055"
+NAME="AEN18147"
 ></A
 ><H3
 ><A
@@ -1725,7 +1791,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18064"
+NAME="AEN18156"
 ></A
 ><P
 ></P
@@ -1795,7 +1861,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18081"
+NAME="AEN18173"
 ></A
 ><H3
 ><A
@@ -1831,7 +1897,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18089"
+NAME="AEN18181"
 ></A
 ><P
 ></P
@@ -1901,7 +1967,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18106"
+NAME="AEN18198"
 ></A
 ><H3
 ><A
@@ -1938,7 +2004,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18114"
+NAME="AEN18206"
 ></A
 ><P
 ></P
@@ -2025,7 +2091,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18135"
+NAME="AEN18227"
 ></A
 ><H3
 ><A
@@ -2069,7 +2135,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18145"
+NAME="AEN18237"
 ></A
 ><P
 ></P
@@ -2173,7 +2239,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18170"
+NAME="AEN18262"
 ></A
 ><H3
 ><A
@@ -2206,7 +2272,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18177"
+NAME="AEN18269"
 ></A
 ><P
 ></P
@@ -2277,7 +2343,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18194"
+NAME="AEN18286"
 ></A
 ><H3
 ><A
@@ -2313,7 +2379,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18202"
+NAME="AEN18294"
 ></A
 ><P
 ></P
@@ -2384,7 +2450,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18219"
+NAME="AEN18311"
 ></A
 ><H3
 ><A
@@ -2418,7 +2484,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18226"
+NAME="AEN18318"
 ></A
 ><P
 ></P
@@ -2506,7 +2572,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18247"
+NAME="AEN18339"
 ></A
 ><H3
 ><A
@@ -2536,7 +2602,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18254"
+NAME="AEN18346"
 ></A
 ><P
 ></P
@@ -2574,7 +2640,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18263"
+NAME="AEN18355"
 ></A
 ><H3
 ><A
@@ -2601,7 +2667,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18269"
+NAME="AEN18361"
 ></A
 ><P
 ></P
@@ -2654,7 +2720,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18282"
+NAME="AEN18374"
 ></A
 ><H3
 ><A
@@ -2696,7 +2762,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18292"
+NAME="AEN18384"
 ></A
 ><P
 ></P
@@ -2800,7 +2866,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18317"
+NAME="AEN18409"
 ></A
 ><H3
 ><A
@@ -2829,7 +2895,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18323"
+NAME="AEN18415"
 ></A
 ><H3
 ><A
@@ -2862,7 +2928,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18331"
+NAME="AEN18423"
 ></A
 ><P
 ></P
@@ -2915,7 +2981,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18344"
+NAME="AEN18436"
 ></A
 ><H3
 ><A
@@ -2956,7 +3022,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18352"
+NAME="AEN18444"
 ></A
 ><P
 ></P
@@ -3043,7 +3109,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18373"
+NAME="AEN18465"
 ></A
 ><H3
 ><A
@@ -3082,7 +3148,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18382"
+NAME="AEN18474"
 ></A
 ><P
 ></P
@@ -3152,7 +3218,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18399"
+NAME="AEN18491"
 ></A
 ><H3
 ><A
@@ -3187,7 +3253,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18407"
+NAME="AEN18499"
 ></A
 ><P
 ></P
@@ -3257,7 +3323,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18424"
+NAME="AEN18516"
 ></A
 ><H3
 ><A
@@ -3300,7 +3366,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18434"
+NAME="AEN18526"
 ></A
 ><P
 ></P
@@ -3404,7 +3470,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18459"
+NAME="AEN18551"
 ></A
 ><H3
 ><A
@@ -3439,7 +3505,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18466"
+NAME="AEN18558"
 ></A
 ><P
 ></P
@@ -3527,7 +3593,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18487"
+NAME="AEN18579"
 ></A
 ><H3
 ><A
@@ -3561,7 +3627,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18494"
+NAME="AEN18586"
 ></A
 ><P
 ></P
@@ -3632,7 +3698,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18511"
+NAME="AEN18603"
 ></A
 ><H3
 ><A
@@ -3662,7 +3728,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18518"
+NAME="AEN18610"
 ></A
 ><P
 ></P
@@ -3715,7 +3781,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18531"
+NAME="AEN18623"
 ></A
 ><H3
 ><A
@@ -3746,7 +3812,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18538"
+NAME="AEN18630"
 ></A
 ><P
 ></P
@@ -3799,7 +3865,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18551"
+NAME="AEN18643"
 ></A
 ><H3
 ><A
@@ -3841,7 +3907,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18561"
+NAME="AEN18653"
 ></A
 ><P
 ></P
@@ -3945,7 +4011,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18586"
+NAME="AEN18678"
 ></A
 ><H3
 ><A
@@ -3974,7 +4040,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18592"
+NAME="AEN18684"
 ></A
 ><P
 ></P
@@ -4029,7 +4095,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18605"
+NAME="AEN18697"
 ></A
 ><H3
 ><A
@@ -4059,7 +4125,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18611"
+NAME="AEN18703"
 ></A
 ><H3
 ><A
@@ -4094,7 +4160,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18619"
+NAME="AEN18711"
 ></A
 ><P
 ></P
@@ -4181,7 +4247,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18640"
+NAME="AEN18732"
 ></A
 ><H3
 ><A
@@ -4217,7 +4283,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18648"
+NAME="AEN18740"
 ></A
 ><P
 ></P
@@ -4321,7 +4387,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18673"
+NAME="AEN18765"
 ></A
 ><H3
 ><A
@@ -4362,7 +4428,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18682"
+NAME="AEN18774"
 ></A
 ><P
 ></P
@@ -4485,7 +4551,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN18711"
+NAME="AEN18803"
 ></A
 ><H3
 ><A
@@ -4520,7 +4586,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN18719"
+NAME="AEN18811"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-xmlmemory.html b/doc/html/libxml-xmlmemory.html
index 6b80a44..b9a95fb 100644
--- a/doc/html/libxml-xmlmemory.html
+++ b/doc/html/libxml-xmlmemory.html
@@ -111,7 +111,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN23621"
+NAME="AEN25878"
 ></A
 ><H2
 >Name</H2
@@ -119,7 +119,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN23624"
+NAME="AEN25881"
 ></A
 ><H2
 >Synopsis</H2
@@ -231,15 +231,15 @@
 >xmlMemoryDump</A
 >                   (void);
 #define     <A
-HREF="libxml-xmlmemory.html#XMLMALLOC"
+HREF="libxml-globals.html#XMLMALLOC"
 >xmlMalloc</A
 >                       (size)
 #define     <A
-HREF="libxml-xmlmemory.html#XMLREALLOC"
+HREF="libxml-globals.html#XMLREALLOC"
 >xmlRealloc</A
 >                      (ptr, size)
 #define     <A
-HREF="libxml-xmlmemory.html#XMLMEMSTRDUP"
+HREF="libxml-globals.html#XMLMEMSTRDUP"
 >xmlMemStrdup</A
 >                    (str)
 void*       <A
@@ -274,7 +274,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN23660"
+NAME="AEN25917"
 ></A
 ><H2
 >Description</H2
@@ -284,14 +284,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN23663"
+NAME="AEN25920"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23665"
+NAME="AEN25922"
 ></A
 ><H3
 ><A
@@ -322,7 +322,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23671"
+NAME="AEN25928"
 ></A
 ><H3
 ><A
@@ -350,7 +350,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23677"
+NAME="AEN25934"
 ></A
 ><H3
 ><A
@@ -375,7 +375,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23682"
+NAME="AEN25939"
 ></A
 ><P
 ></P
@@ -413,7 +413,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23691"
+NAME="AEN25948"
 ></A
 ><H3
 ><A
@@ -441,7 +441,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23697"
+NAME="AEN25954"
 ></A
 ><P
 ></P
@@ -479,7 +479,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23706"
+NAME="AEN25963"
 ></A
 ><H3
 ><A
@@ -508,7 +508,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23712"
+NAME="AEN25969"
 ></A
 ><P
 ></P
@@ -563,7 +563,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23725"
+NAME="AEN25982"
 ></A
 ><H3
 ><A
@@ -588,7 +588,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23730"
+NAME="AEN25987"
 ></A
 ><P
 ></P
@@ -641,7 +641,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23743"
+NAME="AEN26000"
 ></A
 ><H3
 ><A
@@ -687,7 +687,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23754"
+NAME="AEN26011"
 ></A
 ><P
 ></P
@@ -803,7 +803,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23783"
+NAME="AEN26040"
 ></A
 ><H3
 ><A
@@ -845,7 +845,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23793"
+NAME="AEN26050"
 ></A
 ><P
 ></P
@@ -961,7 +961,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23822"
+NAME="AEN26079"
 ></A
 ><H3
 ><A
@@ -988,7 +988,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23828"
+NAME="AEN26085"
 ></A
 ><P
 ></P
@@ -1024,7 +1024,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23837"
+NAME="AEN26094"
 ></A
 ><H3
 ><A
@@ -1051,7 +1051,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23843"
+NAME="AEN26100"
 ></A
 ><P
 ></P
@@ -1087,7 +1087,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23852"
+NAME="AEN26109"
 ></A
 ><H3
 ><A
@@ -1117,7 +1117,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23859"
+NAME="AEN26116"
 ></A
 ><P
 ></P
@@ -1156,7 +1156,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23868"
+NAME="AEN26125"
 ></A
 ><H3
 ><A
@@ -1193,7 +1193,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23876"
+NAME="AEN26133"
 ></A
 ><P
 ></P
@@ -1248,7 +1248,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23889"
+NAME="AEN26146"
 ></A
 ><H3
 ><A
@@ -1276,7 +1276,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23895"
+NAME="AEN26152"
 ></A
 ><H3
 ><A
@@ -1292,7 +1292,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define xmlMalloc(size) xmlMallocLoc((size), __FILE__, __LINE__)</PRE
+>#define     xmlMalloc(size)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1306,7 +1306,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23902"
+NAME="AEN26159"
 ></A
 ><P
 ></P
@@ -1344,7 +1344,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23911"
+NAME="AEN26168"
 ></A
 ><H3
 ><A
@@ -1360,7 +1360,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define xmlRealloc(ptr, size) xmlReallocLoc((ptr), (size), __FILE__, __LINE__)</PRE
+>#define     xmlRealloc(ptr, size)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1374,7 +1374,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23918"
+NAME="AEN26175"
 ></A
 ><P
 ></P
@@ -1429,7 +1429,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23931"
+NAME="AEN26188"
 ></A
 ><H3
 ><A
@@ -1445,7 +1445,7 @@
 ><TD
 ><PRE
 CLASS="PROGRAMLISTING"
->#define xmlMemStrdup(str) xmlMemStrdupLoc((str), __FILE__, __LINE__)</PRE
+>#define     xmlMemStrdup(str)</PRE
 ></TD
 ></TR
 ></TABLE
@@ -1462,7 +1462,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23939"
+NAME="AEN26196"
 ></A
 ><P
 ></P
@@ -1500,7 +1500,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23948"
+NAME="AEN26205"
 ></A
 ><H3
 ><A
@@ -1535,7 +1535,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23956"
+NAME="AEN26213"
 ></A
 ><P
 ></P
@@ -1607,7 +1607,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN23973"
+NAME="AEN26230"
 ></A
 ><H3
 ><A
@@ -1643,7 +1643,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN23981"
+NAME="AEN26238"
 ></A
 ><P
 ></P
@@ -1732,7 +1732,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN24002"
+NAME="AEN26259"
 ></A
 ><H3
 ><A
@@ -1764,7 +1764,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN24009"
+NAME="AEN26266"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-xpath.html b/doc/html/libxml-xpath.html
index 37be1d0..ea109ad 100644
--- a/doc/html/libxml-xpath.html
+++ b/doc/html/libxml-xpath.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN11464"
+NAME="AEN11542"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN11467"
+NAME="AEN11545"
 ></A
 ><H2
 >Synopsis</H2
@@ -591,7 +591,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN11593"
+NAME="AEN11671"
 ></A
 ><H2
 >Description</H2
@@ -601,14 +601,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN11596"
+NAME="AEN11674"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11598"
+NAME="AEN11676"
 ></A
 ><H3
 ><A
@@ -697,7 +697,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11604"
+NAME="AEN11682"
 ></A
 ><H3
 ><A
@@ -723,7 +723,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11609"
+NAME="AEN11687"
 ></A
 ><H3
 ><A
@@ -767,7 +767,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11615"
+NAME="AEN11693"
 ></A
 ><H3
 ><A
@@ -793,7 +793,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11620"
+NAME="AEN11698"
 ></A
 ><H3
 ><A
@@ -842,7 +842,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11625"
+NAME="AEN11703"
 ></A
 ><H3
 ><A
@@ -872,7 +872,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11630"
+NAME="AEN11708"
 ></A
 ><H3
 ><A
@@ -898,7 +898,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11635"
+NAME="AEN11713"
 ></A
 ><H3
 ><A
@@ -935,7 +935,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11640"
+NAME="AEN11718"
 ></A
 ><H3
 ><A
@@ -971,7 +971,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11645"
+NAME="AEN11723"
 ></A
 ><H3
 ><A
@@ -997,7 +997,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11650"
+NAME="AEN11728"
 ></A
 ><H3
 ><A
@@ -1026,7 +1026,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11656"
+NAME="AEN11734"
 ></A
 ><P
 ></P
@@ -1096,7 +1096,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11673"
+NAME="AEN11751"
 ></A
 ><H3
 ><A
@@ -1125,7 +1125,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11678"
+NAME="AEN11756"
 ></A
 ><H3
 ><A
@@ -1151,7 +1151,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11683"
+NAME="AEN11761"
 ></A
 ><H3
 ><A
@@ -1180,7 +1180,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11688"
+NAME="AEN11766"
 ></A
 ><H3
 ><A
@@ -1206,7 +1206,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11693"
+NAME="AEN11771"
 ></A
 ><H3
 ><A
@@ -1237,7 +1237,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11700"
+NAME="AEN11778"
 ></A
 ><P
 ></P
@@ -1292,7 +1292,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11713"
+NAME="AEN11791"
 ></A
 ><H3
 ><A
@@ -1321,7 +1321,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11718"
+NAME="AEN11796"
 ></A
 ><H3
 ><A
@@ -1347,7 +1347,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11723"
+NAME="AEN11801"
 ></A
 ><H3
 ><A
@@ -1382,7 +1382,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11731"
+NAME="AEN11809"
 ></A
 ><P
 ></P
@@ -1452,7 +1452,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11748"
+NAME="AEN11826"
 ></A
 ><H3
 ><A
@@ -1481,7 +1481,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11753"
+NAME="AEN11831"
 ></A
 ><H3
 ><A
@@ -1507,7 +1507,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11758"
+NAME="AEN11836"
 ></A
 ><H3
 ><A
@@ -1539,7 +1539,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11765"
+NAME="AEN11843"
 ></A
 ><H3
 ><A
@@ -1565,7 +1565,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11770"
+NAME="AEN11848"
 ></A
 ><H3
 ><A
@@ -1597,7 +1597,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11777"
+NAME="AEN11855"
 ></A
 ><P
 ></P
@@ -1633,7 +1633,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11786"
+NAME="AEN11864"
 ></A
 ><H3
 ><A
@@ -1668,7 +1668,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11794"
+NAME="AEN11872"
 ></A
 ><P
 ></P
@@ -1721,7 +1721,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11807"
+NAME="AEN11885"
 ></A
 ><H3
 ><A
@@ -1756,7 +1756,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11815"
+NAME="AEN11893"
 ></A
 ><P
 ></P
@@ -1809,7 +1809,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11828"
+NAME="AEN11906"
 ></A
 ><H3
 ><A
@@ -1836,7 +1836,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11834"
+NAME="AEN11912"
 ></A
 ><P
 ></P
@@ -1874,7 +1874,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11843"
+NAME="AEN11921"
 ></A
 ><H3
 ><A
@@ -1904,7 +1904,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11850"
+NAME="AEN11928"
 ></A
 ><P
 ></P
@@ -1959,7 +1959,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11863"
+NAME="AEN11941"
 ></A
 ><H3
 ><A
@@ -1991,7 +1991,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11870"
+NAME="AEN11948"
 ></A
 ><P
 ></P
@@ -2029,7 +2029,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11879"
+NAME="AEN11957"
 ></A
 ><H3
 ><A
@@ -2059,7 +2059,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11886"
+NAME="AEN11964"
 ></A
 ><P
 ></P
@@ -2097,7 +2097,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11895"
+NAME="AEN11973"
 ></A
 ><H3
 ><A
@@ -2135,7 +2135,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11904"
+NAME="AEN11982"
 ></A
 ><P
 ></P
@@ -2188,7 +2188,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11917"
+NAME="AEN11995"
 ></A
 ><H3
 ><A
@@ -2227,7 +2227,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11926"
+NAME="AEN12004"
 ></A
 ><P
 ></P
@@ -2265,7 +2265,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11935"
+NAME="AEN12013"
 ></A
 ><H3
 ><A
@@ -2295,7 +2295,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11942"
+NAME="AEN12020"
 ></A
 ><P
 ></P
@@ -2333,7 +2333,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11951"
+NAME="AEN12029"
 ></A
 ><H3
 ><A
@@ -2366,7 +2366,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11959"
+NAME="AEN12037"
 ></A
 ><P
 ></P
@@ -2419,7 +2419,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11972"
+NAME="AEN12050"
 ></A
 ><H3
 ><A
@@ -2453,7 +2453,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN11980"
+NAME="AEN12058"
 ></A
 ><P
 ></P
@@ -2524,7 +2524,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN11997"
+NAME="AEN12075"
 ></A
 ><H3
 ><A
@@ -2554,7 +2554,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12004"
+NAME="AEN12082"
 ></A
 ><P
 ></P
@@ -2607,7 +2607,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12017"
+NAME="AEN12095"
 ></A
 ><H3
 ><A
@@ -2637,7 +2637,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12024"
+NAME="AEN12102"
 ></A
 ><P
 ></P
@@ -2690,7 +2690,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12037"
+NAME="AEN12115"
 ></A
 ><H3
 ><A
@@ -2720,7 +2720,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12044"
+NAME="AEN12122"
 ></A
 ><P
 ></P
@@ -2773,7 +2773,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12057"
+NAME="AEN12135"
 ></A
 ><H3
 ><A
@@ -2803,7 +2803,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12064"
+NAME="AEN12142"
 ></A
 ><P
 ></P
@@ -2856,7 +2856,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12077"
+NAME="AEN12155"
 ></A
 ><H3
 ><A
@@ -2886,7 +2886,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12084"
+NAME="AEN12162"
 ></A
 ><P
 ></P
@@ -2939,7 +2939,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12097"
+NAME="AEN12175"
 ></A
 ><H3
 ><A
@@ -2972,7 +2972,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12105"
+NAME="AEN12183"
 ></A
 ><P
 ></P
@@ -3025,7 +3025,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12118"
+NAME="AEN12196"
 ></A
 ><H3
 ><A
@@ -3058,7 +3058,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12126"
+NAME="AEN12204"
 ></A
 ><P
 ></P
@@ -3111,7 +3111,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12139"
+NAME="AEN12217"
 ></A
 ><H3
 ><A
@@ -3144,7 +3144,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12147"
+NAME="AEN12225"
 ></A
 ><P
 ></P
@@ -3197,7 +3197,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12160"
+NAME="AEN12238"
 ></A
 ><H3
 ><A
@@ -3230,7 +3230,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12168"
+NAME="AEN12246"
 ></A
 ><P
 ></P
@@ -3283,7 +3283,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12181"
+NAME="AEN12259"
 ></A
 ><H3
 ><A
@@ -3313,7 +3313,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12188"
+NAME="AEN12266"
 ></A
 ><P
 ></P
@@ -3366,7 +3366,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12201"
+NAME="AEN12279"
 ></A
 ><H3
 ><A
@@ -3399,7 +3399,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12209"
+NAME="AEN12287"
 ></A
 ><P
 ></P
@@ -3452,7 +3452,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12222"
+NAME="AEN12300"
 ></A
 ><H3
 ><A
@@ -3485,7 +3485,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12230"
+NAME="AEN12308"
 ></A
 ><P
 ></P
@@ -3538,7 +3538,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12243"
+NAME="AEN12321"
 ></A
 ><H3
 ><A
@@ -3571,7 +3571,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12251"
+NAME="AEN12329"
 ></A
 ><P
 ></P
@@ -3624,7 +3624,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12264"
+NAME="AEN12342"
 ></A
 ><H3
 ><A
@@ -3660,7 +3660,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12273"
+NAME="AEN12351"
 ></A
 ><P
 ></P
@@ -3715,7 +3715,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12286"
+NAME="AEN12364"
 ></A
 ><H3
 ><A
@@ -3751,7 +3751,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12295"
+NAME="AEN12373"
 ></A
 ><P
 ></P
@@ -3810,7 +3810,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12309"
+NAME="AEN12387"
 ></A
 ><H3
 ><A
@@ -3846,7 +3846,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12318"
+NAME="AEN12396"
 ></A
 ><P
 ></P
@@ -3905,7 +3905,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12332"
+NAME="AEN12410"
 ></A
 ><H3
 ><A
@@ -3941,7 +3941,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12341"
+NAME="AEN12419"
 ></A
 ><P
 ></P
@@ -4000,7 +4000,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12355"
+NAME="AEN12433"
 ></A
 ><H3
 ><A
@@ -4028,7 +4028,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12361"
+NAME="AEN12439"
 ></A
 ><H3
 ><A
@@ -4061,7 +4061,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12369"
+NAME="AEN12447"
 ></A
 ><P
 ></P
@@ -4114,7 +4114,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12382"
+NAME="AEN12460"
 ></A
 ><H3
 ><A
@@ -4144,7 +4144,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12389"
+NAME="AEN12467"
 ></A
 ><P
 ></P
@@ -4182,7 +4182,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12398"
+NAME="AEN12476"
 ></A
 ><H3
 ><A
@@ -4219,7 +4219,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12407"
+NAME="AEN12485"
 ></A
 ><P
 ></P
@@ -4290,7 +4290,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12424"
+NAME="AEN12502"
 ></A
 ><H3
 ><A
@@ -4327,7 +4327,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12433"
+NAME="AEN12511"
 ></A
 ><P
 ></P
@@ -4398,7 +4398,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12450"
+NAME="AEN12528"
 ></A
 ><H3
 ><A
@@ -4441,7 +4441,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12459"
+NAME="AEN12537"
 ></A
 ><P
 ></P
@@ -4511,7 +4511,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12476"
+NAME="AEN12554"
 ></A
 ><H3
 ><A
@@ -4544,7 +4544,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12484"
+NAME="AEN12562"
 ></A
 ><P
 ></P
@@ -4598,7 +4598,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12497"
+NAME="AEN12575"
 ></A
 ><H3
 ><A
@@ -4635,7 +4635,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12506"
+NAME="AEN12584"
 ></A
 ><P
 ></P
@@ -4706,7 +4706,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12523"
+NAME="AEN12601"
 ></A
 ><H3
 ><A
@@ -4741,7 +4741,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12531"
+NAME="AEN12609"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-xpathinternals.html b/doc/html/libxml-xpathinternals.html
index 7c26ae0..8909ae6 100644
--- a/doc/html/libxml-xpathinternals.html
+++ b/doc/html/libxml-xpathinternals.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN12545"
+NAME="AEN12623"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN12548"
+NAME="AEN12626"
 ></A
 ><H2
 >Synopsis</H2
@@ -1531,7 +1531,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN12928"
+NAME="AEN13006"
 ></A
 ><H2
 >Description</H2
@@ -1541,14 +1541,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN12931"
+NAME="AEN13009"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12933"
+NAME="AEN13011"
 ></A
 ><H3
 ><A
@@ -1575,7 +1575,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12939"
+NAME="AEN13017"
 ></A
 ><P
 ></P
@@ -1630,7 +1630,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12952"
+NAME="AEN13030"
 ></A
 ><H3
 ><A
@@ -1657,7 +1657,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12958"
+NAME="AEN13036"
 ></A
 ><P
 ></P
@@ -1695,7 +1695,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12967"
+NAME="AEN13045"
 ></A
 ><H3
 ><A
@@ -1722,7 +1722,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12973"
+NAME="AEN13051"
 ></A
 ><P
 ></P
@@ -1760,7 +1760,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12982"
+NAME="AEN13060"
 ></A
 ><H3
 ><A
@@ -1787,7 +1787,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN12988"
+NAME="AEN13066"
 ></A
 ><P
 ></P
@@ -1825,7 +1825,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN12997"
+NAME="AEN13075"
 ></A
 ><H3
 ><A
@@ -1852,7 +1852,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13003"
+NAME="AEN13081"
 ></A
 ><P
 ></P
@@ -1890,7 +1890,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13012"
+NAME="AEN13090"
 ></A
 ><H3
 ><A
@@ -1917,7 +1917,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13018"
+NAME="AEN13096"
 ></A
 ><P
 ></P
@@ -1955,7 +1955,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13027"
+NAME="AEN13105"
 ></A
 ><H3
 ><A
@@ -1982,7 +1982,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13033"
+NAME="AEN13111"
 ></A
 ><P
 ></P
@@ -2020,7 +2020,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13042"
+NAME="AEN13120"
 ></A
 ><H3
 ><A
@@ -2054,7 +2054,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13050"
+NAME="AEN13128"
 ></A
 ><P
 ></P
@@ -2107,7 +2107,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13063"
+NAME="AEN13141"
 ></A
 ><H3
 ><A
@@ -2144,7 +2144,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13072"
+NAME="AEN13150"
 ></A
 ><P
 ></P
@@ -2197,7 +2197,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13085"
+NAME="AEN13163"
 ></A
 ><H3
 ><A
@@ -2234,7 +2234,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13094"
+NAME="AEN13172"
 ></A
 ><P
 ></P
@@ -2287,7 +2287,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13107"
+NAME="AEN13185"
 ></A
 ><H3
 ><A
@@ -2324,7 +2324,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13116"
+NAME="AEN13194"
 ></A
 ><P
 ></P
@@ -2377,7 +2377,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13129"
+NAME="AEN13207"
 ></A
 ><H3
 ><A
@@ -2411,7 +2411,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13137"
+NAME="AEN13215"
 ></A
 ><P
 ></P
@@ -2449,7 +2449,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13146"
+NAME="AEN13224"
 ></A
 ><H3
 ><A
@@ -2481,7 +2481,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13153"
+NAME="AEN13231"
 ></A
 ><P
 ></P
@@ -2536,7 +2536,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13166"
+NAME="AEN13244"
 ></A
 ><H3
 ><A
@@ -2563,7 +2563,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13172"
+NAME="AEN13250"
 ></A
 ><P
 ></P
@@ -2601,7 +2601,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13181"
+NAME="AEN13259"
 ></A
 ><H3
 ><A
@@ -2628,7 +2628,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13187"
+NAME="AEN13265"
 ></A
 ><P
 ></P
@@ -2666,7 +2666,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13196"
+NAME="AEN13274"
 ></A
 ><H3
 ><A
@@ -2698,7 +2698,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13203"
+NAME="AEN13281"
 ></A
 ><P
 ></P
@@ -2753,7 +2753,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13216"
+NAME="AEN13294"
 ></A
 ><H3
 ><A
@@ -2785,7 +2785,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13223"
+NAME="AEN13301"
 ></A
 ><P
 ></P
@@ -2840,7 +2840,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13236"
+NAME="AEN13314"
 ></A
 ><H3
 ><A
@@ -2867,7 +2867,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13242"
+NAME="AEN13320"
 ></A
 ><P
 ></P
@@ -2905,7 +2905,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13251"
+NAME="AEN13329"
 ></A
 ><H3
 ><A
@@ -2937,7 +2937,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13258"
+NAME="AEN13336"
 ></A
 ><P
 ></P
@@ -2992,7 +2992,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13271"
+NAME="AEN13349"
 ></A
 ><H3
 ><A
@@ -3019,7 +3019,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13277"
+NAME="AEN13355"
 ></A
 ><P
 ></P
@@ -3074,7 +3074,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13290"
+NAME="AEN13368"
 ></A
 ><H3
 ><A
@@ -3101,7 +3101,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13296"
+NAME="AEN13374"
 ></A
 ><P
 ></P
@@ -3156,7 +3156,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13309"
+NAME="AEN13387"
 ></A
 ><H3
 ><A
@@ -3184,7 +3184,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13315"
+NAME="AEN13393"
 ></A
 ><P
 ></P
@@ -3222,7 +3222,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13324"
+NAME="AEN13402"
 ></A
 ><H3
 ><A
@@ -3250,7 +3250,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13330"
+NAME="AEN13408"
 ></A
 ><P
 ></P
@@ -3288,7 +3288,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13339"
+NAME="AEN13417"
 ></A
 ><H3
 ><A
@@ -3315,7 +3315,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13345"
+NAME="AEN13423"
 ></A
 ><P
 ></P
@@ -3353,7 +3353,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13354"
+NAME="AEN13432"
 ></A
 ><H3
 ><A
@@ -3381,7 +3381,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13360"
+NAME="AEN13438"
 ></A
 ><H3
 ><A
@@ -3409,7 +3409,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13366"
+NAME="AEN13444"
 ></A
 ><H3
 ><A
@@ -3436,7 +3436,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13372"
+NAME="AEN13450"
 ></A
 ><P
 ></P
@@ -3474,7 +3474,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13381"
+NAME="AEN13459"
 ></A
 ><H3
 ><A
@@ -3501,7 +3501,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13387"
+NAME="AEN13465"
 ></A
 ><P
 ></P
@@ -3539,7 +3539,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13396"
+NAME="AEN13474"
 ></A
 ><H3
 ><A
@@ -3567,7 +3567,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13402"
+NAME="AEN13480"
 ></A
 ><P
 ></P
@@ -3605,7 +3605,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13411"
+NAME="AEN13489"
 ></A
 ><H3
 ><A
@@ -3633,7 +3633,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13417"
+NAME="AEN13495"
 ></A
 ><P
 ></P
@@ -3671,7 +3671,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13426"
+NAME="AEN13504"
 ></A
 ><H3
 ><A
@@ -3698,7 +3698,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13432"
+NAME="AEN13510"
 ></A
 ><P
 ></P
@@ -3736,7 +3736,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13441"
+NAME="AEN13519"
 ></A
 ><H3
 ><A
@@ -3764,7 +3764,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13447"
+NAME="AEN13525"
 ></A
 ><H3
 ><A
@@ -3792,7 +3792,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13453"
+NAME="AEN13531"
 ></A
 ><H3
 ><A
@@ -3820,7 +3820,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13459"
+NAME="AEN13537"
 ></A
 ><H3
 ><A
@@ -3857,7 +3857,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13467"
+NAME="AEN13545"
 ></A
 ><P
 ></P
@@ -3944,7 +3944,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13488"
+NAME="AEN13566"
 ></A
 ><H3
 ><A
@@ -3979,7 +3979,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13496"
+NAME="AEN13574"
 ></A
 ><P
 ></P
@@ -4051,7 +4051,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13513"
+NAME="AEN13591"
 ></A
 ><H3
 ><A
@@ -4083,7 +4083,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13520"
+NAME="AEN13598"
 ></A
 ><P
 ></P
@@ -4119,7 +4119,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13529"
+NAME="AEN13607"
 ></A
 ><H3
 ><A
@@ -4154,7 +4154,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13537"
+NAME="AEN13615"
 ></A
 ><P
 ></P
@@ -4226,7 +4226,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13554"
+NAME="AEN13632"
 ></A
 ><H3
 ><A
@@ -4259,7 +4259,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13561"
+NAME="AEN13639"
 ></A
 ><P
 ></P
@@ -4348,7 +4348,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13582"
+NAME="AEN13660"
 ></A
 ><H3
 ><A
@@ -4383,7 +4383,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13590"
+NAME="AEN13668"
 ></A
 ><P
 ></P
@@ -4455,7 +4455,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13607"
+NAME="AEN13685"
 ></A
 ><H3
 ><A
@@ -4490,7 +4490,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13615"
+NAME="AEN13693"
 ></A
 ><P
 ></P
@@ -4562,7 +4562,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13632"
+NAME="AEN13710"
 ></A
 ><H3
 ><A
@@ -4606,7 +4606,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13642"
+NAME="AEN13720"
 ></A
 ><P
 ></P
@@ -4686,7 +4686,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13661"
+NAME="AEN13739"
 ></A
 ><H3
 ><A
@@ -4727,7 +4727,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13671"
+NAME="AEN13749"
 ></A
 ><P
 ></P
@@ -4798,7 +4798,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13688"
+NAME="AEN13766"
 ></A
 ><H3
 ><A
@@ -4839,7 +4839,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13698"
+NAME="AEN13776"
 ></A
 ><P
 ></P
@@ -4910,7 +4910,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13715"
+NAME="AEN13793"
 ></A
 ><H3
 ><A
@@ -4947,7 +4947,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13724"
+NAME="AEN13802"
 ></A
 ><P
 ></P
@@ -5011,7 +5011,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13739"
+NAME="AEN13817"
 ></A
 ><H3
 ><A
@@ -5058,7 +5058,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13750"
+NAME="AEN13828"
 ></A
 ><P
 ></P
@@ -5122,7 +5122,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13765"
+NAME="AEN13843"
 ></A
 ><H3
 ><A
@@ -5157,7 +5157,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13773"
+NAME="AEN13851"
 ></A
 ><P
 ></P
@@ -5238,7 +5238,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13792"
+NAME="AEN13870"
 ></A
 ><H3
 ><A
@@ -5279,7 +5279,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13802"
+NAME="AEN13880"
 ></A
 ><P
 ></P
@@ -5381,7 +5381,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13825"
+NAME="AEN13903"
 ></A
 ><H3
 ><A
@@ -5422,7 +5422,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13835"
+NAME="AEN13913"
 ></A
 ><P
 ></P
@@ -5524,7 +5524,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13858"
+NAME="AEN13936"
 ></A
 ><H3
 ><A
@@ -5575,7 +5575,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13870"
+NAME="AEN13948"
 ></A
 ><P
 ></P
@@ -5677,7 +5677,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13893"
+NAME="AEN13971"
 ></A
 ><H3
 ><A
@@ -5733,7 +5733,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13906"
+NAME="AEN13984"
 ></A
 ><P
 ></P
@@ -5835,7 +5835,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13929"
+NAME="AEN14007"
 ></A
 ><H3
 ><A
@@ -5876,7 +5876,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13939"
+NAME="AEN14017"
 ></A
 ><P
 ></P
@@ -5978,7 +5978,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13962"
+NAME="AEN14040"
 ></A
 ><H3
 ><A
@@ -6019,7 +6019,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN13972"
+NAME="AEN14050"
 ></A
 ><P
 ></P
@@ -6121,7 +6121,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN13995"
+NAME="AEN14073"
 ></A
 ><H3
 ><A
@@ -6172,7 +6172,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14007"
+NAME="AEN14085"
 ></A
 ><P
 ></P
@@ -6274,7 +6274,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14030"
+NAME="AEN14108"
 ></A
 ><H3
 ><A
@@ -6330,7 +6330,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14043"
+NAME="AEN14121"
 ></A
 ><P
 ></P
@@ -6432,7 +6432,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14066"
+NAME="AEN14144"
 ></A
 ><H3
 ><A
@@ -6476,7 +6476,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14076"
+NAME="AEN14154"
 ></A
 ><P
 ></P
@@ -6563,7 +6563,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14097"
+NAME="AEN14175"
 ></A
 ><H3
 ><A
@@ -6601,7 +6601,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14106"
+NAME="AEN14184"
 ></A
 ><P
 ></P
@@ -6671,7 +6671,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14123"
+NAME="AEN14201"
 ></A
 ><H3
 ><A
@@ -6701,7 +6701,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14130"
+NAME="AEN14208"
 ></A
 ><P
 ></P
@@ -6739,7 +6739,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14139"
+NAME="AEN14217"
 ></A
 ><H3
 ><A
@@ -6782,7 +6782,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14149"
+NAME="AEN14227"
 ></A
 ><P
 ></P
@@ -6869,7 +6869,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14170"
+NAME="AEN14248"
 ></A
 ><H3
 ><A
@@ -6916,7 +6916,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14181"
+NAME="AEN14259"
 ></A
 ><P
 ></P
@@ -7020,7 +7020,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14206"
+NAME="AEN14284"
 ></A
 ><H3
 ><A
@@ -7064,7 +7064,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14216"
+NAME="AEN14294"
 ></A
 ><P
 ></P
@@ -7151,7 +7151,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14237"
+NAME="AEN14315"
 ></A
 ><H3
 ><A
@@ -7199,7 +7199,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14248"
+NAME="AEN14326"
 ></A
 ><P
 ></P
@@ -7303,7 +7303,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14273"
+NAME="AEN14351"
 ></A
 ><H3
 ><A
@@ -7341,7 +7341,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14282"
+NAME="AEN14360"
 ></A
 ><P
 ></P
@@ -7411,7 +7411,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14299"
+NAME="AEN14377"
 ></A
 ><H3
 ><A
@@ -7453,7 +7453,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14309"
+NAME="AEN14387"
 ></A
 ><P
 ></P
@@ -7540,7 +7540,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14330"
+NAME="AEN14408"
 ></A
 ><H3
 ><A
@@ -7570,7 +7570,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14337"
+NAME="AEN14415"
 ></A
 ><P
 ></P
@@ -7608,7 +7608,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14346"
+NAME="AEN14424"
 ></A
 ><H3
 ><A
@@ -7646,7 +7646,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14355"
+NAME="AEN14433"
 ></A
 ><P
 ></P
@@ -7716,7 +7716,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14372"
+NAME="AEN14450"
 ></A
 ><H3
 ><A
@@ -7758,7 +7758,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14382"
+NAME="AEN14460"
 ></A
 ><P
 ></P
@@ -7845,7 +7845,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14403"
+NAME="AEN14481"
 ></A
 ><H3
 ><A
@@ -7876,7 +7876,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14410"
+NAME="AEN14488"
 ></A
 ><P
 ></P
@@ -7914,7 +7914,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14419"
+NAME="AEN14497"
 ></A
 ><H3
 ><A
@@ -7952,7 +7952,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14428"
+NAME="AEN14506"
 ></A
 ><P
 ></P
@@ -8022,7 +8022,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14445"
+NAME="AEN14523"
 ></A
 ><H3
 ><A
@@ -8052,7 +8052,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14452"
+NAME="AEN14530"
 ></A
 ><P
 ></P
@@ -8090,7 +8090,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14461"
+NAME="AEN14539"
 ></A
 ><H3
 ><A
@@ -8123,7 +8123,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14469"
+NAME="AEN14547"
 ></A
 ><P
 ></P
@@ -8176,7 +8176,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14482"
+NAME="AEN14560"
 ></A
 ><H3
 ><A
@@ -8210,7 +8210,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14490"
+NAME="AEN14568"
 ></A
 ><P
 ></P
@@ -8280,7 +8280,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14507"
+NAME="AEN14585"
 ></A
 ><H3
 ><A
@@ -8318,7 +8318,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14516"
+NAME="AEN14594"
 ></A
 ><P
 ></P
@@ -8371,7 +8371,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14529"
+NAME="AEN14607"
 ></A
 ><H3
 ><A
@@ -8406,7 +8406,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14537"
+NAME="AEN14615"
 ></A
 ><P
 ></P
@@ -8459,7 +8459,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14550"
+NAME="AEN14628"
 ></A
 ><H3
 ><A
@@ -8497,7 +8497,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14559"
+NAME="AEN14637"
 ></A
 ><P
 ></P
@@ -8550,7 +8550,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14572"
+NAME="AEN14650"
 ></A
 ><H3
 ><A
@@ -8580,7 +8580,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14579"
+NAME="AEN14657"
 ></A
 ><P
 ></P
@@ -8633,7 +8633,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14592"
+NAME="AEN14670"
 ></A
 ><H3
 ><A
@@ -8671,7 +8671,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14601"
+NAME="AEN14679"
 ></A
 ><P
 ></P
@@ -8724,7 +8724,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14614"
+NAME="AEN14692"
 ></A
 ><H3
 ><A
@@ -8759,7 +8759,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14622"
+NAME="AEN14700"
 ></A
 ><P
 ></P
@@ -8812,7 +8812,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14635"
+NAME="AEN14713"
 ></A
 ><H3
 ><A
@@ -8851,7 +8851,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14644"
+NAME="AEN14722"
 ></A
 ><P
 ></P
@@ -8904,7 +8904,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14657"
+NAME="AEN14735"
 ></A
 ><H3
 ><A
@@ -8943,7 +8943,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14666"
+NAME="AEN14744"
 ></A
 ><P
 ></P
@@ -8996,7 +8996,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14679"
+NAME="AEN14757"
 ></A
 ><H3
 ><A
@@ -9030,7 +9030,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14687"
+NAME="AEN14765"
 ></A
 ><P
 ></P
@@ -9085,7 +9085,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14700"
+NAME="AEN14778"
 ></A
 ><H3
 ><A
@@ -9120,7 +9120,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14708"
+NAME="AEN14786"
 ></A
 ><P
 ></P
@@ -9175,7 +9175,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14721"
+NAME="AEN14799"
 ></A
 ><H3
 ><A
@@ -9205,7 +9205,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14728"
+NAME="AEN14806"
 ></A
 ><P
 ></P
@@ -9243,7 +9243,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14737"
+NAME="AEN14815"
 ></A
 ><H3
 ><A
@@ -9288,7 +9288,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14745"
+NAME="AEN14823"
 ></A
 ><P
 ></P
@@ -9343,7 +9343,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14758"
+NAME="AEN14836"
 ></A
 ><H3
 ><A
@@ -9373,7 +9373,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14765"
+NAME="AEN14843"
 ></A
 ><P
 ></P
@@ -9411,7 +9411,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14774"
+NAME="AEN14852"
 ></A
 ><H3
 ><A
@@ -9442,7 +9442,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14781"
+NAME="AEN14859"
 ></A
 ><P
 ></P
@@ -9480,7 +9480,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14790"
+NAME="AEN14868"
 ></A
 ><H3
 ><A
@@ -9518,7 +9518,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14800"
+NAME="AEN14878"
 ></A
 ><P
 ></P
@@ -9571,7 +9571,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14813"
+NAME="AEN14891"
 ></A
 ><H3
 ><A
@@ -9609,7 +9609,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14823"
+NAME="AEN14901"
 ></A
 ><P
 ></P
@@ -9662,7 +9662,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14836"
+NAME="AEN14914"
 ></A
 ><H3
 ><A
@@ -9703,7 +9703,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14846"
+NAME="AEN14924"
 ></A
 ><P
 ></P
@@ -9756,7 +9756,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14859"
+NAME="AEN14937"
 ></A
 ><H3
 ><A
@@ -9799,7 +9799,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14868"
+NAME="AEN14946"
 ></A
 ><P
 ></P
@@ -9869,7 +9869,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14885"
+NAME="AEN14963"
 ></A
 ><H3
 ><A
@@ -9897,7 +9897,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14891"
+NAME="AEN14969"
 ></A
 ><H3
 ><A
@@ -9960,7 +9960,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14900"
+NAME="AEN14978"
 ></A
 ><P
 ></P
@@ -10015,7 +10015,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14913"
+NAME="AEN14991"
 ></A
 ><H3
 ><A
@@ -10045,7 +10045,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14920"
+NAME="AEN14998"
 ></A
 ><P
 ></P
@@ -10083,7 +10083,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14929"
+NAME="AEN15007"
 ></A
 ><H3
 ><A
@@ -10121,7 +10121,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14938"
+NAME="AEN15016"
 ></A
 ><P
 ></P
@@ -10174,7 +10174,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14951"
+NAME="AEN15029"
 ></A
 ><H3
 ><A
@@ -10232,7 +10232,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14964"
+NAME="AEN15042"
 ></A
 ><P
 ></P
@@ -10302,7 +10302,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN14981"
+NAME="AEN15059"
 ></A
 ><H3
 ><A
@@ -10336,7 +10336,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN14989"
+NAME="AEN15067"
 ></A
 ><P
 ></P
@@ -10391,7 +10391,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15002"
+NAME="AEN15080"
 ></A
 ><H3
 ><A
@@ -10422,7 +10422,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15009"
+NAME="AEN15087"
 ></A
 ><P
 ></P
@@ -10477,7 +10477,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15022"
+NAME="AEN15100"
 ></A
 ><H3
 ><A
@@ -10507,7 +10507,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15029"
+NAME="AEN15107"
 ></A
 ><P
 ></P
@@ -10545,7 +10545,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15038"
+NAME="AEN15116"
 ></A
 ><H3
 ><A
@@ -10584,7 +10584,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15047"
+NAME="AEN15125"
 ></A
 ><P
 ></P
@@ -10637,7 +10637,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15060"
+NAME="AEN15138"
 ></A
 ><H3
 ><A
@@ -10675,7 +10675,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15069"
+NAME="AEN15147"
 ></A
 ><P
 ></P
@@ -10728,7 +10728,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15082"
+NAME="AEN15160"
 ></A
 ><H3
 ><A
@@ -10763,7 +10763,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15090"
+NAME="AEN15168"
 ></A
 ><P
 ></P
@@ -10816,7 +10816,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15103"
+NAME="AEN15181"
 ></A
 ><H3
 ><A
@@ -10855,7 +10855,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15112"
+NAME="AEN15190"
 ></A
 ><P
 ></P
@@ -10893,7 +10893,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15121"
+NAME="AEN15199"
 ></A
 ><H3
 ><A
@@ -10923,7 +10923,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15128"
+NAME="AEN15206"
 ></A
 ><P
 ></P
@@ -10961,7 +10961,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15137"
+NAME="AEN15215"
 ></A
 ><H3
 ><A
@@ -10994,7 +10994,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15145"
+NAME="AEN15223"
 ></A
 ><P
 ></P
@@ -11047,7 +11047,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15158"
+NAME="AEN15236"
 ></A
 ><H3
 ><A
@@ -11077,7 +11077,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15165"
+NAME="AEN15243"
 ></A
 ><P
 ></P
@@ -11115,7 +11115,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15174"
+NAME="AEN15252"
 ></A
 ><H3
 ><A
@@ -11155,7 +11155,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15183"
+NAME="AEN15261"
 ></A
 ><P
 ></P
@@ -11208,7 +11208,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15196"
+NAME="AEN15274"
 ></A
 ><H3
 ><A
@@ -11294,7 +11294,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15212"
+NAME="AEN15290"
 ></A
 ><P
 ></P
@@ -11381,7 +11381,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15233"
+NAME="AEN15311"
 ></A
 ><H3
 ><A
@@ -11413,7 +11413,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15240"
+NAME="AEN15318"
 ></A
 ><P
 ></P
@@ -11451,7 +11451,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15249"
+NAME="AEN15327"
 ></A
 ><H3
 ><A
@@ -11483,7 +11483,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15256"
+NAME="AEN15334"
 ></A
 ><P
 ></P
@@ -11521,7 +11521,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15265"
+NAME="AEN15343"
 ></A
 ><H3
 ><A
@@ -11553,7 +11553,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15272"
+NAME="AEN15350"
 ></A
 ><P
 ></P
@@ -11591,7 +11591,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15281"
+NAME="AEN15359"
 ></A
 ><H3
 ><A
@@ -11623,7 +11623,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15288"
+NAME="AEN15366"
 ></A
 ><P
 ></P
@@ -11661,7 +11661,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15297"
+NAME="AEN15375"
 ></A
 ><H3
 ><A
@@ -11703,7 +11703,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15306"
+NAME="AEN15384"
 ></A
 ><P
 ></P
@@ -11741,7 +11741,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15315"
+NAME="AEN15393"
 ></A
 ><H3
 ><A
@@ -11783,7 +11783,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15324"
+NAME="AEN15402"
 ></A
 ><P
 ></P
@@ -11821,7 +11821,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15333"
+NAME="AEN15411"
 ></A
 ><H3
 ><A
@@ -11856,7 +11856,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15341"
+NAME="AEN15419"
 ></A
 ><P
 ></P
@@ -11909,7 +11909,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15354"
+NAME="AEN15432"
 ></A
 ><H3
 ><A
@@ -11947,334 +11947,6 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15363"
-></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 Parser context</TD
-></TR
-><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 current node in the traversal</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->the next element following that axis</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN15380"
-></A
-><H3
-><A
-NAME="XMLXPATHNEXTCHILD"
-></A
->xmlXPathNextChild ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="libxml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
->  xmlXPathNextChild               (<A
-HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
->xmlXPathParserContextPtr</A
-> ctxt,
-                                             <A
-HREF="libxml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> cur);</PRE
-></TD
-></TR
-></TABLE
-><P
->Traversal function for the "child" direction
-The child axis contains the children of the context node in document order.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN15389"
-></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 Parser context</TD
-></TR
-><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 current node in the traversal</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->the next element following that axis</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN15406"
-></A
-><H3
-><A
-NAME="XMLXPATHNEXTDESCENDANT"
-></A
->xmlXPathNextDescendant ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="libxml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
->  xmlXPathNextDescendant          (<A
-HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
->xmlXPathParserContextPtr</A
-> ctxt,
-                                             <A
-HREF="libxml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> cur);</PRE
-></TD
-></TR
-></TABLE
-><P
->Traversal function for the "descendant" direction
-the descendant axis contains the descendants of the context node in document
-order; a descendant is a child or a child of a child and so on.</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN15415"
-></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 Parser context</TD
-></TR
-><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 current node in the traversal</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->the next element following that axis</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN15432"
-></A
-><H3
-><A
-NAME="XMLXPATHNEXTDESCENDANTORSELF"
-></A
->xmlXPathNextDescendantOrSelf ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="libxml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
->  xmlXPathNextDescendantOrSelf    (<A
-HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
->xmlXPathParserContextPtr</A
-> ctxt,
-                                             <A
-HREF="libxml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> cur);</PRE
-></TD
-></TR
-></TABLE
-><P
->Traversal function for the "descendant-or-self" direction
-the descendant-or-self axis contains the context node and the descendants
-of the context node in document order; thus the context node is the first
-node on the axis, and the first child of the context node is the second node
-on the axis</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
 NAME="AEN15441"
 ></A
 ><P
@@ -12349,9 +12021,9 @@
 ></A
 ><H3
 ><A
-NAME="XMLXPATHNEXTPARENT"
+NAME="XMLXPATHNEXTCHILD"
 ></A
->xmlXPathNextParent ()</H3
+>xmlXPathNextChild ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -12364,7 +12036,7 @@
 ><A
 HREF="libxml-tree.html#XMLNODEPTR"
 >xmlNodePtr</A
->  xmlXPathNextParent              (<A
+>  xmlXPathNextChild               (<A
 HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
 >xmlXPathParserContextPtr</A
 > ctxt,
@@ -12376,8 +12048,8 @@
 ></TR
 ></TABLE
 ><P
->Traversal function for the "parent" direction
-The parent axis contains the parent of the context node, if there is one.</P
+>Traversal function for the "child" direction
+The child axis contains the children of the context node in document order.</P
 ><P
 ></P
 ><DIV
@@ -12457,9 +12129,9 @@
 ></A
 ><H3
 ><A
-NAME="XMLXPATHNEXTANCESTORORSELF"
+NAME="XMLXPATHNEXTDESCENDANT"
 ></A
->xmlXPathNextAncestorOrSelf ()</H3
+>xmlXPathNextDescendant ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -12472,7 +12144,7 @@
 ><A
 HREF="libxml-tree.html#XMLNODEPTR"
 >xmlNodePtr</A
->  xmlXPathNextAncestorOrSelf      (<A
+>  xmlXPathNextDescendant          (<A
 HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
 >xmlXPathParserContextPtr</A
 > ctxt,
@@ -12484,11 +12156,9 @@
 ></TR
 ></TABLE
 ><P
->Traversal function for the "ancestor-or-self" direction
-he ancestor-or-self axis contains the context node and ancestors of
-the context node in reverse document order; thus the context node is
-the first node on the axis, and the context node's parent the second;
-parent here is defined the same as with the parent axis.</P
+>Traversal function for the "descendant" direction
+the descendant axis contains the descendants of the context node in document
+order; a descendant is a child or a child of a child and so on.</P
 ><P
 ></P
 ><DIV
@@ -12568,9 +12238,9 @@
 ></A
 ><H3
 ><A
-NAME="XMLXPATHNEXTFOLLOWINGSIBLING"
+NAME="XMLXPATHNEXTDESCENDANTORSELF"
 ></A
->xmlXPathNextFollowingSibling ()</H3
+>xmlXPathNextDescendantOrSelf ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -12583,7 +12253,7 @@
 ><A
 HREF="libxml-tree.html#XMLNODEPTR"
 >xmlNodePtr</A
->  xmlXPathNextFollowingSibling    (<A
+>  xmlXPathNextDescendantOrSelf    (<A
 HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
 >xmlXPathParserContextPtr</A
 > ctxt,
@@ -12595,9 +12265,11 @@
 ></TR
 ></TABLE
 ><P
->Traversal function for the "following-sibling" direction
-The following-sibling axis contains the following siblings of the context
-node in document order.</P
+>Traversal function for the "descendant-or-self" direction
+the descendant-or-self axis contains the context node and the descendants
+of the context node in document order; thus the context node is the first
+node on the axis, and the first child of the context node is the second node
+on the axis</P
 ><P
 ></P
 ><DIV
@@ -12677,9 +12349,9 @@
 ></A
 ><H3
 ><A
-NAME="XMLXPATHNEXTFOLLOWING"
+NAME="XMLXPATHNEXTPARENT"
 ></A
->xmlXPathNextFollowing ()</H3
+>xmlXPathNextParent ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -12692,7 +12364,7 @@
 ><A
 HREF="libxml-tree.html#XMLNODEPTR"
 >xmlNodePtr</A
->  xmlXPathNextFollowing           (<A
+>  xmlXPathNextParent              (<A
 HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
 >xmlXPathParserContextPtr</A
 > ctxt,
@@ -12704,11 +12376,8 @@
 ></TR
 ></TABLE
 ><P
->Traversal function for the "following" direction
-The following axis contains all nodes in the same document as the context
-node that are after the context node in document order, excluding any
-descendants and excluding attribute nodes and namespace nodes; the nodes
-are ordered in document order</P
+>Traversal function for the "parent" direction
+The parent axis contains the parent of the context node, if there is one.</P
 ><P
 ></P
 ><DIV
@@ -12788,9 +12457,9 @@
 ></A
 ><H3
 ><A
-NAME="XMLXPATHNEXTNAMESPACE"
+NAME="XMLXPATHNEXTANCESTORORSELF"
 ></A
->xmlXPathNextNamespace ()</H3
+>xmlXPathNextAncestorOrSelf ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -12803,7 +12472,7 @@
 ><A
 HREF="libxml-tree.html#XMLNODEPTR"
 >xmlNodePtr</A
->  xmlXPathNextNamespace           (<A
+>  xmlXPathNextAncestorOrSelf      (<A
 HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
 >xmlXPathParserContextPtr</A
 > ctxt,
@@ -12815,237 +12484,17 @@
 ></TR
 ></TABLE
 ><P
->Traversal function for the "namespace" direction
-the namespace axis contains the namespace nodes of the context node;
-the order of nodes on this axis is implementation-defined; the axis will
-be empty unless the context node is an element</P
-><P
->We keep the XML namespace node at the end of the list.</P
+>Traversal function for the "ancestor-or-self" direction
+he ancestor-or-self axis contains the context node and ancestors of
+the context node in reverse document order; thus the context node is
+the first node on the axis, and the context node's parent the second;
+parent here is defined the same as with the parent axis.</P
 ><P
 ></P
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15572"
-></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 Parser context</TD
-></TR
-><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 current attribute in the traversal</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->the next element following that axis</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN15589"
-></A
-><H3
-><A
-NAME="XMLXPATHNEXTATTRIBUTE"
-></A
->xmlXPathNextAttribute ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="libxml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
->  xmlXPathNextAttribute           (<A
-HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
->xmlXPathParserContextPtr</A
-> ctxt,
-                                             <A
-HREF="libxml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> cur);</PRE
-></TD
-></TR
-></TABLE
-><P
->Traversal function for the "attribute" direction
-TODO: support DTD inherited default attributes</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN15598"
-></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 Parser context</TD
-></TR
-><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 current attribute in the traversal</TD
-></TR
-><TR
-><TD
-WIDTH="20%"
-ALIGN="RIGHT"
-VALIGN="TOP"
-><I
-CLASS="EMPHASIS"
->Returns</I
-> :</TD
-><TD
-WIDTH="80%"
-ALIGN="LEFT"
-VALIGN="TOP"
->the next element following that axis</TD
-></TR
-></TBODY
-></TABLE
-><P
-></P
-></DIV
-></DIV
-><HR><DIV
-CLASS="REFSECT2"
-><A
-NAME="AEN15615"
-></A
-><H3
-><A
-NAME="XMLXPATHNEXTPRECEDING"
-></A
->xmlXPathNextPreceding ()</H3
-><TABLE
-BORDER="0"
-BGCOLOR="#D6E8FF"
-WIDTH="100%"
-CELLPADDING="6"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
-><A
-HREF="libxml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
->  xmlXPathNextPreceding           (<A
-HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
->xmlXPathParserContextPtr</A
-> ctxt,
-                                             <A
-HREF="libxml-tree.html#XMLNODEPTR"
->xmlNodePtr</A
-> cur);</PRE
-></TD
-></TR
-></TABLE
-><P
->Traversal function for the "preceding" direction
-the preceding axis contains all nodes in the same document as the context
-node that are before the context node in document order, excluding any
-ancestors and excluding attribute nodes and namespace nodes; the nodes are
-ordered in reverse document order</P
-><P
-></P
-><DIV
-CLASS="INFORMALTABLE"
-><A
-NAME="AEN15624"
+NAME="AEN15571"
 ></A
 ><P
 ></P
@@ -13115,13 +12564,13 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15641"
+NAME="AEN15588"
 ></A
 ><H3
 ><A
-NAME="XMLXPATHNEXTANCESTOR"
+NAME="XMLXPATHNEXTFOLLOWINGSIBLING"
 ></A
->xmlXPathNextAncestor ()</H3
+>xmlXPathNextFollowingSibling ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -13134,7 +12583,7 @@
 ><A
 HREF="libxml-tree.html#XMLNODEPTR"
 >xmlNodePtr</A
->  xmlXPathNextAncestor            (<A
+>  xmlXPathNextFollowingSibling    (<A
 HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
 >xmlXPathParserContextPtr</A
 > ctxt,
@@ -13146,12 +12595,232 @@
 ></TR
 ></TABLE
 ><P
->Traversal function for the "ancestor" direction
-the ancestor axis contains the ancestors of the context node; the ancestors
-of the context node consist of the parent of context node and the parent's
-parent and so on; the nodes are ordered in reverse document order; thus the
-parent is the first node on the axis, and the parent's parent is the second
-node on the axis</P
+>Traversal function for the "following-sibling" direction
+The following-sibling axis contains the following siblings of the context
+node in document order.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN15597"
+></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 Parser context</TD
+></TR
+><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 current node in the traversal</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the next element following that axis</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN15614"
+></A
+><H3
+><A
+NAME="XMLXPATHNEXTFOLLOWING"
+></A
+>xmlXPathNextFollowing ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+>  xmlXPathNextFollowing           (<A
+HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> cur);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Traversal function for the "following" direction
+The following axis contains all nodes in the same document as the context
+node that are after the context node in document order, excluding any
+descendants and excluding attribute nodes and namespace nodes; the nodes
+are ordered in document order</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN15623"
+></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 Parser context</TD
+></TR
+><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 current node in the traversal</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the next element following that axis</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN15640"
+></A
+><H3
+><A
+NAME="XMLXPATHNEXTNAMESPACE"
+></A
+>xmlXPathNextNamespace ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+>  xmlXPathNextNamespace           (<A
+HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> cur);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Traversal function for the "namespace" direction
+the namespace axis contains the namespace nodes of the context node;
+the order of nodes on this axis is implementation-defined; the axis will
+be empty unless the context node is an element</P
+><P
+>We keep the XML namespace node at the end of the list.</P
 ><P
 ></P
 ><DIV
@@ -13201,7 +12870,7 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
->  the current node in the traversal</TD
+>  the current attribute in the traversal</TD
 ></TR
 ><TR
 ><TD
@@ -13231,9 +12900,9 @@
 ></A
 ><H3
 ><A
-NAME="XMLXPATHNEXTPRECEDINGSIBLING"
+NAME="XMLXPATHNEXTATTRIBUTE"
 ></A
->xmlXPathNextPrecedingSibling ()</H3
+>xmlXPathNextAttribute ()</H3
 ><TABLE
 BORDER="0"
 BGCOLOR="#D6E8FF"
@@ -13246,7 +12915,7 @@
 ><A
 HREF="libxml-tree.html#XMLNODEPTR"
 >xmlNodePtr</A
->  xmlXPathNextPrecedingSibling    (<A
+>  xmlXPathNextAttribute           (<A
 HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
 >xmlXPathParserContextPtr</A
 > ctxt,
@@ -13258,10 +12927,8 @@
 ></TR
 ></TABLE
 ><P
->Traversal function for the "preceding-sibling" direction
-The preceding-sibling axis contains the preceding siblings of the context
-node in reverse document order; the first preceding sibling is first on the
-axis; the sibling preceding that node is the second on the axis and so on.</P
+>Traversal function for the "attribute" direction
+TODO: support DTD inherited default attributes</P
 ><P
 ></P
 ><DIV
@@ -13311,6 +12978,117 @@
 WIDTH="80%"
 ALIGN="LEFT"
 VALIGN="TOP"
+>  the current attribute in the traversal</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the next element following that axis</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN15693"
+></A
+><H3
+><A
+NAME="XMLXPATHNEXTPRECEDING"
+></A
+>xmlXPathNextPreceding ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+>  xmlXPathNextPreceding           (<A
+HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> cur);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Traversal function for the "preceding" direction
+the preceding axis contains all nodes in the same document as the context
+node that are before the context node in document order, excluding any
+ancestors and excluding attribute nodes and namespace nodes; the nodes are
+ordered in reverse document order</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN15702"
+></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 Parser context</TD
+></TR
+><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 current node in the traversal</TD
 ></TR
 ><TR
@@ -13337,7 +13115,229 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15693"
+NAME="AEN15719"
+></A
+><H3
+><A
+NAME="XMLXPATHNEXTANCESTOR"
+></A
+>xmlXPathNextAncestor ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+>  xmlXPathNextAncestor            (<A
+HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> cur);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Traversal function for the "ancestor" direction
+the ancestor axis contains the ancestors of the context node; the ancestors
+of the context node consist of the parent of context node and the parent's
+parent and so on; the nodes are ordered in reverse document order; thus the
+parent is the first node on the axis, and the parent's parent is the second
+node on the axis</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN15728"
+></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 Parser context</TD
+></TR
+><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 current node in the traversal</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the next element following that axis</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN15745"
+></A
+><H3
+><A
+NAME="XMLXPATHNEXTPRECEDINGSIBLING"
+></A
+>xmlXPathNextPrecedingSibling ()</H3
+><TABLE
+BORDER="0"
+BGCOLOR="#D6E8FF"
+WIDTH="100%"
+CELLPADDING="6"
+><TR
+><TD
+><PRE
+CLASS="PROGRAMLISTING"
+><A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+>  xmlXPathNextPrecedingSibling    (<A
+HREF="libxml-xpath.html#XMLXPATHPARSERCONTEXTPTR"
+>xmlXPathParserContextPtr</A
+> ctxt,
+                                             <A
+HREF="libxml-tree.html#XMLNODEPTR"
+>xmlNodePtr</A
+> cur);</PRE
+></TD
+></TR
+></TABLE
+><P
+>Traversal function for the "preceding-sibling" direction
+The preceding-sibling axis contains the preceding siblings of the context
+node in reverse document order; the first preceding sibling is first on the
+axis; the sibling preceding that node is the second on the axis and so on.</P
+><P
+></P
+><DIV
+CLASS="INFORMALTABLE"
+><A
+NAME="AEN15754"
+></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 Parser context</TD
+></TR
+><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 current node in the traversal</TD
+></TR
+><TR
+><TD
+WIDTH="20%"
+ALIGN="RIGHT"
+VALIGN="TOP"
+><I
+CLASS="EMPHASIS"
+>Returns</I
+> :</TD
+><TD
+WIDTH="80%"
+ALIGN="LEFT"
+VALIGN="TOP"
+>the next element following that axis</TD
+></TR
+></TBODY
+></TABLE
+><P
+></P
+></DIV
+></DIV
+><HR><DIV
+CLASS="REFSECT2"
+><A
+NAME="AEN15771"
 ></A
 ><H3
 ><A
@@ -13376,7 +13376,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15702"
+NAME="AEN15780"
 ></A
 ><P
 ></P
@@ -13431,7 +13431,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15715"
+NAME="AEN15793"
 ></A
 ><H3
 ><A
@@ -13475,7 +13475,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15725"
+NAME="AEN15803"
 ></A
 ><P
 ></P
@@ -13530,7 +13530,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15738"
+NAME="AEN15816"
 ></A
 ><H3
 ><A
@@ -13565,7 +13565,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15746"
+NAME="AEN15824"
 ></A
 ><P
 ></P
@@ -13620,7 +13620,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15759"
+NAME="AEN15837"
 ></A
 ><H3
 ><A
@@ -13660,7 +13660,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15767"
+NAME="AEN15845"
 ></A
 ><P
 ></P
@@ -13715,7 +13715,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15780"
+NAME="AEN15858"
 ></A
 ><H3
 ><A
@@ -13756,7 +13756,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15788"
+NAME="AEN15866"
 ></A
 ><P
 ></P
@@ -13811,7 +13811,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15801"
+NAME="AEN15879"
 ></A
 ><H3
 ><A
@@ -13850,7 +13850,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15809"
+NAME="AEN15887"
 ></A
 ><P
 ></P
@@ -13905,7 +13905,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15822"
+NAME="AEN15900"
 ></A
 ><H3
 ><A
@@ -13941,7 +13941,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15830"
+NAME="AEN15908"
 ></A
 ><P
 ></P
@@ -13996,7 +13996,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15843"
+NAME="AEN15921"
 ></A
 ><H3
 ><A
@@ -14033,7 +14033,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15851"
+NAME="AEN15929"
 ></A
 ><P
 ></P
@@ -14088,7 +14088,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15864"
+NAME="AEN15942"
 ></A
 ><H3
 ><A
@@ -14125,7 +14125,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15872"
+NAME="AEN15950"
 ></A
 ><P
 ></P
@@ -14180,7 +14180,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15885"
+NAME="AEN15963"
 ></A
 ><H3
 ><A
@@ -14235,7 +14235,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15893"
+NAME="AEN15971"
 ></A
 ><P
 ></P
@@ -14290,7 +14290,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15906"
+NAME="AEN15984"
 ></A
 ><H3
 ><A
@@ -14330,7 +14330,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15914"
+NAME="AEN15992"
 ></A
 ><P
 ></P
@@ -14385,7 +14385,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15927"
+NAME="AEN16005"
 ></A
 ><H3
 ><A
@@ -14426,7 +14426,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15935"
+NAME="AEN16013"
 ></A
 ><P
 ></P
@@ -14481,7 +14481,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15948"
+NAME="AEN16026"
 ></A
 ><H3
 ><A
@@ -14522,7 +14522,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15956"
+NAME="AEN16034"
 ></A
 ><P
 ></P
@@ -14577,7 +14577,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15969"
+NAME="AEN16047"
 ></A
 ><H3
 ><A
@@ -14621,7 +14621,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15977"
+NAME="AEN16055"
 ></A
 ><P
 ></P
@@ -14676,7 +14676,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN15990"
+NAME="AEN16068"
 ></A
 ><H3
 ><A
@@ -14713,7 +14713,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN15998"
+NAME="AEN16076"
 ></A
 ><P
 ></P
@@ -14768,7 +14768,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16011"
+NAME="AEN16089"
 ></A
 ><H3
 ><A
@@ -14806,7 +14806,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16020"
+NAME="AEN16098"
 ></A
 ><P
 ></P
@@ -14861,7 +14861,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16033"
+NAME="AEN16111"
 ></A
 ><H3
 ><A
@@ -14899,7 +14899,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16042"
+NAME="AEN16120"
 ></A
 ><P
 ></P
@@ -14954,7 +14954,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16055"
+NAME="AEN16133"
 ></A
 ><H3
 ><A
@@ -14997,7 +14997,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16063"
+NAME="AEN16141"
 ></A
 ><P
 ></P
@@ -15052,7 +15052,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16076"
+NAME="AEN16154"
 ></A
 ><H3
 ><A
@@ -15087,7 +15087,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16084"
+NAME="AEN16162"
 ></A
 ><P
 ></P
@@ -15142,7 +15142,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16097"
+NAME="AEN16175"
 ></A
 ><H3
 ><A
@@ -15179,7 +15179,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16105"
+NAME="AEN16183"
 ></A
 ><P
 ></P
@@ -15234,7 +15234,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16118"
+NAME="AEN16196"
 ></A
 ><H3
 ><A
@@ -15271,7 +15271,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16126"
+NAME="AEN16204"
 ></A
 ><P
 ></P
@@ -15326,7 +15326,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16139"
+NAME="AEN16217"
 ></A
 ><H3
 ><A
@@ -15363,7 +15363,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16147"
+NAME="AEN16225"
 ></A
 ><P
 ></P
@@ -15418,7 +15418,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16160"
+NAME="AEN16238"
 ></A
 ><H3
 ><A
@@ -15456,7 +15456,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16168"
+NAME="AEN16246"
 ></A
 ><P
 ></P
@@ -15511,7 +15511,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16181"
+NAME="AEN16259"
 ></A
 ><H3
 ><A
@@ -15551,7 +15551,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16189"
+NAME="AEN16267"
 ></A
 ><P
 ></P
diff --git a/doc/html/libxml-xpointer.html b/doc/html/libxml-xpointer.html
index ab06d08..cadba0d 100644
--- a/doc/html/libxml-xpointer.html
+++ b/doc/html/libxml-xpointer.html
@@ -123,7 +123,7 @@
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN16207"
+NAME="AEN16285"
 ></A
 ><H2
 >Name</H2
@@ -131,7 +131,7 @@
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN16210"
+NAME="AEN16288"
 ></A
 ><H2
 >Synopsis</H2
@@ -411,7 +411,7 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN16285"
+NAME="AEN16363"
 ></A
 ><H2
 >Description</H2
@@ -421,14 +421,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN16288"
+NAME="AEN16366"
 ></A
 ><H2
 >Details</H2
 ><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16290"
+NAME="AEN16368"
 ></A
 ><H3
 ><A
@@ -458,7 +458,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16295"
+NAME="AEN16373"
 ></A
 ><H3
 ><A
@@ -484,7 +484,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16300"
+NAME="AEN16378"
 ></A
 ><H3
 ><A
@@ -522,7 +522,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16309"
+NAME="AEN16387"
 ></A
 ><P
 ></P
@@ -575,7 +575,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16322"
+NAME="AEN16400"
 ></A
 ><H3
 ><A
@@ -605,7 +605,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16329"
+NAME="AEN16407"
 ></A
 ><P
 ></P
@@ -643,7 +643,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16338"
+NAME="AEN16416"
 ></A
 ><H3
 ><A
@@ -690,7 +690,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16349"
+NAME="AEN16427"
 ></A
 ><P
 ></P
@@ -760,7 +760,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16366"
+NAME="AEN16444"
 ></A
 ><H3
 ><A
@@ -799,7 +799,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16375"
+NAME="AEN16453"
 ></A
 ><P
 ></P
@@ -903,7 +903,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16400"
+NAME="AEN16478"
 ></A
 ><H3
 ><A
@@ -940,7 +940,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16409"
+NAME="AEN16487"
 ></A
 ><P
 ></P
@@ -1010,7 +1010,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16426"
+NAME="AEN16504"
 ></A
 ><H3
 ><A
@@ -1047,7 +1047,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16435"
+NAME="AEN16513"
 ></A
 ><P
 ></P
@@ -1117,7 +1117,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16452"
+NAME="AEN16530"
 ></A
 ><H3
 ><A
@@ -1154,7 +1154,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16461"
+NAME="AEN16539"
 ></A
 ><P
 ></P
@@ -1224,7 +1224,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16478"
+NAME="AEN16556"
 ></A
 ><H3
 ><A
@@ -1261,7 +1261,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16487"
+NAME="AEN16565"
 ></A
 ><P
 ></P
@@ -1331,7 +1331,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16504"
+NAME="AEN16582"
 ></A
 ><H3
 ><A
@@ -1380,7 +1380,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16515"
+NAME="AEN16593"
 ></A
 ><P
 ></P
@@ -1450,7 +1450,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16532"
+NAME="AEN16610"
 ></A
 ><H3
 ><A
@@ -1490,7 +1490,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16541"
+NAME="AEN16619"
 ></A
 ><P
 ></P
@@ -1543,7 +1543,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16554"
+NAME="AEN16632"
 ></A
 ><H3
 ><A
@@ -1580,7 +1580,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16563"
+NAME="AEN16641"
 ></A
 ><P
 ></P
@@ -1650,7 +1650,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16580"
+NAME="AEN16658"
 ></A
 ><H3
 ><A
@@ -1683,7 +1683,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16588"
+NAME="AEN16666"
 ></A
 ><P
 ></P
@@ -1736,7 +1736,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16601"
+NAME="AEN16679"
 ></A
 ><H3
 ><A
@@ -1776,7 +1776,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16610"
+NAME="AEN16688"
 ></A
 ><P
 ></P
@@ -1831,7 +1831,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16623"
+NAME="AEN16701"
 ></A
 ><H3
 ><A
@@ -1869,7 +1869,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16632"
+NAME="AEN16710"
 ></A
 ><P
 ></P
@@ -1922,7 +1922,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16645"
+NAME="AEN16723"
 ></A
 ><H3
 ><A
@@ -1956,7 +1956,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16653"
+NAME="AEN16731"
 ></A
 ><P
 ></P
@@ -2011,7 +2011,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16666"
+NAME="AEN16744"
 ></A
 ><H3
 ><A
@@ -2042,7 +2042,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16673"
+NAME="AEN16751"
 ></A
 ><P
 ></P
@@ -2097,7 +2097,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16686"
+NAME="AEN16764"
 ></A
 ><H3
 ><A
@@ -2138,7 +2138,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16696"
+NAME="AEN16774"
 ></A
 ><P
 ></P
@@ -2226,7 +2226,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16717"
+NAME="AEN16795"
 ></A
 ><H3
 ><A
@@ -2263,7 +2263,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16726"
+NAME="AEN16804"
 ></A
 ><P
 ></P
@@ -2334,7 +2334,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16743"
+NAME="AEN16821"
 ></A
 ><H3
 ><A
@@ -2368,7 +2368,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16751"
+NAME="AEN16829"
 ></A
 ><P
 ></P
@@ -2423,7 +2423,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16764"
+NAME="AEN16842"
 ></A
 ><H3
 ><A
@@ -2457,7 +2457,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16772"
+NAME="AEN16850"
 ></A
 ><P
 ></P
@@ -2511,7 +2511,7 @@
 ><HR><DIV
 CLASS="REFSECT2"
 ><A
-NAME="AEN16785"
+NAME="AEN16863"
 ></A
 ><H3
 ><A
@@ -2548,7 +2548,7 @@
 ><DIV
 CLASS="INFORMALTABLE"
 ><A
-NAME="AEN16794"
+NAME="AEN16872"
 ></A
 ><P
 ></P
diff --git a/doc/index.html b/doc/index.html
index 30c0f28..0cf1978 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -49,6 +49,7 @@
 <li><a href="entities.html">Entities or no entities</a></li>
 <li><a href="namespaces.html">Namespaces</a></li>
 <li><a href="upgrade.html">Upgrading 1.x code</a></li>
+<li><a href="threads.html">Thread safety</a></li>
 <li><a href="DOM.html">DOM Principles</a></li>
 <li><a href="example.html">A real example</a></li>
 <li><a href="contribs.html">Contributions</a></li>
diff --git a/doc/interface.html b/doc/interface.html
index 17a2a8b..6adc52b 100644
--- a/doc/interface.html
+++ b/doc/interface.html
@@ -49,6 +49,7 @@
 <li><a href="entities.html">Entities or no entities</a></li>
 <li><a href="namespaces.html">Namespaces</a></li>
 <li><a href="upgrade.html">Upgrading 1.x code</a></li>
+<li><a href="threads.html">Thread safety</a></li>
 <li><a href="DOM.html">DOM Principles</a></li>
 <li><a href="example.html">A real example</a></li>
 <li><a href="contribs.html">Contributions</a></li>
diff --git a/doc/intro.html b/doc/intro.html
index ff9e929..f253a8c 100644
--- a/doc/intro.html
+++ b/doc/intro.html
@@ -49,6 +49,7 @@
 <li><a href="entities.html">Entities or no entities</a></li>
 <li><a href="namespaces.html">Namespaces</a></li>
 <li><a href="upgrade.html">Upgrading 1.x code</a></li>
+<li><a href="threads.html">Thread safety</a></li>
 <li><a href="DOM.html">DOM Principles</a></li>
 <li><a href="example.html">A real example</a></li>
 <li><a href="contribs.html">Contributions</a></li>
diff --git a/doc/library.html b/doc/library.html
index 99a0a9d..4bda13b 100644
--- a/doc/library.html
+++ b/doc/library.html
@@ -49,6 +49,7 @@
 <li><a href="entities.html">Entities or no entities</a></li>
 <li><a href="namespaces.html">Namespaces</a></li>
 <li><a href="upgrade.html">Upgrading 1.x code</a></li>
+<li><a href="threads.html">Thread safety</a></li>
 <li><a href="DOM.html">DOM Principles</a></li>
 <li><a href="example.html">A real example</a></li>
 <li><a href="contribs.html">Contributions</a></li>
diff --git a/doc/namespaces.html b/doc/namespaces.html
index 74fd164..ae293f9 100644
--- a/doc/namespaces.html
+++ b/doc/namespaces.html
@@ -49,6 +49,7 @@
 <li><a href="entities.html">Entities or no entities</a></li>
 <li><a href="namespaces.html">Namespaces</a></li>
 <li><a href="upgrade.html">Upgrading 1.x code</a></li>
+<li><a href="threads.html">Thread safety</a></li>
 <li><a href="DOM.html">DOM Principles</a></li>
 <li><a href="example.html">A real example</a></li>
 <li><a href="contribs.html">Contributions</a></li>
diff --git a/doc/news.html b/doc/news.html
index 31b6d6a..a13b642 100644
--- a/doc/news.html
+++ b/doc/news.html
@@ -49,6 +49,7 @@
 <li><a href="entities.html">Entities or no entities</a></li>
 <li><a href="namespaces.html">Namespaces</a></li>
 <li><a href="upgrade.html">Upgrading 1.x code</a></li>
+<li><a href="threads.html">Thread safety</a></li>
 <li><a href="DOM.html">DOM Principles</a></li>
 <li><a href="example.html">A real example</a></li>
 <li><a href="contribs.html">Contributions</a></li>
diff --git a/doc/site.xsl b/doc/site.xsl
index aa58934..b126472 100644
--- a/doc/site.xsl
+++ b/doc/site.xsl
@@ -85,6 +85,9 @@
       <xsl:when test="$name = '#Memory'">
         <xsl:text>xmlmem.html</xsl:text>
       </xsl:when>
+      <xsl:when test="$name = '#Thread'">
+        <xsl:text>threads.html</xsl:text>
+      </xsl:when>
       <xsl:when test="$name = '#FAQ'">
         <xsl:text>FAQ.html</xsl:text>
       </xsl:when>
diff --git a/doc/threads.html b/doc/threads.html
new file mode 100644
index 0000000..048235b
--- /dev/null
+++ b/doc/threads.html
@@ -0,0 +1,103 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<html>
+<head>
+<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type">
+<style type="text/css"><!--
+TD {font-size: 10pt; font-family: Verdana,Arial,Helvetica}
+BODY {font-size: 10pt; font-family: Verdana,Arial,Helvetica; margin-top: 5pt; margin-left: 0pt; margin-right: 0pt}
+H1 {font-size: 16pt; font-family: Verdana,Arial,Helvetica}
+H2 {font-size: 14pt; font-family: Verdana,Arial,Helvetica}
+H3 {font-size: 12pt; font-family: Verdana,Arial,Helvetica}
+A:link, A:visited, A:active { text-decoration: underline }
+--></style>
+<title>Thread safety</title>
+</head>
+<body bgcolor="#8b7765" text="#000000" link="#000000" vlink="#000000">
+<table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr>
+<td width="180">
+<a href="http://www.gnome.org/"><img src="smallfootonly.gif" alt="Gnome Logo"></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo"></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo"></a>
+</td>
+<td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center">
+<h1>The XML C library for Gnome</h1>
+<h2>Thread safety</h2>
+</td></tr></table></td></tr></table></td>
+</tr></table>
+<table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr>
+<td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td>
+<table width="100%" border="0" cellspacing="1" cellpadding="3">
+<tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Main Menu</b></center></td></tr>
+<tr><td bgcolor="#fffacd"><ul style="margin-left: -2pt">
+<li><a href="index.html">Home</a></li>
+<li><a href="intro.html">Introduction</a></li>
+<li><a href="FAQ.html">FAQ</a></li>
+<li><a href="docs.html">Documentation</a></li>
+<li><a href="bugs.html">Reporting bugs and getting help</a></li>
+<li><a href="help.html">How to help</a></li>
+<li><a href="downloads.html">Downloads</a></li>
+<li><a href="news.html">News</a></li>
+<li><a href="XML.html">XML</a></li>
+<li><a href="XSLT.html">XSLT</a></li>
+<li><a href="architecture.html">libxml architecture</a></li>
+<li><a href="tree.html">The tree output</a></li>
+<li><a href="interface.html">The SAX interface</a></li>
+<li><a href="xmldtd.html">Validation &amp; DTDs</a></li>
+<li><a href="xmlmem.html">Memory Management</a></li>
+<li><a href="encoding.html">Encodings support</a></li>
+<li><a href="xmlio.html">I/O Interfaces</a></li>
+<li><a href="catalog.html">Catalog support</a></li>
+<li><a href="library.html">The parser interfaces</a></li>
+<li><a href="entities.html">Entities or no entities</a></li>
+<li><a href="namespaces.html">Namespaces</a></li>
+<li><a href="upgrade.html">Upgrading 1.x code</a></li>
+<li><a href="threads.html">Thread safety</a></li>
+<li><a href="DOM.html">DOM Principles</a></li>
+<li><a href="example.html">A real example</a></li>
+<li><a href="contribs.html">Contributions</a></li>
+<li>
+<a href="xml.html">flat page</a>, <a href="site.xsl">stylesheet</a>
+</li>
+</ul></td></tr>
+</table>
+<table width="100%" border="0" cellspacing="1" cellpadding="3">
+<tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr>
+<tr><td bgcolor="#fffacd"><ul style="margin-left: -2pt">
+<li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li>
+<li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li>
+<li><a href="http://www.cs.unibo.it/~casarini/gdome2/">DOM gdome2</a></li>
+<li><a href="ftp://xmlsoft.org/">FTP</a></li>
+<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://pages.eidosnet.co.uk/~garypen/libxml/">Solaris binaries</a></li>
+<li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml">Bug Tracker</a></li>
+</ul></td></tr>
+</table>
+</td></tr></table></td>
+<td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd">
+<p>Starting with 2.4.7, libxml makes provisions to ensure that concurent
+threads can safely work in parallel parsing different documents. There is
+however a couple of things to do to ensure it:</p>
+<ul>
+<li>configure the library accordingly using the --with-threads options</li>
+<li>call xmlInitParser() in the &quot;main&quot; thread before using any of the
+    libxml API (except possibly selecting a different memory allocator)</li>
+</ul>
+<p>Note that the thread safety cannot be ensured for multiple threads sharing
+the same document, the locking must be done at the application level, libxml
+exports a basic mutex and reentrant mutexes API in &lt;libxml/threads.h&gt;.
+The parts of the library checked for thread safety are:</p>
+<ul>
+<li>concurrent loading</li>
+<li>file access resolution</li>
+<li>catalog access</li>
+<li>catalog building</li>
+<li>entities lookup/accesses</li>
+<li>validation</li>
+<li>global variables per-thread override</li>
+<li>memory handling</li>
+</ul>
+<p>XPath is supposed to be thread safe now, but this wasn't tested
+seriously.</p>
+<p><a href="mailto:daniel@veillard.com">Daniel Veillard</a></p>
+</td></tr></table></td></tr></table></td></tr></table></td>
+</tr></table></td></tr></table>
+</body>
+</html>
diff --git a/doc/tree.html b/doc/tree.html
index f84e328..7fd0d77 100644
--- a/doc/tree.html
+++ b/doc/tree.html
@@ -49,6 +49,7 @@
 <li><a href="entities.html">Entities or no entities</a></li>
 <li><a href="namespaces.html">Namespaces</a></li>
 <li><a href="upgrade.html">Upgrading 1.x code</a></li>
+<li><a href="threads.html">Thread safety</a></li>
 <li><a href="DOM.html">DOM Principles</a></li>
 <li><a href="example.html">A real example</a></li>
 <li><a href="contribs.html">Contributions</a></li>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index efb8aef..47212d2 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -49,6 +49,7 @@
 <li><a href="entities.html">Entities or no entities</a></li>
 <li><a href="namespaces.html">Namespaces</a></li>
 <li><a href="upgrade.html">Upgrading 1.x code</a></li>
+<li><a href="threads.html">Thread safety</a></li>
 <li><a href="DOM.html">DOM Principles</a></li>
 <li><a href="example.html">A real example</a></li>
 <li><a href="contribs.html">Contributions</a></li>
diff --git a/doc/xml.html b/doc/xml.html
index d4befa9..a8c0d10 100644
--- a/doc/xml.html
+++ b/doc/xml.html
@@ -559,9 +559,25 @@
     SGML docs</li>
 </ul>
 
+<h3>2.4.7: Oct 30 2001</h3>
+<ul>
+  <li>exported some debugging interfaces</li>
+  <li>serious rewrite of the catalog code</li>
+  <li>integrated Gary Pennington thread safety patch, added configure option
+    and regression tests</li>
+  <li>removed an HTML parser bug</li>
+  <li>fixed a couple of potentially serious validation bugs</li>
+  <li>integrated the SGML DocBook support in xmllint</li>
+  <li>changed the nanoftp anonymous login passwd</li>
+  <li>some I/O cleanup and a couple of interfaces for Perl wrapper</li>
+  <li>general bug fixes</li>
+  <li>updated xmllint man page by John Fleck</li>
+  <li>some VMS and Windows updates</li>
+</ul>
+
 <h3>2.4.6: Oct 10 2001</h3>
 <ul>
-  <li>added and updated man pages by John Fleck</li>
+  <li>added an updated man pages by John Fleck</li>
   <li>portability and configure fixes</li>
   <li>an infinite loop on the HTML parser was removed (William)</li>
   <li>Windows makefile patches from Igor</li>
@@ -2124,6 +2140,7 @@
 
 
 
+
 } </pre>
   </li>
   <li>And then use it to save the document:
@@ -2994,6 +3011,35 @@
 has been drastically improved too. Don't take those changes as an excuse to
 not upgrade, it may cost a lot on the long term ...</p>
 
+<h2><a name="Thread">Thread safety</a></h2>
+
+<p>Starting with 2.4.7, libxml makes provisions to ensure that concurent
+threads can safely work in parallel parsing different documents. There is
+however a couple of things to do to ensure it:</p>
+<ul>
+  <li>configure the library accordingly using the --with-threads options</li>
+  <li>call xmlInitParser() in the "main" thread before using any of the
+    libxml API (except possibly selecting a different memory allocator)</li>
+</ul>
+
+<p>Note that the thread safety cannot be ensured for multiple threads sharing
+the same document, the locking must be done at the application level, libxml
+exports a basic mutex and reentrant mutexes API in &lt;libxml/threads.h&gt;.
+The parts of the library checked for thread safety are:</p>
+<ul>
+  <li>concurrent loading</li>
+  <li>file access resolution</li>
+  <li>catalog access</li>
+  <li>catalog building</li>
+  <li>entities lookup/accesses</li>
+  <li>validation</li>
+  <li>global variables per-thread override</li>
+  <li>memory handling</li>
+</ul>
+
+<p>XPath is supposed to be thread safe now, but this wasn't tested
+seriously.</p>
+
 <h2><a name="DOM"></a><a name="Principles">DOM Principles</a></h2>
 
 <p><a href="http://www.w3.org/DOM/">DOM</a> stands for the <em>Document
diff --git a/doc/xmldtd.html b/doc/xmldtd.html
index a0ce478..fe1d3b3 100644
--- a/doc/xmldtd.html
+++ b/doc/xmldtd.html
@@ -49,6 +49,7 @@
 <li><a href="entities.html">Entities or no entities</a></li>
 <li><a href="namespaces.html">Namespaces</a></li>
 <li><a href="upgrade.html">Upgrading 1.x code</a></li>
+<li><a href="threads.html">Thread safety</a></li>
 <li><a href="DOM.html">DOM Principles</a></li>
 <li><a href="example.html">A real example</a></li>
 <li><a href="contribs.html">Contributions</a></li>
diff --git a/doc/xmlio.html b/doc/xmlio.html
index 54d8c1f..9fb30db 100644
--- a/doc/xmlio.html
+++ b/doc/xmlio.html
@@ -49,6 +49,7 @@
 <li><a href="entities.html">Entities or no entities</a></li>
 <li><a href="namespaces.html">Namespaces</a></li>
 <li><a href="upgrade.html">Upgrading 1.x code</a></li>
+<li><a href="threads.html">Thread safety</a></li>
 <li><a href="DOM.html">DOM Principles</a></li>
 <li><a href="example.html">A real example</a></li>
 <li><a href="contribs.html">Contributions</a></li>
@@ -214,6 +215,7 @@
 
 
 
+
 } </pre>
 </li>
 <li>And then use it to save the document:
diff --git a/doc/xmlmem.html b/doc/xmlmem.html
index 09b6009..7366a28 100644
--- a/doc/xmlmem.html
+++ b/doc/xmlmem.html
@@ -49,6 +49,7 @@
 <li><a href="entities.html">Entities or no entities</a></li>
 <li><a href="namespaces.html">Namespaces</a></li>
 <li><a href="upgrade.html">Upgrading 1.x code</a></li>
+<li><a href="threads.html">Thread safety</a></li>
 <li><a href="DOM.html">DOM Principles</a></li>
 <li><a href="example.html">A real example</a></li>
 <li><a href="contribs.html">Contributions</a></li>
diff --git a/include/libxml/xmlwin32version.h b/include/libxml/xmlwin32version.h
index 9b2dbc0..c8a8677 100644
--- a/include/libxml/xmlwin32version.h
+++ b/include/libxml/xmlwin32version.h
@@ -27,21 +27,21 @@
  *
  * the version string like "1.2.3"
  */
-#define LIBXML_DOTTED_VERSION "2.4.6"
+#define LIBXML_DOTTED_VERSION "2.4.7"
 
 /**
  * LIBXML_VERSION:
  *
  * the version number: 1.2.3 value is 1002003
  */
-#define LIBXML_VERSION 20406
+#define LIBXML_VERSION 20407
 
 /**
  * LIBXML_VERSION_STRING:
  *
  * the version number string, 1.2.3 value is "1002003"
  */
-#define LIBXML_VERSION_STRING "20406"
+#define LIBXML_VERSION_STRING "20407"
 
 /**
  * LIBXML_TEST_VERSION:
@@ -49,7 +49,7 @@
  * Macro to check that the libxml version in use is compatible with
  * the version the software has been compiled against
  */
-#define LIBXML_TEST_VERSION xmlCheckVersion(20406);
+#define LIBXML_TEST_VERSION xmlCheckVersion(20407);
 
 #if 0
 /**
diff --git a/xmllint.1 b/xmllint.1
deleted file mode 100644
index 2e9b814..0000000
--- a/xmllint.1
+++ /dev/null
@@ -1,113 +0,0 @@
-.TH XMLLINT 1 "12 April 2000" 
-.SH NAME
-xmllint \- parse XML files and print the result of parsing
-.SH SYNOPSIS
-.B xmllint
-.RB [ \-\-compress ]
-.RB [ \-\-copy ]
-.RB [ \-\-debug ]
-.RB [ \-\-debugent ]
-.RB [ \-\-htmlout ]
-.RB [ \-\-insert ]
-.RB [ \-\-noblanks ]
-.RB [ \-\-noent ]
-.RB [ \-\-noout ]
-.RB [ \-\-nowarning ]
-.RB [ \-\-nowarp ]
-.RB [ \-\-postvalid ]
-.RB [ \-\-push ]
-.RB [ \-\-recover ]
-.RB [ \-\-repeat ]
-.RB [ \-\-shell ]
-.RB [ \-\-testIO ]
-.RB [ \-\-valid ]
-.IR xmlfile ...
-.SH DESCRIPTION
-The 
-.IR xmllint 
-program parses one or more XML files,
-specified on the command line as 
-.IR xmlfile ....
-It prints various types of output
-(depending upon the options selected).
-It is useful for detecting errors both in XML code and in the 
-XML parser itself.
-.SH OPTIONS
-.TP 12
-.B \-\-compress
-Do 
-.IR gzip (1)
-compression for the output.
-.TP 
-.B \-\-copy
-Test the internal copy implementation.
-.TP
-.B \-\-debug
-Dump a debug tree of the in-memory document.
-.TP
-.B \-\-debugent
-Debug the entities defined in the document.
-.TP
-.B \-\-htmlout
-Output results in
-.I html
-format.
-.TP
-.B \-\-insert
-Test for valid insertion.
-.TP
-.B \-\-noblanks
-Drop blanks from the output.
-.TP
-.B \-\-noent
-Substitute entity references by their value.
-.TP
-.B \-\-noout
-Do not output the result tree.
-.TP
-.B \-\-nowarning
-Do not print warning messages from the parser or validator.
-.TP
-.B \-\-nowarp
-Do not put 
-.I html
-document wrapper.
-.TP
-.B \-\-postvalid
-Do a
-.I posteriori
-validation.
-.TP
-.B \-\-push
-Use the push mode for the parser.
-.TP
-.B \-\-recover
-Output what was parsable on broken XML documents.
-.TP
-.B \-\-repeat
-Repeat the process 100 times, for the purpose of timing and profiling.
-.TP
-.B \-\-shell
-Run a navigating shell.
-.TP
-.B \-\-testIO
-Test user i/o support.
-.TP
-.B \-\-valid
-Validate the document in addition to std well-formed.
-.SH RESULT
-xmllint will return 1 if the XML is not well formed, 2 if the
-Dtd could not be loaded and 3 if the valiadtion fails. If no
-error is detected it will return 0.
-.SH FILES
-.TP 2.2i
-.B /depot/package/libxml_2.0.0/bin/xmllint
-executable 
-.SH "SEE ALSO"
-.BR libxml (4)
-.SH AUTHOR
-Daniel Veillard (daniel@veillard.com)
-Manual page by Ziying Sherwin,
-Lister Hill National Center for Biomedical Communication,
-U.S. National Library of Medicine (sherwin@nlm.nih.gov).
-.\" end of manual page